Changeset 3375 for d-collide

Timestamp:

04/19/08 17:00:35 (2 years ago)

Author:

horst

Message:

Reverted all unintentional changes

Location:

d-collide/trunk/d-collide

Files:

• CMakeLists.txt (modified) (1 diff)
• testapp/do_benchmark_hack.h (modified) (1 diff)
• testapp/gui.cpp (modified) (1 diff)
• testapp/modelloader/modelloader3ds.cpp (modified) (2 diffs)
• testapp/scenes/benchmark/deformable.cpp (modified) (2 diffs)
• testapp/scenes/benchmark/mixed.cpp (modified) (1 diff)
• testapp/scenes/benchmark/rigid.cpp (modified) (1 diff)
• testapp/scenes/general/devtest.cpp (modified) (5 diffs)
• testapp/scenes/general/devtest.h (modified) (1 diff)
• testapp/scenes/physics/hangingclothscene.cpp (modified) (5 diffs)
• testapp/scenes/physics/hangingclothscene.h (modified) (1 diff)
• testapp/scenes/physics/marblerun.cpp (modified) (7 diffs)
• testapp/scenes/rigid/manymovingboxes.cpp (modified) (3 diffs)
• testapp/scenes/rigid/manymovingboxes.h (modified) (1 diff)
• testapp/scenes/rigid/tworigidhelicopters.cpp (modified) (1 diff)
• testapp/scenes/scenemanager.cpp (modified) (3 diffs)

d-collide/trunk/d-collide/CMakeLists.txt

@@ -101 +101 @@
         
         if (CMAKE_C_COMPILER MATCHES "icl")
-            #set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise /arch:SSE2 /O3 /Qprefetch /Qipo /Qfp-speculation=safe /Qprec-div- /QxP /Qscalar-rep" )
-            #set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /arch:SSE2 /O3 /Qprefetch /Qipo /Qfp-speculation=safe /Qprec-div- /QxP /Qscalar-rep" )
-            set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise /arch:SSE2 /O3 /Qprefetch /Qipo /Qfp-speculation=safe /Qprec-div- /QxP /Qparallel /Gr /Oi /Qopenmp /Qopt-streaming-stores:auto /Os /Ot /Qglobal-hoist /Qscalar-rep /Qssp /w" )
-            set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /arch:SSE2 /O3 /Qprefetch /Qipo /Qfp-speculation=safe /Qprec-div- /QxP /Qparallel /Gr /Oi /Qopenmp /Qopt-streaming-stores:auto /Os /Ot /Qglobal-hoist /Qscalar-rep /Qssp /w" )
+            #set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Wall /w2 /Wcheck" )
+            #set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Wall /w2 /Wcheck" )
         endif (CMAKE_C_COMPILER MATCHES "icl")
         

d-collide/trunk/d-collide/testapp/do_benchmark_hack.h

@@ -36 +36 @@
 #define DCOLLIDE_DO_BENCHMARK_HACK_H
 
-#define DCOLLIDE_DO_BENCHMARK_HACK 1
+#define DCOLLIDE_DO_BENCHMARK_HACK 0
 
 #endif

d-collide/trunk/d-collide/testapp/gui.cpp

@@ -201 +201 @@
     const int maxMs = 1000; // we average over maxMs ms
 #else
-#   ifdef __GNUC__
-#       warning HACK: setRemoveFramesOlderThan() uses large dummy value
-#   endif
-
+#warning HACK: setRemoveFramesOlderThan() uses large dummy value
     const int maxMs = 200000000; // we average over maxMs ms
 #endif

d-collide/trunk/d-collide/testapp/modelloader/modelloader3ds.cpp

@@ -81 +81 @@
     }
 
