Changeset 4903 in orxonox.OLD

Timestamp:

Jul 19, 2005, 10:50:53 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: wanted to test the terrain quadtree in the subproject but the subproject do not work anymore because of the fast development speed of orxonox

Location:

orxonox/trunk/src/subprojects

Files:

• collision_detection/collision_detection.cc (modified) (2 diffs)
• framework.cc (modified) (1 diff)

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

@@ -29 +29 @@
 #include "test_entity.h"
 #include "environment.h"
+#include "terrain.h"
 
 
@@ -80 +81 @@
   entityList = new tList<WorldEntity>();
 
-  a = new TestEntity(); a->setName("Clown1");
-  b = new Environment(); b->setName("Jaeger");
-  //c = new Terrain();
-
-  b->setRelCoor(0.0, 0.0, -20.0);
-  b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
+//   a = new TestEntity(); a->setName("Clown1");
+//   b = new Environment(); b->setName("Jaeger");
+  a = new Terrain();
+
+//   b->setRelCoor(0.0, 0.0, -20.0);
+//   b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
 
   entityList->add(a);
-  entityList->add(b);
+//   entityList->add(b);
 
   CDEngine::getInstance()->setEntityList(entityList);

orxonox/trunk/src/subprojects/framework.cc

@@ -286 +286 @@
 
   camera = new Camera();
-  State::getInstance()->setCamera(camera, camera->getTarget());
+  State::setCamera(camera, camera->getTarget());
   camera->setAbsCoor(Vector(10, 10, 10));