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

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

Revision: 805
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=805&view=rev
Author:   andy_miller
Date:     2008-11-21 02:25:55 +0000 (Fri, 21 Nov 2008)

Log Message:
-----------
Linux updates - Bullet 2.72 and OgreBulletC now OK

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/code_generators/bullet/generate_code.py
    trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
    trunk/python-ogre/code_generators/ogrebulletd/customization_data.py
    trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
    trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h
    trunk/python-ogre/demos/ogrepcz/plugins.cfg
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2008-11-21 02:25:55 UTC (rev 805)
@@ -70,7 +70,7 @@
 PATH_NxOgre=        os.path.join(PATH_THIRDPARTY, 'nxogre')
 PATH_NxOgre_09=        os.path.join(PATH_THIRDPARTY, 'nxogre_0.9')
 # PATH_NxOgre=        os.path.join(BASE_DIR, 'nxogre/NxOgre')
-PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.70') 
+PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.72') 
 ###PATH_PhysX=         os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs')
 PATH_Theora=        os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
 PATH_ffmpeg=        os.path.join(BASE_DIR, 'ffmpeg')

Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py	2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py	2008-11-21 02:25:55 UTC (rev 805)
@@ -81,7 +81,7 @@
             ,'::btCompoundShape::createAabbTreeFromChildren'
             ,'::btCollisionAlgorithm::getDispatcherId'
             ,'::btCollisionAlgorithmConstructionInfo::getDispatcherId'
-            ,'::btOptimizedBvh::walkRecursiveQuantizedTreeAgainstQuantizedTree'
+            ,'::btQuantizedBvh::walkRecursiveQuantizedTreeAgainstQuantizedTree'
             
             ,'::btCapsuleShape::calculateLocalInertia'
             ,'::btCapsuleShape::localGetSupportingVertexWithoutMargin'
@@ -127,9 +127,9 @@
             ,'btAlignedAllocator<btMultiSapBroadphase::btBridgeProxy*, 16u>'
             ,'btAlignedAllocator<btMultiSapBroadphase::btMultiSapProxy*, 16u>'
 #             ,'btAlignedAllocator<btOdeContactJoint, 16u>'
-            ,'btAlignedAllocator<btOdeJoint*, 16u>'
+#            ,'btAlignedAllocator<btOdeJoint*, 16u>'
 #             ,'btAlignedAllocator<btOdeSolverBody, 16u>'
-            ,'btAlignedAllocator<btOdeSolverBody*, 16u>'
+#            ,'btAlignedAllocator<btOdeSolverBody*, 16u>'
 #             ,'btAlignedAllocator<btOdeTypedJoint, 16u>'
             ,'btAlignedAllocator<unsigned int, 16u>'
             ,'btAlignedAllocator<unsigned short, 16u>'
@@ -150,8 +150,9 @@
 #             ,'btAlignedObjectArray<btQuantizedBvhNode>'
 #             ,'btAlignedObjectArray<btOptimizedBvhNode>'
 #             ,'btAlignedObjectArray<btCollisionObject*>'
-            ,'btDbvtBroadphase'
-            ,'btSorLcpSolver'
+            ,'btDbvtBroadphase'
+            ,'btContinuousDynamicsWorld'
+#            ,'btSorLcpSolver'
             ]
     for e in excludes:
         print "excluding class", e

Modified: trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h	2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h	2008-11-21 02:25:55 UTC (rev 805)
@@ -32,11 +32,11 @@
 typedef btAlignedAllocator<btDbvt::sStkNPS, 16u> AlignedAllocatorsStkNPS;
 // typedef btAlignedAllocator<btMultiSapBroadphase::btBridgeProxy*, 16u> AlignedAllocatorMultiSapBradBridge;
 // typedef btAlignedAllocator<btMultiSapBroadphase::btMultiSapProxy*, 16u> AlignedAllocatorMultiSapBroadMulti;
