[Opal-commits] opal/src BoxShapeData.h,1.1,1.2 CapsuleShapeData.h,1.1,1.2 MeshShapeData.h,1.1,1.2 PlaneShapeData.h,1.1,1.2 RayShapeData.h,1.1,1.2 ShapeData.h,1.1,1.2 SolidData.h,1.1,1.2 SphereShapeData.h,1.1,1.2

[tylerstreeter <tyl...@us...>]

Update of /cvsroot/opal/opal/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30562/src

Modified Files:
	BoxShapeData.h CapsuleShapeData.h MeshShapeData.h 
	PlaneShapeData.h RayShapeData.h ShapeData.h SolidData.h 
	SphereShapeData.h 
Log Message:
made Data object types a private member; updated samples with new changes

Index: SolidData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/SolidData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SolidData.h	22 Feb 2005 01:25:55 -0000	1.1
--- SolidData.h	22 Feb 2005 19:46:30 -0000	1.2
***************
*** 44,49 ****
  			isStatic = defaults::solid::isStatic;
  			// Leave the transform as an identity matrix.
! 			globalLinearVel = 0;
! 			globalAngularVel = 0;
  			linearDamping = defaults::linearDamping;
  			angularDamping = defaults::angularDamping;
--- 44,49 ----
  			isStatic = defaults::solid::isStatic;
  			// Leave the transform as an identity matrix.
! 			// "globalLinearVel" is already initialized in its constructor.
! 			// "globalAngularVel" is already initialized in its constructor.
  			linearDamping = defaults::linearDamping;
  			angularDamping = defaults::angularDamping;

Index: SphereShapeData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/SphereShapeData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SphereShapeData.h	22 Feb 2005 01:25:55 -0000	1.1
--- SphereShapeData.h	22 Feb 2005 19:46:40 -0000	1.2
***************
*** 41,45 ****
  		: ShapeData()
  		{
! 			type = SPHERE_SHAPE;
  			radius = 0;
  		}
--- 41,45 ----
  		: ShapeData()
  		{
! 			mType = SPHERE_SHAPE;
  			radius = 0;
  		}
