[Python-ogre-commit] SF.net SVN: python-ogre:[733] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre:[733] trunk/python-ogre
|
From: <and...@us...> - 2008-09-04 02:37:23
|
Revision: 733
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=733&view=rev
Author: andy_miller
Date: 2008-09-04 02:37:29 +0000 (Thu, 04 Sep 2008)
Log Message:
-----------
Change to code generators to move common attribute creation to common code
OgreOde patch to support ODE 0.10.1
Removed 'Warnings' fix from __init__ code as no longer required
Added ReportVersion as a support tool
Fixed OgreOde demo
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
trunk/python-ogre/code_generators/betagui/generate_code.py
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/cadunetree/generate_code.py
trunk/python-ogre/code_generators/caelum/generate_code.py
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/code_generators/et/generate_code.py
trunk/python-ogre/code_generators/hikari/generate_code.py
trunk/python-ogre/code_generators/hydrax/generate_code.py
trunk/python-ogre/code_generators/navi/generate_code.py
trunk/python-ogre/code_generators/noise/generate_code.py
trunk/python-ogre/code_generators/nxogre/generate_code.py
trunk/python-ogre/code_generators/ode/generate_code.py
trunk/python-ogre/code_generators/ofusion/generate_code.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogreal/generate_code.py
trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/code_generators/ogredshow/generate_code.py
trunk/python-ogre/code_generators/ogreforests/generate_code.py
trunk/python-ogre/code_generators/ogrenewt/generate_code.py
trunk/python-ogre/code_generators/ogreode/generate_code.py
trunk/python-ogre/code_generators/ogreode/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogrepcz/generate_code.py
trunk/python-ogre/code_generators/ogrerefapp/generate_code.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
trunk/python-ogre/code_generators/ois/generate_code.py
trunk/python-ogre/code_generators/opcode/generate_code.py
trunk/python-ogre/code_generators/particleuniverse/generate_code.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/plib/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/template/generate_code.py
trunk/python-ogre/code_generators/theora/generate_code.py
trunk/python-ogre/code_generators/watermesh/generate_code.py
trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
trunk/python-ogre/environment.py
trunk/python-ogre/packages_2.5/ogre/gui/QuickGUI/__init__.py
trunk/python-ogre/packages_2.5/ogre/gui/betagui/__init__.py
trunk/python-ogre/packages_2.5/ogre/io/OIS/__init__.py
trunk/python-ogre/patch/ogreode.patch
Added Paths:
-----------
trunk/python-ogre/ReportVersion.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/BuildModule.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -34,7 +34,7 @@
console.setFormatter(formatter)
# add the handler to the root logger
logging.getLogger('').addHandler(console)
-
+
def getClassList ():
""" create a dictionary of classes from the environment modules
Added: trunk/python-ogre/ReportVersion.py
===================================================================
--- trunk/python-ogre/ReportVersion.py (rev 0)
+++ trunk/python-ogre/ReportVersion.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -0,0 +1,52 @@
+#
+# module to assit with versioning on python-ogre
+#
+import os, sys, time, shutil
+import logging
+import BuildModule as bm
+
+#add environment to the path
+sys.path.append( '.' )
+#add common utils to the pass
+if sys.platform == 'win32':
+ newpath = os.path.join ( os.path.abspath(os.path.dirname(__file__)), 'plugins')
+ os.environ['PATH'] = newpath +';' + os.environ['PATH']
+
+
+if __name__ == '__main__':
+
+ moduleList = ( 'ogre.renderer.OGRE',
+ 'ogre.io.OIS',
+ 'ogre.gui.CEGUI','ogre.gui.QuickGUI', 'ogre.gui.betagui',
+ 'ogre.sound.OgreAL',
+ 'ogre.physics.ODE', 'ogre.physics.OgreRefApp',
+ 'ogre.physics.OgreOde', 'ogre.physics.OgreNewt', 'ogre.physics.Opcode',
+ 'ogre.physics.bullet','ogre.physics.PhysX','ogre.physics.NxOgre',
+ 'ogre.physics.OgreBulletC', 'ogre.physics.OgreBulletD',
+ 'ogre.addons.theora', 'ogre.addons.plib',
+ 'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum',
+ 'ogre.addons.noise', 'ogre.addons.watermesh',
+ 'ogre.addons.particleuniverse', 'ogre.addons.cadunetree',
+ 'ogre.renderer.ogrepcz', 'ogre.addons.hydrax' )
+# 'ogre.gui.hikari' )
+
+ bm.setupLogging("version.info") # options.logfilename)
+ logger = logging.getLogger('PythonOgre.ReportVersionInfo')
+ for name in moduleList:
+# logger.info ("Attemping to import " + name )
+ try:
+ basename = name.split('.')[-1]
+ mod = __import__(name)
+ components = name.split('.')
+ for comp in components[1:]:
+ mod = getattr(mod, comp)
+ print "Module %s ( %s )" % (basename, name)
+ print " PythonOgre Ver: %s" % (getattr(mod, "PythonOgreVersion__") )
+ print " Module Version: %s" % (getattr(mod, "Version__") )
+ print " Python Version: %s" % (getattr(mod, 'PythonVersion__') )
+ print " Code Generated: %s" % (getattr(mod, 'PythonOgreDetail__').split('_')[-1])
+ print " Compiled : %s %s" % (getattr(mod, 'CompileTime__'), getattr(mod, 'CompileDate__') )
+ print " Raw Detail : %s" % (getattr(mod, 'PythonOgreDetail__') )
+# logger.info ( "Import Successful: " + basename )
+ except ImportError:
+ logger.error ( "Import failed:" + basename )
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/betagui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/betagui/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/betagui/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -436,13 +436,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'betagui_version' : '"%s"' % environment.betagui.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"betagui DESCRIPTION"' } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.betagui )
-
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -408,13 +408,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'bullet_version' : '"%s"' % environment.bullet.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.bullet )
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"bullet DESCRIPTION"' } )
-
-
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/cadunetree/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/cadunetree/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -249,13 +249,10 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'cadunetree_version' : '"%s"' % environment.cadunetree.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"cadunetree DESCRIPTION"' } )
+
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.cadunetree )
-
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/caelum/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/caelum/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -294,14 +294,11 @@
for cls in main_ns.classes():
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
-
- common_utils.add_constants( mb, { 'caelum_version' : '"%s"' % environment.caelum.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"caelum DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.caelum )
+
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -301,10 +301,10 @@
print "INCLUDE:", v
v.include()
print "DONE"
-
- common_utils.add_constants( mb, { 'CEGUI_version' : '"%s"' % environment.cegui.version
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n") } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.cegui )
+
#Creating code creator. After this step you should not modify/customize declarations.
extractor = exdoc.doc_extractor("")
Modified: trunk/python-ogre/code_generators/common_utils/__init__.py
===================================================================
--- trunk/python-ogre/code_generators/common_utils/__init__.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/common_utils/__init__.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -1,6 +1,8 @@
import os, shutil
import sys
import shared_ptr
+import datetime
+import subprocess
##import hashlib ## makes this 2.5 dependent
import md5
from pygccxml import declarations
@@ -31,7 +33,59 @@
t = i % {'timestamp':timestamp, 'version':version}
add_constants( mb, { '__info__' : t } )
+
+def addDetailVersion ( mb, env, envClass ):
+ """Add detailed version and build information to the module to assist with debugging etc
+ """
+# decCode = """
+# boost::python::tuple getCompileTime () { return ( boost::python::make_tuple( __TIME__ , __DATE__) ); }
+# """
+# regCode = """
+# bp::def( "getCompileTime", &getCompileTime,
+# "Python-Ogre Helper Function: Return the Time and Date the module was compiled.\\n\\
+# Input: None\\n\\
+# Ouput: Tuple [time, date]");
+# """
+ def getSVNVersion ( environment ):
+ """ return a string with the current SVN version number
+ """
+ if hasattr( environment.Config, "SVNVersionCommmand"):
+ cmd = environment.Config.SVNVersionCommand
+ else:
+ cmd = "svnversion"
+ process = subprocess.Popen (cmd, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE )
+ try:
+ out,err = process.communicate()
+ returncode = process.returncode
+ svnversion = out
+ except:
+ returncode = -1
+ svnversion = "0000"
+ return svnversion.strip()
+
+ po = ".".join( (env.PythonOgreMajorVersion,env.PythonOgreMinorVersion, env.PythonOgrePatchVersion) )
+ t = datetime.datetime.now().isoformat(' ').strip()
+ v = envClass.version
+ s = getSVNVersion( env )
+ detail = "_".join( (po,s,envClass.name, v, t) )
+ if hasattr( envClass, 'docstring' ):
+ docstring = envClass.docstring
+ else:
+ docstring = "PythonOgre %s Module - Version %s" % (envClass.name, v)
+
+ add_constants ( mb, { 'PythonOgreDetail__' : '"%s"' % detail.replace("\n", "\\\n" )
+ , 'CompileTime__' : '__TIME__'
+ , 'CompileDate__' : '__DATE__'
+ , 'PythonVersion__' : '"%s"' % sys.version.replace("\n", "\\\n" )
+ , 'Version__' : '"%s"' % v.replace("\n", "\\\n" )
+ , 'PythonOgreVersion__' : '"%s"' % po.replace("\n", "\\\n" )
+ , '__doc__' : '"%s"' % docstring.replace("\n", "\\\n" )
+ } )
+
+# mb.add_declaration_code( decCode )
+# mb.add_registration_code ( regCode )
+
def _ReturnUnsignedInt( type_ ):
"""helper to return an UnsignedInt call for tranformation functions
"""
@@ -390,10 +444,14 @@
# Update 30 July 2008 -- support for void * variables to be exposed with ctypes handling
for v in mb.variables( allow_empty=True ):
if v.type.decl_string == 'void const *' or v.type.decl_string =='void *':
- if v.access_type == 'public' and not v.documentation:
-# if not v.parent.noncopyable: ## this test as we don't support classes with protected destructors
- print "CTYPE Implementation on ", v, v.access_type
- v.expose_address = True
+ try: # this only works on memeber vars not global ones so need to check
+ if v.access_type == 'public' and not v.documentation:
+ # if not v.parent.noncopyable: ## this test as we don't support classes with protected destructors
+ print "CTYPE Implementation on ", v, v.access_type
+ v.expose_address = True
+ except : #RunTimeError:
+ pass
+
def AutoExclude( mb, MAIN_NAMESPACE=None ):
""" Automaticaly exclude a range of things that don't convert well from C++ to Python
Modified: trunk/python-ogre/code_generators/et/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/et/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/et/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -274,13 +274,11 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'et_version' : '"%s"' % environment.et.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"et DESCRIPTION"' } )
+
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.et )
+
-
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/hikari/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/hikari/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/hikari/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -259,13 +259,11 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'hikari_version' : '"%s"' % environment.hikari.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"hikari DESCRIPTION"' } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.hikari )
+
-
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/hydrax/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/hydrax/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/hydrax/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -251,13 +251,10 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'hydrax_version' : '"%s"' % environment.hydrax.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"hydrax DESCRIPTION"' } )
-
-
+
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.hydrax )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/navi/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/navi/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/navi/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -536,11 +536,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'PROJECT_version' : '"%s"' % environment.navi.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"Navi PROJECT DESCRIPTION"' } )
+
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.navi )
##########################################################################################
Modified: trunk/python-ogre/code_generators/noise/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/noise/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/noise/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -318,14 +318,11 @@
for ns in namespaces:
for cls in mb.global_ns.namespace(ns).classes():
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
+
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.noise )
- common_utils.add_constants( mb, { 'noise_version' : '"%s"' % environment.noise.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"noise DESCRIPTION"' } )
-
-
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -778,11 +778,8 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'PROJECT_version' : '"%s"' % environment.nxogre.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"NxOgre PROJECT DESCRIPTION"' } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.nxogre )
##########################################################################################
Modified: trunk/python-ogre/code_generators/ode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ode/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ode/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -301,9 +301,8 @@
ode_ns = mb.global_ns ## .namespace ('ode')
common_utils.add_properties( ode_ns.classes() )
- common_utils.add_constants( mb, { 'ode_version' : '"%s"' % environment.ode.version
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n") } )
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ode )
#Creating code creator. After this step you should not modify/customize declarations.
extractor = exdoc.doc_extractor("")
Modified: trunk/python-ogre/code_generators/ofusion/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ofusion/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ofusion/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -254,13 +254,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'ofusion_version' : '"%s"' % environment.ofusion.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ofusion DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ofusion )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -1066,16 +1066,8 @@
## because we want backwards pyogre compatibility lets add leading lowercase properties
common_utils.add_LeadingLowerProperties ( cls )
- common_utils.add_constants( mb, { 'ogre_version' : '"%s"' % environment.ogre.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" )
- , 'pythonogre_version' : '"%s"' %\
- '.'.join( [environment.PythonOgreMajorVersion,
- environment.PythonOgreMinorVersion,
- environment.PythonOgrePatchVersion] ) }
- )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"Python-Ogre Main Module for OGRE 3D"' } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogre )
count = 0
for v in main_ns.variables():
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -284,12 +284,9 @@
for cls in main_ns.classes():
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
-
- common_utils.add_constants( mb, { 'ogreal_version' : '"%s"' % environment.ogreal.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ogreal DESCRIPTION"' } )
+
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogreal )
##########################################################################################
#
Modified: trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -265,13 +265,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'ogrebulletC_version' : '"%s"' % environment.ogrebulletc.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ogrebullet DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogrebulletc )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -253,13 +253,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'ogrebulletD_version' : '"%s"' % environment.ogrebulletd.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ogrebullet DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogrebulletd )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ogredshow/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogredshow/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogredshow/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -502,13 +502,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'DSHOW_version' : '"%s"' % environment.ogredshow.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ogredshow PROJECT DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.dshow )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ogreforests/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogreforests/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -317,13 +317,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'ogreforests_version' : '"%s"' % environment.ogreforests.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ogreforests DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogreforests )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -249,9 +249,9 @@
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
common_utils.add_LeadingLowerProperties ( cls )
- common_utils.add_constants( mb, { 'ogrenewt_version' : '"%s"' % environment.ogrenewt.version
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n") } )
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogrenewt )
+
# create the doc extractor we'll be using
extractor = exdoc.doc_extractor("")
#
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -63,6 +63,7 @@
'::OgreOde::TerrainGeometry::_heightCallback',
'::OgreOde::EntityInformer::getIndices', ## unsigned int const *
# '::OgreOde::RagdollFactory::requestTypeFlags', # causes issues with moveableobjectfactory
+ '::OgreOde::EntityInformer::getBoneVertices' # hand wrapped
]
for e in excludes:
@@ -272,8 +273,8 @@
# We filter (both include and exclude) specific classes and functions that we want to wrap
#
global_ns = mb.global_ns
- global_ns.exclude()
-
+ global_ns.exclude()
+
query = lambda decl: isinstance( decl, ( declarations.class_t, declarations.class_declaration_t ) ) \
and decl.name.startswith( 'dx' )
mb.global_ns.decls( query ).opaque = True
@@ -304,13 +305,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'ogreode_version' : '"%s"' % environment.ogreode.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ogreode DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogreode )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ogreode/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/hand_made_wrappers.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogreode/hand_made_wrappers.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -54,15 +54,40 @@
"""
WRAPPER_REGISTRATION_OgreOdeLoader = [
- 'def( "loadVehicle", &::OgreOde_Loader_loadVehicle,\
- ( bp::arg("filename"), bp::arg("object_name"), bp::arg("instance_name")=Ogre::StringUtil::BLANK ),\
- "Python-Ogre Hand Wrapped\\nReturns a vehicle or ragdoll as appropiate" );'
- 'def( "loadRagdoll", &::OgreOde_Loader_loadRagdoll,\
- ( bp::arg("filename"), bp::arg("object_name"), bp::arg("instance_name")=Ogre::StringUtil::BLANK ),\
- "Python-Ogre Hand Wrapped\\nReturns a vehicle or ragdoll as appropiate",\
- bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());'
+ """def( "loadVehicle", &::OgreOde_Loader_loadVehicle,
+ ( bp::arg("filename"), bp::arg("object_name"), bp::arg("instance_name")=Ogre::StringUtil::BLANK ),
+ "Python-Ogre Hand Wrapped\\nReturns a vehicle or ragdoll as appropiate" );""",
+ """def( "loadRagdoll", &::OgreOde_Loader_loadRagdoll,
+ ( bp::arg("filename"), bp::arg("object_name"), bp::arg("instance_name")=Ogre::StringUtil::BLANK ),
+ "Python-Ogre Hand Wrapped\\nReturns a vehicle or ragdoll as appropiate",
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());"""
]
+
+WRAPPER_DEFINITION_EntityInformer=\
+"""
+boost::python::list
+OgreOdeEntityInformer_getBoneVertices( OgreOde::EntityInformer & me, unsigned char bone, unsigned int &vertex_count) {
+ boost::python::list outlist;
+ Ogre::Vector3 * vertices;
+
+ if ( ! me.getBoneVertices(bone,vertex_count,vertices ) )
+ return outlist;
+
+ while ( count-- > 0 ) {
+ outlist.append ( *vertices++ );
+ }
+ delete[] vertices;
+ return outlist;
+}
+"""
+WRAPPER_REGISTRATION_EntityInformer = [
+ """def( "getBoneVertices", &::OgreOdeEntityInformer_getBoneVertices,
+ "Python-Ogre Hand Wrapped\\nReturns a list of vertices\\n\\
+ Input: Bone number, vertex count\\n\\
+ Output: List of vertices (can be empty)" );"""
+ ]
+
def apply_reg ( class_, code ):
for c in code:
class_.add_registration_code ( c )
@@ -71,4 +96,7 @@
rt = mb.class_( 'DotLoader' )
rt.add_declaration_code( WRAPPER_DEFINITION_OgreOdeLoader )
apply_reg (rt, WRAPPER_REGISTRATION_OgreOdeLoader )
+# rt = mb.class_( 'EntityInformer' )
+# rt.add_declaration_code( WRAPPER_DEFINITION_EntityInformer )
+# apply_reg (rt, WRAPPER_REGISTRATION_EntityInformer )
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/ogrepcz/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -350,13 +350,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'ogrepcz_version' : '"%s"' % environment.ogrepcz.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ogrepcz DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogrepcz )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ogrerefapp/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrerefapp/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogrerefapp/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -111,8 +111,8 @@
common_utils.add_LeadingLowerProperties ( cls )
- common_utils.add_constants( mb, { 'ogrerefapp_version' : '"%s"' % environment.ogrerefapp.version
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n") } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogrerefapp )
#Creating code creator. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -408,13 +408,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'ogrevideoffmpeg_version' : '"%s"' % environment.ogrevideoffmpeg.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ogrevideoffmpeg DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ogrevideoffmpeg )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/ois/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ois/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/ois/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -215,7 +215,7 @@
)
# if this module depends on another set it here
- ## mb.register_module_dependency ( environment.ogre.generated_dir )
+ mb.register_module_dependency ( environment.ogre.generated_dir )
# normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
mb.constructors().allow_implicit_conversion = False
@@ -254,13 +254,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'ois_version' : '"%s"' % environment.ois.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"ois DESCRIPTION"' } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.ois )
-
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/opcode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/opcode/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/opcode/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -569,13 +569,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'opcode_version' : '"%s"' % environment.opcode.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"opcode DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.opcode )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/particleuniverse/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -285,13 +285,10 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'particleuniverse_version' : '"%s"' % environment.particleuniverse.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"particleuniverse DESCRIPTION"' } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.particleuniverse )
+
-
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -409,12 +409,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'physx_version' : '"%s"' % environment.physx.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"PhysX DESCRIPTION"' } )
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.physx )
+
# for func in mb.global_ns.free_functions ():
# if not func.ignore:
# print "Free Func Included", func
Modified: trunk/python-ogre/code_generators/plib/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/plib/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/plib/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -578,12 +578,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'PROJECT_version' : '"%s"' % environment.plib.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"plib PROJECT DESCRIPTION"' } )
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.plib )
+
f = global_ns.member_function('::ssgEntity::cull')
f.include()
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -458,13 +458,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'quickgui_version' : '"%s"' % environment.quickgui.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"quickgui DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.quickgui )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/template/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/template/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/template/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -250,13 +250,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'PROJECT_version' : '"%s"' % environment.PROJECT.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"PROJECT DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.PROJECT )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/theora/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/theora/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/theora/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -136,7 +136,7 @@
# # print "Base: ", i
# # print dir (i)
- main_ns.enum('::Ogre::eTexturePlayMode').include()
+# main_ns.enum('::Ogre::eTexturePlayMode').include()
main_ns.enum('::Ogre::eAudioSampleFormat').include()
main_ns.class_('::Ogre::RingBuffer').include(already_exposed=True)
main_ns.class_('::Ogre::TexturePtr').include(already_exposed=True)
@@ -481,6 +481,9 @@
, indexing_suite_version=2
, cflags=environment.ogre.cflags
)
+ # if this module depends on another set it here
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+
# NOTE THE CHANGE HERE
mb.constructors().allow_implicit_conversion = False
@@ -523,13 +526,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'Theora_version' : '"%s"' % environment.theora.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"Theora DESCRIPTION"' } )
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.theora )
-
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/code_generators/watermesh/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/watermesh/generate_code.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/code_generators/watermesh/generate_code.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -257,13 +257,9 @@
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
- common_utils.add_constants( mb, { 'watermesh_version' : '"%s"' % environment.watermesh.version.replace("\n", "\\\n")
- , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
-
- ## need to create a welcome doc string for this...
- common_utils.add_constants( mb, { '__doc__' : '"watermesh DESCRIPTION"' } )
-
-
+ ## add additional version information to the module to help identify it correctly
+ common_utils.addDetailVersion ( mb, environment, environment.watermesh )
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
Modified: trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
===================================================================
--- trunk/python-ogre/demos/ogreode/Demo_GranTurism.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/demos/ogreode/Demo_GranTurism.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -186,12 +186,12 @@
self.TimeUntilNextToggle = 0.5
if( not self._stepper.isPaused()):
- print "**** Stepping"
-# self.vehicle.setInputs(self.Keyboard.isKeyDown(OIS.KC_J),
-# self.Keyboard.isKeyDown(OIS.KC_L),
-# self.Keyboard.isKeyDown(OIS.KC_I),
-# self.Keyboard.isKeyDown(OIS.KC_K))
-# self.vehicle.update(time)
+# print "**** Stepping"
+ self.vehicle.setInputs(self.Keyboard.isKeyDown(OIS.KC_J),
+ self.Keyboard.isKeyDown(OIS.KC_L),
+ self.Keyboard.isKeyDown(OIS.KC_I),
+ self.Keyboard.isKeyDown(OIS.KC_K))
+ self.vehicle.update(time)
# Thanks to Ahmed!
followFactor = 0.2
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/environment.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -1613,7 +1613,7 @@
ModuleName="cadunetree"
class ogrepcz:
- active = False
+ active = True
pythonModule = True
version="1.0"
name='ogrepcz'
Modified: trunk/python-ogre/packages_2.5/ogre/gui/QuickGUI/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/gui/QuickGUI/__init__.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/packages_2.5/ogre/gui/QuickGUI/__init__.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -1,5 +1,5 @@
import sys, os
-import warnings
-warnings.simplefilter('ignore', RuntimeWarning)
+# import warnings
+# warnings.simplefilter('ignore', RuntimeWarning)
from _quickgui_ import *
-warnings.resetwarnings( )
+# warnings.resetwarnings( )
Modified: trunk/python-ogre/packages_2.5/ogre/gui/betagui/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/gui/betagui/__init__.py 2008-09-04 00:48:38 UTC (rev 732)
+++ trunk/python-ogre/packages_2.5/ogre/gui/betagui/__init__.py 2008-09-04 02:37:29 UTC (rev 733)
@@ -1,4...
[truncated message content] |
