Changeset 4710 in orxonox.OLD for orxonox/trunk/src/subprojects/collision_detection

Timestamp:

Jun 26, 2005, 10:10:48 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: weeped out some very serious bugs, now the tree separation werks flawless, hf

Location:

orxonox/trunk/src/subprojects/collision_detection

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• collision_detection.cc (modified) (8 diffs)

orxonox/trunk/src/subprojects/collision_detection/Makefile.am

@@ -41 +41 @@
                    $(MAINSRCDIR)/world_entities/world_entity.cc
 
+#$(MAINSRCDIR)/util/loading/load_param.cc
 
 

orxonox/trunk/src/subprojects/collision_detection/Makefile.in

@@ -878 +878 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
+#$(MAINSRCDIR)/util/loading/load_param.cc
+
 #                   $(MAINSRCDIR)/util/loading/game_loader.cc \
 #                   $(MAINSRCDIR)/util/track/track_manager.cc \

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -29 +29 @@
 #include "test_entity.h"
 #include "environment.h"
+
 
 #include "graphics_engine.h"
@@ -44 +45 @@
 bool drawModel;
 
-Environment* a;
-Environment* b;
+WorldEntity* a;
+WorldEntity* b;
+//Terrain* c;
 
 void Framework::moduleInit(int argc, char** argv)
@@ -53 +55 @@
   CDEngine::getInstance();
 
-  /* Simple Test */
-  //CDEngine::getInstance()->debug();
+  /* Primitive Data Test */
+//   sVec3D* data = new sVec3D[6];
+//   float tmp[6][3] = {{0.0, 4.2, 2.4}, {3.0, 3.0, 2.0}, {5.0, 1.0, 6.0}, {6.5, 1.0, 3.0}, {7.0, 3.0, 5.0}, {8.0, 6.0, 6.0}};
+//   for(int i = 0; i < 6; ++i)
+//   {
+//     data[i][0] = tmp[i][0];
+//     data[i][1] = tmp[i][1];
+//     data[i][2] = tmp[i][2];
+//   }
+//   CDEngine::getInstance()->debugSpawnTree(5, data, 6);
 
   /* MD2 Model Test */
@@ -69 +79 @@
   entityList = new tList<WorldEntity>();
 
-  //a = new TestEntity(); a->setName("Clown1");
-  a = new Environment(); a->setName("Clown");
-  b = new Environment(); b->setName("Jaeger");
+  a = new TestEntity(); a->setName("Clown1");
+  b = new Environment(); a->setName("Clown");
+  //b = new Environment(); b->setName("Jaeger");
+  //c = new Terrain();
 
   b->setRelCoor(0.0, 0.0, -10.0);
-  b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
-
-//   TestEntity* c = new TestEntity(); c->setName("Colwn2");
-//   c->setRelCoor(0.0, 0.0, -20.0);
+  //b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
 
   entityList->add(a);
@@ -85 +93 @@
 
   LightManager* lightMan = LightManager::getInstance();
-  lightMan->setAmbientColor(.1,.1,.1);
+    lightMan->setAmbientColor(.1,.1,.1);
   lightMan->addLight();
-  lightMan->setPosition(30, 30, 30);
+  lightMan->setPosition(-5.0, 50.0, -40.0);
   lightMan->addLight();
-  lightMan->setPosition(-30, -30, -30);
+  lightMan->setPosition(100, 80, 60);
+
 
   /* properties */
@@ -223 +232 @@
 
 
-  b->shiftCoor(Vector(0.0, 0.0, iterata));
+  //b->shiftCoor(Vector(0.0, 0.0, iterata));
 
 
@@ -239 +248 @@
 void Framework::moduleDraw() const
 {
+  //CDEngine::getInstance()->debugDraw(depth, drawMode);
+
   tIterator<WorldEntity>* iterator = entityList->getIterator();
   WorldEntity* entity = iterator->nextElement();
@@ -371 +382 @@
 
 
-      Slider* TreeDepth = new Slider("TreeDepth", 0, 5);
+      Slider* TreeDepth = new Slider("TreeDepth", 0, 10);
       TreeDepth->connectSignal("value_changed", (void*)TreeDepth, treeDepth);
       windowBox->fill(TreeDepth);