-    MyObjectNode* topObject = new MyObjectNode(topProxy, true, false);
+    MyObjectNode* topObject = new MyObjectNode(topProxy);
     if (!loadNode(topObject)) {
         std::cerr << dc_funcinfo << "loading " << fileName << " failed" << std::endl;
@@ -102 +102 @@
     node->translate(transformation.translation);
     node->rotate(transformation.rotation);
-/*
+
     const std::map<dcollide::Proxy*, ModelLoader::TextureInformation>& textureInformation = mLoader->getTextureInformation();
     if (textureInformation.find(node->getProxy()) != textureInformation.end()) {
         node->setTextureInformation((*textureInformation.find(node->getProxy())).second);
     }
-*/
+
     for (std::list<dcollide::Proxy*>::const_iterator it = node->getProxy()->getChildProxies().begin(); it != node->getProxy()->getChildProxies().end(); ++it) {
         MyObjectNode* child = new MyObjectNode(*it);

d-collide/trunk/d-collide/testapp/scenes/benchmark/deformable.cpp

@@ -60 +60 @@
     dcollide::Mesh* meshSphere = dcollide::Sphere(12, 7.5).getMesh()->cloneMesh();
 
-    std::cout << "sphere size: " << meshSphere->getTriangles().size() << std::endl;
-
     MyDeformableObjectNode* sphere = new MyDeformableObjectNode(getCollisionWorld(),
                                                                 meshSphere,
@@ -95 +93 @@
 
     parameters.setDeformableAlgorithms(algorithm);
-    parameters.setWorkerThreadCount(8);
+    parameters.setWorkerThreadCount(4);
 }
 

d-collide/trunk/d-collide/testapp/scenes/benchmark/mixed.cpp

@@ -107 +107 @@
 
     parameters.setDeformableAlgorithms(algorithm);
-    parameters.setWorkerThreadCount(8);
+    parameters.setWorkerThreadCount(4);
 }
 

d-collide/trunk/d-collide/testapp/scenes/benchmark/rigid.cpp

@@ -74 +74 @@
 
     parameters.setDeformableAlgorithms(algorithm);
-    parameters.setWorkerThreadCount(8);
+    parameters.setWorkerThreadCount(4);
 }
 

d-collide/trunk/d-collide/testapp/scenes/general/devtest.cpp

@@ -37 +37 @@
 #include "mydeformableobjectnode.h"
 
-#include <modelloader/loaderdummy.h>
-
 #include <d-collide/debug.h>
 #include <d-collide/world.h>
@@ -54 +52 @@
  */
 DevTestScene::DevTestScene(Ogre::Root* root) : SceneBase(root) {
-    
-    tlp_node = 0;
-    b1_node  = 0;
-    b2_node  = 0;
-
 }
 
@@ -72 +65 @@
 
 void DevTestScene::addSceneSpecificWorldParameters(dcollide::WorldParameters& parameters) const {
-    std::list<dcollide::DeformableAlgorithmType> algorithm;
-    algorithm.push_back(dcollide::DEFORMABLE_TYPE_SPATIAL_HASH);
-    parameters.setDeformableAlgorithms(algorithm);
+
 }
 