***************
*** 58,62 ****
  		virtual void OPAL_CALL operator=(const SphereShapeData& data)
  		{
! 			type = data.type;
  			offset = data.offset;
  			material = data.material;
--- 58,62 ----
  		virtual void OPAL_CALL operator=(const SphereShapeData& data)
  		{
! 			mType = data.mType;
  			offset = data.offset;
  			material = data.material;

Index: ShapeData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/ShapeData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ShapeData.h	22 Feb 2005 01:25:55 -0000	1.1
--- ShapeData.h	22 Feb 2005 19:46:30 -0000	1.2
***************
*** 51,55 ****
  		ShapeData()
  		{
! 			type = SPHERE_SHAPE;
  			// Leave the offset as an identity matrix.
  			material = defaults::material;
--- 51,57 ----
  		ShapeData()
  		{
! 			// The initial type doesn't matter since the abstract base 
! 			// class will never be instantiated.
! 			mType = SPHERE_SHAPE;
  			// Leave the offset as an identity matrix.
  			material = defaults::material;
***************
*** 60,65 ****
  		}
  
! 		/// The Shape type.
! 		ShapeType type;
  
  		/// The offset transform from a Solid's transform.
--- 62,70 ----
  		}
  
! 		/// Returns the Shape's type.
! 		virtual ShapeType OPAL_CALL getType()const
! 		{
! 			return mType;
! 		}
  
  		/// The offset transform from a Solid's transform.
***************
*** 70,73 ****
--- 75,80 ----
  
  	protected:
+ 		/// The Shape type.
+ 		ShapeType mType;
  
  	private:

Index: RayShapeData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/RayShapeData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RayShapeData.h	22 Feb 2005 04:28:11 -0000	1.1
--- RayShapeData.h	22 Feb 2005 19:46:30 -0000	1.2
***************
*** 41,45 ****
  		: ShapeData()
  		{
! 			type = RAY_SHAPE;
  			// "ray" is already initialized from its constructor.
  		}
--- 41,45 ----
  		: ShapeData()
  		{
! 			mType = RAY_SHAPE;
  			// "ray" is already initialized from its constructor.
  		}
***************
*** 58,62 ****
  		virtual void OPAL_CALL operator=(const RayShapeData& data)
  		{
! 			type = data.type;
  			offset = data.offset;
  			material = data.material;
--- 58,62 ----
  		virtual void OPAL_CALL operator=(const RayShapeData& data)
  		{
! 			mType = data.mType;
  			offset = data.offset;
  			material = data.material;

Index: PlaneShapeData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/PlaneShapeData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PlaneShapeData.h	22 Feb 2005 04:28:11 -0000	1.1
--- PlaneShapeData.h	22 Feb 2005 19:46:30 -0000	1.2
***************
*** 41,45 ****
  		: ShapeData()
  		{
! 			type = PLANE_SHAPE;
  
  			for (int i=0; i<4; ++i)
--- 41,45 ----
  		: ShapeData()
  		{
! 			mType = PLANE_SHAPE;
  
  			for (int i=0; i<4; ++i)
***************
*** 62,66 ****
  		virtual void OPAL_CALL operator=(const PlaneShapeData& data)
  		{
! 			type = data.type;
  			offset = data.offset;
  			material = data.material;
--- 62,66 ----
  		virtual void OPAL_CALL operator=(const PlaneShapeData& data)
  		{
! 			mType = data.mType;
  			offset = data.offset;
  			material = data.material;

Index: CapsuleShapeData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/CapsuleShapeData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CapsuleShapeData.h	22 Feb 2005 01:25:55 -0000	1.1
--- CapsuleShapeData.h	22 Feb 2005 19:46:29 -0000	1.2
***************
*** 41,45 ****
  		: ShapeData()
  		{
! 			type = CAPSULE_SHAPE;
  			radius = 0;
  			length = 0;
--- 41,45 ----
  		: ShapeData()
  		{
! 			mType = CAPSULE_SHAPE;
  			radius = 0;
  			length = 0;
***************
*** 59,63 ****
  		virtual void OPAL_CALL operator=(const CapsuleShapeData& data)
  		{
! 			type = data.type;
  			offset = data.offset;
  			material = data.material;
--- 59,63 ----
  		virtual void OPAL_CALL operator=(const CapsuleShapeData& data)
  		{
! 			mType = data.mType;
  			offset = data.offset;
  			material = data.material;

Index: BoxShapeData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/BoxShapeData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BoxShapeData.h	22 Feb 2005 01:25:55 -0000	1.1
--- BoxShapeData.h	22 Feb 2005 19:46:29 -0000	1.2
***************
*** 41,45 ****
  		: ShapeData()
  		{
! 			type = BOX_SHAPE;
  			// "dimensions" is already initialized from its constructor.
  		}
--- 41,45 ----
  		: ShapeData()
  		{
! 			mType = BOX_SHAPE;
  			// "dimensions" is already initialized from its constructor.
  		}
***************
*** 58,62 ****
  		virtual void OPAL_CALL operator=(const BoxShapeData& data)
  		{
! 			type = data.type;
  			offset = data.offset;
  			material = data.material;
--- 58,62 ----
  		virtual void OPAL_CALL operator=(const BoxShapeData& data)
  		{
! 			mType = data.mType;
  			offset = data.offset;
  			material = data.material;

Index: MeshShapeData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/MeshShapeData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MeshShapeData.h	22 Feb 2005 04:28:11 -0000	1.1
--- MeshShapeData.h	22 Feb 2005 19:46:29 -0000	1.2
***************
*** 45,49 ****
  		: ShapeData()
  		{
! 			type = MESH_SHAPE;
  			vertexArray[0] = NULL;
  			numVertices = 0;
--- 45,49 ----
  		: ShapeData()
  		{
! 			mType = MESH_SHAPE;
  			vertexArray[0] = NULL;
  			numVertices = 0;
***************
*** 65,69 ****
  		virtual void OPAL_CALL operator=(const MeshShapeData& data)
  		{
! 			type = data.type;
  			offset = data.offset;
  			material = data.material;
--- 65,69 ----
  		virtual void OPAL_CALL operator=(const MeshShapeData& data)
  		{
! 			mType = data.mType;
  			offset = data.offset;
  			material = data.material;