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

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

Revision: 800
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=800&view=rev
Author:   andy_miller
Date:     2008-11-18 13:33:14 +0000 (Tue, 18 Nov 2008)

Log Message:
-----------
Fixes for Linux bullet and Hydrax

Modified Paths:
--------------
    trunk/python-ogre/ThirdParty/Hydrax/Perlin.cpp
    trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
    trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
    trunk/python-ogre/demos/plugins.cfg
    trunk/python-ogre/environment.py
    trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
    trunk/python-ogre/scripts/00-PreReqs.sh

Modified: trunk/python-ogre/ThirdParty/Hydrax/Perlin.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/Hydrax/Perlin.cpp	2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/ThirdParty/Hydrax/Perlin.cpp	2008-11-18 13:33:14 UTC (rev 800)
@@ -133,7 +133,7 @@
 
 		// Create our perlin textures
 
-		Ogre::TexturePtr& mPerlinTexture0 
+		Ogre::TexturePtr mPerlinTexture0 
 			= Ogre::TextureManager::getSingleton().
 			createManual("_Hydrax_Perlin_Noise0",
 			             HYDRAX_RESOURCE_GROUP,
@@ -142,7 +142,7 @@
 						 Ogre::PF_L16,
 						 Ogre::TU_DYNAMIC_WRITE_ONLY);
 
-		Ogre::TexturePtr& mPerlinTexture1 
+		Ogre::TexturePtr mPerlinTexture1 
 			= Ogre::TextureManager::getSingleton().
 			createManual("_Hydrax_Perlin_Noise1",
 			             HYDRAX_RESOURCE_GROUP,
@@ -590,4 +590,4 @@
 
 		return o >> (upsamplepower+upsamplepower);
 	}
-}}
\ No newline at end of file
+}}

Modified: trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletc/generate_code.py	2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/code_generators/ogrebulletc/generate_code.py	2008-11-18 13:33:14 UTC (rev 800)
@@ -214,7 +214,7 @@
     if os.name == 'nt':
         defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
     else:
-        defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+        defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
     defined_symbols.append( 'VERSION_' + environment.ogrebulletc.version ) 
     if environment._USE_THREADS:
         defined_symbols.append('BOOST_HAS_THREADS')

Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py	2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py	2008-11-18 13:33:14 UTC (rev 800)
@@ -202,7 +202,7 @@
     if os.name == 'nt':
         defined_symbols = ["WIN32","NDEBUG","_WINDOWS", "_PRECOMP", 'OGRE_NONCLIENT_BUILD','__PYTHONOGRE_BUILD_CODE' ]
     else:
-        defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD' ]
+        defined_symbols = ["NDEBUG", "_PRECOMP", 'OGRE_NONCLIENT_BUILD', '__PYTHONOGRE_BUILD_CODE' ]
     defined_symbols.append( 'VERSION_' + environment.ogrebulletd.version )
      
     if environment._USE_THREADS:

Modified: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg	2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/demos/plugins.cfg	2008-11-18 13:33:14 UTC (rev 800)
@@ -1,23 +1,13 @@
 # Defines plugins to load
 
 ## Use this for Windows
-# Define plugin folder
-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
-#PluginFolder=/home/andy/development/root/usr/lib/OGRE
-#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=Plugin_OctreeSceneManager
+Plugin=Plugin_CgProgramManager

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/environment.py	2008-11-18 13:33:14 UTC (rev 800)
@@ -815,8 +815,8 @@
                  [cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
                  ]
     else:
