[Opal-commits] opal/samples/playpen main.cpp,1.13,1.14

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

Update of /cvsroot/opal/opal/samples/playpen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22699/samples/playpen

Modified Files:
	main.cpp 
Log Message:
replaced playpen models with low poly versions

Index: main.cpp
===================================================================
RCS file: /cvsroot/opal/opal/samples/playpen/main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main.cpp	20 Apr 2005 03:59:33 -0000	1.13
--- main.cpp	21 Apr 2005 05:23:19 -0000	1.14
***************
*** 360,364 ****
  			opal::Matrix44r m;
  			m.rotate(45, 0, 1, 0);
! 			m.translate(0, 0, -20);
  			createWall(6, 8, opal::Vec3r(3, 1.5, 1.5), m);
  
--- 360,364 ----
  			opal::Matrix44r m;
  			m.rotate(45, 0, 1, 0);
! 			m.translate(0, 0, -23);
  			createWall(6, 8, opal::Vec3r(3, 1.5, 1.5), m);
  
***************
*** 387,391 ****
  			// Instantiate the Blueprint.
  			opal::BlueprintInstance instance;
! 			mSimulator->instantiateBlueprint(instance, ragdollBP, transform, 12);
  
  			unsigned int i=0;
--- 387,391 ----
  			// Instantiate the Blueprint.
  			opal::BlueprintInstance instance;
! 			mSimulator->instantiateBlueprint(instance, ragdollBP, transform, 16);
  
  			unsigned int i=0;
***************
*** 403,422 ****
  						case opal::BOX_SHAPE:
  						{
! 							opal::Vec3r dim = ((opal::BoxShapeData*)shapeData)->dimensions;
  							Ogre::Vector3 boxDim(dim[0], dim[1], dim[2]);
! 							createPhysicalEntityBox("", "Plastic/LightBlue", boxDim, s);
  							break;
  						}
  						case opal::SPHERE_SHAPE:
  						{
! 							opal::real r = ((opal::SphereShapeData*)shapeData)->radius;
! 							createPhysicalEntitySphere("", "Plastic/LightBlue", r, s);
  							break;
  						}
  						case opal::CAPSULE_SHAPE:
  						{
! 							opal::real r = ((opal::CapsuleShapeData*)shapeData)->radius;
! 							opal::real l = ((opal::CapsuleShapeData*)shapeData)->length;
! 							createPhysicalEntityCapsule("", "Plastic/LightBlue", r, l, s);
  							break;
  						}
--- 403,429 ----
  						case opal::BOX_SHAPE:
  						{
! 							opal::Vec3r dim = 
! 								((opal::BoxShapeData*)shapeData)->dimensions;
  							Ogre::Vector3 boxDim(dim[0], dim[1], dim[2]);
! 							createPhysicalEntityBox("", "Plastic/LightBlue", 
! 								boxDim, s);
  							break;
  						}
  						case opal::SPHERE_SHAPE:
  						{
! 							opal::real r = 
! 								((opal::SphereShapeData*)shapeData)->radius;
! 							createPhysicalEntitySphere("", 
! 								"Plastic/LightBlue", r, s);
  							break;
  						}
  						case opal::CAPSULE_SHAPE:
  						{
! 							opal::real r = 
! 								((opal::CapsuleShapeData*)shapeData)->radius;
! 							opal::real l = 
! 								((opal::CapsuleShapeData*)shapeData)->length;
! 							createPhysicalEntityCapsule("", 
! 								"Plastic/LightBlue", r, l, s);
  							break;
  						}
***************
*** 570,577 ****
  
  		// Create a static box for a ground plane.
! 		Ogre::Vector3 boxDim(70, 8, 70);
  		opal::Solid* s = mSimulator->createSolid();
  		s->setStatic(true);
! 		s->setPosition(0, -4, 0);
  		opal::BoxShapeData data;
  		data.dimensions.set(boxDim[0], boxDim[1], boxDim[2]);
--- 577,584 ----
  
  		// Create a static box for a ground plane.
! 		Ogre::Vector3 boxDim(70, 16, 70);
  		opal::Solid* s = mSimulator->createSolid();
  		s->setStatic(true);
! 		s->setPosition(0, -8, 0);
  		opal::BoxShapeData data;
  		data.dimensions.set(boxDim[0], boxDim[1], boxDim[2]);
***************
*** 582,586 ****
  		boxDim.x = 1;
  		boxDim.y = 20;
! 		boxDim.z = 8;
  		data.dimensions.set(boxDim[0], boxDim[1], boxDim[2]);
  
--- 589,593 ----
  		boxDim.x = 1;
  		boxDim.y = 20;
! 		boxDim.z = 10;
  		data.dimensions.set(boxDim[0], boxDim[1], boxDim[2]);
  
***************
*** 660,664 ****
  				opal::BoxShapeData boxData;
  				boxData.dimensions = boxDim;
! 				boxData.material.density = 20;
  				s->addShape(boxData);
  				Ogre::Vector3 boxDimensions(boxDim[0], boxDim[1], boxDim[2]);
--- 667,672 ----
  				opal::BoxShapeData boxData;
  				boxData.dimensions = boxDim;
! 				boxData.material.density = 6;
! 				boxData.material.hardness = 0.4;
  				s->addShape(boxData);
  				Ogre::Vector3 boxDimensions(boxDim[0], boxDim[1], boxDim[2]);