-typedef btAlignedAllocator<btOdeContactJoint, 16u> AlignedAllocatorOdeContactJoint;
-typedef btAlignedAllocator<btOdeJoint*, 16u> AlignedAllocatorOdeJointPtr;
-typedef btAlignedAllocator<btOdeSolverBody, 16u> AlignedAllocatorOdeSolverBody;
-typedef btAlignedAllocator<btOdeSolverBody*, 16u> AlignedAllocatorOdeSolverBodyPtr;
-typedef btAlignedAllocator<btOdeTypedJoint, 16u> AlignedAllocatorOdeTypedJoint;
+//typedef btAlignedAllocator<btOdeContactJoint, 16u> AlignedAllocatorOdeContactJoint;
+//typedef btAlignedAllocator<btOdeJoint*, 16u> AlignedAllocatorOdeJointPtr;
+//typedef btAlignedAllocator<btOdeSolverBody, 16u> AlignedAllocatorOdeSolverBody;
+//typedef btAlignedAllocator<btOdeSolverBody*, 16u> AlignedAllocatorOdeSolverBodyPtr;
+//typedef btAlignedAllocator<btOdeTypedJoint, 16u> AlignedAllocatorOdeTypedJoint;
 typedef btAlignedAllocator<short, 16u> AlignedAllocatorShort16;
 typedef btAlignedObjectArray<btDbvtNode const*> AlignedObjectArrayDbvtNode;
 typedef btAlignedObjectArray<btDbvt::sStkNN> AlignedObjectArrayDbvtsStkNN;
@@ -44,11 +44,11 @@
 typedef btAlignedObjectArray<btDbvt::sStkNPS> AlignedObjectArrayDbvtsStkNPS;
 // typedef btAlignedObjectArray<btMultiSapBroadphase::btBridgeProxy*> AlignedObjectArrayMultiSapBroadBridge;
 // typedef btAlignedObjectArray<btMultiSapBroadphase::btMultiSapProxy*> AlignedObjectArrayMultiSapBroadMulti;
-typedef btAlignedObjectArray<btOdeContactJoint> AlignedObjectArrayOdeContactJoint;
-typedef btAlignedObjectArray<btOdeJoint*> AlignedObjectArrayOdeJointPtr;
-typedef btAlignedObjectArray<btOdeSolverBody> AlignedObjectArrayOdeSolverBody;
-typedef btAlignedObjectArray<btOdeSolverBody*> AlignedObjectArrayOdeSolverBodyPtr;
-typedef btAlignedObjectArray<btOdeTypedJoint> AlignedObjectArrayOdeTypedJoint;
+//typedef btAlignedObjectArray<btOdeContactJoint> AlignedObjectArrayOdeContactJoint;
+//typedef btAlignedObjectArray<btOdeJoint*> AlignedObjectArrayOdeJointPtr;
+//typedef btAlignedObjectArray<btOdeSolverBody> AlignedObjectArrayOdeSolverBody;
+//typedef btAlignedObjectArray<btOdeSolverBody*> AlignedObjectArrayOdeSolverBodyPtr;
+//typedef btAlignedObjectArray<btOdeTypedJoint> AlignedObjectArrayOdeTypedJoint;
 
 
 

Modified: trunk/python-ogre/code_generators/ogrebulletd/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/customization_data.py	2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/ogrebulletd/customization_data.py	2008-11-21 02:25:55 UTC (rev 805)
@@ -1,7 +1,11 @@
 
 def header_files( version ):
