[Python-ogre-commit] SF.net SVN: python-ogre:[783] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre:[783] trunk/python-ogre
|
From: <and...@us...> - 2008-10-30 06:06:02
|
Revision: 783
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=783&view=rev
Author: andy_miller
Date: 2008-10-30 06:06:00 +0000 (Thu, 30 Oct 2008)
Log Message:
-----------
Getting ready for next release - implemented threading in Ogre build
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/caelum/generate_code.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/demos/ogreal/Demo_AL_01.py
trunk/python-ogre/environment.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-10-30 03:21:08 UTC (rev 782)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-10-30 06:06:00 UTC (rev 783)
@@ -44,7 +44,7 @@
PATH_ODE = os.path.join(BASE_DIR, 'ode-0.10.1')
PATH_OGG = os.path.join(BASE_DIR, 'ogg')
PATH_VORBIS= os.path.join(BASE_DIR, 'vorbis')
-PATH_OPENAL= os.path.join(BASE_DIR, 'openal')
+PATH_OPENAL= os.path.join(BASE_DIR, 'openal-soft-1.5.304') #'openal')
PATH_OgreOde= os.path.join(BASE_DIR, PATH_OgreAddons,'ogreode')
# # PATH_OgreBullet= os.path.join(PATH_OgreAddons,'ogrebullet')
# # PATH_ogreforests= os.path.join(PATH_OgreAddons,'forests')
@@ -133,6 +133,7 @@
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
+PATH_INCLUDE_NEDMALLOC= os.path.join(PATH_Ogre,'OgreMain', 'src', 'nedmalloc')
PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/include')
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-10-30 03:21:08 UTC (rev 782)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-10-30 06:06:00 UTC (rev 783)
@@ -50,7 +50,7 @@
PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9')
PATH_OGG = os.path.join(BASE_DIR, 'libogg-1.1.3')
PATH_VORBIS= os.path.join(BASE_DIR, 'libvorbis-1.2.0')
-PATH_OPENAL= os.path.join(BASE_DIR, 'openal-0.0.8')
+PATH_OPENAL= os.path.join(BASE_DIR, 'openal-soft-1.5.304')
PATH_OgreOde= os.path.join(PATH_OgreAddons,'ogreode')
PATH_OgreBullet= os.path.join(PATH_THIRDPARTY,'ogrebullet')
Modified: trunk/python-ogre/code_generators/caelum/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/generate_code.py 2008-10-30 03:21:08 UTC (rev 782)
+++ trunk/python-ogre/code_generators/caelum/generate_code.py 2008-10-30 06:06:00 UTC (rev 783)
@@ -85,8 +85,8 @@
else:
main_ns = global_ns
- global_ns.namespace( 'Ogre' ).class_('FrameListener').include(already_exposed=True)
- global_ns.namespace( 'Ogre' ).class_('RenderTargetListener').include(already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('FrameListener').include(already_exposed=True)
+# # global_ns.namespace( 'Ogre' ).class_('RenderTargetListener').include(already_exposed=True)
############################################################
##
@@ -221,30 +221,30 @@
# the 'main'function
#
def generate_code():
- messages.disable(
-# Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
- messages.W1020
- , messages.W1021
- , messages.W1022
- , messages.W1023
- , messages.W1024
- , messages.W1025
- , messages.W1026
- , messages.W1027
- , messages.W1028
- , messages.W1029
- , messages.W1030
- , messages.W1031
-# , messages.W1035
-# , messages.W1040
-# , messages.W1038
-# , messages.W1041
- , messages.W1036 # pointer to Python immutable member
- , messages.W1033 # unnamed variables
- , messages.W1018 # expose unnamed classes
- , messages.W1049 # returns reference to local variable
- , messages.W1014 # unsupported '=' operator
- )
+# messages.disable(
+# # Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
+# messages.W1020
+# , messages.W1021
+# , messages.W1022
+# , messages.W1023
+# , messages.W1024
+# , messages.W1025
+# , messages.W1026
+# , messages.W1027
+# , messages.W1028
+# , messages.W1029
+# , messages.W1030
+# , messages.W1031
+# # , messages.W1035
+# # , messages.W1040
+# # , messages.W1038
+# # , messages.W1041
+# , messages.W1036 # pointer to Python immutable member
+# , messages.W1033 # unnamed variables
+# , messages.W1018 # expose unnamed classes
+# , messages.W1049 # returns reference to local variable
+# , messages.W1014 # unsupported '=' operator
+# )
#
# Use GCCXML to create the controlling XML file.
# If the cache file (../cache/*.xml) doesn't exist it gets created, otherwise it just gets loaded
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-10-30 03:21:08 UTC (rev 782)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-10-30 06:06:00 UTC (rev 783)
@@ -1064,13 +1064,18 @@
xml_cached_fc = parser.create_cached_source_fc(
os.path.join( environment.ogre.root_dir, "python_ogre.h" )
, environment.ogre.cache_file )
-
defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY']
+ undefine_symbols=[]
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
defined_symbols.append('BOOST_HAS_WINTHREADS')
defined_symbols.append( 'OGRE_VERSION_' + environment.ogre.version )
+ print os.getcwd()
+ print environment.ogre.include_dirs
+ environment.ogre.include_dirs.insert ( 0,os.getcwd() )
+ print environment.ogre.include_dirs
+
#
# build the core Py++ system from the GCCXML created source
#
@@ -1079,6 +1084,7 @@
, working_directory=environment.root_dir
, include_paths=environment.ogre.include_dirs
, define_symbols=defined_symbols
+ , undefine_symbols=undefine_symbols
, indexing_suite_version=2
, cflags=environment.ogre.cflags
)
Modified: trunk/python-ogre/demos/ogreal/Demo_AL_01.py
===================================================================
--- trunk/python-ogre/demos/ogreal/Demo_AL_01.py 2008-10-30 03:21:08 UTC (rev 782)
+++ trunk/python-ogre/demos/ogreal/Demo_AL_01.py 2008-10-30 06:06:00 UTC (rev 783)
@@ -81,12 +81,12 @@
self.mPlane = ogre.MovablePlane(name="ReflectPlane")
self.mPlane.d = 0
- self.mPlane.normal =ogre.Vector3.UNIT_Y
+ self.mPlane.normal =ogre.Vector3().UNIT_Y
ogre.MeshManager.getSingleton().createPlane("ReflectionPlane",
ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME,
self.mPlane, 2000.0, 2000.0,
- 1, 1, True, 1, 1.0, 1.0, ogre.Vector3.UNIT_Z,
+ 1, 1, True, 1, 1.0, 1.0, ogre.Vector3().UNIT_Z,
ogre.HardwareBuffer.HBU_STATIC_WRITE_ONLY, ogre.HardwareBuffer.HBU_STATIC_WRITE_ONLY,
True,True
)
@@ -150,15 +150,15 @@
# create ViewPort
v = rttTex.addViewport( self.mReflectCam )
v.setClearEveryFrame ( True )
- v.setBackgroundColour (ogre.ColourValue.White)
+ v.setBackgroundColour (ogre.ColourValue().White)
mat = ogre.MaterialManager.getSingleton().create("RttMat",ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
t = mat.getTechnique(0).getPass(0).createTextureUnitState('RustedMetal.jpg')
t = mat.getTechnique(0).getPass(0).createTextureUnitState('RttTex') # creates the reflection...
# Blend with base texture
t.setColourOperationEx( ogre.LBX_BLEND_MANUAL, ogre.LBS_TEXTURE,
- ogre.LBS_CURRENT, ogre.ColourValue.White,
- ogre.ColourValue.White, 0.25)
+ ogre.LBS_CURRENT, ogre.ColourValue().White,
+ ogre.ColourValue().White, 0.25)
t.setTextureAddressingMode (ogre.TextureUnitState.TAM_CLAMP)
t.setProjectiveTexturing(True, self.mReflectCam)
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-10-30 03:21:08 UTC (rev 782)
+++ trunk/python-ogre/environment.py 2008-10-30 06:06:00 UTC (rev 783)
@@ -21,7 +21,7 @@
##
## set this to True if you compiled Ogre with Threads enabled
##
-_USE_THREADS = False
+_USE_THREADS = True
def log ( instring ):
if _LOGGING_ON:
@@ -615,6 +615,7 @@
]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
+ , Config.PATH_INCLUDE_NEDMALLOC
]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 '
LINKFLAGS = ''
@@ -1351,7 +1352,7 @@
,os.path.join(Config.PATH_VORBIS, 'win32','Vorbis_Static_Release')
,os.path.join(Config.PATH_VORBIS, 'win32','VorbisEnc_Static_Release')
,os.path.join(Config.PATH_VORBIS, 'win32','VorbisFile_Static_Release')
- ,os.path.join(Config.PATH_OPENAL, 'libs','Win32')
+ ,os.path.join(Config.PATH_OPENAL, 'Release' ) #'libs','Win32')
,Config.PATH_LIB_OgreAL
]
CCFLAGS = ' -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS ' #-DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER '
@@ -1393,9 +1394,9 @@
[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, "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',
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-10-30 03:21:08 UTC (rev 782)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-10-30 06:06:00 UTC (rev 783)
@@ -353,8 +353,6 @@
OIS.InputManager.destroyInputSystem(self.InputManager)
self.InputManager=None
-
-
## NOTE the in Ogre 1.6 (1.7) this is changed to frameRenderingQueued !!!
def frameRenderingQueued ( self, evt ):
if(self.renderWindow.isClosed() or self.shouldQuit ):
@@ -397,7 +395,6 @@
if not self.Mouse.buffered() or not self.Keyboard.buffered() or not buffJ:
self._moveCamera()
-
return True
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
