Changeset 3359 for d-collide

Timestamp:

03/21/08 16:32:42 (2 years ago)

Author:

horst

Message:

Added the last rigid object collision benchmark (helicopter which flies into a tower of boxes)

Location:

d-collide/trunk/d-collide/testapp

Files:

• CMakeLists.txt (modified) (1 diff)
• myobjectnode.cpp (modified) (1 diff)
• myobjectnode.h (modified) (1 diff)
• scenes/benchmark/rigid.cpp (added)
• scenes/benchmark/rigid.h (added)

d-collide/trunk/d-collide/testapp/CMakeLists.txt

@@ -87 +87 @@
 
         scenes/benchmark/mixed.cpp
+        scenes/benchmark/rigid.cpp
         scenes/benchmark/deformable.cpp
 

d-collide/trunk/d-collide/testapp/myobjectnode.cpp

@@ -334 +334 @@
 }
 
+void MyObjectNode::setRotation(float angle, float x, float y, float z, bool movePhysicsBody) {
+    dcollide::Matrix m;
+    m.rotate(angle, x,y,z);
+    setRotation(m, movePhysicsBody);
+}
+
 /*!
  * \brief rotates the Proxy,the OGRE node, and (if it exists) the physics body

d-collide/trunk/d-collide/testapp/myobjectnode.h

@@ -80 +80 @@
         virtual void rotate(float angle, float x, float y, float z, bool respectOrientation = true);
         virtual void rotate(const dcollide::Matrix& rotationMatrix, bool respectOrientation = true);
-        //void setRotation(float angle, float x, float y, float z, bool movePhysicsBody = true);
+        void setRotation(float angle, float x, float y, float z, bool movePhysicsBody = true);
         virtual void setRotation(const dcollide::Matrix& rotationMatrix, bool movePhysicsBody = true);