Changeset 2442 for code/branches/physics_merge/src/orxonox/gamestates

Timestamp:

Dec 14, 2008, 4:16:52 PM (16 years ago)

Author:

rgrieder

Message:

Finally merged physics stuff. Target is physics_merge because I'll have to do some testing first.

Location:

code/branches/physics_merge

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• src/orxonox/gamestates/GSRoot.cc (modified) (1 diff)

code/branches/physics_merge/src/orxonox/gamestates/GSLevel.cc

@@ -51 +51 @@
 namespace orxonox
 {
-    SetCommandLineArgument(level, "sample2.oxw").shortcut("l");
+    SetCommandLineArgument(level, "physicstest2.oxw").shortcut("l");
 
     GSLevel::GSLevel()

code/branches/physics_merge/src/orxonox/gamestates/GSRoot.cc

@@ -146 +146 @@
         /*** HACK *** HACK ***/
         // Call the Tickable objects
+        float leveldt = time.getDeltaTime();
+        if (leveldt > 1.0f)
+        {
+            // just loaded
+            leveldt = 0.0f;
+        }
         for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
-            it->tick(time.getDeltaTime());
+            it->tick(leveldt);
         /*** HACK *** HACK ***/