@@ -91 +82 @@
  **/
 bool DevTestScene::initializeScene() {
-    return false;
-/*
-    dcollide::Proxy* tlp = getCollisionWorld()->createProxy(dcollide::PROXYTYPE_RIGID);
-    dcollide::Proxy* b1 = getCollisionWorld()->createProxy(dcollide::Box(10.0, 10.0, 10.0).getMesh()->cloneMesh(), dcollide::PROXYTYPE_RIGID);
-    dcollide::Proxy* b2 = getCollisionWorld()->createProxy(dcollide::Box(10.0, 10.0, 10.0).getMesh()->cloneMesh(), dcollide::PROXYTYPE_RIGID);
-
-    dcollide::Proxy* h2_tlp = getCollisionWorld()->createProxy(dcollide::PROXYTYPE_RIGID);
-    dcollide::Proxy* h2_b1 = getCollisionWorld()->createProxy(dcollide::Box(10.0, 10.0, 10.0).getMesh()->cloneMesh(), dcollide::PROXYTYPE_RIGID);
-    dcollide::Proxy* h2_b2 = getCollisionWorld()->createProxy(dcollide::Box(10.0, 10.0, 10.0).getMesh()->cloneMesh(), dcollide::PROXYTYPE_RIGID);
-*/    
-    dcollide::Proxy* tlp = getCollisionWorld()->createProxy(dcollide::PROXYTYPE_DEFORMABLE);
-    dcollide::Proxy* b1 = getCollisionWorld()->createProxy(dcollide::Box(10.0, 10.0, 10.0).getMesh()->cloneMesh(), dcollide::PROXYTYPE_DEFORMABLE);
-    dcollide::Proxy* b2 = getCollisionWorld()->createProxy(dcollide::Box(10.0, 10.0, 10.0).getMesh()->cloneMesh(), dcollide::PROXYTYPE_DEFORMABLE);
-
-    dcollide::Proxy* h2_tlp = getCollisionWorld()->createProxy(dcollide::PROXYTYPE_DEFORMABLE);
-    dcollide::Proxy* h2_b1 = getCollisionWorld()->createProxy(dcollide::Box(10.0, 10.0, 10.0).getMesh()->cloneMesh(), dcollide::PROXYTYPE_DEFORMABLE);
-    dcollide::Proxy* h2_b2 = getCollisionWorld()->createProxy(dcollide::Box(10.0, 10.0, 10.0).getMesh()->cloneMesh(), dcollide::PROXYTYPE_DEFORMABLE);
-
-//    dcollide::Proxy* b1 = getCollisionWorld()->createProxy(new dcollide::Sphere(10.0));
-//    dcollide::Proxy* b2 = getCollisionWorld()->createProxy(new dcollide::Sphere(10.0));
-
-    MyObjectNode* origin = new MyObjectNode(getCollisionWorld(), new dcollide::Sphere(1));
-    
-    tlp_node = new MyDeformableObjectNode(tlp);
-    b1_node  = new MyDeformableObjectNode(b1);
-    b2_node  = new MyDeformableObjectNode(b2);
-
-    h2_tlp_node = new MyDeformableObjectNode(h2_tlp);
-    h2_b1_node  = new MyDeformableObjectNode(h2_b1);
-    h2_b2_node  = new MyDeformableObjectNode(h2_b2);
-/*
-    MyObjectNode* origin = new MyObjectNode(getCollisionWorld(), new dcollide::Sphere(1));
-    
-    tlp_node = new MyObjectNode(tlp);
-    b1_node  = new MyObjectNode(b1);
-    b2_node  = new MyObjectNode(b2);
-
-    h2_tlp_node = new MyObjectNode(h2_tlp);
-    h2_b1_node  = new MyObjectNode(h2_b1);
-    h2_b2_node  = new MyObjectNode(h2_b2);
-  */  
-    
-    //b1_node->getProxy()->printDebugOutput(true, "b1_node->Proxy: ");
-    origin->printDebugOutput(false, "origin");
-    tlp_node->printDebugOutput(false, "tlp_node");
-    b1_node->printDebugOutput(false, "b1_node");
-    b2_node->printDebugOutput(false, "b2_node");
-    
-    //tlp_node->printDebugOutput(true, "tlp_node: ");
-    //b1_node->printDebugOutput(true, "b1_node: ");
-    
-    tlp_node->addChild(b1_node);
-    tlp_node->addChild(b2_node);
-
-    addTopLevelObject(origin);
-    addTopLevelObject(tlp_node);
-    
-    b1_node->translate(0, -100, 0);
-    b2_node->translate(0,  -50, 0);
-
-    
-    h2_tlp_node->addChild(h2_b1_node);
-    h2_tlp_node->addChild(h2_b2_node);
-
-    addTopLevelObject(h2_tlp_node);
-    
-    h2_b1_node->translate(5, -100, 0);
-    h2_b2_node->translate(5,  -50, 0);
-
-    
-/*
-    b1_node->translate(0, -100, 0);
-    b2_node->translate(0,  -50, 0);
-*/
-    //tlp_node->translate(-100, 0, 0);
-    
-    
-    ModelLoader::LoaderDummy firstLoader;
-    dcollide::Mesh* clothMesh = firstLoader.createRectangleSurface(50.0f, 50.0f, 5.0f, 5.0f);
-
-    mCloth = new MyDeformableObjectNode(getCollisionWorld(),
-                                        clothMesh,
-                                        dcollide::PROXYTYPE_DEFORMABLE | dcollide::PROXYTYPE_SELFCOLLIDABLE,
-                                        false);
-
-    mCloth->translate(100, -25, 0);
-
-    addTopLevelObject(mCloth);
-    
-    
     return true;
 }
