Changeset 2119 for code/branches/physics_new/src/orxonox

Timestamp:

Nov 2, 2008, 1:34:58 PM (16 years ago)

Author:

rgrieder

Message:

Merged physics branch into physics_new branch.

Location:

code/branches/physics_new

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• src/orxonox/objects/HelloBullet.cc (copied) (copied from code/branches/physics/src/orxonox/objects/HelloBullet.cc)
• src/orxonox/objects/HelloBullet.h (copied) (copied from code/branches/physics/src/orxonox/objects/HelloBullet.h)
• src/orxonox/objects/PhysicsTest.cc (copied) (copied from code/branches/physics/src/orxonox/objects/PhysicsTest.cc)
• src/orxonox/objects/PhysicsTest.h (copied) (copied from code/branches/physics/src/orxonox/objects/PhysicsTest.h)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)

code/branches/physics_new/src/orxonox/CMakeLists.txt

@@ -46 +46 @@
   objects/EventDispatcher.cc
   objects/EventTarget.cc
+#  objects/PhysicsTest.cc
+  objects/HelloBullet.cc
   objects/Radar.cc
   objects/RadarListener.cc
@@ -144 +146 @@
   tinyxml_orxonox
   tolualib_orxonox
+  LibLinearMath
+  LibBulletCollision
+  LibBulletDynamics
+  LibBulletSoftBody
+  ogrebullet_collisions_orxonox
+  ogrebullet_dynamics_orxonox
   util
   core

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

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