-        source = [ ##to fix
-                 [svn, " co :pserver:ano...@cv...:/cvsroot/ogre co -P "+base, os.getcwd()]
+        source = [
+                [svn, " co https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogrenewt " + base, os.getcwd()]
                  ]
     baseDir = os.path.join(os.getcwd(), base )
     buildCmds = [
@@ -1509,14 +1509,14 @@
     base = "bullet-" + version
     baseDir = os.path.join(os.getcwd(), base)
     parent = "ogre/physics"
-    libs=[boost.lib,  'LibBulletCollision', 'LibBulletDynamics']
+    libs=[boost.lib,  'libbulletcollision', 'libbulletdynamics']
     if isWindows():
         libs.append('libbulletmath')
     else:
-        libs.append('LibLinearMath')
-        libs.append('LibBulletSoftBody')
-        libs.append('LibBulletColladaConverter')
-        libs.append('LibBulletMultiThreaded')
+        libs.append('libbulletmath')
+        libs.append('libbulletsoftbody')
+        #libs.append('libbulletcolladaconverter')
+        libs.append('libbulletmultithreaded')
 
     lib_dirs = [ Config.PATH_LIB_Boost
                 ,  Config.PATH_LIB_Bullet
@@ -1530,9 +1530,14 @@
             ]
         buildCmds = [
             [0, "tar zxf " +os.path.join(downloadPath, base)+".tgz", ''],
-            [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
-            [0, "make", baseDir],
-            [0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
+            [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, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
             ]
     else:
         source=[
@@ -1554,12 +1559,12 @@
     cflags = ""
     parent = "ogre/physics"
     libs = [boost.lib,  'OgreMain', 
-        'LibBulletCollision', 'LibBulletDynamics'
+        'libbulletcollision', 'libbulletdynamics', 'libbulletmath'
         ]
-    if isWindows():
-        libs.append('libbulletmath')
-    else:
-        libs.append('LibLinearMath')
+#    if isWindows():
+#        libs.append('libbulletmath')
+#    else:
+#        libs.append('liblinearmath')
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_INCLUDE_Bullet
                     , os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -1575,8 +1580,9 @@
     else:
         CCFLAGS = ' -D_PRECOMP '
     ModuleName = 'OgreBulletC'
-    CheckIncludes=['boost/python.hpp', 'Ogre.h']    
+    CheckIncludes=['boost/python.hpp', 'Ogre.h']    
 
+
 class ogrebulletd:  # 
     active = True
     pythonModule = True
@@ -1585,12 +1591,12 @@
     cflags = ""
     parent = "ogre/physics"
     libs = [boost.lib,  'OgreMain', 
-        'LibBulletCollision', 'LibBulletDynamics'
+        'libbulletcollision', 'libbulletdynamics', 'libbulletmath'
         ]
-    if isWindows():
-        libs.append('libbulletmath')
-    else:
-        libs.append('LibLinearMath')
+#    if isWindows():
+#        libs.append('libbulletmath')
+#    else:
+#        libs.append('liblinearmath')
     include_dirs = [Config.PATH_Boost
                     , Config.PATH_INCLUDE_Bullet
                     , os.path.join(Config.PATH_OgreBullet, 'Collisions' )

Modified: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py	2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py	2008-11-18 13:33:14 UTC (rev 800)
@@ -118,7 +118,13 @@
     def _setUp(self):
         """This sets up the ogre application, and returns false if the user
         hits "cancel" in the dialog box."""
-        self.root = ogre.Root(getPluginPath())
+        if self.unittest:
+            if os.path.isfile('ogre.cfg'):
+                self.root = ogre.Root(getPluginPath())
+            else:
+                self.root = ogre.Root(getPluginPath(), '../ogre.cfg')
+        else:
+            self.root = ogre.Root(getPluginPath())
         self.root.setFrameSmoothingPeriod (5.0)
 
         self._setUpResources()

Modified: trunk/python-ogre/scripts/00-PreReqs.sh
===================================================================
--- trunk/python-ogre/scripts/00-PreReqs.sh	2008-11-18 07:52:54 UTC (rev 799)
+++ trunk/python-ogre/scripts/00-PreReqs.sh	2008-11-18 13:33:14 UTC (rev 800)
@@ -22,5 +22,6 @@
 	python-dev 				\
 	python-celementtree 	\
 	libglew-dev 			\
+    jam                     \
 	
 


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