@@ -202 +103 @@
  */
 void DevTestScene::startNextSceneFrame() {
-    
-    std::cout << "tlp_node->getTranslation(): " << tlp_node->getTranslation() << std::endl;
-    std::cout << "b1_node->getTranslation(): " << b1_node->getTranslation() << std::endl;
-    std::cout << "b2_node->getTranslation(): " << b2_node->getTranslation() << std::endl;
-
 }
 

d-collide/trunk/d-collide/testapp/scenes/general/devtest.h

@@ -78 +78 @@
         void restart();
         void action();
-      
-        MyDeformableObjectNode* tlp_node;
-        MyDeformableObjectNode* b1_node;
-        MyDeformableObjectNode* b2_node;
-
-        MyDeformableObjectNode* h2_tlp_node;
-        MyDeformableObjectNode* h2_b1_node;
-        MyDeformableObjectNode* h2_b2_node;
-
-        MyDeformableObjectNode* mCloth;
-/*
-        MyObjectNode* tlp_node;
-        MyObjectNode* b1_node;
-        MyObjectNode* b2_node;
-
-        MyObjectNode* h2_tlp_node;
-        MyObjectNode* h2_b1_node;
-        MyObjectNode* h2_b2_node;
-*/
 
 };

d-collide/trunk/d-collide/testapp/scenes/physics/hangingclothscene.cpp

@@ -127 +127 @@
     dJointSetBallAnchor(joint1, position.getX(), position.getY(), position.getZ());
 
-    
-    //Restrict vertex 100,0 to its position
+    //Restrict vertex 10,0 to its position
     dBodyID body2 = mCloth->getPhysicsBody(10);
     position.set(clothMesh->getVertices()[10]->getWorldPosition());
@@ -136 +135 @@
     dJointSetBallAnchor(joint2, position.getX(), position.getY(), position.getZ());
 
-    
-    //Restrict vertex 0,100 to its position
+    //Restrict vertex 0,10 to its position
     dBodyID body3 = mCloth->getPhysicsBody(110);
     position.set(clothMesh->getVertices()[110]->getWorldPosition());
@@ -144 +142 @@
     dJointAttach(joint3, body3, 0);
     dJointSetBallAnchor(joint3, position.getX(), position.getY(), position.getZ());
-
-    
-    //Restrict vertex 100,100 to its position
-    dBodyID body4 = mCloth->getPhysicsBody(120);
-    position.set(clothMesh->getVertices()[120]->getWorldPosition());
-    
-    dJointID joint4 = dJointCreateBall(mOdeWorld, mRestrictionJoints);
-    dJointAttach(joint4, body4, 0);
-    dJointSetBallAnchor(joint4, position.getX(), position.getY(), position.getZ());
-    
     
     //Sphere falling onto the cloth
@@ -163 +151 @@
     mSphere->createPhysicsBody(mOdeWorld,  1);
     addTopLevelObject(mSphere);
