[Python-ogre-commit] SF.net SVN: python-ogre:[784] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre:[784] trunk/python-ogre
|
From: <and...@us...> - 2008-10-30 06:12:24
|
Revision: 784
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=784&view=rev
Author: andy_miller
Date: 2008-10-30 06:12:20 +0000 (Thu, 30 Oct 2008)
Log Message:
-----------
Updates for OgreAL on Linux
Attempts to resolve Physx Issue on Linux (not yet successful)
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/physx/python_physx_aliases.h
trunk/python-ogre/code_generators/physx/python_physx_sizeof.h
trunk/python-ogre/demos/physx/physx_01.py
trunk/python-ogre/demos/plugins.cfg
trunk/python-ogre/environment.py
Removed Paths:
-------------
trunk/python-ogre/demos/ogreal/plugins.cfg
Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h 2008-10-30 06:12:20 UTC (rev 784)
@@ -53,8 +53,8 @@
# define OgreAL_Export
// # endif
#elif OGRE_COMPILER == OGRE_COMPILER_GNUC
- # include "AL/al.h"
- # include "AL/alc.h"
+ # include "al.h"
+ # include "alc.h"
// # if defined(OGREAL_EXPORT) && OGRE_COMP_VER >= 400
// # define OgreAL_Export __attribute__ ((visibility("default")))
// # else
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-10-30 06:12:20 UTC (rev 784)
@@ -62,7 +62,6 @@
excludes=[ '::NxArray<NxShapeDesc*, NxAllocatorDefault>::begin'
,'::NxArray< NxForceFieldShapeDesc*, NxAllocatorDefault >::resize'
,'::NxArray< NxForceFieldShapeGroup*, NxAllocatorDefault >::resize'
- ,'::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry'
,'::NxArray<NxShapeDesc*, NxAllocatorDefault>::end'
# ,'::NxCloth::overlapAABBTriangles' # ugly argument that boost doesn't like.. To Fix in hand wrappers
# these have const refs to classes with protected desctuctors - a bad combination for boost
@@ -79,6 +78,9 @@
,'::NxVec3::isNotUsed'
]
+ if os.name =='nt':
+ excludes.append('::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry')
+
for e in excludes:
print "excluding function", e
global_ns.member_functions(e).exclude()
@@ -92,7 +94,6 @@
global_ns.free_functions(e).exclude()
excludes = ['NxArray<NxShapeDesc*, NxAllocatorDefault>', ## doesn't have a defult constructor for ElemType
- 'NxArray<NxFluidEmitterDesc, NxAllocatorDefault>', ## needs ElemType changed to NxFluidEmitterDesc
'NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault>', ## Elemtype issue
'NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault>', ## Elemtype issue
'NxForceFieldShapeGroup' ## seems to have access issues..
@@ -100,6 +101,10 @@
]
# for c in global_ns.classes():
# print c
+ if os.name =='nt':
+ excludes.append('NxArray<NxFluidEmitterDesc, NxAllocatorDefault>') ## needs ElemType changed to NxFluidEmitterDesc
+ else:
+ excludes.append ( '::NxFluidUserNotify')
for e in excludes:
print "Excluding Class:", e
global_ns.class_(e).exclude()
@@ -136,7 +141,13 @@
############################################################
def ManualFixes ( mb ):
- global_ns = mb.global_ns
+ global_ns = mb.global_ns
+ # this change was for 1.7 but also needed for 1.4
+
+ noncopy=[] ###'NxPhysicsSDK']
+ for c in noncopy:
+ global_ns.class_(c).noncopyable = True
+
# known = ['points', 'triangles']
# for c in global_ns.classes():
# if c.name.startswith ('Nx'):
@@ -358,7 +369,7 @@
if os.name == 'nt':
defined_symbols = ['NXPHYSICS_EXPORTS', 'WIN32', 'PHYSX_EXPORTS'] #'WIN32',
else:
- defined_symbols = ['LINUX']
+ defined_symbols = ['LINUX','NX_DISABLE_FLUIDS']
defined_symbols.append( 'VERSION_' + environment.physx.version )
#
Modified: trunk/python-ogre/code_generators/physx/python_physx_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/physx/python_physx_aliases.h 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/code_generators/physx/python_physx_aliases.h 2008-10-30 06:12:20 UTC (rev 784)
@@ -3,10 +3,11 @@
typedef NxUserEntityReport<unsigned> EntitiReportUnsigned;
typedef NxUserEntityReport<NxSweepQueryHit> EntityReportSweepQuery;
typedef NxArray<NxShapeDesc*, NxAllocatorDefault> NxArrayShapeDesc;
-typedef NxArray<NxFluidEmitterDesc, NxAllocatorDefault> NxArrayFluidEmitterDesc;
typedef NxArray< NxForceFieldShapeDesc*, NxAllocatorDefault > NxArrayNxForceFieldShapeDescPtr;
typedef NxArray< NxForceFieldShapeGroup*, NxAllocatorDefault > NxArrayNxForceFieldShapeGroupPtr;
+
+//typedef NxArray<NxFluidEmitterDesc, NxAllocatorDefault> NxArrayFluidEmitterDesc;
+
-
Modified: trunk/python-ogre/code_generators/physx/python_physx_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/physx/python_physx_sizeof.h 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/code_generators/physx/python_physx_sizeof.h 2008-10-30 06:12:20 UTC (rev 784)
@@ -7,7 +7,8 @@
sizeof ( NxForceFieldShapeGroup );
sizeof ( NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault> );
sizeof ( NxArray<NxShapeDesc*, NxAllocatorDefault> );
-sizeof ( NxArray<NxFluidEmitterDesc, NxAllocatorDefault> );
sizeof ( NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault> );
sizeof ( _Nx3F32 );
+
+//sizeof ( NxArray<NxFluidEmitterDesc, NxAllocatorDefault> );
Deleted: trunk/python-ogre/demos/ogreal/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogreal/plugins.cfg 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/demos/ogreal/plugins.cfg 2008-10-30 06:12:20 UTC (rev 784)
@@ -1,13 +0,0 @@
-# Defines plugins to load
-
-# Define plugin folder
-PluginFolder=../../plugins
-
-# Define D3D rendering implementation plugin
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
-
Modified: trunk/python-ogre/demos/physx/physx_01.py
===================================================================
--- trunk/python-ogre/demos/physx/physx_01.py 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/demos/physx/physx_01.py 2008-10-30 06:12:20 UTC (rev 784)
@@ -34,9 +34,19 @@
gCookingInitialized = False
# Initialize PhysicsSDK
- desc = physics.NxPhysicsSDKDesc()
-
- gPhysicsSDK, errorCode = physics.NxCreatePhysicsSDK(physics.NX_PHYSICS_SDK_VERSION(),desc=desc)
+# desc = physics.NxPhysicsSDKDesc()
+# print "DESC", desc
+ gPhysicsSDK = physics.NxCreatePhysicsSDK(physics.NX_PHYSICS_SDK_VERSION())
+ print gPhysicsSDK
+ print "Getting master"
+ g = physics.getMasterPhysicsSDK()
+ print "Got Master"
+ print g
+ print dir(g)
+ print dir (gPhysicsSDK)
+ d = physics.NxPhysicsSDK ( )
+ print d
+ print dir(d)
if gPhysicsSDK == None :
print "\nSDK create error (%d - %s).\nUnable to initialize the PhysX SDK, exiting the sample.\n\n" % (errorCode,"test")
return False
@@ -104,4 +114,4 @@
return True
if __name__ == "__main__":
- print InitNx()
\ No newline at end of file
+ print InitNx()
Modified: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/demos/plugins.cfg 2008-10-30 06:12:20 UTC (rev 784)
@@ -2,14 +2,13 @@
## 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_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
+#PluginFolder=../../plugins
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_OctreeSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
#Plugin=Plugin_PCZSceneManager.dll
#Plugin=Plugin_OctreeZone.dll
#Plugin=Plugin_OctreeSceneManager.dll
@@ -17,8 +16,9 @@
##
## 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=Plugin_OctreeSceneManager
+Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-10-30 06:06:00 UTC (rev 783)
+++ trunk/python-ogre/environment.py 2008-10-30 06:12:20 UTC (rev 784)
@@ -1275,7 +1275,7 @@
CCFLAGS = ' -D"WIN32" '
## CCFLAGS = ' ' ## try to not define WIN 32 to remove inline assembly code that GCCxml doesn't like
else:
- CCFLAGS = ' -D"LINUX" '
+ CCFLAGS = ' -D"LINUX" -D"NX_USE_SDK_DLLS" -D"_USRDLL" -D"NX_DISABLE_FLUIDS" '
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
Config.PATH_LIB_PhysX
@@ -1388,15 +1388,23 @@
["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",downloadPath],
]
buildCmds = [
-# [0, "tar zxf " + os.path.join(downloadPath, "openal-0.0.8.tar.gz"), ''],
+# [0, "tar zxf " + os.path.join(downloadPath, "openal-0.0.8.tar.gz"), ''],
+
[0, "tar jxf " + os.path.join(downloadPath, "openal-soft-1.5.304.tar.bz2"), ''],
[0, "tar zxf " + os.path.join(downloadPath, "libogg-1.1.3.tar.gz"), ''],
[0, "tar zxf " + os.path.join(downloadPath, "libvorbis-1.2.0.tar.gz"), ''],
[0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libogg-1.1.3")],
- [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
-# [0, "sed --in-place -s 's|( ALCvoid )|()|' alc.h",os.path.join(os.getcwd(),"openal-0.0.8","common", "include", "AL")],
-# [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")],
-# [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
+
+ [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
+
+ [0,"cmake -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"make ", os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"cp -p libopenal* %s/lib " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304')],
+ [0,"cp -p * %s/include " % PREFIX, os.path.join(os.getcwd(),'openal-soft-1.5.304', 'include','AL')]
+
+# [0, "sed --in-place -s 's|( ALCvoid )|()|' alc.h",os.path.join(os.getcwd(),"openal-0.0.8","common", "include", "AL")],
+# [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")],
+# [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
]
libs=[boost.lib, boost_python_index.lib, 'OgreMain', 'vorbisfile',
#'ogg',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
