Changeset 7711 in orxonox.OLD for trunk/src/subprojects/collision_detection/collision_detection.cc

Timestamp:

May 18, 2006, 11:44:21 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the cd branche back to trunk

File:

• trunk/src/subprojects/collision_detection/collision_detection.cc (modified) (3 diffs)

trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -48 +48 @@
 //Terrain* c;
 bool animateModel = false;
+
+
 
 void Framework::moduleInit(int argc, char** argv)
@@ -76 +78 @@
 //   CDEngine::getInstance()->debugSpawnTree(9, (sVec3D*)mod->getVertexArray(), mod->getVertexArrayCount());
 
-
-
-  entityList = new tList<WorldEntity>();
-
-//   a = new TestEntity(); a->setName("Clown1");
-   b = new CollisionTestEntity(); b->setName("Jaeger");
+   entityList = new tList<WorldEntity>();
+
    if (argc > 1)
    {
      printf("Loading model %s\n", argv[1]);
-     b->loadModel(argv[1]);
+     b = new CollisionTestEntity(argv[1]); b->setName("Jaeger");
    }
-//   a = new Terrain();
-
+   else
+   {
+     printf("----------------------- WARNING ---------------------\n\n");
+     printf("no path specified, using default model: models/ships/fighter.obj\n\n");
+     printf("----------------------- WARNING ---------------------\n");
+     b = new CollisionTestEntity("models/test/cd_test_0.obj"); b->setName("Jaeger");
+   }
 //   b->setRelCoor(0.0, 0.0, -20.0);
 //   b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
-
-  entityList->add(b);
+   if(b != NULL)
+     printf("model successfully loaded\n");
+   entityList->add(b);
+
+
+//   a = new Terrain();
+
+
 //   entityList->add(b);
 
@@ -261 +270 @@
       entity->draw();
     entity->drawBVTree(depth, drawMode);
-    printf("%i, %i\n", depth, drawMode);
+   // printf("%i, %i\n", depth, drawMode);
     entity = iterator->nextElement();
   }