Gem 427a3d0e61d61e64e76facfa905c120356383bab osx/i386

built 'master:427a3d0e61d61e64e76facfa905c120356383bab' for osx/i386

1 files changed, 31 insertions, 25 deletions

diff --git a/Gem/develop/include/Gem/Base/GemShape.h b/Gem/develop/include/Gem/Base/GemShape.h
index 2878156..47395c2 100644
--- a/Gem/develop/include/Gem/Base/GemShape.h
+++ b/Gem/develop/include/Gem/Base/GemShape.h
@@ -36,67 +36,67 @@
 class TexCoord;
 class GEM_EXTERN GemShape : public GemBase
 {
- public:
+public:
 
   //////////
   // Constructor
   // [in] size - A size of 0. means to just use the default (ie, 1.)
-  GemShape(t_floatarg size);
+  explicit GemShape(t_floatarg size);
   GemShape();
 
- protected:
+protected:
 
   //////////
   // Destructor
   virtual ~GemShape();
 
   //-----------------------------------
-  // GROUP:	Access functions
+  // GROUP:     Access functions
   //-----------------------------------
 
   //////////
   // The width of the lines in line draw mode
-  void	    	linewidthMess(float linewidth);
+  void          linewidthMess(float linewidth);
 
   //////////
   // The size of the object
-  void	    	sizeMess(float size);
+  void          sizeMess(float size);
 
   //////////
   // How the object should be drawn
-  virtual void	typeMess(t_symbol *type);
+  virtual void  typeMess(t_symbol *type);
 
   //-----------------------------------
-  // GROUP:	Utility functions
+  // GROUP:     Utility functions
   //-----------------------------------
 
   void SetVertex(GemState* state,float x, float y, float z,
-		 float tx, float ty,
-		 int curCoord);
+                 float tx, float ty,
+                 int curCoord);
 
   void SetVertex(GemState* state,float x, float y, float z,
-		 float s, float t, float r, float q,
-		 int curCoord);
+                 float s, float t, float r, float q,
+                 int curCoord);
 
   //-----------------------------------
-  // GROUP:	Member variables
+  // GROUP:     Member variables
   //-----------------------------------
 
   //////////
   // The line width for GL_LINE mode
-  GLfloat	    	m_linewidth;
+  GLfloat               m_linewidth;
 
   //////////
   // The size of the object
-  GLfloat	    	m_size;
+  GLfloat               m_size;
 
   //////////
   // The drawing style (GL_LINE, GL_POLYGON, etc)
-  GLenum	    	m_drawType;
+  GLenum                m_drawType;
 
   //////////
   // do we want blending?
-  GLboolean	    	m_blend;
+  GLboolean             m_blend;
   void  blendMess(float blend);
 
 
@@ -114,23 +114,29 @@ class GEM_EXTERN GemShape : public GemBase
   t_inlet         *m_inlet;
 
   //-----------------------------------
-  // GROUP:	Setup functions
+  // GROUP:     Setup functions
   //-----------------------------------
 
   //////////
   // creation callback
-  static void 	real_obj_setupCallback(t_class *classPtr)
-    { GemBase::real_obj_setupCallback(classPtr); GemShape::obj_setupCallback(classPtr); }
+  static void   real_obj_setupCallback(t_class *classPtr)
+  {
+    GemBase::real_obj_setupCallback(classPtr);
+    GemShape::obj_setupCallback(classPtr);
+  }
 
- private:
+private:
 
-  static inline GemShape *GetMyClass(void *data) {return((GemShape *)((Obj_header *)data)->data);}
+  static inline GemShape *GetMyClass(void *data)
+  {
+    return((GemShape *)((Obj_header *)data)->data);
+  }
 
   //////////
   // static member functions
-  static void 	obj_setupCallback(t_class *classPtr);
+  static void   obj_setupCallback(t_class *classPtr);
 
- protected:
+protected:
   int m_texType, m_texNum;
   TexCoord*m_texCoords;
   bool m_lighting;
@@ -138,4 +144,4 @@ class GEM_EXTERN GemShape : public GemBase
   std::map<std::string, GLenum>m_drawTypes;
 };
 
-#endif	// for header file
+#endif  // for header file