Changeset 7533 in orxonox.OLD for branches/cd

Timestamp:

May 4, 2006, 2:59:48 PM (19 years ago)

Author:

patrick

Message:

collision: subproject up

Location:

branches/cd/src/subprojects/collision_detection

Files:

• collision_detection.cc (modified) (3 diffs)
• collision_test_entity.cc (modified) (1 diff)
• collision_test_entity.h (modified) (1 diff)

branches/cd/src/subprojects/collision_detection/collision_detection.cc

@@ -48 +48 @@
 //Terrain* c;
 bool animateModel = false;
+
+
 
 void Framework::moduleInit(int argc, char** argv)
@@ -78 +80 @@
 
 
-  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/ships/fighter.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);
 
@@ -259 +269 @@
   while( entity != NULL)
   {
-    if( likely(drawModel))
+    //if( likely(drawModel))
       entity->draw();
     entity->drawBVTree(depth, drawMode);

branches/cd/src/subprojects/collision_detection/collision_test_entity.cc

@@ -31 +31 @@
  *  creates an environment
 */
-CollisionTestEntity::CollisionTestEntity () : WorldEntity()
+CollisionTestEntity::CollisionTestEntity (const char* modelName) : WorldEntity()
 {
   this->init();
-  this->loadModel("models/ships/reaplow.obj");
+  this->loadModel(modelName);
   //  this->loadModel("models/ships/figther.obj");
 

branches/cd/src/subprojects/collision_detection/collision_test_entity.h

@@ -19 +19 @@
 
  public:
-  CollisionTestEntity ();
+  CollisionTestEntity (const char* modelName);
   CollisionTestEntity (const TiXmlElement* root);
   virtual ~CollisionTestEntity ();