-    //mDampedBodyNodes.push_back(mSphere);
     mSphere->translate(20,20, 10);
     const_cast<ModelLoader::TextureInformation&> (mSphere->getTextureInformation()).setTransparent(0.1);
@@ -175 +162 @@
 }
 
-
-void HangingClothScene::action() {
-    double radius = 5; //5+-3
-    double posX = 20;
-    double posY = 30 + (rand () % 20); 
-    double posZ = 50 + (rand() % 60);
-    //(-90, 20, 220);//-90, [20-70], 220
-
-    MyObjectNode* marble = new MyObjectNode(getCollisionWorld(),
-                             new dcollide::Sphere(radius, 2.0),
-                             dcollide::PROXYTYPE_RIGID);
-
-    marble->createPhysicsBody(mOdeWorld,  4);
-
-    addTopLevelObject(marble);
-    marble->setPosition(posX, posY, posZ);
-    //mDampedBodyNodes.push_back(marble);
-}
-
 void HangingClothScene::startNextSceneFrame() {
     //dcollide::debug() << "............. step .............";

d-collide/trunk/d-collide/testapp/scenes/physics/hangingclothscene.h

@@ -82 +82 @@
         
         dJointGroupID mRestrictionJoints;
-        
-        virtual void action();
 };
 

d-collide/trunk/d-collide/testapp/scenes/physics/marblerun.cpp

@@ -98 +98 @@
         mRamp->translate(dcollide::Vector3(-100, 50, 0));
         */
-/*
         MyObjectNode* ramp1 = new MyObjectNode( getCollisionWorld(),
                                         new dcollide::Box(120, 50, 5),
@@ -115 +114 @@
         ramp2->rotate(-15, 0, 1,0);
         environment->addChild(ramp2);
-*/
+
         //funnel mesh
         std::vector<dcollide::Triangle*> triangles;
         std::vector<dcollide::Vertex*> vertices;
 
-        int ringsections = 8;
-        double upperRadius = 45;
-        double middleRadius= 10;
+        int ringsections = 6;
+        double upperRadius = 100;
+        double middleRadius= 15;
         double lowerRadius = 2;
 
@@ -128 +127 @@
 
         for (int i = 0; i < ringsections; i++){
-            vertices.push_back(new dcollide::Vertex(cos(i * angleIncrement) * upperRadius, sin(i*angleIncrement) * upperRadius, 70));
-            vertices.push_back(new dcollide::Vertex(cos(i * angleIncrement) * middleRadius, sin(i*angleIncrement) * middleRadius, 10));
+            vertices.push_back(new dcollide::Vertex(cos(i * angleIncrement) * upperRadius, sin(i*angleIncrement) * upperRadius, 50));
+            vertices.push_back(new dcollide::Vertex(cos(i * angleIncrement) * middleRadius, sin(i*angleIncrement) * middleRadius, 0));
             vertices.push_back(new dcollide::Vertex(cos(i * angleIncrement) * lowerRadius, sin(i*angleIncrement) * lowerRadius, -40));
         }
@@ -147 +146 @@
                                         dcollide::PROXYTYPE_FIXED,
                                         false);
-        funnel->setPosition(0, 0, 0);
+        funnel->translate(-50, 0, 50);
         environment->addChild(funnel);
 
@@ -165 +164 @@
         addTopLevelObject(mMarble1);
         mDampedBodyNodes.push_back(mMarble1);