-    return [ 'OgreBulletDynamics.h']
+    return [ 'OgreBulletDynamics.h'
+            ,"LinearMath/btStackAlloc.h"
+            ,"LinearMath/btPoolAllocator.h"
+            ,"BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+]
   
 def huge_classes( version ):
     return []
-   
\ No newline at end of file
+   

Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py	2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py	2008-11-21 02:25:55 UTC (rev 805)
@@ -58,6 +58,15 @@
         main_ns = global_ns.namespace( MAIN_NAMESPACE )
     else:
         main_ns = global_ns    
+    excludes=['::btSimulationIslandManager'
+            ]
+    for e in excludes:
+        print "excluding class", e
+        global_ns.class_(e).exclude()
+    for c in global_ns.classes():
+        #if not c.ignore:
+        print c
+    sys.exit(-1)
 
 ############################################################
 ##

Modified: trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h	2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h	2008-11-21 02:25:55 UTC (rev 805)
@@ -1,5 +1,9 @@
-#include "OgreBulletDynamics.h"
+#include "OgreBulletDynamics.h"
+#include "LinearMath/btStackAlloc.h"
+#include "LinearMath/btPoolAllocator.h"
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
 
+
 // First we create a magic namespace to hold all our aliases
 namespace pyplusplus { namespace aliases {
     

Modified: trunk/python-ogre/demos/ogrepcz/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogrepcz/plugins.cfg	2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/demos/ogrepcz/plugins.cfg	2008-11-21 02:25:55 UTC (rev 805)
@@ -2,22 +2,24 @@
 
 ## Use this for Windows
 # Define plugin folder
-PluginFolder=../../plugins
-#home/andy/development/root/usr/lib/OGRE
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
-Plugin=Plugin_PCZSceneManager.dll
-Plugin=Plugin_OctreeZone.dll
-Plugin=Plugin_OctreeSceneManager.dll
+#PluginFolder=../../plugins
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
+#Plugin=Plugin_PCZSceneManager.dll
+#Plugin=Plugin_OctreeZone.dll
+#Plugin=Plugin_OctreeSceneManager.dll
 
 
 ##
 ## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+Plugin=RenderSystem_GL
+Plugin=Plugin_ParticleFX
+Plugin=Plugin_BSPSceneManager
+Plugin=libPlugin_PCZSceneManager
+#Plugin=Plugin_OctreeZone
+Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-11-19 10:38:17 UTC (rev 804)
+++ trunk/python-ogre/environment.py	2008-11-21 02:25:55 UTC (rev 805)
@@ -1525,19 +1525,20 @@
 class bullet:
     active = True
     pythonModule = True
-    version= "2.70"
+    version= "2.72"
     name='bullet'
     base = "bullet-" + version
     baseDir = os.path.join(os.getcwd(), base)
     parent = "ogre/physics"
-    libs=[boost.lib,  'libbulletcollision', 'libbulletdynamics']
+    libs=[boost.lib,  'LibBulletCollision', 'LibBulletDynamics','LibLinearMath']
     if isWindows():
-        libs.append('libbulletmath')
+        pass
+        #libs.append('libbulletMath')
     else:
-        libs.append('libbulletmath')
-        libs.append('libbulletsoftbody')
+        #libs.append('libbulletmath')
+        libs.append('LibBulletSoftBody')
         #libs.append('libbulletcolladaconverter')
-        libs.append('libbulletmultithreaded')
+        libs.append('LibBulletMultiThreaded')
         libs.append ( boost_python_index.lib )
 
     lib_dirs = [ Config.PATH_LIB_Boost
@@ -1552,14 +1553,15 @@
             ]
         buildCmds = [
             [0, "tar zxf " +os.path.join(downloadPath, base)+".tgz", ''],
-            [0, "./autogen.sh", baseDir],
-            [0, "./configure --prefix=%s " %(PREFIX), baseDir],
-##            [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
-##            [0, "make", baseDir],
-            [0, "jam", baseDir],
-            [0, "jam install", baseDir]
+#            [0, "./autogen.sh", baseDir],
+#            [0, "./configure --prefix=%s " %(PREFIX), baseDir],
+            [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
+            [0, "make", baseDir],
+#            [0, "make install", baseDir],
+#            [0, "jam", baseDir],
+#            [0, "jam install", baseDir]
 
-##            [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
+            [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
             ]
     else:
         source=[
@@ -1581,7 +1583,7 @@
     cflags = ""
     parent = "ogre/physics"
     libs = [boost.lib,  'OgreMain', 
-        'libbulletcollision', 'libbulletdynamics', 'libbulletmath'
+        'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath'
         ]
 #    if isWindows():
 #        libs.append('libbulletmath')
@@ -1614,7 +1616,7 @@
     cflags = ""
     parent = "ogre/physics"
     libs = [boost.lib,  'OgreMain', 
-        'libbulletcollision', 'libbulletdynamics', 'libbulletmath'
+        'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath'
         ]
 #    if isWindows():
 #        libs.append('libbulletmath')
@@ -1634,7 +1636,7 @@
     if isWindows():
         CCFLAGS =  ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
     else:
-        CCFLAGS = ' -D_PRECOMP '
+        CCFLAGS = ' -D_PRECOMP -fno-inline '
         libs.append ( boost_python_index.lib )
     ModuleName = 'OgreBulletD'
     CheckIncludes=['boost/python.hpp', 'Ogre.h']        


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