Changeset 4704 in orxonox.OLD for orxonox/trunk/src/subprojects

Timestamp:

Jun 26, 2005, 4:13:11 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now collision detection is accurate. Now I have to tune the code, so the cd becomes faster

File:

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

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

@@ -38 +38 @@
 int drawMode;
 int depth;
+float iterata;
 tList<WorldEntity>* entityList;
 
@@ -43 +44 @@
 bool drawModel;
 
-TestEntity* a;
+Environment* a;
 Environment* b;
 
@@ -68 +69 @@
   entityList = new tList<WorldEntity>();
 
-  a = new TestEntity(); a->setName("Clown1");
+  //a = new TestEntity(); a->setName("Clown1");
+  a = new Environment(); a->setName("Clown");
   b = new Environment(); b->setName("Jaeger");
   b->setRelCoor(0.0, 0.0, -10.0);
@@ -92 +94 @@
   depth = 0;
   dt = lastFrame = currentFrame = 0;
-
+  iterata = 0.05f;
 
   moduleHelp();
@@ -198 +200 @@
           }
           break;
+        case SDLK_o:
+          if(iterata == 0.0f)
+          {
+            iterata = 0.05f;
+          }
+          else
+          {
+            iterata = 0.0f;
+          }
+          break;
 
       }
@@ -227 +239 @@
   }
 
-  b->shiftCoor(Vector(0.0, 0.0, 0.1));
+  b->shiftCoor(Vector(0.0, 0.0, iterata));