-/*
+//*
         //cylinder supposed to roll down the lanes
         mCylinder = new MyObjectNode(getCollisionWorld(),
@@ -176 +175 @@
         addTopLevelObject(mCylinder);
         mDampedBodyNodes.push_back(mCylinder);
-*/
+// */
 /*
         //cone supposed to "roll" down the lanes
@@ -195 +194 @@
     void MarblerunScene::restart() {
         //set inital positions
-        //mCylinder->setPosition(-90, 50, 220);
-        //mCylinder->rotate(90,1,0,0);
+        mCylinder->setPosition(-90, 50, 220);
+        mCylinder->rotate(90,1,0,0);
    //     mCone->setPosition(-90, 50, 220);
    //     mCone->rotate(90,1,0,0);
-        mMarble1->setPosition(0, 0, 100);
+        mMarble1->setPosition(-90, 70, 220);
 
         //nullify body velocity, accelleration and forces
-        //dBodySetForce(mCylinder->getPhysicsBody(), 0,0,0);
+        dBodySetForce(mCylinder->getPhysicsBody(), 0,0,0);
      //   dBodySetForce(mCone->getPhysicsBody(), 0,0,0);
         dBodySetForce(mMarble1->getPhysicsBody(), 0,0,0);
 
-        //dBodySetAngularVel(mCylinder->getPhysicsBody(), 0,0,0);
+        dBodySetAngularVel(mCylinder->getPhysicsBody(), 0,0,0);
      //   dBodySetAngularVel(mCone->getPhysicsBody(), 0,0,0);
         dBodySetAngularVel(mMarble1->getPhysicsBody(), 0,0,0);
 
-        //dBodySetLinearVel(mCylinder->getPhysicsBody(), 0,0,0);
+        dBodySetLinearVel(mCylinder->getPhysicsBody(), 0,0,0);
      //   dBodySetLinearVel(mCone->getPhysicsBody(), 0,0,0);
         dBodySetLinearVel(mMarble1->getPhysicsBody(), 0,0,0);

d-collide/trunk/d-collide/testapp/scenes/rigid/manymovingboxes.cpp

@@ -61 +61 @@
  **/
 bool ManyMovingBoxes::initializeScene() {
+    createManyMovingRigidBoxes(0.0f);
+    createManyMovingRigidBoxes(7.0f, 2.0f);
+    createManyMovingRigidBoxes(15.0f, 5.0f);
 
-    createManyMovingRigidBoxes( 250.0f, 250.0f, 250.0f,
-                               -1250.0f, -1250.0f, -1250.0f,
-                                1250.0f,  1250.0f, -1250.0f,
-                                50, 50, 50);
-
-    
-    createManyMovingRigidBoxes( 750.0f, 750.0f, 750.0f,
-                               -1250.0f, -1250.0f, -1250.0f,
-                                1250.0f,  1250.0f,  1250.0f,
-                                25, 25, 25);
-    createManyMovingRigidBoxes(  6.25f,  6.25f,    6.25f,
-                               -25.00f, -25.00f, -25.00f,
-                                25.00f,  25.00f,  25.00f,
-                                 2.50f,   2.50f,   2.50f);
-
-    createManyMovingRigidBoxes( 4.5f,  4.5f,   4.5f,
-                               -100.00f, 25.00f, -10.00f,
-                               -80.00f, 50.00f,  35.00f,
-                                 2.0f,  2.0f,   2.0f);
-
-    
     std::cout << dc_funcinfo << "done" << std::endl;
 
@@ -95 +77 @@
  */
 void ManyMovingBoxes::startNextSceneFrame() {
-/*
     const float step = 1.0f;
     float xStep = step;
@@ -113 +94 @@
         mHasMoved = 0.0f;
     }
-*/
+
 }
 
-void ManyMovingBoxes::createManyMovingRigidBoxes(float xOffset, float yOffset, float zOffset,
-                                                 float xMin, float yMin, float zMin,
-                                                 float xMax, float yMax, float zMax,
-                                                 float xSize, float ySize, float zSize) {
+void ManyMovingBoxes::createManyMovingRigidBoxes(float xOffset, float yOffset) {
+    const float minX = -500.0f;
+    const float minY = -500.0f;
+    const float maxX = -minX;
+    const float maxY = -minY;
+    for (float x = minX; x <= maxX; x += 40.0f) {
+        for (float y = minY; y <= maxY; y += 50.0f) {
+            MyObjectNode* box =
+                new MyObjectNode(
+                    getCollisionWorld(),
+                    //new dcollide::Wedge(10.0, 20.0, 5.0));
+                    //new dcollide::Cylinder(10.0, 25.0));
+                    new dcollide::Box(dcollide::Vector3(10.0, 10.0, 10.0)));
+            dcollide::Vector3 translation = dcollide::Vector3(x + xOffset, y + yOffset, 0.0f);
+            dcollide::Matrix rot;
+            rot.rotate(xOffset, 1,1,1);
+            rot.rotate(yOffset, 1,0,0);
+            box->rotate(rot);
 
-    for (float x = xMin; x <= xMax; x += xOffset) {
-        for (float y = yMin; y <= yMax; y += yOffset) {
-            for (float z = zMin; z <= zMax; z += zOffset) {
+            MyObjectNode* container = new MyObjectNode(getCollisionWorld(), (dcollide::Shape*)0);
+            container->addChild(box);
 
-                MyObjectNode* box =
-                    new MyObjectNode(getCollisionWorld(),
-                                     new dcollide::Box(xSize, ySize, zSize),
-                                     dcollide::PROXYTYPE_RIGID,
-                                     false, false);
+            addTopLevelObject(container);
+            container->translate(translation);
 
-                dcollide::Vector3 translation = dcollide::Vector3(x, y, z);
-/*
-                dcollide::Matrix rot;
-                rot.rotate(x, 1,1,1);
-                rot.rotate(y, 1,0,0);
-                box->rotate(rot);
-*/
-                addTopLevelObject(box);
-                box->translate(translation, false);
-    
-                mMovableObjects.push_back(box);
-            }
+            mMovableObjects.push_back(container);
         }
     }

d-collide/trunk/d-collide/testapp/scenes/rigid/manymovingboxes.h

@@ -59 +59 @@
         virtual void startNextSceneFrame();
 
-        void createManyMovingRigidBoxes(float xOffset, float yOffset, float zOffset,
-                                        float xMin, float yMin, float zMin,
-                                        float xMax, float yMax, float zMax,
-                                        float xSize, float ySize, float zSize);
+        void createManyMovingRigidBoxes(float xOffset = 0.0f, float yOffset = 0.0f);
 
     private:

d-collide/trunk/d-collide/testapp/scenes/rigid/tworigidhelicopters.cpp

@@ -60 +60 @@
 bool TwoRigidHelicopters::initializeScene() {
     MyObjectNode* helicopter1 = create3dsModel("puma.3ds");
-    MyObjectNode* helicopter2 = 0;//create3dsModel("puma.3ds");
+    MyObjectNode* helicopter2 = create3dsModel("puma.3ds");
     if (helicopter1) {
         addTopLevelObject(helicopter1);

d-collide/trunk/d-collide/testapp/scenes/scenemanager.cpp

@@ -71 +71 @@
 
 #include "benchmark/mixed.h"
-#include "benchmark/rigid.h"
 #include "benchmark/deformable.h"
 
@@ -107 +106 @@
     mSceneTitles.insert(std::make_pair("deforming",             "Deforming objects          [deforming]"));
     mSceneTitles.insert(std::make_pair("mixedbenchmark",        "Benchmarking Scene (Mixed) [mixedbenchmark]"));
-    mSceneTitles.insert(std::make_pair("rigidbenchmark",        "Benchmarking Scene (Rigid) [rigidbenchmark]"));
     mSceneTitles.insert(std::make_pair("deformablebenchmark",   "Benchmarking Scene (Deformable) [deformablebenchmark]"));
 
@@ -239 +237 @@
     } else if (id == "mixedbenchmark") {
         scene = new MixedBenchmark(root);
-    } else if (id == "rigidbenchmark") {
-        scene = new RigidBenchmark(root);
     } else if (id == "deformablebenchmark") {
         scene = new DeformableBenchmark(root);