[Python-ogre-commit] SF.net SVN: python-ogre:[711] trunk/python-ogre

[<and...@us...>]

Revision: 711
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=711&view=rev
Author:   andy_miller
Date:     2008-08-22 10:45:22 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
Fix to OgreBullet due to api change in bullet 2.70
Fixed compiler options as extra command ignored on windows

Modified Paths:
--------------
    trunk/python-ogre/BuildModule.py
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.cpp
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h
    trunk/python-ogre/demos/bullet/test01.py
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py	2008-08-22 08:23:01 UTC (rev 710)
+++ trunk/python-ogre/BuildModule.py	2008-08-22 10:45:22 UTC (rev 711)
@@ -83,7 +83,11 @@
             for FLAGS in "CFLAGS", "CXXFLAGS", "CCFLAGS", "LDFLAGS":
                 if not FLAGS in env:
                     env[FLAGS] = ""
-            env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib")
+            if environment.isWindows():                    
+                env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")
+            else:
+                env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib")
+                            
             env["CXXFLAGS"]+=" "+env["CFLAGS"]
             env["CCFLAGS"]+=" "+env["CFLAGS"]
             env["LDFLAGS"]+="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin"

Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp	2008-08-22 08:23:01 UTC (rev 710)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp	2008-08-22 10:45:22 UTC (rev 711)
@@ -75,7 +75,7 @@
     // -------------------------------------------------------------------------
     bool  CollisionRayResultCallback::doesCollide() const
     {
-        return mRayResultCallback->HasHit();
+        return mRayResultCallback->hasHit();
     }
     // -------------------------------------------------------------------------
     Object  *CollisionClosestRayResultCallback::getCollidedObject () const

Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.cpp	2008-08-22 08:23:01 UTC (rev 710)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.cpp	2008-08-22 10:45:22 UTC (rev 711)
@@ -213,13 +213,12 @@
     }
 
     // -------------------------------------------------------------------------
-    void CollisionsWorld::launchRay(CollisionRayResultCallback &rayresult, short int collisionFilterMask)
+    void CollisionsWorld::launchRay(CollisionRayResultCallback &rayresult)
     {
         mWorld->rayTest(
             OgreBtConverter::to(rayresult.getRayStartPoint()), 
             OgreBtConverter::to(rayresult.getRayEndPoint()), 
-            *rayresult.getBulletRay (),
-			collisionFilterMask);
+            *rayresult.getBulletRay ());
     }
 }
 

Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h	2008-08-22 08:23:01 UTC (rev 710)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h	2008-08-22 10:45:22 UTC (rev 711)
@@ -64,7 +64,7 @@
         Ogre::SceneManager *getSceneManager() const {return mScnMgr;}
         btCollisionWorld *getBulletCollisionWorld() const {return mWorld;}
 
-        void launchRay (CollisionRayResultCallback &ray, short int collisionFilterMask = -1);
+        void launchRay (CollisionRayResultCallback &ray);
 
     protected:
         btCollisionWorld*          mWorld;

Modified: trunk/python-ogre/demos/bullet/test01.py
===================================================================
--- trunk/python-ogre/demos/bullet/test01.py	2008-08-22 08:23:01 UTC (rev 710)
+++ trunk/python-ogre/demos/bullet/test01.py	2008-08-22 10:45:22 UTC (rev 711)
@@ -2,7 +2,7 @@
 sys.path.insert(0,'..')
 import PythonOgreConfig
 
-import ogre.renderer.OGRE
+import ogre.renderer.OGRE as ogre
 import ogre.physics.bullet as bullet
 t = bullet.btTransform()
 ms = bullet.btDefaultMotionState (t)
@@ -37,3 +37,21 @@
     
 world.stepSimulation(0)
 world.stepSimulation(-0.333)
+
+
+class OgreMotionState(bullet.btMotionState): 
+    def __init__(self, initalPosition): 
+        bullet.btMotionState.__init__(self)
+        self.Pos=initalPosition 
+        self.Position=ogre.Vector3() 
+        self.Quaternion=ogre.Quaternion() 
+    def getWorldTransform(self, WorldTrans): 
+        worldTrans=self.Pos 
+    def setWorldTransform(WorldTrans): 
+        self.Position=ogre.Vector3(WorldTrans.getOrigin().x(),WorldTrans.getOrigin().y(),WorldTrans.getOrigin().z()) 
+        self.Quaternion=ogre.Quaternion(WorldTrans.getRoation().w(),WorldTrans.getRoation().x(),WorldTrans.getRoation().y(),WorldTrans.getRoation().z()) 
+
+shape=bullet.btCapsuleShape(10, 20) 
+motionState=OgreMotionState(bullet.btTransform()) 
+Object=bullet.btRigidBody(10.0, motionState, shape) # ...this should work in my eyes 
+#Object=bullet.btRigidBody(bullet.btRigidBodyConstructionInfo())   ...well obviously not in bullet 2.6.9
\ No newline at end of file

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-08-22 08:23:01 UTC (rev 710)
+++ trunk/python-ogre/environment.py	2008-08-22 10:45:22 UTC (rev 711)
@@ -1472,7 +1472,7 @@
     libs = [boost.lib,  'OgreMain', 
         'LibBulletCollision', 'LibBulletDynamics'
         ]
-    if os.name == 'nt':
+    if isWindows():
         libs.append('LibBulletMath')        
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_INCLUDE_Bullet
@@ -1484,7 +1484,7 @@
                 ,Config.PATH_LIB_Bullet
                 , Config.PATH_LIB_Ogre_OgreMain
                 ]
-    if os.name=="nt":
+    if isWindows():
         CCFLAGS =  ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
     else:
         CCFLAGS = ' -D_PRECOMP '
@@ -1501,7 +1501,7 @@
     libs = [boost.lib,  'OgreMain', 
         'LibBulletCollision', 'LibBulletDynamics'
         ]
-    if os.name == 'nt':
+    if isWindows():
         libs.append('LibBulletMath')        
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_INCLUDE_Bullet
@@ -1514,7 +1514,7 @@
                 ,Config.PATH_LIB_Bullet
                 , Config.PATH_LIB_Ogre_OgreMain
                 ]
-    if os.name=="nt":
+    if isWindows():
         CCFLAGS =  ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
     else:
         CCFLAGS = ' -D_PRECOMP '


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.