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

Timestamp:

Nov 29, 2005, 11:07:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches world_entities to trunk again
merged with command
svn merge -r5795:HEAD branches/world_entities/ trunk/
no conflicts (what a wonder)

Location:

trunk/src/subprojects

Files:

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

trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -81 +81 @@
 //   a = new TestEntity(); a->setName("Clown1");
    b = new CollisionTestEntity(); b->setName("Jaeger");
+   if (argc > 1)
+   {
+     printf("Loading model %s\n", argv[1]);
+     b->loadModel(argv[1]);
+   }
 //   a = new Terrain();
 

trunk/src/subprojects/framework.cc

@@ -80 +80 @@
       float dt = framework->tick();
 
-      NullParent::getInstance()->update(dt);
+      NullParent::getInstance()->updateNode(dt);
 
       // Draw the scene