[Opal-commits] opal/samples/simple_objects main.cpp,1.22,1.23

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

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

Modified Files:
	main.cpp 
Log Message:
changed how friction is used (now sqrt(f1*f2) instead of just f1*f2); minor changes to sample apps

Index: main.cpp
===================================================================
RCS file: /cvsroot/opal/opal/samples/simple_objects/main.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** main.cpp	3 Mar 2005 04:39:54 -0000	1.22
--- main.cpp	4 Mar 2005 05:09:23 -0000	1.23
***************
*** 189,193 ****
  			{
  				opal::Vec3r dim = ((opal::BoxShapeData*)shapeData)->dimensions;
! 				newObject = new BoxObject(gSimulator, s, dim);
  				break;
  			}
--- 189,194 ----
  			{
  				opal::Vec3r dim = ((opal::BoxShapeData*)shapeData)->dimensions;
! 				newObject = new BoxObject(gSimulator, s, dim, 
! 					shapeData->offset);
  				break;
  			}
***************
*** 195,199 ****
  			{
  				opal::real rad = ((opal::SphereShapeData*)shapeData)->radius;
! 				newObject = new SphereObject(gSimulator, s, rad);
  				break;
  			}
--- 196,201 ----
  			{
  				opal::real rad = ((opal::SphereShapeData*)shapeData)->radius;
! 				newObject = new SphereObject(gSimulator, s, rad, 
! 					shapeData->offset);
  				break;
  			}
***************
*** 202,221 ****
  				opal::real rad = ((opal::CapsuleShapeData*)shapeData)->radius;
  				opal::real len = ((opal::CapsuleShapeData*)shapeData)->length;
! 				newObject = new CapsuleObject(gSimulator, s, rad, len);
  				break;
  			}
  			case opal::PLANE_SHAPE:
  			{
! 				// Not implemented;
  				break;
  			}
  			case opal::RAY_SHAPE:
  			{
! 				// Not implemented;
  				break;
  			}
  			case opal::MESH_SHAPE:
  			{
! 				// Not implemented;
  				break;
  			}
--- 204,224 ----
  				opal::real rad = ((opal::CapsuleShapeData*)shapeData)->radius;
  				opal::real len = ((opal::CapsuleShapeData*)shapeData)->length;
! 				newObject = new CapsuleObject(gSimulator, s, rad, len, 
! 					shapeData->offset);
  				break;
  			}
  			case opal::PLANE_SHAPE:
  			{
! 				// Not implemented.
  				break;
  			}
  			case opal::RAY_SHAPE:
  			{
! 				// Not implemented.
  				break;
  			}
  			case opal::MESH_SHAPE:
  			{
! 				// Not implemented.
  				break;
  			}
***************
*** 518,522 ****
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions);
  							gObjects.push_back(newBox);
  							break;
--- 521,525 ----
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions, boxData.offset);
  							gObjects.push_back(newBox);
  							break;
***************
*** 534,538 ****
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions);
  							gObjects.push_back(newBox);
  							break;
--- 537,541 ----
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions, boxData.offset);
  							gObjects.push_back(newBox);
  							break;
***************
*** 550,554 ****
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions);
  							gObjects.push_back(newBox);
  							break;
--- 553,557 ----
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions, boxData.offset);
  							gObjects.push_back(newBox);
  							break;
***************
*** 566,571 ****
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions);
  							gObjects.push_back(newBox);
  							break;
  						}
--- 569,588 ----
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions, boxData.offset);
  							gObjects.push_back(newBox);
+ 
+ 							// Add a Capsule Shape to the Solid.
+ 							opal::CapsuleShapeData capsuleData;
+ 							capsuleData.material = gObjectMaterial;
+ 							capsuleData.length = 2;
+ 							capsuleData.radius = 1;
+ 							capsuleData.offset.translate(0, 3, 0);
+ 							s->addShape(capsuleData);
+ 							CapsuleObject* newCapsule = 
+ 								new CapsuleObject(gSimulator, s, 
+ 								capsuleData.radius, capsuleData.length, 
+ 								capsuleData.offset);
+ 
+ 							gObjects.push_back(newCapsule);
  							break;
  						}
***************
*** 582,586 ****
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions);
  							gObjects.push_back(newBox);
  							break;
--- 599,603 ----
  							s->addShape(boxData);
  							BoxObject* newBox = new BoxObject(gSimulator, s, 
! 								boxData.dimensions, boxData.offset);
  							gObjects.push_back(newBox);
  							break;
***************
*** 597,601 ****
  							s->addShape(sphereData);
  							SphereObject* newSphere = new SphereObject(gSimulator, s, 
! 								sphereData.radius);
  							gObjects.push_back(newSphere);
  							break;
--- 614,618 ----
  							s->addShape(sphereData);
  							SphereObject* newSphere = new SphereObject(gSimulator, s, 
! 								sphereData.radius, sphereData.offset);
  							gObjects.push_back(newSphere);
  							break;
***************
*** 612,616 ****
  							s->addShape(sphereData);
  							SphereObject* newSphere = new SphereObject(gSimulator, s, 
! 								sphereData.radius);
  							gObjects.push_back(newSphere);
  							break;
--- 629,633 ----
  							s->addShape(sphereData);
  							SphereObject* newSphere = new SphereObject(gSimulator, s, 
! 								sphereData.radius, sphereData.offset);
  							gObjects.push_back(newSphere);
  							break;