You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(30) |
Oct
(60) |
Nov
(17) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(33) |
Feb
(18) |
Mar
(3) |
Apr
(5) |
May
(6) |
Jun
(34) |
Jul
(54) |
Aug
(33) |
Sep
(36) |
Oct
(33) |
Nov
(40) |
Dec
(6) |
| 2009 |
Jan
(37) |
Feb
(38) |
Mar
(31) |
Apr
(23) |
May
(24) |
Jun
(2) |
Jul
(6) |
Aug
(5) |
Sep
(1) |
Oct
(14) |
Nov
(12) |
Dec
(26) |
| 2010 |
Jan
(23) |
Feb
(17) |
Mar
(17) |
Apr
(2) |
May
(10) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2011 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
|
From: <mi...@us...> - 2009-01-12 07:37:49
|
Revision: 833
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=833&view=rev
Author: mithro
Date: 2009-01-12 07:37:43 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Add support for BuildModule to run the osc commands which upload to the build service.
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2009-01-05 17:59:09 UTC (rev 832)
+++ trunk/python-ogre/BuildModule.py 2009-01-12 07:37:43 UTC (rev 833)
@@ -218,6 +218,7 @@
logger.warning("Was not able to build package")
logger.info("Package successfully built!")
+BUILDSERVICE_MODULE = "home:mithro:python-ogre-build"
def buildService ( module, install = False ):
""" Create a debian package for the module
"""
@@ -226,12 +227,28 @@
if not os.path.exists(srcdir):
exit("You need to get the src first, use -r")
+ # Make sure that the build directory exists
+ buildloc = os.path.join(os.getcwd(), 'build')
+ if not os.path.exists(buildloc):
+ spawnTask("mkdir -p %s" % buildloc, os.getcwd())
+
buildbase = os.path.join(os.getcwd(), 'build', module.base)
builddir = os.path.join(buildbase, module.base)
- # Make the builddir
- spawnTask("mkdir -p %s" % buildbase, os.getcwd())
+ if not os.path.exists(buildbase):
+ # Do the initial checkout
+ logger.info("Downloading %s:%s into %s" % (BUILDSERVICE_MODULE, module.base, buildloc))
+ spawnTask("osc checkout %s %s" % (BUILDSERVICE_MODULE, module.base), buildloc)
+ spawnTask("mv %s/%s %s" % (BUILDSERVICE_MODULE, module.base, module.base), buildloc)
+ spawnTask("rm -rf %s" % (BUILDSERVICE_MODULE,), buildloc)
+ else:
+ if not os.path.exists(os.path.join(buildbase, ".osc")):
+ raise TypeError("The buildservice directory is not a osc checkout! (Please remove and rerun this command.)")
+ # Do an update so we don't get conflicts
+ logger.info("Updating home:mithro:python-ogre:%s in %s" % (module.base, buildloc))
+ spawnTask("osc update", buildbase)
+
# Create the source we are making
spawnTask("cp -rvf %s/ %s" % (srcdir, builddir), os.getcwd())
@@ -279,13 +296,15 @@
' -e "s|%%SIZE%%|`du -b '+module.base+'.tar.gz | sed -e\'s/[\t ]/ /g\'`|g" ' + \
' -e "s|%%SHORTDATE%%|`date +%Y%m%d`|g" ' + \
' -e "s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|g" ' + \
- ' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^g"' + \
+ ' -e "s^%%BUILDDEPS%%^`cat debian.control | grep Build-Depends:`^" ' + \
' -e "s|%%VERSION%%|'+module.source_version+'|g"'
, buildbase)
# Do some cleanup
spawnTask("rm -rf %s" % builddir, buildbase)
spawnTask("rm %s.md5sum" % module.base, buildbase)
+
+ spawnTask("osc diff", buildbase)
return
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ks...@us...> - 2009-01-05 17:59:17
|
Revision: 832
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=832&view=rev
Author: kspes
Date: 2009-01-05 17:59:09 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
added theora_v2 folder, preparation for wrapping the new plugin
Added Paths:
-----------
trunk/python-ogre/code_generators/theora_v2/
trunk/python-ogre/code_generators/theora_v2/customization_data.py
trunk/python-ogre/code_generators/theora_v2/generate_code.py
trunk/python-ogre/code_generators/theora_v2/hand_made_wrappers.py
trunk/python-ogre/code_generators/theora_v2/python_theora.h
trunk/python-ogre/code_generators/theora_v2/python_theora_aliases.h
trunk/python-ogre/code_generators/theora_v2/python_theora_sizeof.h
trunk/python-ogre/code_generators/theora_v2/register_exceptions.py
Added: trunk/python-ogre/code_generators/theora_v2/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/theora_v2/customization_data.py (rev 0)
+++ trunk/python-ogre/code_generators/theora_v2/customization_data.py 2009-01-05 17:59:09 UTC (rev 832)
@@ -0,0 +1,14 @@
+
+def header_files( version ):
+ return [ 'Ogre.h'
+ ,'TheoraVideoController.h'
+ ,'TheoraMovieClip.h'
+ ,'TheoraAudioDriver.h'
+ ,"SoundManager.h"
+ ,'OgreExternalTextureSource.h'
+ ,'OgreExternalTextureSourceManager.h'
+ ]
+
+def huge_classes( version ):
+ return []
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/theora_v2/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/theora_v2/generate_code.py (rev 0)
+++ trunk/python-ogre/code_generators/theora_v2/generate_code.py 2009-01-05 17:59:09 UTC (rev 832)
@@ -0,0 +1,568 @@
+#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
+
+
+import os, sys, time, shutil
+
+#add environment to the path
+sys.path.append( os.path.join( '..', '..' ) )
+#add common utils to the pass
+sys.path.append( '..' )
+sys.path.append( '.' )
+
+import environment
+import common_utils
+import customization_data
+import hand_made_wrappers
+import register_exceptions
+
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import messages
+from pyplusplus import module_builder
+from pyplusplus import decl_wrappers
+
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+from pyplusplus.module_creator import sort_algorithms
+
+import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
+import common_utils.ogre_properties as ogre_properties
+
+MAIN_NAMESPACE = 'Ogre'
+
+## small helper function
+def docit ( general, i, o ):
+ docs = "Python-Ogre Modified Function Call\\n" + general +"\\n"
+ docs = docs + "Input: " + i + "\\n"
+ docs = docs + "Output: " + o + "\\n\\\n"
+ return docs
+
+############################################################
+##
+## Here is where we manually exclude stuff
+##
+############################################################
+
+def ManualExclude ( mb ):
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ # things not yet implemented in the C source..
+ excludes=[]
+ for c in main_ns.classes():
+ for m in c.member_functions(allow_empty=True):
+ for e in excludes:
+ if e in m.decl_string:
+ m.exclude()
+
+
+ ### Member Functions
+ excludes=['::Ogre::TheoraVideoController::CmdRenderFx::doGet'
+ ,'::Ogre::TheoraVideoController::CmdSeekingEnabled::doGet'
+ ,'::Ogre::TheoraVideoController::CmdRenderFx::doSet'
+ ,'::Ogre::TheoraVideoController::CmdSeekingEnabled::doSet']
+ for e in excludes:
+ print "excluding ", e
+ main_ns.member_functions(e).exclude()
+
+ ### Free Functions
+ excludes = []
+ for e in excludes:
+ main_ns.free_functions(e).exclude()
+
+ ## Classes
+ excludes = ['::Ogre::TheoraSeekUtility'
+ ,'::Ogre::TheoraVideoController::CmdRenderFx'
+ ,'::Ogre::TheoraVideoController::CmdSeekingEnabled']
+ for e in excludes:
+ main_ns.class_(e).exclude()
+
+
+ ## I have a challenge that Py++ doesn't recognise these classes by full name (perhaps because they are structs?)
+ ## so I have to look through and match on a class by class basis
+ excludeName = [ ]
+ for c in main_ns.classes():
+ if c.name in excludeName:
+ c.exclude()
+
+
+ ### Variables
+ excludes = []
+ for e in excludes:
+ main_ns.variable(e).exclude()
+
+ ### Typedefs
+ excludes = []
+ for e in excludes:
+ main_ns.typedefs(e).exclude()
+
+ ### Operators
+ excludes=[]
+ for e in excludes:
+ main_ns.operators(e).exclude()
+
+ ### Constructors
+
+
+
+############################################################
+##
+## And there are things that manually need to be INCLUDED
+##
+############################################################
+
+def ManualInclude ( mb ):
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ main_ns.enum('::Ogre::TextureSpecialRenderFX').include()
+
+ ## need this as it's a base class in Theora
+ c = main_ns.class_('::Ogre::ExternalTextureSource')
+ c.include()
+ for cls in c.classes():
+ if cls.name.startswith('Cmd'):
+ cls.exclude()
+
+# # c = main_ns.class_('::Ogre::TheoraVideoController')
+# # print dir ( c )
+# # print c.bases
+# # for i in c.bases:
+# # print "Base: ", i
+# # print dir (i)
+
+# 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)
+
+ main_ns.class_('::Ogre::SoundManager').include()
+
+
+############################################################
+##
+## And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):
+
+ global_ns = mb.global_ns
+
+ # fix issue where the namespace isn't in the default values
+
+############################################################
+##
+## And things that need to have their argument and call values fixed.
+## ie functions that pass pointers in the argument list and of course we need
+## to read the updated values - so instead we pass them back
+## as new values in a tuple (ETC ETC)
+##
+############################################################
+
+def ManualTransformations ( mb ):
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ def create_output( size ):
+ return [ ft.output( i ) for i in range( size ) ]
+
+
+###############################################################################
+##
+## Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
+
+
+def AutoExclude( mb ):
+ """ Automaticaly exclude a range of things that don't convert well from C++ to Python
+ """
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ # vars that are static consts but have their values set in the header file are bad
+ Remove_Static_Consts ( main_ns )
+
+ ## Exclude protected and private that are not pure virtual
+ query = ~declarations.access_type_matcher_t( 'public' ) \
+ & ~declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.PURE_VIRTUAL )
+ non_public_non_pure_virtual = main_ns.calldefs( query )
+ non_public_non_pure_virtual.exclude()
+
+ #Virtual functions that return reference could not be overriden from Python
+ query = declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.VIRTUAL ) \
+ & declarations.custom_matcher_t( lambda decl: declarations.is_reference( decl.return_type ) )
+ try:
+ main_ns.calldefs( query ).virtuality = declarations.VIRTUALITY_TYPES.NOT_VIRTUAL
+ except:
+ pass
+
+def AutoInclude( mb ):
+ main_ns = mb.global_ns ## doesn't have it's own namespace..
+
+ for c in main_ns.classes():
+ if c.name.startswith ('Theora'):
+ c.include()
+ print "Including:", c
+
+# for cls in main_ns.classes():
+# try:
+# if cls.decl_string[2:4]=='Nx' and cls.decl_string[4].isupper():
+# cls.include()
+# except:
+# pass
+# ## and we'll need the free functions as well
+# for funcs in main_ns.free_functions ():
+# if funcs.name[0:2]=='Nx' and funcs.name[2].isupper():
+# funcs.include()
+#
+# for var in main_ns.variables ():
+# # print "checking var ", var.name
+# if len(var.name) > 2:
+# if var.name[0:2]=='Nx' and var.name[2].isupper():
+# var.include()
+# for var in main_ns.typedefs ():
+# # print "checking typedef ", var.name
+# if len(var.name) > 2:
+# if var.name[0:2]=='Nx' and var.name[2].isupper():
+# var.include()
+
+
+
+def AutoFixes ( mb ):
+ """ now we fix a range of things automatically - typically by going through
+ the entire name space trying to guess stuff and fix it:)
+ """
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ # arguments passed as refs but not const are not liked by boost
+ #Fix_Ref_Not_Const ( main_ns )
+
+ # Functions that have void pointers in their argument list need to change to unsigned int's
+ Fix_Void_Ptr_Args ( main_ns )
+
+ # and change functions that return a variety of pointers to instead return unsigned int's
+ Fix_Pointer_Returns ( main_ns )
+
+ # functions that need to have implicit conversions turned off
+ Fix_Implicit_Conversions ( main_ns)
+
+ if os.name =='nt':
+ Fix_NT( mb )
+ elif os.name =='posix':
+ Fix_Posix( mb )
+
+
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################
+def Fix_Posix ( mb ):
+ """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+ """
+ ## we could do more here if need be...
+ if sys.platform == 'darwin':
+ pass
+ elif sys.platform.startswith ('linux'):
+ pass
+
+
+def Fix_NT ( mb ):
+ """ fixup for NT systems
+ """
+
+
+def Fix_Implicit_Conversions ( mb ):
+ """By default we disable explicit conversion, however sometimes it makes sense
+ """
+# for c in mb.classes():
+# if c.name.endswith ('Params'):
+# print "Implicit Conversion:", c
+# c.constructors().allow_implicit_conversion = True
+#
+# ImplicitClasses=['::NxOgre::Pose']
+# for className in ImplicitClasses:
+# mb.class_(className).constructors().allow_implicit_conversion = True
+
+def Add_Auto_Conversions( mb ):
+ pass
+
+
+def Set_Call_Policies( mb ):
+ """ set the return call policies on classes that this hasn't already been done for.
+ Set the default policy to deal with pointer/reference return types to reference_existing object
+ """
+ mem_funs = mb.calldefs ()
+ mem_funs.create_with_signature = True #Generated code will not compile on
+ #MSVC 7.1 if function has throw modifier.
+ for mem_fun in mem_funs:
+ if mem_fun.call_policies:
+ continue
+ if not mem_fun.call_policies and \
+ (declarations.is_reference (mem_fun.return_type) or declarations.is_pointer (mem_fun.return_type) ):
+ mem_fun.call_policies = call_policies.return_value_policy(
+ call_policies.reference_existing_object )
+
+
+def Set_Exception(mb):
+ pass
+ #~ """We don't exclude Exception, because it contains functionality, that could
+ #~ be useful to user. But, we will provide automatic exception translator
+ #~ """
+ #~ Exception = mb.namespace( 'Ogre' ).class_( 'Exception' )
+ #~ Exception.include()
+ #~ Exception.mem_fun('what').exclude() # declared with empty throw
+ #~ Exception.mem_fun('getNumber').exclude() # declared with empty throw
+ #~ Exception.translate_exception_to_string( 'PyExc_RuntimeError', 'exc.getFullDescription().c_str()' )
+
+
+def _ReturnUnsignedInt( type_ ):
+ """helper to return an UnsignedInt call for tranformation functions
+ """
+ return declarations.cpptypes.unsigned_int_t()
+
+def Fix_Void_Ptr_Args ( mb ):
+ """ we modify functions that take void *'s in their argument list to instead take
+ unsigned ints, which allows us to use CTypes buffers
+ """
+ for fun in mb.member_functions():
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.type_traits.is_void_pointer(arg.type):
+ fun.add_transformation( ft.modify_type(arg_position,_ReturnUnsignedInt ) )
+ fun.documentation = docit ("Modified Input Argument to work with CTypes",
+ "Argument "+arg.name+ "(pos:" + str(arg_position)\
+ +") takes a CTypes.adddressof(xx)", "...")
+ #print "Fixed Void Ptr", fun, arg_position
+ break
+ arg_position +=1
+
+ ## lets go and look for stuff that might be a problem
+ pointee_types=['unsigned int',' int ', ' float ', ' Real ', 'uchar', 'uint8',
+ 'unsigned char']
+
+ function_names=[]
+ for fun in mb.member_functions():
+ if fun.documentation or fun.ignore: continue ## means it's been tweaked somewhere else
+ for n in function_names:
+ if n in fun.name:
+ print "CHECK :", fun
+ break
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.is_pointer(arg.type): ## and "const" not in arg.type.decl_string:
+ for i in pointee_types:
+ if i in arg.type.decl_string:
+ print '"',arg.type.decl_string, '"'
+ print "CHECK ", fun, str(arg_position)
+ fun.documentation=docit("SUSPECT - MAYBE BROKEN", "....", "...")
+ break
+ arg_position +=1
+
+## NEED To do the same for constructors
+ for fun in mb.constructors():
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.is_pointer(arg.type): ## and "const" not in arg.type.decl_string:
+ for i in pointee_types:
+ if i in arg.type.decl_string:
+ print '"',arg.type.decl_string, '"'
+ print "Excluding: ", fun
+ fun.exclude()
+ break
+ arg_position +=1
+
+def Fix_Pointer_Returns ( mb ):
+ """ Change out functions that return a variety of pointer to base types and instead
+ have them return the address the pointer is pointing to (the pointer value)
+ This allow us to use CTypes to handle in memory buffers from Python
+
+ Also - if documentation has been set then ignore the class/function as it means it's been tweaked else where
+ """
+ pointee_types=['unsigned int','int', 'float', 'unsigned char']
+ known_names=[] # these are function names we know it's cool to exclude
+ for fun in mb.member_functions(allow_empty=True):
+ if declarations.is_pointer (fun.return_type) and not fun.documentation:
+ for i in pointee_types:
+ if fun.return_type.decl_string.startswith ( i ) and not fun.documentation:
+ if not fun.name in known_names:
+ print "Excluding (function):", fun, "as it returns (pointer)", i
+ fun.exclude()
+ for fun in mb.member_operators(allow_empty=True):
+ if declarations.is_pointer (fun.return_type) and not fun.documentation:
+ for i in pointee_types:
+ if fun.return_type.decl_string.startswith ( i ) and not fun.documentation:
+ print "Excluding (operator):", fun
+ fun.exclude()
+
+
+
+def query_containers_with_ptrs(decl):
+ if not isinstance( decl, declarations.class_types ):
+ return False
+ if not decl.indexing_suite:
+ return False
+ return declarations.is_pointer( decl.indexing_suite.element_type )
+
+
+def Remove_Static_Consts ( mb ):
+ """ linux users have compile problems with vars that are static consts AND have values set in the .h files
+ we can simply leave these out """
+ checker = varchecker.var_checker()
+ for var in mb.vars():
+ if type(var.type) == declarations.cpptypes.const_t:
+ if checker( var ):
+ print "Excluding static const ", var
+ var.exclude()
+
+#
+# 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.W1039
+# , 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
+ # NOTE: If you update the source library code you need to manually delete the cache .XML file
+ #
+ xml_cached_fc = parser.create_cached_source_fc(
+ os.path.join( environment.theora.root_dir, "python_theora.h" )
+ , environment.theora.cache_file )
+
+ defined_symbols = [ 'THEORAVIDEO_PLUGIN_EXPORTS','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY','__PYTHONOGRE_BUILD_CODE']
+ if os.name == 'nt':
+ defined_symbols.append ( 'WIN32' )
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+ defined_symbols.append( 'VERSION_' + environment.theora.version )
+
+ undefined_symbols = []
+ #
+ # build the core Py++ system from the GCCXML created source
+ #
+ mb = module_builder.module_builder_t( [ xml_cached_fc ]
+ , gccxml_path=environment.gccxml_bin
+ , working_directory=environment.root_dir
+ , include_paths=environment.theora.include_dirs
+ , define_symbols=defined_symbols
+# # , undefine_symbols = undefined_symbols
+ , 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
+
+ mb.BOOST_PYTHON_MAX_ARITY = 25
+ mb.classes().always_expose_using_scope = True
+
+
+ #
+ # We filter (both include and exclude) specific classes and functions that we want to wrap
+ #
+ global_ns = mb.global_ns
+ global_ns.exclude()
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ main_ns.exclude() ## Note we exclude so we don't get the ogre stuff
+
+
+ AutoExclude ( mb )
+ AutoInclude ( mb )
+ ManualInclude ( mb )
+ ManualExclude ( mb )
+ # here we fixup functions that expect to modifiy their 'passed' variables
+ ManualTransformations ( mb )
+
+ AutoFixes ( mb )
+ ManualFixes ( mb )
+
+ #
+ # We need to tell boost how to handle calling (and returning from) certain functions
+ #
+ Set_Call_Policies ( mb.global_ns.namespace (MAIN_NAMESPACE) )
+ c = main_ns.class_('::Ogre::ExternalTextureSource' ).include(already_exposed=True)
+
+ #
+ # the manual stuff all done here !!!
+ #
+ hand_made_wrappers.apply( mb )
+
+ NoPropClasses = [""]
+ for cls in main_ns.classes():
+ if cls.name not in NoPropClasses:
+ 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.theora )
+
+ ##########################################################################################
+ #
+ # Creating the code. After this step you should not modify/customize declarations.
+ #
+ ##########################################################################################
+ extractor = exdoc.doc_extractor("")
+ mb.build_code_creator (module_name='_theora_' , doc_extractor= extractor )
+
+ for inc in environment.theora.include_dirs:
+ mb.code_creator.user_defined_directories.append(inc )
+ mb.code_creator.user_defined_directories.append( environment.theora.generated_dir )
+ mb.code_creator.replace_included_headers( customization_data.header_files( environment.theora.version ) )
+
+ huge_classes = map( mb.class_, customization_data.huge_classes( environment.theora.version ) )
+
+ mb.split_module(environment.theora.generated_dir, huge_classes,use_files_sum_repository=False)
+
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generaated directory..
+ additional_files=[
+# os.path.join( environment.shared_ptr_dir, 'py_shared_ptr.h'),
+# # os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'generators.h' ),
+# # os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'custom_rvalue.cpp' ),
+# os.path.join( environment.include_dir, 'tuples.hpp' )
+ ]
+ for sourcefile in additional_files:
+ p,filename = os.path.split(sourcefile)
+ destfile = os.path.join(environment.ogre.generated_dir, filename )
+
+ if not common_utils.samefile( sourcefile ,destfile ):
+ shutil.copy( sourcefile, environment.ogre.generated_dir )
+ print "Updated ", filename, "as it was missing or out of date"
+
+if __name__ == '__main__':
+ start_time = time.clock()
+ generate_code()
+ print 'Source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
Added: trunk/python-ogre/code_generators/theora_v2/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/theora_v2/hand_made_wrappers.py (rev 0)
+++ trunk/python-ogre/code_generators/theora_v2/hand_made_wrappers.py 2009-01-05 17:59:09 UTC (rev 832)
@@ -0,0 +1,83 @@
+import os
+import environment
+
+WRAPPER_DEFINITION_General = \
+"""
+Ogre::TheoraVideoController * General_castAsVideoController( Ogre::ExternalTextureSource* e ){
+ return (Ogre::TheoraVideoController*) e;
+ }
+
+Ogre::TheoraVideoController * Get_Controller( void ) {
+ Ogre::TheoraVideoController * mVideoControl = static_cast<Ogre::TheoraVideoController*>
+ (Ogre::ExternalTextureSourceManager::getSingleton().
+ getExternalTextureSource("ogg_video"));
+ return mVideoControl;
+ }
+
+Ogre::TheoraVideoController * General_Init( void ) {
+ Ogre::TheoraVideoController * mVideoControl = static_cast<Ogre::TheoraVideoController*>
+ (Ogre::ExternalTextureSourceManager::getSingleton().
+ getExternalTextureSource("ogg_video"));
+
+ mVideoControl->setInputName( "clock.ogg" );
+ //Start paused so we can have audio
+ mVideoControl->setPlayMode( Ogre::TextureEffectPause );
+ //! Used for attaching texture to Technique, State, and texture unit layer
+ mVideoControl->setTextureTecPassStateLevel( 0, 0, 0 );
+
+ //Set to true to allow for seeking - highly experimental though ;)
+ mVideoControl->setSeekEnabled( false );
+ //This is mainly for OpenAL - but applies to other audio libs which
+ //use pooling instead of callbacks for updating...
+ //Let TheoraMovieClip update the audioclip.
+ mVideoControl->setAutoAudioUpdate( false );
+
+
+ // Grab Our material, then add a new texture unit
+ Ogre::MaterialPtr material = Ogre::MaterialManager::getSingleton().getByName("Example/TheoraVideoPlayer/Play");
+
+ //Create the material the first time through this method
+ if( material.isNull() )
+ material = Ogre::MaterialManager::getSingleton().create("Example/TheoraVideoPlayer/Play", "General");
+
+ material->getTechnique(0)->getPass(0)->createTextureUnitState();
+
+ mVideoControl->createDefinedTexture( "Example/TheoraVideoPlayer/Play", "General" );
+
+ return mVideoControl;
+ }
+
+
+"""
+
+WRAPPER_REGISTRATION_General = [
+ """bp::def( "castAsVideoController", &General_castAsVideoController,
+ "Python-Ogre Helper Function: Casts as Video Controller\\n\\
+ Input: \\n\\
+ Ouput: r",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());""",
+ """bp::def( "InitVideoController", &General_Init,
+ "Python-Ogre Helper Function: Init Video Controller .\\n\\
+ Input: None\\n\\
+ Ouput: ",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());"""
+ """bp::def( "getVideoController", &Get_Controller,
+ "Python-Ogre Helper Function: Get a Video Controller .\\n\\
+ Input: None\\n\\
+ Ouput: ",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());"""
+ ]
+
+#################################################################################################
+#################################################################################################
+
+def apply_reg ( class_, code ):
+ for c in code:
+ class_.add_registration_code ( c )
+
+def apply( mb ):
+ return
+# # mb.add_declaration_code( WRAPPER_DEFINITION_General )
+# # apply_reg (mb, WRAPPER_REGISTRATION_General )
+
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/theora_v2/python_theora.h
===================================================================
--- trunk/python-ogre/code_generators/theora_v2/python_theora.h (rev 0)
+++ trunk/python-ogre/code_generators/theora_v2/python_theora.h 2009-01-05 17:59:09 UTC (rev 832)
@@ -0,0 +1,28 @@
+// #include "SoundManager.h"
+#include "TheoraVideoController.h"
+#include "TheoraMovieClip.h"
+#include "TheoraAudioDriver.h"
+#include "TheoraPlayerPreReqs.h"
+#include "SoundManager.h"
+#include "Ogre.h"
+#include "OgreExternalTextureSource.h"
+#include "OgreExternalTextureSourceManager.h"
+
+
+
+// First we create a magic namespace to hold all our aliases
+namespace pyplusplus { namespace aliases {
+
+ #include "python_theora_aliases.h"
+} }
+
+// then we exposed everything needed (and more) to ensure GCCXML makes them visible to Py++
+//
+namespace python_nxogre{ namespace details{
+inline void instantiate(){
+ using namespace Ogre;
+ #include "python_theora_sizeof.h"
+
+} } }
+
+
Added: trunk/python-ogre/code_generators/theora_v2/python_theora_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/theora_v2/python_theora_aliases.h (rev 0)
+++ trunk/python-ogre/code_generators/theora_v2/python_theora_aliases.h 2009-01-05 17:59:09 UTC (rev 832)
@@ -0,0 +1,2 @@
+typedef std::string String;
+typedef std::vector<std::string> VectorString;
\ No newline at end of file
Added: trunk/python-ogre/code_generators/theora_v2/register_exceptions.py
===================================================================
--- trunk/python-ogre/code_generators/theora_v2/register_exceptions.py (rev 0)
+++ trunk/python-ogre/code_generators/theora_v2/register_exceptions.py 2009-01-05 17:59:09 UTC (rev 832)
@@ -0,0 +1,137 @@
+import os
+import environment
+from string import Template
+
+base_exception = \
+"""
+class OgreException(Exception):
+ def __init__( self, app_error ):
+ Exception.__init__( self )
+ self._pimpl = app_error
+
+ def __str__( self ):
+ return self._pimpl.getFullDescription()
+
+ def __getattribute__(self, attr):
+ my_pimpl = super(OgreException, self).__getattribute__("_pimpl")
+ try:
+ return getattr(my_pimpl, attr)
+ except AttributeError:
+ return super(OgreException,self).__getattribute__(attr)
+
+_ogre_.OgreException = OgreException
+#this one for backward compatability
+_ogre_.Exception = OgreException
+_ogre_._Exception_.py_err_class = OgreException
+""".strip()
+
+derived_py_exception = \
+"""
+class Ogre${err_class}(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(Ogre${err_class},self).__getattribute__(attr)
+
+_ogre_._${err_class}_.py_err_class = Ogre${err_class}
+_ogre_.Ogre${err_class} = Ogre${err_class}
+""".strip()
+
+register_translator = """${err_class}_exception_translator();"""
+
+exception_translator = \
+"""
+
+struct ${err_class}_exception_translator{
+
+ typedef Ogre::${err_class} exception_type;
+ typedef ${err_class}_exception_translator translator_type;
+
+ ${err_class}_exception_translator(){
+ bp::converter::registry::push_back( &translator_type::convertible
+ , &translator_type::construct
+ , bp::type_id<exception_type>() );
+
+ bp::register_exception_translator<exception_type>(&translator_type::translate);
+ }
+
+ static void
+ translate( const exception_type& err ){
+ bp::object pimpl_err( err );
+ bp::object pyerr_class = pimpl_err.attr( "py_err_class" );
+ bp::object pyerr = pyerr_class( pimpl_err );
+ PyErr_SetObject( pyerr_class.ptr(), bp::incref( pyerr.ptr() ) );
+ }
+
+ //Sometimes, exceptions should be passed back to the library.
+ static void*
+ convertible(PyObject* py_obj){
+ if( 1 != PyObject_IsInstance( py_obj, PyExc_Exception ) ){
+ return 0;
+ }
+
+ if( !PyObject_HasAttrString( py_obj, "_pimpl" ) ){
+ return 0;
+ }
+
+ bp::object pyerr( bp::handle<>( bp::borrowed( py_obj ) ) );
+ bp::object pimpl = bp::getattr( pyerr, "_pimpl" );
+ bp::extract<exception_type> type_checker( pimpl );
+ if( !type_checker.check() ){
+ return 0;
+ }
+ return py_obj;
+ }
+
+ static void
+ construct( PyObject* py_obj, bp::converter::rvalue_from_python_stage1_data* data){
+ typedef bp::converter::rvalue_from_python_storage<exception_type> storage_t;
+
+ bp::object pyerr( bp::handle<>( bp::borrowed( py_obj ) ) );
+ bp::object pimpl = bp::getattr( pyerr, "_pimpl" );
+
+ storage_t* the_storage = reinterpret_cast<storage_t*>( data );
+ void* memory_chunk = the_storage->storage.bytes;
+ exception_type* cpp_err
+ = new (memory_chunk) exception_type( bp::extract<exception_type>(pimpl) );
+
+ data->convertible = memory_chunk;
+ }
+
+};
+""".strip()
+
+def substitute( text, **keywd ):
+ return Template( text ).substitute( **keywd )
+
+def register( mb ):
+ ogre_ns = mb.namespace( 'Ogre' )
+ python_part_code = ['import _ogre_']
+
+ exception = ogre_ns.class_( 'Exception' )
+ exception.include()
+ exception.alias = '_%s_' % exception.name
+ exception.add_declaration_code( substitute( exception_translator, err_class=exception.name ) )
+ exception.add_registration_code( substitute( register_translator, err_class=exception.name ), False )
+ python_part_code.append( base_exception )
+
+ for derived_info in exception.derived:
+ derived = derived_info.related_class
+ derived.include()
+ derived.alias = '_%s_' % derived.name
+ derived.add_declaration_code( substitute( exception_translator, err_class=derived.name ) )
+ derived.add_registration_code( substitute( register_translator, err_class=derived.name ), False )
+ python_part_code.append( substitute( derived_py_exception, err_class=derived.name ) )
+
+ directory_path = environment.ogre.generated_dir
+ ogre_exceptions = os.path.join( directory_path, '_ogre_exceptions_.py' )
+
+ if os.path.exists( directory_path ) and not os.path.isdir(directory_path):
+ raise RuntimeError( 'directory_path should be a path not a file.' )
+ if not os.path.exists( directory_path ):
+ os.makedirs( directory_path )
+
+ f = file( ogre_exceptions, 'w+' )
+ f.write( os.linesep.join( python_part_code ) )
+ f.close()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-12-18 12:23:04
|
Revision: 831
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=831&view=rev
Author: andy_miller
Date: 2008-12-18 12:21:14 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
Updates to OgreForests code base
Set windows build back to a shared lib (dll) build for Boost
Significant changes in common code to support Pure Virtual functions needing transformation (requires the latest Py++)
Reasonable set of updates to PhysX (Dermont's wrapper code + more)
Small update to Bullet due to new common wrapping code
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ReportVersion.py
trunk/python-ogre/SConstruct
trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp
trunk/python-ogre/ThirdParty/forests/GrassLoader.h
trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
trunk/python-ogre/demos/ogre/Demo_Basic.py
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/UpdateDLLs.bat
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -13,17 +13,13 @@
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-PATH_Boost = os.path.join(BASE_DIR, 'boost_1_36_0' ) #-trunk')
+PATH_Boost = os.path.join(BASE_DIR, 'boost_1_37_0' ) #-trunk')
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/threading-multi')
-
-## and the name of the boost python library
-## now part of class boos tin environtment.py
-# LIB_Boost = r'boost_python-vc90-mt-1_37'
-# # LIB_Boost = r'boost_python-vc80-mt-1_34_1'
-# LIB_Boost = r'boost_python-vc-mt-1_35'
-
+PATH_LIB_Boost_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/link-static/threading-multi')
+PATH_LIB_Thread_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/thread/build/msvc-9.0/release/link-static/threading-multi')
+PATH_LIB_date_time_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/date_time/build/msvc-9.0/release/link-static/threading-multi')
# in Linux we need to code in the Relative path for the library
RPATH=""
@@ -36,7 +32,7 @@
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR, 'ogre')
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
-PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.1')
+PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2')
PATH_OIS = os.path.join(BASE_DIR, 'ois' ) ##'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk','sdk')
Modified: trunk/python-ogre/ReportVersion.py
===================================================================
--- trunk/python-ogre/ReportVersion.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ReportVersion.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -4,6 +4,7 @@
import os, sys, time, shutil
import logging
#import BuildModule as bm
+import ogre.renderer.OGRE as o
#add environment to the path
sys.path.append( '.' )
@@ -17,7 +18,7 @@
moduleList = ( 'ogre.renderer.OGRE',
'ogre.io.OIS',
- 'ogre.gui.CEGUI','ogre.gui.QuickGUI', 'ogre.gui.betagui',
+ 'ogre.gui.betagui', # 'ogre.gui.CEGUI', 'ogre.gui.QuickGUI',
'ogre.sound.OgreAL',
'ogre.physics.ODE', 'ogre.physics.OgreRefApp',
'ogre.physics.OgreOde', 'ogre.physics.OgreNewt', 'ogre.physics.Opcode',
@@ -51,3 +52,5 @@
except ImportError:
print "Import failed:", basename
# logger.error ( "Import failed:" + basename )
+ except TypeError:
+ print "Type Error:"
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/SConstruct 2008-12-18 12:21:14 UTC (rev 831)
@@ -50,7 +50,7 @@
def get_ccflags(cls):
if os.name=='nt':
CCFLAGS=''
- #CCFLAGS += '-DBOOST_PYTHON_MAX_ARITY=19'
+ CCFLAGS += ' /DBOOST_PYTHON_MAX_ARITY=19 '
CCFLAGS += ' /nologo -Zm200 '
CCFLAGS += ' /W3 /wd4675' # warning level -Zc:wchar_t
CCFLAGS += ' /TP /MD /Zc:forScope /EHs /c /Ox /Ob2 /Oi /Ot /Oy /GS- /GR '
Modified: trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/GrassLoader.cpp 2008-12-18 12:21:14 UTC (rev 831)
@@ -260,6 +260,13 @@
if (heightFunction){
y1 = heightFunction(x1, z1, heightFunctionUserData);
y2 = heightFunction(x2, z2, heightFunctionUserData);
+
+ if (layer->getMaxSlope() < (Math::Abs(y1 - y2) / (halfScaleX * 2))) {
+ //Degenerate the face
+ x2 = x1;
+ y2 = y1;
+ z2 = z1;
+ }
} else {
y1 = 0;
y2 = 0;
@@ -398,6 +405,13 @@
if (heightFunction){
y1 = heightFunction(x1, z1, heightFunctionUserData);
y2 = heightFunction(x2, z2, heightFunctionUserData);
+
+ if (layer->getMaxSlope() < (Math::Abs(y1 - y2) / (halfScaleX * 2))) {
+ //Degenerate the face
+ x2 = x1;
+ y2 = y1;
+ z2 = z1;
+ }
} else {
y1 = 0;
y2 = 0;
@@ -432,6 +446,13 @@
float y3, y4;
if (heightFunction){
+ if (layer->getMaxSlope() < (Math::Abs(y1 - y2) / (halfScaleX * 2))) {
+ //Degenerate the face
+ x2 = x1;
+ y2 = y1;
+ z2 = z1;
+ }
+
y3 = heightFunction(x3, z3, heightFunctionUserData);
y4 = heightFunction(x4, z4, heightFunctionUserData);
} else {
@@ -659,6 +680,7 @@
minWidth = 1.0f; maxWidth = 1.0f;
minHeight = 1.0f; maxHeight = 1.0f;
minY = 0; maxY = 0;
+ maxSlope = 1000;
renderTechnique = GRASSTECH_QUAD;
fadeTechnique = FADETECH_ALPHA;
animMag = 1.0f;
Modified: trunk/python-ogre/ThirdParty/forests/GrassLoader.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/GrassLoader.h 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/GrassLoader.h 2008-12-18 12:21:14 UTC (rev 831)
@@ -169,7 +169,6 @@
heightFunctionUserData = userData;
}
-
/** INTERNAL FUNCTION - DO NOT USE */
void loadPage(PageInfo &page);
/** INTERNAL FUNCTION - DO NOT USE */
@@ -276,6 +275,34 @@
as necessary. */
void setHeightRange(float minHeight, float maxHeight = 0) { minY = minHeight; maxY = maxHeight; }
+ /** \brief Set the maximum slope a grass of blade can be placed on.
+ \param maxSlopeRatio The maximum slope (h/w ratio) a grass blade is allowed to be placed on.
+
+ This function can be used to set the maximum slope you want your grass to be placed on
+ (although it doesn't work for sprite grass). By default grass is allowed on any slope.
+
+ This version of setMaxSlope() accepts a slope ratio value, where ATan(maxSlopeRatio) =
+ maxSlopeAngle. If you wish to provide a maximum slope as an angle, either use the other
+ overload of this function, or convert your angle to a slope ratio first with Tan().*/
+ void setMaxSlope(const float maxSlopeRatio) { maxSlope = maxSlopeRatio; }
+
+ void setMaxSlope(Ogre::Radian maxSlopeAngle) {
+ if (maxSlopeAngle > Ogre::Degree(89.99f))
+ maxSlopeAngle = Ogre::Degree(89.99f);
+ if (maxSlopeAngle < Ogre::Degree(0))
+ maxSlopeAngle = Ogre::Degree(0);
+
+ maxSlope = Ogre::Math::Tan(maxSlopeAngle);
+ }
+
+ /** \brief Get the maximum slope a grass blade can be placed on (as set by setMaxSlope()).
+ \returns The currently set maximum slope ratio value (not an angle).
+
+ This returns the currently set maximum slope which is used to determine what ground is too steep
+ for grass to be placed on. Note that this returns the slope as a slope ratio, not an angle. If you
+ need an angle value, convert with ATan() (maxSlopeAngle = ATan(maxSlopeRatio)).*/
+ float getMaxSlope() const { return maxSlope; }
+
/** \brief Sets the density map used for this grass layer
\param mapFile The density map image
\param channel The color channel(s) to from the image to interpret as density
@@ -487,6 +514,7 @@
float minHeight, maxHeight;
float minY, maxY;
+ float maxSlope;
FadeTechnique fadeTechnique;
GrassTechnique renderTechnique;
Modified: trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2008-12-18 12:21:14 UTC (rev 831)
@@ -49,6 +49,7 @@
if (++selfInstances == 1){
//Set up a single instance of a scene node which will be used when rendering impostor textures
geom->getSceneNode()->createChildSceneNode("ImpostorPage::renderNode");
+ geom->getSceneNode()->createChildSceneNode("ImpostorPage::cameraNode");
}
}
@@ -63,6 +64,7 @@
if (--selfInstances == 0){
sceneMgr->destroySceneNode("ImpostorPage::renderNode");
+ sceneMgr->destroySceneNode("ImpostorPage::cameraNode");
}
}
@@ -445,6 +447,7 @@
RenderTexture *renderTarget;
Camera *renderCamera;
Viewport *renderViewport;
+ SceneNode *camNode;
//Set up RTT texture
uint32 textureSize = ImpostorPage::impostorResolution;
@@ -459,7 +462,9 @@
renderTarget->setAutoUpdated(false);
//Set up camera
+ camNode = sceneMgr->getSceneNode("ImpostorPage::cameraNode");
renderCamera = sceneMgr->createCamera(getUniqueID("ImpostorCam"));
+ camNode->attachObject(renderCamera);
renderCamera->setLodBias(1000.0f);
renderViewport = renderTarget->addViewport(renderCamera);
renderViewport->setOverlaysEnabled(false);
Modified: trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp 2008-12-18 12:21:14 UTC (rev 831)
@@ -166,7 +166,7 @@
{
if (!managerList.empty())
OGRE_EXCEPT(0, "PagedGeometry::setBounds() cannot be called after detail levels have been added. Call removeDetailLevels() first.", "PagedGeometry::setBounds()");
- if (bounds.width() != bounds.height())
+ if (!Math::RealEqual(bounds.width(), bounds.height(), 0.01f))
OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Bounds must be square", "PagedGeometry::setBounds()");
if (bounds.width() <= 0 || bounds.height() <=0)
OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Bounds must have positive width and height", "PagedGeometry::setBounds()");
Modified: trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp 2008-12-18 12:21:14 UTC (rev 831)
@@ -131,6 +131,10 @@
float boundsWidth = mapBounds.width();
float boundsHeight = mapBounds.height();
+ //Patch incorrect PixelBox::getWidth() in OpenGL mode
+ if (Root::getSingleton().getRenderSystem()->getName() == "OpenGL Rendering Subsystem")
+ --mapWidth;
+
uint32 xindex = mapWidth * (x - mapBounds.left) / boundsWidth;
uint32 zindex = mapHeight * (z - mapBounds.top) / boundsHeight;
if (xindex < 0 || zindex < 0 || xindex >= mapWidth || zindex >= mapHeight)
@@ -153,6 +157,10 @@
float boundsWidth = mapBounds.width();
float boundsHeight = mapBounds.height();
+ //Patch incorrect PixelBox::getWidth() in OpenGL mode
+ if (Root::getSingleton().getRenderSystem()->getName() == "OpenGL Rendering Subsystem")
+ --mapWidth;
+
float xIndexFloat = (mapWidth * (x - mapBounds.left) / boundsWidth) - 0.5f;
float zIndexFloat = (mapHeight * (z - mapBounds.top) / boundsHeight) - 0.5f;
Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -212,7 +212,14 @@
f=main_ns.class_('btCollisionWorld').mem_fun('addCollisionObject')
f.arguments[1].default_value = 'btBroadphaseProxy::DefaultFilter' # (short int)(btBroadphaseProxy::DefaultFilter)
f.arguments[2].default_value = 'btBroadphaseProxy::AllFilter' # (short int)(btBroadphaseProxy::AllFilter)
-
+
+ f = ['::btBroadphaseInterface::createProxy',
+ '::btDispatcher::getNewManifold'
+ ]
+ for fun in f:
+ print "setting call policy", fun
+ main_ns.member_function(fun).call_policies = call_policies.default_call_policies()
+
############################################################
##
## And things that need to have their argument and call values fixed.
Modified: trunk/python-ogre/code_generators/common_utils/__init__.py
===================================================================
--- trunk/python-ogre/code_generators/common_utils/__init__.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/common_utils/__init__.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -282,6 +282,7 @@
arg_position = 0
trans=[]
desc=""
+ ft_type = None
ctypes_conversion = False
for arg in fun.arguments:
rawarg = declarations.remove_declarated(
@@ -301,10 +302,12 @@
arg.type.decl_string + " ) takes a CTypes.addressof(xx). \\n"
ctypes_conversion = True
ctypes_arg = arg.type.decl_string.split()[0]
+ ft_type = 'CTYPES'
elif declarations.is_reference(arg.type)and not declarations.is_const(declarations.remove_reference( arg.type)): # seen functions passing const ref's
trans.append( ft.inout(arg_position ) )
desc = desc + "Argument: "+arg.name+ "( pos:" + str(arg_position) + " - " +\
arg.type.decl_string + " ) converted to an input/output (change to return types).\\n"
+ ft_type = 'INOUT'
elif declarations.is_reference(arg.type):
print "Warning: - possible code change.", fun,arg," not wrapped as const reference to base type invalid"
else:
@@ -313,10 +316,23 @@
pass # it's not a var we need to handle
arg_position += 1
if trans:
+ const_return = False # declarations.is_const(fun)
+ if fun.decl_string.endswith('const'):
+ const_return=True
+ simple_return = declarations.is_arithmetic(fun.return_type) or declarations.is_void(fun.return_type)
+ nonpublic_destructor = declarations.is_class(fun.parent) and declarations.has_destructor(fun.parent) and\
+ not declarations.has_public_destructor(fun.parent)
+
if fun.documentation or fun.transformations: # it's already be tweaked:
print "AUTOFT ERROR: Duplicate Tranforms.", fun, fun.documentation
- elif hasattr(fun, "virtuality") and fun.virtuality == "pure virtual": # free functions don't have virtuality arrtibute
- print "AUTOFT WARNING: PURE VIRTUAL function requires tranform.", fun
+
+ # if the class has a protected destruction AND the return value is const or a non arithmatic value then exclude it.
+ elif nonpublic_destructor and const_return:
+ print "AUTOFT ERROR Const: Parent has non public destructor and const return.", fun.parent.name, fun.return_type.decl_string, fun
+ fun.documentation="Python-Ogre Warning: function required transformation - not possible due to non public destructor and const return value.."
+ elif nonpublic_destructor and not simple_return:
+ print "AUTOFT ERROR Const: Parent has non public destructor and complex return value.", fun.parent.name, fun.return_type.decl_string, fun
+ fun.documentation="Python-Ogre Warning: function required transformation - not possible due to non public destructor and complex return value.."
else:
new_alias = fun.name
if ctypes_conversion: # only manage name changes if ctypes changing
@@ -338,7 +354,7 @@
desc = desc + "\\\nWARNING FUNCTION NAME CHANGE - from "+fun.name + " -- " + fun.decl_string +" to " + new_alias + " \\n"
print "INFO: Adjusting Alias as multiple overlapping functions:", new_alias
- print "AUTOFT OK: Tranformed ", fun, "(",new_alias,")"
+ print "AUTOFT OK: Tranformed ", fun.return_type.decl_string, fun, "(",new_alias,")"
fun.add_transformation ( * trans , **{"alias":new_alias} )
fun.documentation = docit ("Auto Modified Arguments:",
desc, "...")
@@ -362,13 +378,13 @@
desc = desc +"Argument: "+arg.name+ "( pos:" + str(arg_position) +") takes a CTypes.addressof(xx). "
arg_position +=1
if trans:
- if fun.virtuality == "pure virtual":
- print "*** WARNING: Unable to apply transformation to PURE VIRTUAL function", fun, desc
- else:
- print "Tranformation applied to ", fun, desc, fun.virtuality
- fun.add_transformation ( * trans , **{"alias":fun.name} )
- fun.documentation = docit ("Modified Input Argument to work with CTypes",
- desc, "...")
+# if fun.virtuality == "pure virtual":
+# print "*** WARNING: Unable to apply transformation to PURE VIRTUAL function", fun, desc
+# else:
+ print "Tranformation applied to ", fun, desc, fun.virtuality
+ fun.add_transformation ( * trans , **{"alias":fun.name} )
+ fun.documentation = docit ("Modified Input Argument to work with CTypes",
+ desc, "...")
for fun in mb.member_functions():
fixVoids ( fun )
@@ -511,6 +527,7 @@
""" There are some cases where function transformations don't get applied as Py++ doesn't
support all cases -- the only current one is pure virtual functions don't get managed correctly
"""
+ return
ACCESS_TYPES = declarations.ACCESS_TYPES
VIRTUALITY_TYPES = declarations.VIRTUALITY_TYPES
for f in mb.member_functions():
Modified: trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -78,61 +78,7 @@
]
-WRAPPER_DEFINITION_RenderQueueListener =\
-"""
-struct RenderQueueListener_wrapper : Ogre::RenderQueueListener, bp::wrapper< Ogre::RenderQueueListener > {
- void RenderQueueListener_renderQueueEnded( ::Ogre::uint8 queueGroupId, ::Ogre::String const & invocation, bool & repeatThisInvocation ){
- bool holder;
- if ( bp::override func_renderQueueEnded = this->get_override( "renderQueueEnded" ) ) {
- holder = func_renderQueueEnded( queueGroupId, invocation, repeatThisInvocation );
- repeatThisInvocation = holder;
- }
- else {
- Ogre::RenderQueueListener::renderQueueEnded ( queueGroupId, invocation, repeatThisInvocation );
- }
- }
-
-
- void RenderQueueListener_renderQueueStarted( ::Ogre::uint8 queueGroupId, ::Ogre::String const & invocation, bool & skipThisInvocation ){
- bool holder;
- if ( bp::override func_renderQueueStarted = this->get_override( "renderQueueStarted" ) ) {
- holder = func_renderQueueStarted( queueGroupId, invocation, skipThisInvocation );
- skipThisInvocation = holder;
- }
- else {
- Ogre::RenderQueueListener::renderQueueStarted ( queueGroupId, invocation, skipThisInvocation );
- }
-
- }
-};
-"""
-
-WRAPPER_REGISTRATION_RenderQueueListener = [
- """def( "renderQueueStarted", &::RenderQueueListener_renderQueueStarted,\\
- "Python-Ogre Helper Function: This method is called by the SceneManager\\n\\
- before each queue group is rendered.
- @param queueGroupId The id of the queue group which has just been rendered
- @param invocation Name of the invocation which is causing this to be
- called (@see RenderQueueInvocation)
- @param .\\n\\
- Input: queueGroupId The id of the queue group which has just been rendered\\n\\
- Input: invocation Name of the invocation which is causing this to be called\\n\\
- Input: skipThisInvocation A boolean which is by default set to false.\\n\\
- Output: "skipThisInvocation" If the event sets this to true, the queue will be skipped\\n\\
- and not rendered. Note that in this case the renderQueueEnded event will not be raised\\n\\
- for this queue group");""",
- """def( "renderQueueEnded", &::RenderQueueListener_renderQueueEnded,\\
- "Python-Ogre Helper Function: This method is called by the SceneManager\\n\\
- after each queue group is rendered.\\n\\
- Input: queueGroupId The id of the queue group which has just been rendered\\n\\
- Input: invocation Name of the invocation which is causing this to be called\\n\\
- Input: repeatThisInvocation A boolean which is by default set to false.\\n\\
- Output: "repeatThisInvocation" If return true, the queue which has just been\\n\\
- rendered will be repeated, and the renderQueueStarted and renderQueueEnded\\n\\
- events will also be fired for it again");"""
- ]
-
WRAPPER_DEFINITION_OverlayElement = \
"""
Ogre::OverlayElement * OverlayElement_castElementAsOverlayContainer(Ogre::OverlayElement * e){
@@ -185,26 +131,6 @@
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
]
-# WRAPPER_DEFINITION_OverlayManager = \
-# """
-# Ogre::OverlayElement* OverlayManager_createOverlayElement(Ogre::OverlayManager &me, const Ogre::String& typeName,
-# const Ogre::String& instanceName, bool isTemplate = false){
-# Ogre::OverlayElement* e = me.createOverlayElement(typeName, instanceName, isTemplate );
-# if( dynamic_cast< Ogre::TextAreaOverlayElement * >( e ) ){
-# return (Ogre::TextAreaOverlayElement*) e;
-# }
-# if( dynamic_cast< Ogre::OverlayContainer * >( e ) ){
-# return (Ogre::OverlayContainer*) e;
-# }
-# return ( e );
-# }
-# """
-#
-# WRAPPER_REGISTRATION_OverlayManager = [
-# 'def( "createOverlayElement", &::OverlayManager_createOverlayElement,\
-# "Python-Ogre Hand Wrapped\\nShould Return the correct Type (TextAreOverlayElement or OverlayContainer)",\
-# bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
-# ]
WRAPPER_DEFINITION_Bone = \
"""
@@ -566,12 +492,6 @@
return boost::python::object( r ); //unknown type
}
-// void
-// Utility_setFloat(void * ptrin, float datain)
-// {
-// float * newptr = reinterpret_cast<float *>(ptrin);
-// newptr[0]= datain;
-// }
"""
WRAPPER_REGISTRATION_General = [
@@ -943,18 +863,6 @@
Ouput: List containing particles" );"""
]
-# #################################################################################################
-# WRAPPER_DEFINITION_Vector3 =\
-# """
-# int Vector3_len( Ogre::Vector3 & me ) {
-# return 3;
-# }
-# """
-# WRAPPER_REGISTRATION_Vector3 = [
-# """def( "__len__", &Vector3_len,
-# "Python-Ogre Helper Function: return length of Vector3");""",
-# ]
-#
#################################################################################################
def iter_as_generator_vector( cls ):
@@ -995,10 +903,6 @@
rt.add_declaration_code( WRAPPER_DEFINITION_RenderTarget )
apply_reg (rt, WRAPPER_REGISTRATION_RenderTarget )
-# rt = mb.class_( 'Vector3' )
-# rt.add_declaration_code( WRAPPER_DEFINITION_Vector3 )
-# apply_reg (rt, WRAPPER_REGISTRATION_Vector3 )
-
rt = mb.class_( 'ResourceManager' )
rt.add_declaration_code( WRAPPER_DEFINITION_ResourceManager )
apply_reg (rt, WRAPPER_REGISTRATION_ResourceManager )
@@ -1019,18 +923,10 @@
rt.add_declaration_code( WRAPPER_DEFINITION_PixelBox )
apply_reg (rt, WRAPPER_REGISTRATION_PixelBox )
-# rt = mb.class_( 'ShadowRenderable' )
-# rt.add_declaration_code( WRAPPER_DEFINITION_ShadowRenderable )
-# apply_reg (rt, WRAPPER_REGISTRATION_ShadowRenderable )
-
rt = mb.class_( 'OverlayElement' )
rt.add_declaration_code( WRAPPER_DEFINITION_OverlayElement )
apply_reg (rt, WRAPPER_REGISTRATION_OverlayElement )
-# rt = mb.class_( 'OverlayManager' )
-# rt.add_declaration_code( WRAPPER_DEFINITION_OverlayManager )
-# apply_reg (rt, WRAPPER_REGISTRATION_OverlayManager )
-
rt = mb.class_( 'Frustum' )
rt.add_declaration_code( WRAPPER_DEFINITION_Frustum )
apply_reg (rt, WRAPPER_REGISTRATION_Frustum )
@@ -1066,30 +962,4 @@
for cls in map_iterators:
iter_as_generator_map( cls )
- rt = mb.class_( 'RenderQueueListener' )
-# # # # # rt.add_declaration_code( WRAPPER_DEFINITION_RenderQueueListener )
-# # # # # apply_reg (rt, WRAPPER_REGISTRATION_RenderQueueListener )
-# print "WRAPPER CODE\n\n"
-# print rt.wrapper_code
-# print rt
-# print dir(rt)
-# # rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
-# print "NOW\n\n"
-# print rt.wrapper_code
-
-# cls = mb.class_('Animation').class_('NodeTrackIterator')
-# iter_as_generator_map( cls )
-# global_ns = mb.global_ns
-# ogre_ns = global_ns.namespace( 'Ogre' )
-# i = ogre_ns.typedef( name="NodeTrackIterator" )
-# iter_as_generator_map( i )
-
-# typedef std::map<unsigned short, NodeAnimationTrack*> NodeTrackList;
-# typedef ConstMapIterator<NodeTrackList> NodeTrackIterator;
-# typedef std::map<unsigned short, NumericAnimationTrack*> NumericTrackList;
-# typedef ConstMapIterator<NumericTrackList> NumericTrackIterator;
-
-# typedef std::map<unsigned short, VertexAnimationTrack*> VertexTrackList;
-# typedef ConstMapIterator<VertexTrackList> VertexTrackIterator;
-
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -63,20 +63,34 @@
,'::NxArray< NxForceFieldShapeDesc*, NxAllocatorDefault >::resize'
,'::NxArray< NxForceFieldShapeGroup*, NxAllocatorDefault >::resize'
,'::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
+
+ # These have const refs to classes with protected desctuctors - a bad combination for boost
,'::NxCookingInterface::NxCreatePMap'
-# # ,'::NxForceField::releaseShape'
,'::NxUtilLib::NxGetBoxEdgesAxes'
-# ,'::NxHeightFieldShape::overlapAABBTrianglesDeprecated'
-# # ,'::NxImplicitScreenMesh::getProjectionMatrix' # returns a const int pointer
,'::NxVec3::get'
- # not in source
+
+ # Not in source
,'::NxBitField::rangeToDenseMask'
,'::NxBitField::maskToShift'
,'::NxVec3::setNotUsed'
,'::NxVec3::isNotUsed'
-
+
+ # These show up as now handling FT on pure virtual - however need a public class destructor
+ # so these are hand wrapped
+ ,'::NxCompartment::getTiming' # requires a functional transform however destructor is protected so compile fails
+ ,'::NxScene::getTiming' # requires a functional transform however destructor is protected so compile fails
+ ,'::NxConvexMesh::getMassInformation'
+ ,'::NxTriangleMesh::getMassInformation'
+ ,'::NxPhysicsSDK::getInternalVersion'
+
+ ,'::NxHeightField::saveCells' # excluded
+
+ ,'::NxForceFieldShapeGroup::releaseShape' # has a const forecfieldshape as arg and there isn't a public desctuctor
+ #
+
+
+# ,'::NxStream::storeBuffer'
+
]
if os.name =='nt':
excludes.append('::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry')
@@ -94,17 +108,11 @@
global_ns.free_functions(e).exclude()
excludes = [
- #'NxArray<NxShapeDesc*, NxAllocatorDefault>', ## doesn't have a defult constructor for ElemType
- #'NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault>', ## Elemtype issue
- #'NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault>', ## Elemtype issue
- 'NxForceFieldShapeGroup' ## seems to have access issues..
+# 'NxForceFieldShapeGroup' ## seems to have access issues..
]
-# for c in global_ns.classes():
-# print c
if os.name =='nt':
pass
-# excludes.append('NxArray<NxFluidEmitterDesc, NxAllocatorDefault>') ## needs ElemType changed to NxFluidEmitterDesc
else:
excludes.append ( '::NxFluidUserNotify')
for e in excludes:
@@ -125,7 +133,15 @@
if not "const" in o.decl_string:
o.exclude()
print "Excluding Operator:", o
-
+
+ # this is really a fix however needs to happen for the automatic stuff as we set the doc string to
+ # stop any further functional transformation happening
+ s = ['::NxStream::storeBuffer'
+ ,'::NxUserAllocator::realloc'
+ ]
+ for f in s:
+ global_ns.mem_fun(f).documentation="broken function as auto wrapping fails"
+
############################################################
##
## And there are things that manually need to be INCLUDED
@@ -160,16 +176,14 @@
if c.arguments[x].default_value:
if "ElemType" in c.arguments[x].default_value:
c.arguments[x].default_value=''
-
-# known = ['points', 'triangles']
-# for c in global_ns.classes():
-# if c.name.startswith ('Nx'):
-# print "Checking", c
-# for v in c.variables(allow_empty = True ):
-# if v.name in known:
-# v.expose_address = True
-# print "Exposing Address: ", v.name, " of class: ", c.name
-
+
+
+ for f in global_ns.member_functions():
+ for arg in f.arguments:
+ if arg.default_value == '-1u':
+ arg.default_value = '0xffffffff'
+
+
############################################################
##
## And things that need to have their argument and call values fixed.
@@ -186,12 +200,6 @@
def create_output( size ):
return [ ft.output( i ) for i in range( size ) ]
-# f=main_ns.free_function( "NxCreatePhysicsSDK")
-# f.add_transformation(ft.output('errorCode'))
-# f.documentation = docit ("","", "tuple - SDK, ErrorCode")
-# f=main_ns.free_function( "NxCreatePhysicsSDKWithID")
-# f.add_transformation(ft.output('errorCode'))
-# f.documentation = docit ("","", "tuple - SDK, ErrorCode")
###############################################################################
##
@@ -206,17 +214,6 @@
global_ns = mb.global_ns
main_ns = global_ns # No namespaces in NxPhysics
- # vars that are static consts but have their values set in the header file are bad
-# # Remove_Static_Consts ( main_ns )
-
-# ## Exclude protected and private that are not pure virtual
-# query = ~declarations.access_type_matcher_t( 'public' ) \
-# & ~declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.PURE_VIRTUAL )
-# try:
-# non_public_non_pure_virtual = main_ns.calldefs( query )
-# non_public_non_pure_virtual.exclude()
-# except:
-# pass
#Virtual functions that return reference could not be overriden from Python
query = declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.VIRTUAL ) \
@@ -264,15 +261,6 @@
main_ns = global_ns # .namespace( ns )
- # arguments passed as refs but not const are not liked by boost
-# Fix_Ref_Not_Const ( main_ns )
-
-# # Functions that have void pointers in their argument list need to change to unsigned int's
-# 3_Args ( main_ns )
-#
-# # and change functions that return a variety of pointers to instead return unsigned int's
-# Fix_Pointer_Returns ( main_ns )
-#
# and change functions that return a variety of pointers to instead return unsigned int's
pointee_types=['unsigned int','int', 'float', 'unsigned char', 'char','::NxI32']
ignore_names=['getName'] # these are function names we know it's cool to exclude
Modified: trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/physx/hand_made_wrappers.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/code_generators/physx/hand_made_wrappers.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -1,6 +1,127 @@
import os
import environment
+WRAPPER_WRAPPER_DEF_NxForceFieldShapeGroup = \
+"""
+ virtual void releaseShape( ::NxForceFieldShape const & arg0 ){
+ bp::override func_releaseShape = this->get_override( "releaseShape" );
+ func_releaseShape( boost::ref(arg0) );
+ }
+"""
+
+WRAPPER_DEFINITION_NxScene = \
+"""bp::tuple NxScene_getTiming( ::NxScene & me) {
+ NxReal maxTimestep;
+ NxTimeStepMethod method;
+ NxU32 maxIter;
+ NxU32 numSubSteps;
+ me.getTiming(maxTimestep, maxIter, method, &numSubSteps);
+ return ( boost::python::make_tuple( maxTimestep, maxIter, method, numSubSteps ) );
+ }
+"""
+WRAPPER_WRAPPER_DEF_NxScene = \
+"""
+ virtual void getTiming(NxReal& maxTimestep, NxU32& maxIter, NxTimeStepMethod& method, NxU32* numSubSteps=NULL) const {
+ // placeholder so wrapper will compile
+ }
+"""
+
+WRAPPER_REGISTRATION_NxScene = [
+ 'def( "getTiming", &::NxScene_getTiming,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with maxTimestep, maxIter, method, numSubSteps");'
+# ,\
+# bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
+ ]
+
+WRAPPER_DEFINITION_NxStream = \
+""" NxStream& NxStream_storeBuffer(NxStream & me, const void* buffer, NxU32 size) {
+// NOT YET IMPLEMENTED
+ NxStream result;
+ return result;
+}
+"""
+
+WRAPPER_WRAPPER_DEF_NxStream = \
+"""
+ virtual NxStream& storeBuffer(const void* buffer, NxU32 size) {
+ // placeholder so wrapper will compile
+ }
+"""
+
+WRAPPER_REGISTRATION_NxStream = [
+ 'def( "storeBuffer", &::NxStream_storeBuffer,\
+ "Python-Ogre Hand Wrapped NOT IMPLEMENTED\\nReturns a NxStream -- takes a python list",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
+ ]
+
+
+WRAPPER_DEFINITION_NxCompartment = \
+"""bp::tuple NxCompartment_getTiming( ::NxCompartment & me) {
+ NxReal maxTimestep;
+ NxTimeStepMethod method;
+ NxU32 maxIter;
+ NxU32 numSubSteps;
+ me.getTiming(maxTimestep, maxIter, method, &numSubSteps);
+ return ( boost::python::make_tuple( maxTimestep, maxIter, method, numSubSteps ) );
+ }
+"""
+
+WRAPPER_REGISTRATION_NxCompartment = [
+ 'def( "getTiming", &::NxCompartment_getTiming,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with maxTimestep, maxIter, method, numSubSteps");',
+ ]
+
+WRAPPER_DEFINITION_NxConvexMesh= \
+"""bp::tuple NxConvexMesh_getMassInformation( ::NxConvexMesh & me) {
+ NxReal mass;
+ NxMat33 localInertia;
+ NxVec3 localCenterOfMass;
+ me.getMassInformation( mass, localInertia, localCenterOfMass );
+ return ( boost::python::make_tuple( mass, localInertia, localCenterOfMass ) );
+ }
+"""
+WRAPPER_REGISTRATION_NxConvexMesh = [
+ 'def( "getMassInformation", &::NxConvexMesh_getMassInformation,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with mass, localInertia, localCenterOfMass");',
+ ]
+
+WRAPPER_DEFINITION_NxTriangleMesh= \
+"""bp::tuple NxTriangleMesh_getMassInformation( ::NxTriangleMesh & me) {
+ NxReal mass;
+ NxMat33 localInertia;
+ NxVec3 localCenterOfMass;
+ me.getMassInformation( mass, localInertia, localCenterOfMass );
+ return ( boost::python::make_tuple( mass, localInertia, localCenterOfMass ) );
+ }
+"""
+WRAPPER_REGISTRATION_NxTriangleMesh = [
+ 'def( "getMassInformation", &::NxTriangleMesh_getMassInformation,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with mass, localInertia, localCenterOfMass");',
+ ]
+
+WRAPPER_WRAPPER_DEF_NxPhysicsSDK= \
+"""
+ virtual ::NxU32 getInternalVersion( ::NxU32 & apiRev, ::NxU32 & descRev, ::NxU32 & branchId ) const {
+ // dummy function as place holder
+ return 0;
+ };
+"""
+
+WRAPPER_DEFINITION_NxPhysicsSDK= \
+"""bp::tuple NxPhysicsSDK_getInternalVersion(::NxPhysicsSDK & me ) {
+ NxU32 apiRev;
+ NxU32 descRev;
+ NxU32 branchId;
+ NxU32 sdkRev;
+ sdkRev = me.getInternalVersion( apiRev, descRev, branchId );
+ return ( boost::python::make_tuple( sdkRev, apiRev, descRev, branchId ) );
+ }
+"""
+WRAPPER_REGISTRATION_NxPhysicsSDK = [
+ 'def( "getInternalVersion", &::NxPhysicsSDK_getInternalVersion,\
+ "Python-Ogre Hand Wrapped\\nReturns a tuple with sdkRev, apiRev, descRev, branchId");',
+ ]
+
WRAPPER_DEFINITION_NxActor_Wrapper = \
"""
virtual ::NxShape * const * getShapes( ) const {
@@ -118,7 +239,44 @@
// bp::override func_getProjectionMatrix = this->get_override( "getProjectionMatrix" );
// return func_getProjectionMatrix( );
}
-"""
+"""
+
+WRAPPER_DEFINITION_NxSimpleTriangleMesh=\
+"""
+void NxSimpleTriangleMesh_setPoints(::NxSimpleTriangleMesh& me,boost::python::list vertices, unsigned int vertex_count ){
+
+ unsigned int index;
+ ::NxVec3* verts = new NxVec3[vertex_count];
+ for (index =0 ; index < vertex_count ; index ++) {
+ verts[index] = bp::extract<::NxVec3> (vertices[index]);
+ }
+ me.points = verts;
+}
+void NxSimpleTriangleMesh_setFaces(::NxSimpleTriangleMesh& me,boost::python::list faces, unsigned int face_count ) {
+ unsigned int index;
+ ::NxU32* triangles = new NxU32[face_count];
+ for (index =0 ; index < face_count ; index ++) {
+ triangles[index] = (::NxU32)(bp::extract<float> (faces[index]));
+ }
+ me.triangles = triangles;
+}
+"""
+
+WRAPPER_REGISTRATION_NxSimpleTriangleMesh = [
+ """def( "setPoints", &::NxSimpleTriangleMesh_setPoints,
+ ( bp::arg("vertices"), bp::arg("vertex_count")),
+ "Python-Ogre Hand Wrapped\\nSet's the points for a SimpleTriangleMesh",
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());""",
+ """def( "setFaces", &::NxSimpleTriangleMesh_setFaces,
+ ( bp::arg("faces"), bp::arg("face_count")),
+ "Python-Ogre Hand Wrapped\\nSet's the faces for a SimpleTriangleMesh",
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());""",
+
+ ]
+
+
+
+
ConstPointerReference=\
"""
virtual %(FuncDecl)s {
@@ -127,8 +285,7 @@
"""
PointerReg=\
"""
-def( "%(function_name)s", &::%(classname)s_%(function_name)s,\
- "Python-Ogre Hand Wrapped\\n");
+def( "%(function_name)s", &::%(classname)s_%(function_name)s,"Python-Ogre Hand Wrapped\\n");
"""
PointerDec=\
"""
@@ -146,7 +303,7 @@
return outlist;
}
"""
-PointerWrapper = \
+PointerWrapper=\
"""
virtual %(returnType)s %(function_name)s( ) %(const)s {
bp::override func_%(function_name)s = this->get_override( "%(function_name)s" );
@@ -154,6 +311,33 @@
}
"""
+
+UserDataDec=\
+"""
+void %(classname)s_setUserData ( ::%(classname)s& me, PyObject * data) {
+ me.userData = data;
+ }
+
+PyObject * %(classname)s_getUserData ( ::%(classname)s& me) {
+ void * data = me.userData;
+ if ( data == NULL) {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+ else {
+ Py_INCREF( (PyObject *) data ); // I'm passing a reference to this object so better inc the ref :)
+ return (PyObject *) data;
+ }
+ }
+"""
+
+UserDataReg=[
+ """def( "setUserData", &::%(classname)s_setUserData,"Python-Ogre Hand Wrapped\\n");""",
+ """def( "getUserData", &::%(classname)s_getUserData,"Python-Ogre Hand Wrapped\\n");"""
+ ]
+
+
+
#################################################################################################
#################################################################################################
@@ -180,8 +364,6 @@
for f in global_ns.member_functions():
if f.parent.name in ignoreClasses:
continue
- else:
- print "Class OK:", f.parent.name
for a in f.arguments:
if "unsigned int const * &" in a.type.decl_string:
f.exclude()
@@ -227,14 +409,61 @@
print "Wrapped:", f, values
else:
print "Excluded:",f
+
+ # Patch from Dermont to make userData more useful and simple to use
+ vars = ["userData"]
+ for var in global_ns.variables ():
+ class_ = var.parent
+ classname = class_.name
+ if var.name in vars:
+ if var.type.decl_string.startswith('void'):
+ values = { 'classname':classname }
+ for i in range(len(UserDataReg)):
+ regcode = UserDataReg[i] % values
+ class_.add_registration_code( regcode )
+ deccode = UserDataDec % values
+ class_.add_declaration_code( deccode )
+ print "Hand Wrapped:", var.name, values
+
-
rt = mb.class_( 'NxUtilLib' )
rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxUtilLib)
rt = mb.class_( 'NxCookingInterface' )
rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxCookingInterface)
rt = mb.class_( 'NxForceField' )
rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxForceField)
+
+ rt = mb.class_( 'NxForceFieldShapeGroup' )
+ rt.add_wrapper_code( WRAPPER_WRAPPER_DEF_NxForceFieldShapeGroup )
+
+
+ rt = mb.class_( 'NxScene' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxScene )
+ rt.add_wrapper_code( WRAPPER_WRAPPER_DEF_NxScene )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxScene )
+
+# rt = mb.class_( 'NxStream' )
+# rt.add_declaration_code( WRAPPER_DEFINITION_NxStream )
+# rt.add_wrapper_code( WRAPPER_WRAPPER_DEF_NxStream )
+# apply_reg (rt, WRAPPER_REGISTRATION_NxStream )
+
+ rt = mb.class_( 'NxCompartment' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxCompartment )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxCompartment )
+
+ rt = mb.class_( 'NxConvexMesh' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxConvexMesh )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxConvexMesh )
+
+ rt = mb.class_( 'NxTriangleMesh' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxTriangleMesh )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxTriangleMesh )
+
+ rt = mb.class_( 'NxPhysicsSDK' )
+ rt.add_wrapper_code( WRAPPER_WRAPPER_DEF_NxPhysicsSDK )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NxPhysicsSDK )
+ apply_reg (rt, WRAPPER_REGISTRATION_NxPhysicsSDK )
+
# rt = mb.class_( 'NxHeightFieldShape' )
# rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxHeightFieldShape)
# rt = mb.class_( 'NxImplicitScreenMesh' )
Modified: trunk/python-ogre/demos/ogre/Demo_Basic.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Basic.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/demos/ogre/Demo_Basic.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -17,10 +17,9 @@
import time
import ogre.renderer.OGRE as ogre
-import ogre.io.OIS as OIS
class OGREMain(ogre.Root):
- def __init__(self, plugins_path='plugins.cfg',resource_path='../resources.cfg'):
+ def __init__(self, plugins_path='../plugins.cfg',resource_path='../resources.cfg'):
ogre.Root.__init__(self, plugins_path)
self.plugins_path = plugins_path
self.resource_path = resource_path
@@ -97,7 +96,11 @@
def main():
- root = OGREMain(plugins_path='../plugins.cfg')
+ import os
+ if os.name == 'nt':
+ root = OGREMain(plugins_path='../plugins.cfg.nt')
+ else:
+ root = OGREMain(plugins_path='../plugins.cfg.linux')
weu = ogre.WindowEventUtilities()
while not root.window.isClosed():
weu.messagePump()
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-12-09 08:36:19 UTC (rev 830)
+++ trunk/python-ogre/environment.py 2008-12-18 12:21:14 UTC (rev 831)
@@ -18,7 +18,6 @@
_LOGGING_ON = False
_PreCompiled = True
-
def log ( instring ):
if _LOGGING_ON:
print __file__, "LOG::", instring
@@ -49,12 +48,14 @@
##
-## set this to True if you compiled Ogre with Threads enabled
+## set this to True if you compiled Ogre with Threads enabled and setting a static boost link
##
if isWindows():
- _USE_THREADS = True
+ _USE_THREADS = False
+ BOOST_STATIC = False
else:
_USE_THREADS = False
+ BOOST_STATIC = False
PythonOgreMajorVersion = "1"
@@ -212,7 +213,7 @@
else:
source_version = "20080901"
source = [
- [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co "+base, os.getcwd()]
+ [cvs, " -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D 01Aug2008 "+base, os.getcwd()]
]
if isLinux() or isMac():
buildCmds = [
@@ -464,29 +465,40 @@
class boost: ## also included bjam
active = True
- version = "3.5"
+ version = "1.37"
pythonModule = False
ModuleName = ""
+ # move lib path here (lib name is already here) so we can easily do a static link for windows
+ PATH_LIB = Config.PATH_LIB_Boost
if isWindows():
+ PATH_LIB_THREAD=Config.PATH_LIB_Thread_STATIC
+ PATH_LIB_DATETIME=Config.PATH_LIB_date_time_STATIC
if _STABLE:
base = 'boost_1_36_0'
lib = 'boost_python-vc90-mt-1_36'
versionBase = '1_36' ## the version used on the library name
else:
- base = 'boost_1_36_0'
- lib = 'boost_python-vc90-mt-1_36'
- versionBase = '1_36' ## the version used on the library name
+ base = 'boost_1_37_0'
+ lib = 'boost_python-vc90-mt-1_37'
+ PATH_LIB = Config.PATH_LIB_Boost
+
+ # change to handle static boost linking...
+ if BOOST_STATIC:
+ lib = 'libboost_python-vc90-mt-1_37'
+ PATH_LIB = Config.PATH_LIB_Boost_STATIC
+
+ versionBase = '1_37' ## the version used on the library name
else:
if _STABLE:
base = 'boost_1_34_1'
versionBase = '1_34' ## the version used on the library name
else:
- base = 'boost_1_36_0'
- versionBase = '1_36' ## the version used on the library name
+ base = 'boost_1_37_0'
+ versionBase = '1_37' ## the version used on the library name
if isLinux() or isMac():
- bjambase = 'boost-jam-3.1.16'
+ bjambase = 'boost-jam-3.1.17'
if isMac():
bjambuilddir = 'bin.macosxx86'
bjambuildset = 'darwin'
@@ -498,7 +510,7 @@
bjambuildset = 'gcc'
source = [
- [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1.tgz', downloadPath],
[wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
]
buildCmds = [
@@ -520,7 +532,7 @@
]
if isWindows():
- bjambase = 'boost-jam-3.1.16-1-ntx86'
+ bjambase = 'boost-jam-3.1.17-1-ntx86'
source = [
[wget,'http://downloads.sourceforge.net/boost/'+bjambase+'.zip',downloadPath] ,
[wget,'http://downloads.sourceforge.net/boost/'+base+'.zip',downloadPath]
@@ -529,12 +541,12 @@
buildCmds = [
[0,unzip + os.path.join(downloadPath, bjambase+".zip"), ''],
[0,unzip + os.path.join(downloadPath, base + ".zip"), ''],
- [0,'xcopy /s /i /y '+os.path.join('python-ogre','boost') + ' ' + base , ''], # need to overwrite the boost with our files
- [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/configure', '' ],
- [0,'sed -i s/"BOOST_PYTHON_MAX_ARITY 15"/"BOOST_PYTHON_MAX_ARITY 19"/ '+base+'/boost/python/detail/preprocessor.hpp', ''],
- [0,'sed -i s/"# include <boost\/preprocessor\/cat.hpp>"/"\\n#define BOOST_PYTHON_NO_PY_SIGNATURES\\n# include <boost\/preprocessor\/cat.hpp>"/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
- [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
- [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
+# # [0,'xcopy /s /i /y '+os.path.join('python-ogre','boost') + ' ' + base , ''], # need to overwrite the boost with our files
+# [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/configure', '' ],
+# [0,'sed -i s/"BOOST_PYTHON_MAX_ARITY 15"/"BOOST_PYTHON_MAX_ARITY 19"/ '+base+'/boost/python/detail/preprocessor.hpp', ''],
+# [0,'sed -i s/"# include <boost\/preprocessor\/cat.hpp>"/"\\n#define BOOST_PYTHON_NO_PY_SIGNATURES\\n# include <boost\/preprocessor\/cat.hpp>"/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
+# [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
+# [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
]
if not isWindows():
@@ -579,7 +591,6 @@
pythonModule = True
name='ogre'
ModuleName='OGRE'
- CCFLAGS = " "
cflags=''
moduleParentLocation = "renderer"
parent = "ogre/renderer"
@@ -624,7 +635,7 @@
pchincludes = ['python_ogre_precompiled.h']
libs=[boost.lib, 'OgreMain']
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_Ogre_CEGUIRenderer
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_Ogre_Dependencies #needed for ceguibase.lib etc
@@ -634,7 +645,6 @@
, Config.PATH_INCLUDE_Ogre
, Config.PATH_INCLUDE_NEDMALLOC
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 '
LINKFLAGS = ''
externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', boost.lib+'.dll']
elif isLinux():
@@ -667,7 +677,7 @@
libs.append ( boost_python_index.lib )
lib_dirs=[Config.LOCAL_LIB]
include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D__PYTHONOGRE_BUILD_CODE '
+ CCFLAGS = ' -D__PYTHONOGRE_BUILD_CODE '
source = [
[wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
@@ -699,13 +709,12 @@
]
libs=[boost.lib]
- lib_dirs = [ Config.PATH_LIB_Boost ]
+ lib_dirs = [ boost.PATH_LIB ]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
, python_include_dirs
]
- CCFLAGS = ''
LINKFLAGS = ''
cflags += ''
@@ -768,7 +777,7 @@
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_OIS
]
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_OIS
]
ModuleName = 'OIS'
@@ -799,7 +808,7 @@
else:
libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
libs.append ( boost_python_index.lib )
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
, Config.PATH_LIB_OgreRefApp
@@ -809,7 +818,6 @@
,Config.PATH_INCLUDE_OgreRefApp
,Config.PATH_INCLUDE_ODE
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'OgreRefApp'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'OgreReferenceAppLayer.h', 'ode/ode.h']
@@ -853,13 +861,12 @@
, Config.PATH_INCLUDE_OgreNewt
, Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h
]
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Newton
,Config.PATH_LIB_OgreNewt
, Config.PATH_LIB_Ogre_OgreMain
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'OgreNewt'
CheckIncludes=['boost/python.hpp', 'Ogre.h', 'OgreNewt.h', 'Newton.h']
@@ -871,7 +878,7 @@
if _STABLE:
version = "0.5.0b"
else:
- version = "0.6.1"
+ version = "0.6.2b"
if isWindows():
if _PreCompiled:
pchstop = 'cegui.h'
@@ -891,7 +898,7 @@
else:
base = "CEGUI-0.6.1"
source=[
- [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.1.tar.gz?download", downloadPath]
+ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.2b.tar.gz?download", downloadPath]
]
buildCmds = [
@@ -907,13 +914,16 @@
[0,'make install', os.path.join(os.getcwd(), base )]
]
if isWindows():
- version = "0.6.1"
- base = "CEGUI-0.6.1"
+ version = "0.6.2b"
+ base = "CEGUI-0.6.2"
source=[
- [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.1.zip?download", downloadPath]
+ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.2b.zip", downloadPath],
+ [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-DEPS-0.6.0-vc9.zip", downloadPath]
]
buildCmds = [
- [0, unzip + " " + os.path.join(downloadPath,base)+".zip", os.getcwd()],
+ [0, unzip + " " + os.path.join(downloadPath,"CEGUI-0.6.2b.zip"), os.getcwd()],
+ [0, unzip + " " + os.path.join(downloadPath,"CEGUI-DEPS-0.6.0-vc9.zip"), os.path.join(os.getcwd(),base) ],
+ [0, 'move CEGUI-0.6.0\dependencies .', os.path.join(os.getcwd(),base) ],
[0, 'echo Now run build_vs2008.bat from the CEGUI makefiles\premake directory',''],
[0, 'echo then use MSVC to build the CEGUI Release project',''],
[0, 'echo WARNING - Check that RTTI is enabled in the compiler options',''],
@@ -927,13 +937,12 @@
, Config.PATH_INCLUDE_Ogre_Dependencies ## needed as OgreCEGUI uses CEGUI/.. in #includes
]
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
##, Config.PATH_LIB_Ogre_CEGUIRenderer
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_CEGUI
, Config.PATH_LIB_Ogre_Dependencies
]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'CEGUI'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
if isLinux():
@@ -954,7 +963,7 @@
libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
else:
libs.append ( boost_python_index.lib )
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_ODE
]
include_dirs = [ Config.PATH_Boost
@@ -997,7 +1006,7 @@
libs=[boost.lib]
if isLinux():
libs.append ( boost_python_index.lib )
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_OPCODE
@@ -1019,7 +1028,7 @@
Config.PATH_INCLUDE_Ogre,
Config.PATH_caelum
]
- lib_dirs = [Config.PATH_LIB_Boost,
+ lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
@@ -1040,7 +1049,7 @@
base = 'ogreaddons/ogreode'
baseDir = os.path.join(os.getcwd(), base )
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_OgreOde
, Config.PATH_LIB_OgreOdePrefab
, Config.PATH_LIB_OgreOdeLoader
@@ -1077,7 +1086,6 @@
libs.append ( boost_python_index.lib )
else:
libs.append('ode_single')
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h',
'Ogreode_Prefab.h']
@@ -1105,7 +1113,7 @@
Config.PATH_INCLUDE_quickgui
#,Config.PATH_INCLUDE_freetype
]
- lib_dirs = [Config.PATH_LIB_Boost,
+ lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain
##,Config.PATH_LIB_quickgui
]
@@ -1129,7 +1137,7 @@
...
[truncated message content] |
|
From: <mi...@us...> - 2008-12-09 08:36:21
|
Revision: 830
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=830&view=rev
Author: mithro
Date: 2008-12-09 08:36:19 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
Some more small deb package fixes.
Modified Paths:
--------------
trunk/python-ogre/boost/Makefile
trunk/python-ogre/boost/debian/rules
Modified: trunk/python-ogre/boost/Makefile
===================================================================
--- trunk/python-ogre/boost/Makefile 2008-12-08 08:36:02 UTC (rev 829)
+++ trunk/python-ogre/boost/Makefile 2008-12-09 08:36:19 UTC (rev 830)
@@ -13,17 +13,18 @@
-shared \
-Wl,-soname,libboost_python_index-gcc${GCC_VERSION}-${BOOST_VERSION}.so \
-o libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so -fPIC \
- -lboost_python-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION} \
-L${PREFIX}/lib/ \
-lpython${PYTHON_VERSION} \
$(MT_FLAGS)
+BOOST_PYTHON1= -lboost_python-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}
+BOOST_PYTHON2= -lboost_python-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}-py${PYTHON_VERSION}
all: libs/python/src/indexing/indexing_slice.cpp libs/python/src/indexing/python_iterator.cpp
@make version
@echo "Current CXXFLAGS: ${CXXFLAGS}"
@echo "Running g++ ${CXXFLAGS} $?"
- @g++ ${CXXFLAGS} $?
+ @g++ ${CXXFLAGS} ${BOOST_PYTHON} $? || g++ ${CXXFLAGS} ${BOOST_PYTHON2} $?
version:
@if [ x${BOOST_VERSION} = x ]; then \
Modified: trunk/python-ogre/boost/debian/rules
===================================================================
--- trunk/python-ogre/boost/debian/rules 2008-12-08 08:36:02 UTC (rev 829)
+++ trunk/python-ogre/boost/debian/rules 2008-12-09 08:36:19 UTC (rev 830)
@@ -55,8 +55,8 @@
dh_installdirs
# Add here commands to install the package into debian/tmp
- make install PREFIX=$(CURDIR)/debian/tmp
- make install PREFIX=$(CURDIR)/debian/tmp MT=True
+ make install PREFIX=$(CURDIR)/debian/tmp/usr
+ make install PREFIX=$(CURDIR)/debian/tmp/usr MT=True
# Build architecture-independent files here.
binary-indep: build install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-12-08 08:36:05
|
Revision: 829
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=829&view=rev
Author: mithro
Date: 2008-12-08 08:36:02 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
Fix a bunch of deb building related problems.
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
trunk/python-ogre/boost/debian/control
trunk/python-ogre/debian/changelog
trunk/python-ogre/debian/rules
trunk/python-ogre/debs/pygccxml-debian/rules
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/BuildModule.py 2008-12-08 08:36:02 UTC (rev 829)
@@ -198,7 +198,7 @@
for file in os.listdir(debiandir):
if not os.path.isfile(os.path.join(debiandir, file)):
continue
- ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\" -e\"s|%%VERSION%%|"+module.source_version+"|\"", srcdir)
+ ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|g\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|g\" -e\"s|%%VERSION%%|"+module.source_version+"|g\"", srcdir)
if ret != 0:
exit("Was not able to update the debian %s." % file)
@@ -246,7 +246,7 @@
spawnTask("tar -zcvf %s.tar.gz %s" % (module.base, module.base), buildbase)
# md5sum the package
- spawnTask("md5sum %s.tar.gz | sed -e's/ .*//' > %s.md5sum" % (module.base, module.base), buildbase)
+ spawnTask("md5sum %s.tar.gz | sed -e's/ .*//g' > %s.md5sum" % (module.base, module.base), buildbase)
debiandir = os.path.join(srcdir, "debian")
if not os.path.exists(debiandir):
@@ -263,10 +263,10 @@
if ret != 0:
exit("Was not able to copy the debian %s." % file)
- ret = spawnTask( "sed --in-place "+filepath+' ' + \
- ' -e"s|%%SHORTDATE%%|`date +%Y%m%d`|" ' + \
- ' -e"s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|" ' + \
- ' -e"s|%%VERSION%%|'+module.source_version+'|"'
+ ret = spawnTask( "sed --in-place "+filepath+' ' + \
+ ' -e"s|%%SHORTDATE%%|`date +%Y%m%d`|g" ' + \
+ ' -e"s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|g" ' + \
+ ' -e"s|%%VERSION%%|'+module.source_version+'|g"'
, srcdir)
if ret != 0:
exit("Was not able to update the debian %s." % file)
@@ -275,11 +275,11 @@
dsc = os.path.join(buildbase, "%s.dsc" % module.base)
spawnTask("cp -f %s %s" % (os.path.join(debiandir, "dsc"), dsc), os.getcwd())
spawnTask( "sed --in-place "+dsc+ \
- ' -e "s|%%MD5SUM%%|`cat '+module.base+'.md5sum`|" ' + \
- ' -e "s|%%SIZE%%|`du -b '+module.base+'.tar.gz | sed -e\'s/[\t ]/ /g\'`|" ' + \
- ' -e "s|%%SHORTDATE%%|`date +%Y%m%d`|" ' + \
- ' -e "s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|" ' + \
- ' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^"' + \
+ ' -e "s|%%MD5SUM%%|`cat '+module.base+'.md5sum`|g" ' + \
+ ' -e "s|%%SIZE%%|`du -b '+module.base+'.tar.gz | sed -e\'s/[\t ]/ /g\'`|g" ' + \
+ ' -e "s|%%SHORTDATE%%|`date +%Y%m%d`|g" ' + \
+ ' -e "s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|g" ' + \
+ ' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^g"' + \
' -e "s|%%VERSION%%|'+module.source_version+'|g"'
, buildbase)
Modified: trunk/python-ogre/boost/debian/control
===================================================================
--- trunk/python-ogre/boost/debian/control 2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/boost/debian/control 2008-12-08 08:36:02 UTC (rev 829)
@@ -1,7 +1,7 @@
Source: boost-python%%VERSION%%-index
Priority: extra
Maintainer: Tim Ansell <mi...@mi...>
-Build-Depends: debhelper (>= 5), libboost-python-dev (>= %%VERSION%%), libstdc++6-4.1-dev | libstdc++6-4.2-dev, python-dev
+Build-Depends: debhelper (>= 5), libboost-python-dev (>= %%VERSION%%) | libboost-python%%VERSION%%-dev (>= %%VERSION%%), libstdc++6-4.1-dev | libstdc++6-4.2-dev, python-dev
Standards-Version: 3.7.2
Section: libs
Modified: trunk/python-ogre/debian/changelog
===================================================================
--- trunk/python-ogre/debian/changelog 2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/debian/changelog 2008-12-08 08:36:02 UTC (rev 829)
@@ -1,3 +1,8 @@
+python-ogre (1.6.0-1) unstable; urgency=low
+
+ * Initial version of Python-Ogre 1.6.0
+
+ -- Tim 'Mithro' Ansell <mi...@mi...> Mon, 08 Dec 2008 17:53:00 +1000
python-ogre (0.0.0-7) unstable; urgency=low
* Lots of small updates.
Modified: trunk/python-ogre/debian/rules
===================================================================
--- trunk/python-ogre/debian/rules 2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/debian/rules 2008-12-08 08:36:02 UTC (rev 829)
@@ -23,17 +23,17 @@
LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} cegui
LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogre
# Extra modules
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} noise
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} noise
# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreode
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} betagui
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} cadunetree
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} betagui
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} cadunetree
# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} caelum
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} et
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} plib
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreforests
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreal
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogrevideoffmpeg
- LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} watermesh
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} et
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} plib
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreforests
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogreal
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} ogrevideoffmpeg
+# LD_PRELOAD='' python$* BuildModule.py ${BUILDFLAGS} watermesh
touch $@
build-python%:
Modified: trunk/python-ogre/debs/pygccxml-debian/rules
===================================================================
--- trunk/python-ogre/debs/pygccxml-debian/rules 2008-12-05 07:54:34 UTC (rev 828)
+++ trunk/python-ogre/debs/pygccxml-debian/rules 2008-12-08 08:36:02 UTC (rev 829)
@@ -34,6 +34,8 @@
dh_clean -k
dh_installdirs
python$* setup.py install --root=$(CURDIR)/debian/pygccxml
+ find $(CURDIR)/debian/pygccxml -name msvc
+ find $(CURDIR)/debian/pygccxml -name msvc | xargs rm -rf
# Build architecture-independent files here.
binary-indep: build install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-12-05 07:54:38
|
Revision: 828
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=828&view=rev
Author: andy_miller
Date: 2008-12-05 07:54:34 +0000 (Fri, 05 Dec 2008)
Log Message:
-----------
First version of Canvas code generator
Added Paths:
-----------
trunk/python-ogre/code_generators/canvas/
trunk/python-ogre/code_generators/canvas/customization_data.py
trunk/python-ogre/code_generators/canvas/generate_code.py
trunk/python-ogre/code_generators/canvas/hand_made_wrappers.py
trunk/python-ogre/code_generators/canvas/python_canvas.h
trunk/python-ogre/code_generators/canvas/python_canvas_aliases.h
trunk/python-ogre/code_generators/canvas/python_canvas_sizeof.h
Added: trunk/python-ogre/code_generators/canvas/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/canvas/customization_data.py (rev 0)
+++ trunk/python-ogre/code_generators/canvas/customization_data.py 2008-12-05 07:54:34 UTC (rev 828)
@@ -0,0 +1,7 @@
+
+def header_files( version ):
+ return [ 'Canvas.h']
+
+def huge_classes( version ):
+ return []
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/canvas/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/canvas/generate_code.py (rev 0)
+++ trunk/python-ogre/code_generators/canvas/generate_code.py 2008-12-05 07:54:34 UTC (rev 828)
@@ -0,0 +1,303 @@
+#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
+
+## STARTER TEMPLATE..
+## replace mygui with lowercase project name
+## set MAIN_NAMESPACE
+## rename and configure .h files
+
+
+import os, sys, time, shutil
+try:
+ import psyco
+ psyco.full()
+except ImportError:
+ pass
+
+#add environment to the path
+sys.path.append( os.path.join( '..', '..' ) )
+#add common utils to the pass
+sys.path.append( '..' )
+sys.path.append( '.' )
+
+import environment
+import common_utils
+import customization_data
+import hand_made_wrappers
+
+
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import messages
+from pyplusplus import module_builder
+from pyplusplus import decl_wrappers
+
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+from pyplusplus.module_creator import sort_algorithms
+
+import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
+import common_utils.ogre_properties as ogre_properties
+from common_utils import docit
+
+MAIN_NAMESPACE = 'CanvasNS'
+
+############################################################
+##
+## Here is where we manually exclude stuff
+##
+############################################################
+
+def ManualExclude ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+############################################################
+##
+## And there are things that manually need to be INCLUDED
+##
+############################################################
+
+def ManualInclude ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+############################################################
+##
+## And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+ for c in main_ns.constructors('Fill'):
+ if not c.arguments: continue
+ if c.arguments[-1].name=='orientation':
+ c.arguments[-1].default_value='CanvasNS::Coloring::Vertical'
+ print "Fixed Dafault value for :", c
+
+
+############################################################
+##
+## And things that need to have their argument and call values fixed.
+## ie functions that pass pointers in the argument list and of course we need
+## to read the updated values - so instead we pass them back
+## as new values in a tuple (ETC ETC)
+##
+############################################################
+
+def ManualTransformations ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+ def create_output( size ):
+ return [ ft.output( i ) for i in range( size ) ]
+
+
+###############################################################################
+##
+## Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
+
+def AutoFixes ( mb, MAIN_NAMESPACE ):
+ """ now we fix a range of things automatically - typically by going through
+ the entire name space trying to guess stuff and fix it:)
+ """
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+# # # Functions that have void pointers in their argument list need to change to unsigned int's
+# # pointee_types=[]
+# # ignore_names=[]
+# # common_utils.Fix_Void_Ptr_Args ( main_ns ) # , pointee_types, ignore_names )
+
+ # and change functions that return a variety of pointers to instead return unsigned int's
+ pointee_types=[]
+ ignore_names=[] # these are function names we know it's cool to exclude
+ common_utils.Fix_Pointer_Returns ( main_ns ) # , pointee_types, ignore_names )
+
+ # functions that need to have implicit conversions turned off
+ ImplicitClasses=[]
+ common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
+
+ if os.name =='nt':
+ Fix_NT( mb )
+ elif os.name =='posix':
+ Fix_Posix( mb )
+
+ common_utils.Auto_Document( mb, MAIN_NAMESPACE )
+
+
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################
+def Fix_Posix ( mb ):
+ """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+ """
+ ## we could do more here if need be...
+ if sys.platform == 'darwin':
+ pass
+ elif sys.platform.startswith ('linux'):
+ pass
+
+
+def Fix_NT ( mb ):
+ """ fixup for NT systems
+ """
+
+
+#
+# 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
+# )
+ #
+ # 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
+ # NOTE: If you update the source library code you need to manually delete the cache .XML file
+ #
+ xml_cached_fc = parser.create_cached_source_fc(
+ os.path.join( environment.canvas.root_dir, "python_canvas.h" )
+ , environment.canvas.cache_file )
+
+ defined_symbols = ['WIN32','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', '__PYTHONOGRE_BUILD_CODE']
+
+ defined_symbols.append( 'VERSION_' + environment.canvas.version )
+
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ if environment.isWindows():
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
+ #
+ # build the core Py++ system from the GCCXML created source
+ #
+ mb = module_builder.module_builder_t( [ xml_cached_fc ]
+ , gccxml_path=environment.gccxml_bin
+ , working_directory=environment.root_dir
+ , include_paths=environment.canvas.include_dirs
+ , define_symbols=defined_symbols
+ , indexing_suite_version=2
+ , cflags=environment.canvas.cflags
+ )
+
+ # if this module depends on another set it here
+ 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
+
+ mb.BOOST_PYTHON_MAX_ARITY = 25
+ mb.classes().always_expose_using_scope = True
+
+ #
+ # We filter (both include and exclude) specific classes and functions that we want to wrap
+ #
+ global_ns = mb.global_ns
+ global_ns.exclude()
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ main_ns.include()
+
+ common_utils.AutoExclude ( mb, MAIN_NAMESPACE )
+ ManualExclude ( mb )
+ common_utils.AutoInclude ( mb, MAIN_NAMESPACE )
+ ManualInclude ( mb )
+ # here we fixup functions that expect to modifiy their 'passed' variables
+ ManualTransformations ( mb )
+ AutoFixes ( mb, MAIN_NAMESPACE )
+ ManualFixes ( mb )
+
+ common_utils.Auto_Functional_Transformation ( main_ns, special_vars=['::Ogre::Real &','::Ogre::ushort &','size_t &'] )
+
+ #
+ # We need to tell boost how to handle calling (and returning from) certain functions
+ #
+ common_utils.Set_DefaultCall_Policies ( mb.global_ns.namespace ( MAIN_NAMESPACE ) )
+
+ #
+ # the manual stuff all done here !!!
+ #
+ hand_made_wrappers.apply( mb )
+
+ NoPropClasses = [""]
+ for cls in main_ns.classes():
+ if cls.name not in NoPropClasses:
+ 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.canvas )
+
+ ##########################################################################################
+ #
+ # Creating the code. After this step you should not modify/customize declarations.
+ #
+ ##########################################################################################
+ extractor = exdoc.doc_extractor() # I'm excluding the UTFstring docs as lots about nothing
+ mb.build_code_creator (module_name='_canvas_' , doc_extractor= extractor )
+
+ for inc in environment.canvas.include_dirs:
+ mb.code_creator.user_defined_directories.append(inc )
+ mb.code_creator.user_defined_directories.append( environment.canvas.generated_dir )
+ mb.code_creator.replace_included_headers( customization_data.header_files( environment.canvas.version ) )
+
+ huge_classes = map( mb.class_, customization_data.huge_classes( environment.canvas.version ) )
+
+ mb.split_module(environment.canvas.generated_dir, huge_classes, use_files_sum_repository=False)
+
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generated directory..
+
+ common_utils.copyTree ( sourcePath = environment.Config.PATH_INCLUDE_canvas,
+ destPath = environment.canvas.generated_dir,
+ recursive=False )
+
+if __name__ == '__main__':
+ start_time = time.clock()
+ generate_code()
+ print 'Source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
Added: trunk/python-ogre/code_generators/canvas/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/canvas/hand_made_wrappers.py (rev 0)
+++ trunk/python-ogre/code_generators/canvas/hand_made_wrappers.py 2008-12-05 07:54:34 UTC (rev 828)
@@ -0,0 +1,15 @@
+import os
+import environment
+
+
+
+#################################################################################################
+#################################################################################################
+
+def apply_reg ( class_, code ):
+ for c in code:
+ class_.add_registration_code ( c )
+
+def apply( mb ):
+ pass
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/canvas/python_canvas.h
===================================================================
--- trunk/python-ogre/code_generators/canvas/python_canvas.h (rev 0)
+++ trunk/python-ogre/code_generators/canvas/python_canvas.h 2008-12-05 07:54:34 UTC (rev 828)
@@ -0,0 +1,19 @@
+
+#include "Canvas.h"
+
+// First we create a magic namespace to hold all our aliases
+namespace pyplusplus { namespace aliases {
+
+ #include "python_canvas_aliases.h"
+} }
+
+// then we exposed everything needed (and more) to ensure GCCXML makes them visible to Py++
+//
+namespace python_canvas{ namespace details{
+inline void instantiate(){
+ using namespace CanvasNS;
+ #include "python_canvas_sizeof.h"
+
+} } }
+
+
Added: trunk/python-ogre/code_generators/canvas/python_canvas_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/canvas/python_canvas_aliases.h (rev 0)
+++ trunk/python-ogre/code_generators/canvas/python_canvas_aliases.h 2008-12-05 07:54:34 UTC (rev 828)
@@ -0,0 +1 @@
+// typedef name nicename;
Added: trunk/python-ogre/code_generators/canvas/python_canvas_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/canvas/python_canvas_sizeof.h (rev 0)
+++ trunk/python-ogre/code_generators/canvas/python_canvas_sizeof.h 2008-12-05 07:54:34 UTC (rev 828)
@@ -0,0 +1 @@
+// sizeof ( variable );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-12-05 07:18:32
|
Revision: 827
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=827&view=rev
Author: andy_miller
Date: 2008-12-05 07:18:28 +0000 (Fri, 05 Dec 2008)
Log Message:
-----------
Initial add of Canvas wrapper and update for mygui
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/ReportVersion.py
trunk/python-ogre/environment.py
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/canvas/
trunk/python-ogre/ThirdParty/canvas/Atlas.cpp
trunk/python-ogre/ThirdParty/canvas/Atlas.h
trunk/python-ogre/ThirdParty/canvas/Canvas.cpp
trunk/python-ogre/ThirdParty/canvas/Canvas.h
trunk/python-ogre/packages_2.5/ogre/gui/canvas/
trunk/python-ogre/packages_2.5/ogre/gui/canvas/__init__.py
trunk/python-ogre/packages_2.5/ogre/gui/mygui/
trunk/python-ogre/packages_2.5/ogre/gui/mygui/__init__.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-12-04 13:12:10 UTC (rev 826)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-12-05 07:18:28 UTC (rev 827)
@@ -84,6 +84,7 @@
PATH_hydrax = os.path.join(PATH_THIRDPARTY, 'Hydrax')
PATH_hikari = os.path.join(PATH_THIRDPARTY, 'Hikari' ) #BASE_DIR, 'hikari', 'hikari')
PATH_mygui = os.path.join(BASE_DIR, 'MyGUI_2.2.0_RC1_source' )
+PATH_canvas = os.path.join(PATH_THIRDPARTY, 'canvas')
# it's time for the SDK version
if SDK:
@@ -132,6 +133,7 @@
PATH_LIB_opensteer = os.path.join(PATH_opensteer, 'win32','release')
PATH_LIB_hikari = os.path.join(PATH_hikari ) # , 'lib')
PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
+PATH_LIB_canvas = os.path.join(PATH_canvas )
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_NEDMALLOC= os.path.join(PATH_Ogre,'OgreMain', 'src', 'nedmalloc')
@@ -183,6 +185,7 @@
PATH_INCLUDE_hydrax= PATH_hydrax
PATH_INCLUDE_hikari = os.path.join(PATH_hikari ) #, 'include')
PATH_INCLUDE_mygui = os.path.join(PATH_mygui,'MyGUIEngine','include')
+PATH_INCLUDE_canvas= PATH_canvas
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-12-04 13:12:10 UTC (rev 826)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-12-05 07:18:28 UTC (rev 827)
@@ -82,6 +82,7 @@
PATH_hydrax = os.path.join(PATH_THIRDPARTY, 'Hydrax')
PATH_hikari = os.path.join(PATH_THIRDPARTY, 'Hikari' ) # BASE_DIR, 'hikari', 'hikari')
PATH_mygui = os.path.join(BASE_DIR, 'MyGUI_2.2.0_RC1_source' )
+PATH_canvas = os.path.join(PATH_THIRDPARTY, 'canvas')
###
### these paths assume you've left all the directory structure as standard
@@ -122,6 +123,7 @@
PATH_LIB_opensteer = os.path.join(LOCAL_LIB)
PATH_LIB_hikari = os.path.join(PATH_hikari ) #, 'lib')
PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
+PATH_LIB_canvas = os.path.join(PATH_canvas )
PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_Ogre_Dependencies = PATH_INCLUDE_Ogre # os.path.join( PATH_Ogre, 'Dependencies/include')
@@ -194,4 +196,5 @@
PATH_INCLUDE_hydrax= PATH_hydrax
PATH_INCLUDE_hikari = os.path.join(PATH_hikari ) #, 'include')
PATH_INCLUDE_mygui = os.path.join(PATH_mygui,'MyGUIEngine','include')
+PATH_INCLUDE_canvas= PATH_canvas
Modified: trunk/python-ogre/ReportVersion.py
===================================================================
--- trunk/python-ogre/ReportVersion.py 2008-12-04 13:12:10 UTC (rev 826)
+++ trunk/python-ogre/ReportVersion.py 2008-12-05 07:18:28 UTC (rev 827)
@@ -28,7 +28,7 @@
'ogre.addons.noise', 'ogre.addons.watermesh',
'ogre.addons.particleuniverse', 'ogre.addons.cadunetree',
'ogre.renderer.ogrepcz', 'ogre.addons.hydrax',
- 'ogre.gui.hikari' )
+ 'ogre.gui.hikari','ogre.gui.canvas','ogre.gui.mygui' )
# bm.setupLogging("version.info") # options.logfilename)
# logger = logging.getLogger('PythonOgre.ReportVersionInfo')
Added: trunk/python-ogre/ThirdParty/canvas/Atlas.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/canvas/Atlas.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/canvas/Atlas.cpp 2008-12-05 07:18:28 UTC (rev 827)
@@ -0,0 +1,515 @@
+/*
+ This file is part of Canvas, a fast, lightweight 2D graphics engine for Ogre3D.
+
+ Copyright (C) 2008 Adam J. Simmons
+ ajs...@gm...
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "Atlas.h"
+namespace CanvasNS
+{
+/************************
+* TextureInfo
+************************/
+
+TextureInfo::TextureInfo() : isEmpty(true), width(0), height(0)
+{
+}
+
+TextureInfo::TextureInfo(int atlasWidth, int atlasHeight, int x, int y, int width, int height) : isEmpty(false), width(width), height(height)
+{
+ texCoords.left = x / (float)atlasWidth;
+ texCoords.top = y / (float)atlasHeight;
+ texCoords.right = (x + width) / (float)atlasWidth;
+ texCoords.bottom = (y + height) / (float)atlasHeight;
+}
+
+/************************
+* GlyphInfo
+************************/
+
+GlyphInfo::GlyphInfo() : bearingX(0), bearingY(0), advance(0)
+{
+}
+
+GlyphInfo::GlyphInfo(Ogre::Real bearingX, Ogre::Real bearingY, Ogre::Real advance)
+ : bearingX(bearingX), bearingY(bearingY), advance(advance)
+{
+}
+
+/************************
+* FontMetrics
+************************/
+
+FontMetrics::FontMetrics() : ascender(0), descender(0), height(0), maxAdvance(0)
+{
+}
+
+FontMetrics::FontMetrics(Ogre::Real ascender, Ogre::Real descender, Ogre::Real height, Ogre::Real maxAdvance)
+ : ascender(ascender), descender(descender), height(height), maxAdvance(maxAdvance)
+{
+
+}
+
+/************************
+* CharCodeRange
+************************/
+
+const CharCodeRange CharCodeRange::BasicLatin = CharCodeRange(32, 166);
+const CharCodeRange CharCodeRange::Latin1 = CharCodeRange(32, 255);
+const CharCodeRange CharCodeRange::All = CharCodeRange();
+
+CharCodeRange::CharCodeRange()
+{
+}
+
+CharCodeRange::CharCodeRange(CharCode from, CharCode to)
+{
+ addRange(from, to);
+}
+
+void CharCodeRange::addRange(CharCode from, CharCode to)
+{
+ ranges.push_back(std::pair<CharCode, CharCode>(from, to));
+}
+
+bool CharCodeRange::isWithinRange(CharCode code) const
+{
+ if(ranges.empty())
+ return true;
+
+ for(std::vector<std::pair<CharCode, CharCode> >::const_iterator i = ranges.begin(); i != ranges.end(); i++)
+ {
+ if(code >= i->first && code <= i->second)
+ return true;
+ }
+
+ return false;
+}
+
+/************************
+* ComputationRect
+************************/
+
+ComputationRect::ComputationRect(const Ogre::String& texFilename, const Ogre::String& resourceGroup)
+ : x(0), y(0), isPlaced(false), isFontGlyph(false), filename(texFilename)
+{
+ image.load(texFilename, resourceGroup);
+ width = (int)image.getWidth();
+ height = (int)image.getHeight();
+ area = width * height;
+}
+
+ComputationRect::ComputationRect(const Ogre::String& texName, unsigned char* buffer, int width, int height)
+ : x(0), y(0), isPlaced(false), isFontGlyph(false), filename(texName)
+{
+ image.loadDynamicImage(buffer, width, height, 1, Ogre::PF_BYTE_BGRA, true);
+ this->width = (int)image.getWidth();
+ this->height = (int)image.getHeight();
+ area = this->width * this->height;
+}
+
+ComputationRect::ComputationRect(const Ogre::String& fontFilename, Ogre::uint fontSize, CharCode charCode, unsigned char* buffer, int width, int height)
+ : x(0), y(0), isPlaced(false), isFontGlyph(true), filename(fontFilename), fontSize(fontSize), charCode(charCode)
+{
+ image.loadDynamicImage(buffer, width, height, 1, Ogre::PF_BYTE_LA, true);
+ this->width = (int)image.getWidth();
+ this->height = (int)image.getHeight();
+ area = this->width * this->height;
+}
+
+/************************
+* FontFaceDefinition
+************************/
+
+FontFaceDefinition::FontFaceDefinition(const Ogre::String& filename, const CharCodeRange& codeRange, short renderType) : filename(filename), codeRange(codeRange), renderType(renderType)
+{
+}
+
+void FontFaceDefinition::addSize(Ogre::uint fontSize)
+{
+ sizes.push_back(fontSize);
+}
+
+/************************
+* FontFace
+************************/
+
+FontFace::FontFace()
+{
+}
+
+FontFace::FontFace(const FontFaceDefinition& definition, const Ogre::String& resourceGroup, ComputationVector& renderContext)
+{
+ FT_Library library;
+ FT_Face face;
+ FT_Error error;
+
+ error = FT_Init_FreeType(&library);
+ if(error)
+ OGRE_EXCEPT(Ogre::Exception::ERR_INTERNAL_ERROR, "Could not load FreeType library.", "FontFace::FontFace");
+
+ Ogre::DataStreamPtr dataStream = Ogre::ResourceGroupManager::getSingleton().openResource(definition.filename, resourceGroup);
+ Ogre::MemoryDataStream stream(dataStream);
+
+ error = FT_New_Memory_Face(library, stream.getPtr(), (FT_Long)stream.size(), 0, &face);
+ if(error)
+ OGRE_EXCEPT(Ogre::Exception::ERR_INTERNAL_ERROR, "FreeType could not load a font-face.", "FontFace::FontFace");
+
+
+ for(std::vector<Ogre::uint>::const_iterator i = definition.sizes.begin(); i != definition.sizes.end(); i++)
+ {
+ FT_ULong charCode = 0;
+ FT_UInt glyphIndex = 1;
+
+ error = FT_Set_Pixel_Sizes(face, 0, (FT_UInt)*i);
+ if(error)
+ OGRE_EXCEPT(Ogre::Exception::ERR_INTERNAL_ERROR, "FreeType could not set a font-size.", "FontFace::FontFace");
+
+ fontMetrics[*i] = FontMetrics(face->size->metrics.ascender / 64.0f, face->size->metrics.descender / 64.0f,
+ face->size->metrics.height / 64.0f, face->size->metrics.max_advance / 64.0f);
+
+ for(charCode = FT_Get_First_Char(face, &glyphIndex); glyphIndex != 0; charCode = FT_Get_Next_Char(face, charCode, &glyphIndex))
+ {
+ if(!definition.codeRange.isWithinRange(charCode))
+ continue;
+
+ if(definition.renderType == FontFaceDefinition::BetterContrast)
+ {
+ error = FT_Load_Glyph(face, glyphIndex, FT_LOAD_DEFAULT);
+ if(error)
+ continue;
+
+ error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL);
+ if(error)
+ continue;
+ }
+ else
+ {
+ error = FT_Load_Glyph(face, glyphIndex, FT_LOAD_TARGET_LIGHT);
+ if(error)
+ continue;
+
+ error = FT_Render_Glyph(face->glyph, FT_RENDER_MODE_LIGHT);
+ if(error)
+ continue;
+ }
+
+ FT_Bitmap& bitmap = face->glyph->bitmap;
+ FT_Glyph_Metrics& metrics = face->glyph->metrics;
+
+ if(!bitmap.buffer || (!bitmap.rows && !bitmap.width))
+ continue;
+
+ unsigned char* buffer = new unsigned char[bitmap.rows * bitmap.pitch * 2];
+
+ for(int idx = 0; idx < bitmap.rows * bitmap.pitch; idx++)
+ {
+ buffer[idx * 2] = 255;
+ buffer[idx * 2 + 1] = bitmap.buffer[idx];
+ }
+
+ fontSizes[*i][charCode] = GlyphInfo(metrics.horiBearingX / 64.0f, metrics.horiBearingY / 64.0f, metrics.horiAdvance / 64.0f);
+
+ renderContext.push_back(new ComputationRect(definition.filename, (Ogre::uint)*i, charCode, buffer, bitmap.pitch, bitmap.rows));
+ }
+ }
+}
+
+/************************
+* Atlas
+************************/
+
+Atlas::Atlas(const std::vector<Ogre::String>& textureFilenames, const std::vector<FontFaceDefinition>& fonts, const Ogre::String& resourceGroup)
+{
+ Ogre::LogManager::getSingleton().logMessage("Loading an Atlas.");
+ Ogre::Timer timer;
+
+ ComputationVector rectangles;
+
+ for(std::vector<FontFaceDefinition>::const_iterator i = fonts.begin(); i != fonts.end(); i++)
+ {
+ fontFaces[i->filename] = FontFace(*i, resourceGroup, rectangles);
+ }
+
+ for(std::vector<Ogre::String>::const_iterator i = textureFilenames.begin(); i != textureFilenames.end(); i++)
+ {
+ rectangles.push_back(new ComputationRect(*i, resourceGroup));
+ }
+
+ unsigned char* vcolBuffer = new unsigned char[16];
+ memset(vcolBuffer, 255, 16);
+
+ rectangles.push_back(new ComputationRect("VertexColor", vcolBuffer, 2, 2));
+
+ guessDimensions(rectangles);
+ pack(rectangles);
+ paint(rectangles);
+
+ int glyphCount = 0;
+ int texCount = -1; // Subtract the default VertexColor texture
+ ComputationRect* rect;
+
+ for(ComputationVector::iterator i = rectangles.begin(); i != rectangles.end(); i++)
+ {
+ rect = (*i);
+
+ if(rect->isFontGlyph)
+ {
+ fontFaces[rect->filename].fontSizes[rect->fontSize][rect->charCode].texInfo = TextureInfo(dimensions.first, dimensions.second, rect->x, rect->y, rect->width, rect->height);
+ glyphCount++;
+ }
+ else
+ {
+ textures[rect->filename] = TextureInfo(dimensions.first, dimensions.second, rect->x, rect->y, rect->width, rect->height);
+ texCount++;
+ }
+
+ delete rect;
+ }
+
+ Ogre::LogManager::getSingleton().logMessage("Atlas loaded in " + Ogre::StringConverter::toString(timer.getMilliseconds() / 1000.0f) +
+ "s. Packed " + Ogre::StringConverter::toString(glyphCount) + " font glyphs and " + Ogre::StringConverter::toString(texCount) +
+ " textures into " + Ogre::StringConverter::toString(dimensions.first) + "x" + Ogre::StringConverter::toString(dimensions.second));
+}
+
+const std::pair<int, int>& Atlas::getDimensions() const
+{
+ return dimensions;
+}
+
+const Ogre::String& Atlas::getMaterialName() const
+{
+ return materialName;
+}
+
+const TextureInfo& Atlas::getTextureInfo(const Ogre::String& filename) const
+{
+ std::map<Ogre::String, TextureInfo>::const_iterator i = textures.find(filename);
+ static TextureInfo empty;
+
+ if(i != textures.end())
+ return i->second;
+
+ return empty;
+}
+
+const FontMetrics& Atlas::getFontMetrics(const Ogre::String& fontFilename, Ogre::uint fontSize) const
+{
+ std::map<Ogre::String, FontFace>::const_iterator font = fontFaces.find(fontFilename);
+ static FontMetrics empty;
+
+ if(font == fontFaces.end())
+ return empty;
+
+ FontMetricsMap::const_iterator iter = font->second.fontMetrics.find(fontSize);
+
+ if(iter == font->second.fontMetrics.end())
+ return empty;
+
+ return iter->second;
+}
+
+const GlyphMap& Atlas::getGlyphMap(const Ogre::String& fontFilename, Ogre::uint fontSize) const
+{
+ std::map<Ogre::String, FontFace>::const_iterator font = fontFaces.find(fontFilename);
+ static GlyphMap empty;
+
+ if(font == fontFaces.end())
+ return empty;
+
+ FontSizeMap::const_iterator size = font->second.fontSizes.find(fontSize);
+
+ if(size == font->second.fontSizes.end())
+ return empty;
+
+ return size->second;
+}
+
+const GlyphInfo& Atlas::getGlyphInfo(const Ogre::String& fontFilename, Ogre::uint fontSize, CharCode charCode) const
+{
+ std::map<Ogre::String, FontFace>::const_iterator font = fontFaces.find(fontFilename);
+ static GlyphInfo empty;
+
+ if(font == fontFaces.end())
+ return empty;
+
+ FontSizeMap::const_iterator size = font->second.fontSizes.find(fontSize);
+
+ if(size == font->second.fontSizes.end())
+ return empty;
+
+ GlyphMap::const_iterator glyph = size->second.find(charCode);
+
+ if(glyph == size->second.end())
+ return empty;
+
+ return glyph->second;
+}
+
+void Atlas::guessDimensions(const ComputationVector& rectangles)
+{
+ int totalArea = 0;
+ int maxWidth = 0;
+ int maxHeight = 0;
+
+ for(ComputationVector::const_iterator i = rectangles.begin(); i != rectangles.end(); i++)
+ {
+ totalArea += (*i)->area;
+ maxWidth = std::max(maxWidth, (*i)->width);
+ maxHeight = std::max(maxHeight, (*i)->height);
+ }
+
+ int squareRoot = (int)sqrt((double)totalArea);
+
+ dimensions.first = Ogre::Bitwise::firstPO2From(std::max(squareRoot, maxWidth));
+ dimensions.second = Ogre::Bitwise::firstPO2From(std::max(squareRoot, maxHeight));
+}
+
+void Atlas::pack(ComputationVector& rectangles)
+{
+ struct compare { bool operator()(ComputationRect* a, ComputationRect* b){ return(a->area > b->area); }};
+ std::sort(rectangles.begin(), rectangles.end(), compare());
+
+ while(true)
+ {
+ for(ComputationVector::iterator i = rectangles.begin(); i != rectangles.end(); i++)
+ {
+ (*i)->isPlaced = false;
+ (*i)->x = -1;
+ (*i)->y = -1;
+ }
+
+ int successCount = 0;
+ fill(rectangles, 0, 0, dimensions.first - 1, dimensions.second - 1, successCount);
+
+ if(successCount == (int)rectangles.size())
+ break;
+
+ static bool toggle = false;
+ toggle = !toggle;
+
+ if(toggle)
+ dimensions.first = Ogre::Bitwise::firstPO2From(dimensions.first + 1);
+ else
+ dimensions.second = Ogre::Bitwise::firstPO2From(dimensions.second + 1);
+ }
+}
+
+void Atlas::fill(ComputationVector& rectangles, int x1, int y1, int x2, int y2, int& count)
+{
+ ComputationVector::iterator iter;
+
+ for(iter = rectangles.begin(); iter != rectangles.end(); iter++)
+ {
+ if((!(*iter)->isPlaced) && (x2 - x1 + 1 >= (*iter)->width) && (y2 - y1 + 1 >= (*iter)->height))
+ break;
+ }
+
+ if(iter == rectangles.end())
+ return;
+
+ ComputationRect* rect = *iter;
+
+ rect->x = x1;
+ rect->y = y1;
+ rect->isPlaced = true;
+ count++;
+
+ int aRight = (x2 - x1 + 1 - rect->width) * rect->height;
+ int aDown = (y2 - y1 + 1 - rect->height) * rect->width;
+ if(aRight < aDown)
+ {
+ if(y1 + rect->height < y2)
+ fill(rectangles, x1, y1 + rect->height, x2, y2, count);
+
+ if((x1 + rect->width < x2) && (y1 < y1 + rect->height - 1))
+ fill(rectangles, x1 + rect->width, y1, x2, y1 + rect->height - 1, count);
+ }
+ else
+ {
+ if(x1 + rect->width < x2)
+ fill(rectangles, x1 + rect->width, y1, x2, y2, count);
+
+ if((y1 + rect->height < y2) && (x1 < x1 + rect->width - 1))
+ fill(rectangles, x1, y1 + rect->height, x1 + rect->width - 1, y2, count);
+ }
+}
+
+void Atlas::paint(const ComputationVector& rectangles)
+{
+ static unsigned int count = 0;
+ Ogre::String texName = "AtlasTexture_" + Ogre::StringConverter::toString(count);
+ materialName = "AtlasMaterial_" + Ogre::StringConverter::toString(count);
+
+ Ogre::TexturePtr texture = Ogre::TextureManager::getSingleton().createManual(
+ texName, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
+ Ogre::TEX_TYPE_2D, dimensions.first, dimensions.second, 0, Ogre::PF_BYTE_BGRA,
+ Ogre::TU_STATIC_WRITE_ONLY);
+
+ Ogre::HardwarePixelBufferSharedPtr pixelBuffer = texture->getBuffer();
+ pixelBuffer->lock(Ogre::HardwareBuffer::HBL_DISCARD);
+ const Ogre::PixelBox& pixelBox = pixelBuffer->getCurrentLock();
+ size_t dstBpp = Ogre::PixelUtil::getNumElemBytes(pixelBox.format);
+ size_t dstPitch = pixelBox.rowPitch * dstBpp;
+
+ Ogre::uint8* dstData = static_cast<Ogre::uint8*>(pixelBox.data);
+
+ for(ComputationVector::const_iterator i = rectangles.begin(); i != rectangles.end(); i++)
+ {
+ unsigned char* conversionBuf = 0;
+ Ogre::PixelBox srcPixels = (*i)->image.getPixelBox();
+
+ if((*i)->image.getFormat() != Ogre::PF_BYTE_BGRA)
+ {
+ conversionBuf = new unsigned char[(*i)->image.getWidth() * (*i)->image.getHeight() * dstBpp];
+ Ogre::PixelBox convPixels(Ogre::Box(0, 0, (*i)->width, (*i)->height), Ogre::PF_BYTE_BGRA, conversionBuf);
+ Ogre::PixelUtil::bulkPixelConversion((*i)->image.getPixelBox(), convPixels);
+ srcPixels = convPixels;
+ }
+
+ size_t srcPitch = srcPixels.rowPitch * dstBpp;
+ Ogre::uint8* srcData = static_cast<Ogre::uint8*>(srcPixels.data);
+
+ for(size_t row = 0; row < (*i)->image.getHeight(); row++)
+ {
+ for(size_t col = 0; col < srcPitch; col++)
+ {
+ dstData[((row + (*i)->y) * dstPitch) + ((*i)->x * dstBpp) + col] = srcData[(row * srcPitch) + col];
+ }
+ }
+
+ if(conversionBuf)
+ delete[] conversionBuf;
+ }
+
+ pixelBuffer->unlock();
+
+ Ogre::MaterialPtr material = Ogre::MaterialManager::getSingleton().create(materialName,
+ Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+ Ogre::Pass* pass = material->getTechnique(0)->getPass(0);
+ pass->setDepthCheckEnabled(false);
+ pass->setDepthWriteEnabled(false);
+ pass->setLightingEnabled(false);
+ pass->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
+
+ Ogre::TextureUnitState* texUnit = pass->createTextureUnitState(texName);
+ texUnit->setTextureFiltering(Ogre::FO_NONE, Ogre::FO_NONE, Ogre::FO_NONE);
+
+ count++;
+}
+} // namespace
Added: trunk/python-ogre/ThirdParty/canvas/Atlas.h
===================================================================
--- trunk/python-ogre/ThirdParty/canvas/Atlas.h (rev 0)
+++ trunk/python-ogre/ThirdParty/canvas/Atlas.h 2008-12-05 07:18:28 UTC (rev 827)
@@ -0,0 +1,270 @@
+/*
+ This file is part of Canvas, a fast, lightweight 2D graphics engine for Ogre3D.
+
+ Copyright (C) 2008 Adam J. Simmons
+ ajs...@gm...
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef __Atlas__
+#define __Atlas__
+
+#include "Ogre.h"
+#include "OgreBitwise.h"
+#include <map>
+#include <vector>
+#include <algorithm>
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+
+namespace CanvasNS
+{
+/**
+* TextureInfo represents a texture within an Atlas instance.
+* Contains the actual dimensions of a texture and its location within the atlas.
+*/
+struct TextureInfo
+{
+ bool isEmpty;
+ Ogre::FloatRect texCoords;
+ int width, height;
+
+ TextureInfo();
+ TextureInfo(int atlasWidth, int atlasHeight, int x, int y, int width, int height);
+};
+
+/**
+* GlyphInfo represents a glyph within an Atlas instance.
+* Contains glyph metrics which can be used for text layout purposes.
+* See: http://freetype.sourceforge.net/freetype2/docs/glyphs/glyphs-3.html
+*/
+struct GlyphInfo
+{
+ Ogre::Real bearingX;
+ Ogre::Real bearingY;
+ Ogre::Real advance;
+
+ TextureInfo texInfo;
+
+ GlyphInfo();
+ GlyphInfo(Ogre::Real bearingX, Ogre::Real bearingY, Ogre::Real advance);
+};
+
+/**
+* FontMetrics represents the scaled global metrics for a certain font size.
+* Contains font metrics which can be used for text layout purposes.
+*
+* <ul>
+* <li>ascender - The typographic ascender of the face, expressed in Real pixels.
+* <li>descender - The typographic descender of the face, expressed in Real pixels.
+* <li>height - The height is the vertical distance between two consecutive baselines, expressed in Real pixels.
+* <li>maxAdvance - The maximal advance width, in Real pixels, for all glyphs in this face. This can be used to make word wrapping computations faster.
+* </ul>
+*/
+struct FontMetrics
+{
+ Ogre::Real ascender;
+ Ogre::Real descender;
+ Ogre::Real height;
+ Ogre::Real maxAdvance;
+
+ FontMetrics();
+ FontMetrics(Ogre::Real ascender, Ogre::Real descender, Ogre::Real height, Ogre::Real maxAdvance);
+};
+
+typedef Ogre::uint32 CharCode;
+
+/**
+* CharCodeRange is used to specify the ranges of characters that a font should load.
+* For convenience, two common unicode ranges (BasicLatin & Latin1) have been already defined.
+*/
+struct CharCodeRange
+{
+ std::vector<std::pair<CharCode, CharCode> > ranges;
+
+ CharCodeRange();
+ CharCodeRange(CharCode from, CharCode to);
+
+ /**
+ * Add a range of characters to the definition.
+ *
+ * @param from The beginning of the range, inclusive.
+ * @param to The end of the range, inclusive.
+ */
+ void addRange(CharCode from, CharCode to);
+
+ /**
+ * Test if a character code is within this CharCodeRange.
+ *
+ * @return True if a character code is within any of the ranges, false otherwise.
+ */
+ bool isWithinRange(CharCode code) const;
+
+ static const CharCodeRange BasicLatin;
+ static const CharCodeRange Latin1;
+ static const CharCodeRange All;
+};
+
+/**
+* Defines a font-face for Atlas initialization purposes.
+*/
+struct FontFaceDefinition
+{
+ Ogre::String filename;
+ std::vector<Ogre::uint> sizes;
+ CharCodeRange codeRange;
+ short renderType;
+
+ /**
+ * Specifies the type of rendering that this font should use.
+ * <ul>
+ * <li>BetterContrast - Sharper text, more like Windows' font rendering.
+ * <li>BetterShape - Smoother text, more like MacOSX's font rendering.
+ * </ul>
+ */
+ enum RenderType
+ {
+ BetterContrast,
+ BetterShape
+ };
+
+ /**
+ * Constructs a FontFaceDefinition
+ *
+ * @param filename The filename of the font-face.
+ * @param codeRange The range of CharCode's to render for this font-face.
+ * @param renderType Optional; the type of rendering to use for this font-face.
+ */
+ FontFaceDefinition(const Ogre::String& filename, const CharCodeRange& codeRange = CharCodeRange::BasicLatin, short renderType = FontFaceDefinition::BetterContrast);
+
+ /**
+ * Adds a font-size (in px) to this font-face definition.
+ */
+ void addSize(Ogre::uint fontSize);
+};
+
+struct ComputationRect
+{
+ int width, height;
+ int x, y;
+ int area;
+ bool isPlaced;
+
+ Ogre::String filename;
+ bool isFontGlyph;
+ Ogre::uint fontSize;
+ CharCode charCode;
+
+ Ogre::Image image;
+
+ ComputationRect(const Ogre::String& texFilename, const Ogre::String& resourceGroup);
+ ComputationRect(const Ogre::String& texName, unsigned char* buffer, int width, int height);
+ ComputationRect(const Ogre::String& fontFilename, Ogre::uint fontSize, CharCode charCode, unsigned char* buffer, int width, int height);
+
+};
+
+typedef std::vector<ComputationRect*> ComputationVector;
+
+typedef std::map<CharCode, GlyphInfo> GlyphMap;
+typedef std::map<Ogre::uint, GlyphMap> FontSizeMap;
+typedef std::map<Ogre::uint, FontMetrics> FontMetricsMap;
+
+struct FontFace
+{
+ FontSizeMap fontSizes;
+ FontMetricsMap fontMetrics;
+
+ FontFace();
+
+ FontFace(const FontFaceDefinition& definition, const Ogre::String& resourceGroup, ComputationVector& renderContext);
+};
+
+/**
+* The work-horse of Canvas; Atlas is a programmatic texture-atlas that can hold textures and font-glyphs.
+*/
+class Atlas
+{
+ std::map<Ogre::String, FontFace> fontFaces;
+ std::map<Ogre::String, TextureInfo> textures;
+ std::pair<int, int> dimensions;
+ Ogre::String materialName;
+
+ void guessDimensions(const ComputationVector& rectangles);
+ void pack(ComputationVector& rectangles);
+ void fill(ComputationVector& rectangles, int x1, int y1, int x2, int y2, int& count);
+ void paint(const ComputationVector& rectangles);
+
+public:
+ /**
+ * Constructs an Atlas.
+ *
+ * @param textureFilenames The filenames of the textures to load into this atlas.
+ * @param fonts The fonts to load into this atlas.
+ * @param resourceGroup The name of the resource group where the textures and fonts can be found.
+ */
+ Atlas(const std::vector<Ogre::String>& textureFilenames, const std::vector<FontFaceDefinition>& fonts, const Ogre::String& resourceGroup);
+
+ /**
+ * Retrieve the dimensions of this atlas, in pixels.
+ */
+ const std::pair<int, int>& getDimensions() const;
+
+ /**
+ * Retrieve the name of the internal material
+ */
+ const Ogre::String& getMaterialName() const;
+
+ /**
+ * Retrieve info about a certain texture within this atlas.
+ *
+ * @note If the filename is not found, the returned TextureInfo's member "isEmpty" will be true.
+ *
+ * @param filename The filename of the texture to look up.
+ */
+ const TextureInfo& getTextureInfo(const Ogre::String& filename) const;
+
+ /**
+ * Retrieve the metrics for a certain font size.
+ *
+ * @param fontFilename The filename of the font to look up.
+ * @param fontSize The font size to look up.
+ */
+ const FontMetrics& getFontMetrics(const Ogre::String& fontFilename, Ogre::uint fontSize) const;
+
+ /**
+ * Retrieve the GlyphMap for a certain font size.
+ *
+ * @param fontFilename The filename of the font to look up.
+ * @param fontSize The font size to look up.
+ */
+ const GlyphMap& getGlyphMap(const Ogre::String& fontFilename, Ogre::uint fontSize) const;
+
+ /**
+ * Retrieve info about a certain font glyph within this atlas.
+ *
+ * @param fontFilename The filename of the font-face.
+ * @param fontSize The size of the font.
+ * @param charCode The CharCode to look up.
+ *
+ * @note If the filename, size, or CharCode is not found, the returned GlyphInfo will contain a TextureInfo with
+ * the member "isEmpty" set to true.
+ */
+ const GlyphInfo& getGlyphInfo(const Ogre::String& fontFilename, Ogre::uint fontSize, CharCode charCode) const;
+};
+} //namespace
+#endif
Added: trunk/python-ogre/ThirdParty/canvas/Canvas.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/canvas/Canvas.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/canvas/Canvas.cpp 2008-12-05 07:18:28 UTC (rev 827)
@@ -0,0 +1,692 @@
+/*
+ This file is part of Canvas, a fast, lightweight 2D graphics engine for Ogre3D.
+
+ Copyright (C) 2008 Adam J. Simmons
+ ajs...@gm...
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "Canvas.h"
+
+using namespace Ogre;
+
+namespace CanvasNS
+{
+/************************
+* Fill
+************************/
+
+Fill::Fill() : isEmpty(true)
+{
+}
+
+Fill::Fill(const Ogre::ColourValue& color) : isEmpty(false), atlasKey("VertexColor")
+{
+ coloring.colors.first = color;
+ coloring.hasGradient = false;
+}
+
+Fill::Fill(const Ogre::ColourValue& gradientColor1, const Ogre::ColourValue& gradientColor2, short orientation) : isEmpty(false), atlasKey("VertexColor")
+{
+ coloring.colors.first = gradientColor1;
+ coloring.colors.second = gradientColor2;
+ coloring.hasGradient = true;
+ coloring.orientation = orientation;
+}
+
+Fill::Fill(const Ogre::String& texture, const Ogre::ColourValue& color) : isEmpty(false), atlasKey(texture)
+{
+ coloring.colors.first = color;
+ coloring.hasGradient = false;
+}
+
+Fill::Fill(const Ogre::String& texture, const Ogre::ColourValue& gradientColor1, const Ogre::ColourValue& gradientColor2, short orientation) : isEmpty(false), atlasKey(texture)
+{
+ coloring.colors.first = gradientColor1;
+ coloring.colors.second = gradientColor2;
+ coloring.hasGradient = true;
+ coloring.orientation = orientation;
+}
+
+/************************
+* Border
+************************/
+
+Border::Border() : isEmpty(true)
+{
+}
+
+Border::Border(int width, const Ogre::ColourValue& color) : widths(width, width, width, width), colors(color, color, color, color), isEmpty(false)
+{
+}
+
+Border::Border(const WidthRect& widths, const ColorRect& colors) : widths(widths), colors(colors), isEmpty(false)
+{
+}
+
+/************************
+* Canvas
+************************/
+
+Canvas::Canvas(Atlas* atlas, Ogre::Viewport* viewport) : atlas(atlas), viewport(viewport), vertexData(0), indexData(0),
+ bufferSize(100), renderQueueID(Ogre::RENDER_QUEUE_OVERLAY), isDirty(false), visibility(true)
+{
+ viewport->getTarget()->addListener(this);
+ material = Ogre::MaterialManager::getSingleton().getByName(atlas->getMaterialName());
+ setUseIdentityProjection(true);
+ setUseIdentityView(true);
+
+ resizeBuffers();
+ clearClip();
+}
+
+
+Canvas::~Canvas()
+{
+ destroyBuffers();
+ viewport->getTarget()->removeListener(this);
+}
+
+void Canvas::drawRectangle(int x, int y, int width, int height, const Fill& fill, const Border& border)
+{
+ PixelRect rect(x, y, x + width, y + height);
+
+ if(border.isEmpty)
+ {
+ if(isOutsideClip(rect))
+ return;
+ }
+ else
+ {
+ if(isOutsideClip(PixelRect(rect.left - border.widths.left, rect.top - border.widths.top, rect.right + border.widths.right, rect.bottom + border.widths.bottom)))
+ return;
+ }
+
+ if(!fill.isEmpty)
+ {
+ TextureInfo texInfo = atlas->getTextureInfo(fill.atlasKey);
+ if(texInfo.isEmpty)
+ return;
+
+ // Draw a simple rectangle with the normal texture-coordinates at each corner
+ if(fill.atlasKey == "VertexColor" || (width == texInfo.width && height == texInfo.height))
+ {
+ drawQuad(rect, texInfo.texCoords, fill.coloring);
+ }
+ else // Draw a tiled rectangle, may contain multiple quads to give the illusion that the texture is "tiling"
+ {
+ Ogre::Real xMax = width / (double)texInfo.width;
+ Ogre::Real yMax = height / (double)texInfo.height;
+
+ Ogre::Real right = 0;
+ Ogre::Real bottom = 0;
+
+ for(Ogre::Real left = 0; left < Ogre::Math::Ceil(xMax); left++)
+ {
+ for(Ogre::Real top = 0; top < Ogre::Math::Ceil(yMax); top++)
+ {
+ if(left + 1 > xMax)
+ right = xMax;
+ else
+ right = left + 1;
+
+ if(top + 1 > yMax)
+ bottom = yMax;
+ else
+ bottom = top + 1;
+
+ PixelRect tile(x + (left * texInfo.width), y + (top * texInfo.height), x + (right * texInfo.width), y + (bottom * texInfo.height));
+
+ if(isOutsideClip(tile))
+ continue;
+
+ Ogre::FloatRect texCoords = texInfo.texCoords;
+ texCoords.right = texCoords.left + (right - left) * (texCoords.width());
+ texCoords.bottom = texCoords.top + (bottom - top) * (texCoords.height());
+
+ Coloring coloring = fill.coloring;
+ if(coloring.hasGradient)
+ {
+ Ogre::Real amount1, amount2;
+
+ if(coloring.orientation == Coloring::Vertical)
+ {
+ amount1 = top / yMax;
+ amount2 = bottom / yMax;
+ }
+ else
+ {
+ amount1 = left / xMax;
+ amount2 = right / xMax;
+ }
+
+ coloring.colors.first = (fill.coloring.colors.first * (1 - amount1)) + (fill.coloring.colors.second * amount1);
+ coloring.colors.second = (fill.coloring.colors.first * (1 - amount2)) + (fill.coloring.colors.second * amount2);
+ }
+
+ drawQuad(tile, texCoords, coloring);
+ }
+ }
+ }
+ }
+
+ // Draw the four sides of the border, if present
+ if(!border.isEmpty)
+ {
+ Ogre::FloatRect vColCoords = atlas->getTextureInfo("VertexColor").texCoords;
+ Corners<Ogre::Vector2> corners;
+
+ PixelRect bRect(rect.left - border.widths.left, rect.top - border.widths.top, rect.right + border.widths.right, rect.bottom + border.widths.bottom);
+
+ // Left Border
+ if(!isOutsideClip(PixelRect(bRect.left, bRect.top, rect.left, bRect.bottom)))
+ {
+ corners.topLeft = Ogre::Vector2(bRect.left, bRect.top);
+ corners.bottomLeft = Ogre::Vector2(bRect.left, bRect.bottom);
+ corners.bottomRight = Ogre::Vector2(rect.left, rect.bottom);
+ corners.topRight = Ogre::Vector2(rect.left, rect.top);
+
+ drawQuad(corners, vColCoords, border.colors.left);
+ }
+
+ // Bottom Border
+ if(!isOutsideClip(PixelRect(bRect.left, rect.bottom, bRect.right, bRect.bottom)))
+ {
+ corners.topLeft = Ogre::Vector2(rect.left, rect.bottom);
+ corners.bottomLeft = Ogre::Vector2(bRect.left, bRect.bottom);
+ corners.bottomRight = Ogre::Vector2(bRect.right, bRect.bottom);
+ corners.topRight = Ogre::Vector2(rect.right, rect.bottom);
+
+ drawQuad(corners, vColCoords, border.colors.bottom);
+ }
+
+ // Right Border
+ if(!isOutsideClip(PixelRect(rect.right, bRect.top, bRect.right, bRect.bottom)))
+ {
+ corners.topLeft = Ogre::Vector2(rect.right, rect.top);
+ corners.bottomLeft = Ogre::Vector2(rect.right, rect.bottom);
+ corners.bottomRight = Ogre::Vector2(bRect.right, bRect.bottom);
+ corners.topRight = Ogre::Vector2(bRect.right, bRect.top);
+
+ drawQuad(corners, vColCoords, border.colors.right);
+ }
+
+ // Top Border
+ if(!isOutsideClip(PixelRect(bRect.left, bRect.top, bRect.right, rect.top)))
+ {
+ corners.topLeft = Ogre::Vector2(bRect.left, bRect.top);
+ corners.bottomLeft = Ogre::Vector2(rect.left, rect.top);
+ corners.bottomRight = Ogre::Vector2(rect.right, rect.top);
+ corners.topRight = Ogre::Vector2(bRect.right, bRect.top);
+
+ drawQuad(corners, vColCoords, border.colors.top);
+ }
+ }
+}
+
+void Canvas::drawGlyph(const GlyphInfo& glyph, int x, int y, int width, int height, const Ogre::ColourValue& color)
+{
+ if(glyph.texInfo.isEmpty)
+ return;
+
+ PixelRect rect(x, y, x + width, y + height);
+
+ if(isOutsideClip(rect))
+ return;
+
+ Coloring coloring;
+ coloring.colors.first = color;
+ coloring.hasGradient = false;
+
+ drawQuad(rect, glyph.texInfo.texCoords, coloring);
+}
+
+void Canvas::clear()
+{
+ quadList.clear();
+ isDirty = true;
+}
+
+void Canvas::setClip(int left, int top, int right, int bottom)
+{
+ clip.left = left;
+ clip.top = top;
+ clip.right = right;
+ clip.bottom = bottom;
+}
+
+void Canvas::clearClip()
+{
+ clip.left = 0;
+ clip.top = 0;
+ clip.right = viewport->getActualWidth();
+ clip.bottom = viewport->getActualHeight();
+}
+
+const Ogre::MaterialPtr& Canvas::getMaterial() const
+{
+ return material;
+}
+
+void Canvas::getRenderOperation(Ogre::RenderOperation& op)
+{
+ op.operationType = Ogre::RenderOperation::OT_TRIANGLE_LIST;
+
+ op.vertexData = vertexData;
+ op.vertexData->vertexStart = 0;
+ op.vertexData->vertexCount = quadList.size() * 4;
+
+ op.useIndexes = true;
+ op.indexData = indexData;
+ op.indexData->indexStart = 0;
+ op.indexData->indexCount = quadList.size() * 6;
+}
+
+void Canvas::getWorldTransforms(Ogre::Matrix4* xform) const
+{
+ xform[0] = this->_getParentNodeFullTransform();
+}
+
+const Ogre::Quaternion& Canvas::getWorldOrientation() const
+{
+ return this->getParentNode()->_getDerivedOrientation();
+}
+
+const Ogre::Vector3& Canvas::getWorldPosition() const
+{
+ return this->getParentNode()->_getDerivedPosition();
+}
+
+Ogre::Real Canvas::getSquaredViewDepth(const Ogre::Camera* cam) const
+{
+ Ogre::Node* node = this->getParentNode();
+ assert(node);
+ return node->getSquaredViewDepth(cam);
+}
+
+const Ogre::LightList& Canvas::getLights() const
+{
+ return this->queryLights();
+}
+
+const Ogre::String& Canvas::getMovableType() const
+{
+ static Ogre::String typeName("Canvas");
+
+ return typeName;
+}
+
+const Ogre::AxisAlignedBox& Canvas::getBoundingBox() const
+{
+ static Ogre::AxisAlignedBox box;
+ box.setInfinite();
+
+ return box;
+}
+
+Ogre::Real Canvas::getBoundingRadius() const
+{
+ return 2.0;
+}
+
+void Canvas::_updateRenderQueue(Ogre::RenderQueue* queue)
+{
+ resizeBuffers();
+ updateGeometry();
+
+ queue->addRenderable(this, renderQueueID);
+}
+
+void Canvas::setVisible(bool visible)
+{
+ mVisible = visibility = visible;
+}
+
+bool Canvas::isVisible() const
+{
+ if (!visibility || mBeyondFarDistance || mRenderingDisabled)
+ return false;
+
+ SceneManager* sm = Root::getSingleton()._getCurrentSceneManager();
+ if (sm && !(mVisibilityFlags & sm->_getCombinedVisibilityMask()))
+ return false;
+
+ return true;
+}
+
+void Canvas::preRenderTargetUpdate(const Ogre::RenderTargetEvent& evt)
+{
+}
+
+void Canvas::postRenderTargetUpdate(const Ogre::RenderTargetEvent& evt)
+{
+}
+
+void Canvas::preViewportUpdate(const Ogre::RenderTargetViewportEvent& evt)
+{
+ if(evt.source == viewport && mVisible)
+ visibility = true;
+}
+
+void Canvas::postViewportUpdate(const Ogre::RenderTargetViewportEvent& evt)
+{
+ if(evt.source == viewport && mVisible)
+ visibility = false;
+}
+
+void Canvas::viewportAdded(const Ogre::RenderTargetViewportEvent& evt)
+{
+}
+
+void Canvas::viewportRemoved(const Ogre::RenderTargetViewportEvent& evt)
+{
+}
+
+void Canvas::destroyBuffers()
+{
+ if(vertexData)
+ {
+ delete vertexData;
+ vertexData = 0;
+
+ buffer.setNull();
+ }
+
+ if(indexData)
+ {
+ delete indexData;
+ indexData = 0;
+ }
+}
+
+void Canvas::resizeBuffers()
+{
+ if(bufferSize < quadList.size())
+ {
+ bufferSize = quadList.size() * 2;
+ destroyBuffers();
+ }
+
+ if(!vertexData)
+ {
+ vertexData = new Ogre::VertexData();
+ vertexData->vertexStart = 0;
+ vertexData->vertexCount = bufferSize * 4;
+
+ Ogre::VertexDeclaration* decl = vertexData->vertexDeclaration;
+ Ogre::VertexBufferBinding* binding = vertexData->vertexBufferBinding;
+
+ size_t offset = 0;
+ decl->addElement(0, offset, Ogre::VET_FLOAT3, Ogre::VES_POSITION);
+ offset += Ogre::VertexElement::getTypeSize(Ogre::VET_FLOAT3);
+ decl->addElement(0, offset, Ogre::VET_COLOUR, Ogre::VES_DIFFUSE);
+ offset += Ogre::VertexElement::getTypeSize(Ogre::VET_COLOUR);
+ decl->addElement(0, offset, Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, 0);
+
+ buffer = Ogre::HardwareBufferManager::getSingleton().createVertexBuffer(
+ decl->getVertexSize(0), vertexData->vertexCount, Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY_DISCARDABLE);
+ binding->setBinding(0, buffer);
+ }
+
+ if(!indexData)
+ {
+ indexData = new Ogre::IndexData();
+ indexData->indexStart = 0;
+ indexData->indexCount = bufferSize * 6;
+
+ indexData->indexBuffer = Ogre::HardwareBufferManager::getSingleton().createIndexBuffer(
+ Ogre::HardwareIndexBuffer::IT_16BIT, indexData->indexCount, Ogre::HardwareBuffer::HBU_STATIC_WRITE_ONLY);
+
+ unsigned short* indexBuffer = (unsigned short*)indexData->indexBuffer->lock(0, indexData->indexBuffer->getSizeInBytes(), Ogre::HardwareBuffer::HBL_DISCARD);
+
+ // Indexes are generated here because we know that we will only be rendering quads
+ // This means that we only have to handle updating the vertex buffer in Canvas::updateGeometry
+ for(size_t indexIdx, vertexIdx, quadIdx = 0; quadIdx < bufferSize; quadIdx++)
+ {
+ indexIdx = quadIdx * 6;
+ vertexIdx = quadIdx * 4;
+
+ indexBuffer[indexIdx++] = (unsigned short)(vertexIdx + 0);
+ indexBuffer[indexIdx++] = (unsigned short)(vertexIdx + 2);
+ indexBuffer[indexIdx++] = (unsigned short)(vertexIdx + 1);
+ indexBuffer[indexIdx++] = (unsigned short)(vertexIdx + 1);
+ indexBuffer[indexIdx++] = (unsigned short)(vertexIdx + 2);
+ indexBuffer[indexIdx++] = (unsigned short)(vertexIdx + 3);
+ }
+
+ indexData->indexBuffer->unlock();
+ }
+}
+
+bool Canvas::isOutsideClip(const PixelRect& rect)
+{
+ if(rect.left > clip.right)
+ return true;
+ else if(rect.right < clip.left)
+ return true;
+ else if(rect.top > clip.bottom)
+ return true;
+ else if(rect.bottom < clip.top)
+ return true;
+
+ return false;
+}
+
+void Canvas::localize(Ogre::Vector2& vertex)
+{
+ Ogre::Real xTexel = Ogre::Root::getSingleton().getRenderSystem()->getHorizontalTexelOffset();
+ Ogre::Real yTexel = Ogre::Root::getSingleton().getRenderSystem()->getVerticalTexelOffset();
+
+ vertex.x = ((vertex.x + xTexel) / (Ogre::Real)viewport->getActualWidth()) * 2 - 1;
+ vertex.y = ((vertex.y + yTexel) / (Ogre::Real)viewport->getActualHeight()) * -2 + 1;
+}
+
+void Canvas::drawQuad(const PixelRect& rect, const Ogre::FloatRect& texCoords, const Coloring& coloring)
+{
+ PixelRect clipped;
+ Ogre::FloatRect clippedTexCoords(texCoords);
+ Coloring clippedColoring = coloring;
+
+ if(rect.left > clip.left)
+ {
+ clipped.left = rect.left;
+ }
+ else
+ {
+ clipped.left = clip.left;
+ Ogre::Real delta = (clipped.left - rect.left) / (float)rect.width();
+ clippedTexCoords.left += delta * texCoords.width();
+
+ if(coloring.hasGradient && coloring.orientation == Coloring::Horizontal)
+ clippedColoring.colors.first = (coloring.colors.first * (1 - delta)) + (coloring.colors.second * delta);
+ }
+
+ if(rect.top > clip.top)
+ {
+ clipped.top = rect.top;
+ }
+ else
+ {
+ clipped.top = clip.top;
+ Ogre::Real delta = (clipped.top - rect.top) / (float)rect.height();
+ clippedTexCoords.top += delta * texCoords.height();
+
+ if(coloring.hasGradient && coloring.orientation == Coloring::Vertical)
+ clippedColoring.colors.first = (coloring.colors.first * (1 - delta)) + (coloring.colors.second * delta);
+ }
+
+ if(rect.right < clip.right)
+ {
+ clipped.right = rect.right;
+ }
+ else
+ {
+ clipped.right = clip.right;
+ Ogre::Real delta = (clipped.right - rect.right) / (float)rect.width();
+ clippedTexCoords.right += delta * texCoords.width();
+
+ if(coloring.hasGradient && coloring.orientation == Coloring::Horizontal)
+ clippedColoring.colors.second = (coloring.colors.first * (-delta)) + (coloring.colors.second * (1 + delta));
+ }
+
+ if(rect.bottom < clip.bottom)
+ {
+ clipped.bottom = rect.bottom;
+ }
+ else
+ {
+ clipped.bottom = clip.bottom;
+ Ogre::Real delta = (clipped.bottom - rect.bottom) / (float)rect.height();
+ clippedTexCoords.bottom += delta * texCoords.height();
+
+ if(coloring.hasGradient && coloring.orientation == Coloring::Vertical)
+ clippedColoring.colors.second = (coloring.colors.first * (-delta)) + (coloring.colors.second * (1 + delta));
+ }
+
+ Canvas::Quad quad;
+ quad.vertices = Corners<Ogre::Vector2>(Ogre::Vector2(clipped.left, clipped.top), Ogre::Vector2(clipped.left, clipped.bottom),
+ Ogre::Vector2(clipped.right, clipped.bottom), Ogre::Vector2(clipped.right, clipped.top));
+
+ localize(quad.vertices.topLeft);
+ localize(quad.vertices.bottomLeft);
+ localize(quad.vertices.bottomRight);
+ localize(quad.vertices.topRight);
+
+ quad.texCoords.topLeft = Ogre::Vector2(clippedTexCoords.left, clippedTexCoords.top);
+ quad.texCoords.bottomLeft = Ogre::Vector2(clippedTexCoords.left, clippedTexCoords.bottom);
+ quad.texCoords.bottomRight = Ogre::Vector2(clippedTexCoords.right, clippedTexCoords.bottom);
+ quad.texCoords.topRight = Ogre::Vector2(clippedTexCoords.right, clippedTexCoords.top);
+
+ if(clippedColoring.hasGradient)
+ {
+ if(clippedColoring.orientation == Coloring::Vertical)
+ quad.colors = Corners<Ogre::ColourValue>(clippedColoring.colors.first, clippedColoring.colors.second, clippedColoring.colors.second, clippedColoring.colors.first);
+ else
+ quad.colors = Corners<Ogre::ColourValue>(clippedColoring.colors.first, clippedColoring.colors.first, clippedColoring.colors.second, clippedColoring.colors.second);
+ }
+ else
+ {
+ quad.colors = Corners<Ogre::ColourValue>(clippedColoring.colors.first);
+ }
+
+ quadList.push_back(quad);
+ isDirty = true;
+}
+
+void Canvas::drawQuad(const Corners<Ogre::Vector2>& corners, const Ogre::FloatRect& texCoords, const Ogre::ColourValue& color)
+{
+ Corners<Ogre::Vector2> clippedCorners;
+ clippedCorners.topLeft.x = corners.topLeft.x > clip.left ? corners.topLeft.x : clip.left;
+ clippedCorners.topLeft.y = corners.topLeft.y > clip.top ? corners.topLeft.y : clip.top;
+ clippedCorners.bottomLeft.x = corners.bottomLeft.x > clip.left ? corners.bottomLeft.x : clip.left;
+ clippedCorners.bottomLeft.y = corners.bottomLeft.y < clip.bottom ? corners.bottomLeft.y : clip.bottom;
+ clippedCorners.bottomRight.x = corners.bottomRight.x < clip.right ? corners.bottomRight.x : clip.right;
+ clippedCorners.bottomRight.y = corners.bottomRight.y < clip.bottom ? corners.bottomRight.y : clip.bottom;
+ clippedCorners.topRight.x = corners.topRight.x < clip.right ? corners.topRight.x : clip.right;
+ clippedCorners.topRight.y = corners.topRight.y > clip.top ? corners.topRight.y : clip.top;
+
+ Canvas::Quad quad;
+ quad.vertices = clippedCorners;
+
+ localize(quad.vertices.topLeft);
+ localize(quad.vertices.bottomLeft);
+ localize(quad.vertices.bottomRight);
+ localize(quad.vertices.topRight);
+
+ quad.texCoords.topLeft = Ogre::Vector2(texCoords.left, texCoords.top);
+ quad.texCoords.bottomLeft = Ogre::Vector2(texCoords.left, texCoords.bottom);
+ quad.texCoords.bottomRight = Ogre::Vector2(texCoords.right, texCoords.bottom);
+ quad.texCoords.topRight = Ogre::Vector2(texCoords.right, texCoords.top);
+
+ quad.colors = Corners<Ogre::ColourValue>(color);
+
+ quadList.push_back(quad);
+ isDirty = true;
+}
+
+void Canvas::updateGeometry()
+{
+ if(!isDirty)
+ return;
+
+ float* vBuffer = (float*)buffer->lock(0, quadList.size() * buffer->getVertexSize() * 4, Ogre::HardwareBuffer::HBL_DISCARD);
+
+ Ogre::RGBA color;
+ Ogre::RGBA* vBufferCol = 0;
+
+ for(std::vector<Canvas::Quad>::iterator i = quadList.begin(); i != quadList.end(); i++)
+ {
+ // Top-Left Vertex
+ *vBuffer++ = i->vertices.topLeft.x;
+ *vBuffer++ = i->vertices.topLeft.y;
+ *vBuffer++ = 0;
+
+ vBufferCol = (Ogre::RGBA*)vBuffer;
+ Ogre::Root::getSingleton().convertColourValue(i->colors.topLeft, &color);
+ *vBufferCol++ = color;
+
+ vBuffer = (float*)vBufferCol;
+
+ *vBuffer++ = i->texCoords.topLeft.x;
+ *vBuffer++ = i->texCoords.topLeft.y;
+
+ // Top-Right Vertex
+ *vBuffer++ = i->vertices.topRight.x;
+ *vBuffer++ = i->vertices.topRight.y;
+ *vBuffer++ = 0;
+
+ vBufferCol = (Ogre::RGBA*)vBuffer;
+ Ogre::Root::getSingleton().convertColourValue(i->colors.topRight, &color);
+ *vBufferCol++ = color;
+
+ vBuffer = (float*)vBufferCol;
+
+ *vBuffer++ = i->texCoords.topRight.x;
+ *vBuffer++ = i->texCoords.topRight.y;
+
+ // Bottom-Left Vertex
+ *vBuffer++ = i->vertices.bottomLeft.x;
+ *vBuffer++ = i->vertices.bottomLeft.y;
+ *vBuffer++ = 0;
+
+ vBufferCol = (Ogre::RGBA*)vBuffer;
+ Ogre::Root::getSingleton().convertColourValue(i->colors.bottomLeft, &color);
+ *vBufferCol++ = color;
+
+ vBuffer = (float*)vBufferCol;
+
+ *vBuffer++ = i->texCoords.bottomLeft.x;
+ *vBuffer++ = i->texCoords.bottomLeft.y;
+
+ // Bottom-Right Vertex
+ *vBuffer++ = i->vertices.bottomRight.x;
+ *vBuffer++ = i->vertices.bottomRight.y;
+ *vBuffer++ = 0;
+
+ vBufferCol = (Ogre::RGBA*)vBuffer;
+ Ogre::Root::getSingleton().convertColourValue(i->colors.bottomRight, &color);
+ *vBufferCol++ = color;
+
+ vBuffer = (float*)vBufferCol;
+
+ *vBuffer++ = i->texCoords.bottomRight.x;
+ *vBuffer++ = i->texCoords.bottomRight.y;
+ }
+
+ buffer->unlock();
+ isDirty = false;
+}
+} // namespace
Added: trunk/python-ogre/ThirdParty/canvas/Canvas.h
===================================================================
--- trunk/python-ogre/ThirdParty/canvas/Canvas.h (rev 0)
+++ trunk/python-ogre/ThirdParty/canvas/Canvas.h 2008-12-05 07:18:28 UTC (rev 827)
@@ -0,0 +1,278 @@
+/*
+ This file is part of Canvas, a fast, lightweight 2D graphics engine for Ogre3D.
+
+ Copyright (C) 2008 Adam J. Simmons
+ ajs...@gm...
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef __Canvas_H__
+#define __Canvas_H__
+
+#include <vector>
+#include "Atlas.h"
+
+namespace CanvasNS
+{
+class Canvas;
+
+/**
+* An internal templated helper class.
+*/
+template<typename T> struct Corners
+{
+ T topLeft, bottomLeft, bottomRight, topRight;
+
+ Corners()
+ {
+ }
+
+ Corners(const T& all) : topLeft(all), bottomLeft(all), bottomRight(all), topRight(all)
+ {
+ }
+
+ Corners(const T& topLeft, const T& bottomLeft, const T& bottomRight, const T& topRight) :
+ topLeft(topLeft), bottomLeft(bottomLeft), bottomRight(bottomRight), topRight(topRight)
+ {
+ }
+};
+
+/**
+* Internal structure, used to define solid fill colors/gradients.
+*/
+struct Coloring
+{
+ std::pair<Ogre::ColourValue, Ogre::ColourValue> colors;
+ bool hasGradient;
+ short orientation;
+
+ enum GradientOrientation
+ {
+ Vertical,
+ Horizontal
+ };
+};
+
+/**
+* Defines the "fill" (color, texture, gradient) for a shape drawn with Canvas.
+*/
+struct Fill
+{
+ bool isEmpty;
+ Ogre::String atlasKey;
+ Coloring coloring;
+
+ /**
+ * Create an empty fill.
+ */
+ Fill();
+
+ /**
+ * Create a pure-color fill.
+ */
+ Fill(const Ogre::ColourValue& color);
+
+ /**
+ * Create a gradient fill.
+ *
+ * @param gradientColor1 In a vertical gradient, the top color, and in a horizontal gradient, the left color.
+ * @param gradientColor2 In a vertical gradient, the bottom color, and in a horizontal gradient, the right color.
+ * @param orientation The orientation of the gradient, can be either Coloring::Vertical or Coloring::Horizontal.
+ */
+ Fill(const Ogre::ColourValue& gradientColor1, const Ogre::ColourValue& gradientColor2, short orientation = CanvasNS::Coloring::Vertical);
+
+ /**
+ * Create a texture fill (must be loaded in current atlas) with an optional multiplied color.
+ *
+ * @param texture The filename of the texture, should be loaded in the current atlas.
+ * @param color The optional color to multiply the texture with.
+ */
+ Fill(const Ogre::String& texture, const Ogre::ColourValue& color = Ogre::ColourValue::White);
+
+ /**
+ * Create a texture fill (must be loaded in current atlas) with a multiplied gradient.
+ *
+ * @param texture The filename of the texture, should be loaded in the current atlas.
+ * @param gradientColor1 In a vertical gradient, the top color, and in a horizontal gradient, the left color.
+ * @param gradientColor2 In a vertical gradient, the bottom color, and in a horizontal gradient, the right color.
+ * @param orientation The orientation of the gradient, can be either Coloring::Vertical or Coloring::Horizontal.
+ */
+ Fill(const Ogre::String& texture, const Ogre::ColourValue& gradientColor1, const Ogre::ColourValue& gradientColor2, short orientation = CanvasNS::Coloring::Vertical);
+};
+
+typedef Ogre::TRect<int> WidthRect;
+typedef Ogre::TRect<int> ClipRect;
+typedef Ogre::TRect<int> PixelRect;
+typedef Ogre::TRect<Ogre::ColourValue> ColorRect;
+
+/**
+* Defines the "border" for a rectangle drawn with Canvas.
+*/
+struct Border
+{
+ bool isEmpty;
+ WidthRect widths;
+ ColorRect colors;
+
+ /**
+ * Create an empty border.
+ */
+ Border();
+
+ /**
+ * Create a border with a uniform pixel width and uniform color
+ *
+ * @param width The width, in pixels, for every side of the border.
+ * @param color The color for every side of the border.
+ */
+ Border(int width, const Ogre::ColourValue& color);
+
+ /**
+ * Create a border with custom pixel widths and colors for each side.
+ *
+ * @param widths The widths, in pixels, to use for each side.
+ * @param colors The colors to use for each side.
+ */
+ Border(const WidthRect& widths, const ColorRect& colors);
+};
+
+/**
+* The Canvas.
+*/
+class Canvas : public Ogre::Renderable, public Ogre::MovableObject, public Ogre::RenderTargetListener
+{
+ struct Quad
+ {
+ Corners<Ogre::Vector2> vertices;
+ Corners<Ogre::Vector2> texCoords;
+ Corners<Ogre::ColourValue> colors;
+ };
+
+ Atlas* atlas;
+ std::vector<Canvas::Quad> quadList;
+ Ogre::HardwareVertexBufferSharedPtr buffer;
+ Ogre::VertexData* vertexData;
+ Ogre::IndexData* indexData;
+ size_t bufferSize;
+ Ogre::MaterialPtr material;
+ Ogre::Viewport* viewport;
+ Ogre::uint8 renderQueueID;
+ ClipRect clip;
+ bool isDirty;
+ bool visibility;
+
+public:
+ /**
+ * Constructs the canvas.
+ *
+ * @param atlas The texture atlas to use for this canvas.
+ * @param viewport The viewport that this canvas will display in.
+ */
+ Canvas(Atlas* atlas, Ogre::Viewport* viewport);
+
+ /**
+ * Destroys the canvas.
+ */
+ ~Canvas();
+
+ /**
+ * Draws a rectangle on the canvas.
+ *
+ * @param x The x-coordinate of the origin, in pixels.
+ * @param y The y-coordinate of the origin, in pixels.
+ * @param width The width of the rectangle, in pixels.
+ * @param height The height of the rectangle, in pixels.
+ * @param fill The fill to use.
+ * @param border The optional border.
+ */
+ void drawRectangle(int x, int y, int width, int height, const Fill& fill, const Border& border = Border());
+
+ /**
+ * Draws a glyph on the canvas.
+ *
+ * @param glyph The GlyphInfo of the glyph to draw (obtained from Atlas).
+ * @param x The x-coordinate of the origin, in pixels.
+ * @param y The y-coordinate of the origin, in pixels.
+ * @param width The width of the rectangle, in pixels.
+ * @param height The height of the rectangle, in pixels.
+ * @param color The color of the glyph.
+ */
+ void drawGlyph(const GlyphInfo& glyph, int x, int y, int width, int height, const Ogre::ColourValue& color);
+
+ /**
+ * Clears the canvas.
+ */
+ void clear();
+
+ /**
+ * Sets the current clipping boundaries to use for subsequent draw calls.
+ *
+ * @param left The left-boundary, in pixels.
+ * @param top The top-boundary, in pixels.
+ * @param right The right-boundary, in pixels.
+ * @param bottom The bottom-boundary, in pixels.
+ */
+ void setClip(int left, int top, int right, int bottom);
+
+ /**
+ * Resets the current clipping boundaries to the dimensions of the viewport.
+ */
+ void clearClip();
+
+ // Inherited from Ogre::Renderable
+ const Ogre::MaterialPtr& getMaterial() const;
+ void getRenderOperation(Ogre::RenderOperation& op);
+ void getWorldTransforms(Ogre::Matrix4* xform) const;
+ const Ogre::Quaternion& getWorldOrientation() const;
+ const Ogre::Vector3& getWorldPosition() const;
+ Ogre::Real getSquaredViewDepth(const Ogre::Camera* cam) const;
+ const Ogre::LightList& getLights() const;
+
+ // Inherited from Ogre::MovableObject
+ const Ogre::String& getMovableType() const;
+ const Ogre::AxisAlignedBox& getBoundingBox() const;
+ Ogre::Real getBoundingRadius() const;
+ void _updateRenderQueue(Ogre::RenderQueue* queue);
+ void setVisible(bool visible);
+ bool isVisible() const;
+
+ // Inherited from Ogre::RenderTargetListener
+ void preRenderTargetUpdate(const Ogre::RenderTargetEvent& evt);
+ void postRenderTargetUpdate(const Ogre::RenderTargetEvent& evt);
+ void preViewportUpdate(const Ogre::RenderTargetViewportEvent& evt);
+ void postViewportUpdate(const Ogre::RenderTargetViewportEvent& evt);
+ void viewportAdded(const Ogre::RenderTargetViewportEvent& evt);
+ void viewportRemoved(const Ogre::RenderTargetViewportEvent& evt);
+
+protected:
+
+ void destroyBuffers();
+
+ void resizeBuffers();
+
+ void localize(Ogre::Vector2& vertex);
+
+ bool isOutsideClip(const PixelRect& rect);
+
+ void drawQuad(const PixelRect& rect, const Ogre::FloatRect& texCoords, const Coloring& coloring);
+
+ void drawQuad(const Corners<Ogre::Vector2>& corners, const Ogre::FloatRect& texCoords, const Ogre::ColourValue& color);
+
+ void updateGeometry();
+};
+
+} // namespace
+#endif
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-12-04 13:12:10 UTC (rev 826)
+++ trunk/python-ogre/environment.py 2008-12-05 07:18:28 UTC (rev 827)
@@ -1863,6 +1863,28 @@
descText = "MyGUI Interface System"
descLink = "http://sourceforge.net/projects/my-gui/"
+class canvas:
+ active = False
+ pythonModule = True
+ version="1.0"
+ name='canvas'
+ parent="ogre/gui"
+ cflags = ""
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_INCLUDE_canvas
+ , Config.PATH_INCLUDE_Ogre
+ ,Config.PATH_INCLUDE_Ogre_Dependencies
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost
+ ,Config.PATH_LIB_Ogre_OgreMain
+ , Config.PATH_LIB_Ogre_Dependencies
+ ]
+ CheckIncludes=[]
+ libs=[ boost.lib, 'OgreMain', 'freetype235']
+ ModuleName="canvas"
+ descText = "Canvas GUI System"
+ descLink = "http://www.ogre3d.org/phpBB2/viewtopic.php?t=41365&postdays=0&postorder=asc&start=0&sid=6578000180a935734beb03d548b900a4"
+
#######################################################################...
[truncated message content] |
|
From: <and...@us...> - 2008-12-04 13:12:16
|
Revision: 826
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=826&view=rev
Author: andy_miller
Date: 2008-12-04 13:12:10 +0000 (Thu, 04 Dec 2008)
Log Message:
-----------
Added MyGui to the code generators (not finished)
Update to ogreode demo
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py
trunk/python-ogre/demos/ogre/Demo_Bezier.py
trunk/python-ogre/demos/ogre/tests/Test_OverlayCaption.py
trunk/python-ogre/demos/ogreode/Demo_Scenes.py
trunk/python-ogre/demos/ogreode/SimpleScenes_BoxStack.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/code_generators/mygui/
trunk/python-ogre/code_generators/mygui/customization_data.py
trunk/python-ogre/code_generators/mygui/generate_code.py
trunk/python-ogre/code_generators/mygui/hand_made_wrappers.py
trunk/python-ogre/code_generators/mygui/python_mygui.h
trunk/python-ogre/code_generators/mygui/python_mygui_aliases.h
trunk/python-ogre/code_generators/mygui/python_mygui_sizeof.h
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2008-11-28 12:39:02 UTC (rev 825)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -81,6 +81,7 @@
PATH_ogrepcz = os.path.join(PATH_Ogre, 'PlugIns', 'PCZSceneManager' )
PATH_hydrax = os.path.join(PATH_THIRDPARTY, 'Hydrax')
PATH_hikari = os.path.join(PATH_THIRDPARTY, 'Hikari' ) # BASE_DIR, 'hikari', 'hikari')
+PATH_mygui = os.path.join(BASE_DIR, 'MyGUI_2.2.0_RC1_source' )
###
### these paths assume you've left all the directory structure as standard
@@ -120,6 +121,7 @@
PATH_LIB_particleuniverse = os.path.join(PATH_particleuniverse, 'bin', 'release')
PATH_LIB_opensteer = os.path.join(LOCAL_LIB)
PATH_LIB_hikari = os.path.join(PATH_hikari ) #, 'lib')
+PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_Ogre_Dependencies = PATH_INCLUDE_Ogre # os.path.join( PATH_Ogre, 'Dependencies/include')
@@ -191,4 +193,5 @@
PATH_INCLUDE_ogrepcz = os.path.join(PATH_ogrepcz,'include')
PATH_INCLUDE_hydrax= PATH_hydrax
PATH_INCLUDE_hikari = os.path.join(PATH_hikari ) #, 'include')
+PATH_INCLUDE_mygui = os.path.join(PATH_mygui,'MyGUIEngine','include')
Added: trunk/python-ogre/code_generators/mygui/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/mygui/customization_data.py (rev 0)
+++ trunk/python-ogre/code_generators/mygui/customization_data.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -0,0 +1,13 @@
+
+def header_files( version ):
+ return [ 'MyGUI.h'
+ ,'MYGUI_RenderItem.h'
+ ,'MYGUI_LayerItemKeeper.h'
+ ,'MYGUI_LayerKeeper.h'
+ ,'MYGUI_WidgetSkinInfo.h'
+ ]
+
+
+def huge_classes( version ):
+ return []
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/mygui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/mygui/generate_code.py (rev 0)
+++ trunk/python-ogre/code_generators/mygui/generate_code.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -0,0 +1,325 @@
+#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
+
+## STARTER TEMPLATE..
+## replace mygui with lowercase project name
+## set MAIN_NAMESPACE
+## rename and configure .h files
+
+
+import os, sys, time, shutil
+try:
+ import psyco
+ psyco.full()
+except ImportError:
+ pass
+#add environment to the path
+sys.path.append( os.path.join( '..', '..' ) )
+#add common utils to the pass
+sys.path.append( '..' )
+sys.path.append( '.' )
+
+import environment
+import common_utils
+import customization_data
+import hand_made_wrappers
+
+
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import messages
+from pyplusplus import module_builder
+from pyplusplus import decl_wrappers
+
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+from pyplusplus.module_creator import sort_algorithms
+
+import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
+import common_utils.ogre_properties as ogre_properties
+from common_utils import docit
+
+MAIN_NAMESPACE = 'MyGUI'
+
+############################################################
+##
+## Here is where we manually exclude stuff
+##
+############################################################
+
+def ManualExclude ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+ e = ['::MyGUI::delegates::CDelegate3< MyGUI::Widget*, std::string const&, std::string const& >',
+ '::MyGUI::delegates::CDelegate2< MyGUI::Widget*, unsigned int >',
+ '::MyGUI::ControllerPosition'
+ ]
+ for c in e:
+ print "Excluding:",c
+ main_ns.class_(c).exclude()
+
+ for c in main_ns.classes():
+ if 'delegates' in c.decl_string:
+ print "Excuding asssign operator from:", c
+ c.operators('=').exclude()
+ c=['::MyGUI::Font',
+ '::MyGUI::FontManager'
+ ]
+ for e in c:
+ main_ns.class_(e).noncopyable=True
+ c=['::MyGUI::LogManager::LevelsName'
+ ]
+ for e in c:
+ main_ns.variable(e).exclude()
+
+ c=['::MyGUI::utility::templates::split'
+ ,'::MyGUI::utility::templates::parseColour'
+ ,'::MyGUI::templates::get_vector_resource_path'
+ ,'::MyGUI::templates::get_resource_path'
+ ]
+ for e in c:
+ main_ns.free_functions(e).exclude()
+
+############################################################
+##
+## And there are things that manually need to be INCLUDED
+##
+############################################################
+
+def ManualInclude ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+############################################################
+##
+## And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+############################################################
+##
+## And things that need to have their argument and call values fixed.
+## ie functions that pass pointers in the argument list and of course we need
+## to read the updated values - so instead we pass them back
+## as new values in a tuple (ETC ETC)
+##
+############################################################
+
+def ManualTransformations ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+ def create_output( size ):
+ return [ ft.output( i ) for i in range( size ) ]
+
+
+###############################################################################
+##
+## Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
+
+def AutoFixes ( mb, MAIN_NAMESPACE ):
+ """ now we fix a range of things automatically - typically by going through
+ the entire name space trying to guess stuff and fix it:)
+ """
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+# # # Functions that have void pointers in their argument list need to change to unsigned int's
+# # pointee_types=[]
+# # ignore_names=[]
+# # common_utils.Fix_Void_Ptr_Args ( main_ns ) # , pointee_types, ignore_names )
+
+ # and change functions that return a variety of pointers to instead return unsigned int's
+ pointee_types=[]
+ ignore_names=[] # these are function names we know it's cool to exclude
+ common_utils.Fix_Pointer_Returns ( main_ns ) # , pointee_types, ignore_names )
+
+ # functions that need to have implicit conversions turned off
+ ImplicitClasses=[]
+ common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
+
+ if os.name =='nt':
+ Fix_NT( mb )
+ elif os.name =='posix':
+ Fix_Posix( mb )
+
+ common_utils.Auto_Document( mb, MAIN_NAMESPACE )
+
+
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################
+def Fix_Posix ( mb ):
+ """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+ """
+ ## we could do more here if need be...
+ if sys.platform == 'darwin':
+ pass
+ elif sys.platform.startswith ('linux'):
+ pass
+
+
+def Fix_NT ( mb ):
+ """ fixup for NT systems
+ """
+
+
+#
+# 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
+ )
+ #
+ # 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
+ # NOTE: If you update the source library code you need to manually delete the cache .XML file
+ #
+ xml_cached_fc = parser.create_cached_source_fc(
+ os.path.join( environment.mygui.root_dir, "python_mygui.h" )
+ , environment.mygui.cache_file )
+
+ defined_symbols = ['WIN32','OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY', '__PYTHONOGRE_BUILD_CODE', 'MYGUI_NONCLIENT_BUILD' ] #MYGUI_NO_OIS
+
+ defined_symbols.append( 'VERSION_' + environment.mygui.version )
+
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ if environment.isWindows():
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+
+ #
+ # build the core Py++ system from the GCCXML created source
+ #
+ mb = module_builder.module_builder_t( [ xml_cached_fc ]
+ , gccxml_path=environment.gccxml_bin
+ , working_directory=environment.root_dir
+ , include_paths=environment.mygui.include_dirs
+ , define_symbols=defined_symbols
+ , indexing_suite_version=2
+ , cflags=environment.mygui.cflags
+ )
+
+ # if this module depends on another set it here
+ 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
+
+ mb.BOOST_PYTHON_MAX_ARITY = 25
+ mb.classes().always_expose_using_scope = True
+
+ #
+ # We filter (both include and exclude) specific classes and functions that we want to wrap
+ #
+ global_ns = mb.global_ns
+ global_ns.exclude()
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ main_ns.include()
+
+ common_utils.AutoExclude ( mb, MAIN_NAMESPACE )
+ ManualExclude ( mb )
+ common_utils.AutoInclude ( mb, MAIN_NAMESPACE )
+ ManualInclude ( mb )
+ # here we fixup functions that expect to modifiy their 'passed' variables
+ ManualTransformations ( mb )
+ AutoFixes ( mb, MAIN_NAMESPACE )
+ ManualFixes ( mb )
+
+ common_utils.Auto_Functional_Transformation ( main_ns, special_vars=['::Ogre::Real &','::Ogre::ushort &','size_t &'] )
+
+ #
+ # We need to tell boost how to handle calling (and returning from) certain functions
+ #
+ common_utils.Set_DefaultCall_Policies ( mb.global_ns.namespace ( MAIN_NAMESPACE ) )
+
+ #
+ # the manual stuff all done here !!!
+ #
+ hand_made_wrappers.apply( mb )
+
+ NoPropClasses = [""]
+ for cls in main_ns.classes():
+ if cls.name not in NoPropClasses:
+ 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.mygui )
+
+ ##########################################################################################
+ #
+ # Creating the code. After this step you should not modify/customize declarations.
+ #
+ ##########################################################################################
+ extractor = exdoc.doc_extractor() # I'm excluding the UTFstring docs as lots about nothing
+ mb.build_code_creator (module_name='_mygui_' , doc_extractor= extractor )
+
+ for inc in environment.mygui.include_dirs:
+ mb.code_creator.user_defined_directories.append(inc )
+ mb.code_creator.user_defined_directories.append( environment.mygui.generated_dir )
+ mb.code_creator.replace_included_headers( customization_data.header_files( environment.mygui.version ) )
+
+ huge_classes = map( mb.class_, customization_data.huge_classes( environment.mygui.version ) )
+
+ mb.split_module(environment.mygui.generated_dir, huge_classes, use_files_sum_repository=False)
+
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generated directory..
+
+# common_utils.copyTree ( sourcePath = environment.Config.PATH_INCLUDE_mygui,
+# destPath = environment.mygui.generated_dir,
+# recursive=False )
+
+if __name__ == '__main__':
+ start_time = time.clock()
+ generate_code()
+ print 'Source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
Added: trunk/python-ogre/code_generators/mygui/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/mygui/hand_made_wrappers.py (rev 0)
+++ trunk/python-ogre/code_generators/mygui/hand_made_wrappers.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -0,0 +1,15 @@
+import os
+import environment
+
+
+
+#################################################################################################
+#################################################################################################
+
+def apply_reg ( class_, code ):
+ for c in code:
+ class_.add_registration_code ( c )
+
+def apply( mb ):
+ pass
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/mygui/python_mygui.h
===================================================================
--- trunk/python-ogre/code_generators/mygui/python_mygui.h (rev 0)
+++ trunk/python-ogre/code_generators/mygui/python_mygui.h 2008-12-04 13:12:10 UTC (rev 826)
@@ -0,0 +1,19 @@
+
+#include "MyGUI.h"
+
+// First we create a magic namespace to hold all our aliases
+namespace pyplusplus { namespace aliases {
+
+ #include "python_mygui_aliases.h"
+} }
+
+// then we exposed everything needed (and more) to ensure GCCXML makes them visible to Py++
+//
+namespace python_mygui{ namespace details{
+inline void instantiate(){
+ using namespace MyGUI;
+ #include "python_mygui_sizeof.h"
+
+} } }
+
+
Added: trunk/python-ogre/code_generators/mygui/python_mygui_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/mygui/python_mygui_aliases.h (rev 0)
+++ trunk/python-ogre/code_generators/mygui/python_mygui_aliases.h 2008-12-04 13:12:10 UTC (rev 826)
@@ -0,0 +1 @@
+// typedef name nicename;
Added: trunk/python-ogre/code_generators/mygui/python_mygui_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/mygui/python_mygui_sizeof.h (rev 0)
+++ trunk/python-ogre/code_generators/mygui/python_mygui_sizeof.h 2008-12-04 13:12:10 UTC (rev 826)
@@ -0,0 +1 @@
+// sizeof ( variable );
Modified: trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py 2008-11-28 12:39:02 UTC (rev 825)
+++ trunk/python-ogre/demos/OgreNewt/Demo01_TheBasics.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -81,6 +81,20 @@
light.setType( Ogre.Light.LT_POINT )
light.setPosition( Ogre.Vector3(0.0, 100.0, 100.0) )
+
+ shapes = OgreNewt.VectorofCollision()
+ print "shape", shapes
+ col = OgreNewt.Pyramid(self.World, Ogre.Vector3(5,5,5), Ogre.Quaternion(0, 0, 0), Ogre.Vector3(0,0,-20) )
+ print "col", col
+ shapes.append(col)
+ print shapes
+ col2 = OgreNewt.Box(self.World, Ogre.Vector3(5,5,5) )
+ print "col2", col2
+ shapes.append(col2)
+ compound = OgreNewt.CompoundCollision(self.World, shapes)
+
+ print "*****", compound
+
def _createFrameListener(self):
## this is a basic frame listener included with OgreNewt that does nothing but update the
Modified: trunk/python-ogre/demos/ogre/Demo_Bezier.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Bezier.py 2008-11-28 12:39:02 UTC (rev 825)
+++ trunk/python-ogre/demos/ogre/Demo_Bezier.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -98,7 +98,7 @@
## Set ambient light
sceneManager.setAmbientLight( (0.2, 0.2, 0.2) )
- print "\n1"
+
## Create a point light
l = sceneManager.createLight("MainLight")
l.setType(ogre.Light.LT_DIRECTIONAL)
@@ -232,10 +232,10 @@
patchEntity.setMaterialName("TextMat")
patchPass = pMat.getTechnique(0).getPass(0)
- print patchPass
- print dir(patchPass)
- print patchPass.msDirtyHashListMutex
- sys.exit()
+# print patchPass
+# print dir(patchPass)
+# print patchPass.msDirtyHashListMutex
+# sys.exit()
## Attach the entity to the root of the scene
Modified: trunk/python-ogre/demos/ogre/tests/Test_OverlayCaption.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_OverlayCaption.py 2008-11-28 12:39:02 UTC (rev 825)
+++ trunk/python-ogre/demos/ogre/tests/Test_OverlayCaption.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -1,5 +1,5 @@
# This code is in the Public Domain
-import Ogre as ogre
+import ogre.renderer.OGRE as ogre
import SampleFramework as sf
import ctypes, math,sys
@@ -10,7 +10,7 @@
overman = ogre.OverlayManager.getSingleton()
statspanel = overman.getOverlayElement('Core/StatPanel', False)
print statspanel
- print dir(statspanel)
+
statspanel.caption=ogre.UTFString("This does work")
statspanel.setCaption(ogre.UTFString("as does this") )
Modified: trunk/python-ogre/demos/ogreode/Demo_Scenes.py
===================================================================
--- trunk/python-ogre/demos/ogreode/Demo_Scenes.py 2008-11-28 12:39:02 UTC (rev 825)
+++ trunk/python-ogre/demos/ogreode/Demo_Scenes.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -112,7 +112,7 @@
sceneManager.setShadowTextureSettings(512, 2)
## Add some default lighting to the scene
- sceneManager.setAmbientLight( (.8, .8, .8) )
+ sceneManager.setAmbientLight( (.25, .25, .25) )
light = sceneManager.createLight('MainLight')
light.setPosition (0, 0, 1)
light.CastShadows=True
@@ -205,7 +205,7 @@
entity.setUserObject(self._plane)
entity.setCastShadows(False)
s.addEntity(entity, ogre.Vector3(x,0,z))
-
+ s.build()
## Load up our UI and display it
pOver = ogre.OverlayManager.getSingleton().getByName("OgreOdeDemos/Overlay")
pOver.show()
Modified: trunk/python-ogre/demos/ogreode/SimpleScenes_BoxStack.py
===================================================================
--- trunk/python-ogre/demos/ogreode/SimpleScenes_BoxStack.py 2008-11-28 12:39:02 UTC (rev 825)
+++ trunk/python-ogre/demos/ogreode/SimpleScenes_BoxStack.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -28,17 +28,13 @@
return "Z - Sphere, X - Box, C - Capsule, G - Ragdoll, T - Trimesh"
def frameEnded(self, time, keyinput, mouse):
-# print "** Simpel Scenes BoxStack frameEnded"
## Do default processing
SimpleScenes.frameEnded(self, time, keyinput, mouse)
body = None
## Create random objects, that method will stop them being created too often
if (keyinput.isKeyDown(OIS.KC_Z)):
- print "Creating a body"
body = self.createRandomObject(OgreOde.Geometry.Class_Sphere)
- print body
- print "OK"
elif (keyinput.isKeyDown(OIS.KC_X)):
body = self.createRandomObject(OgreOde.Geometry.Class_Box)
elif (keyinput.isKeyDown(OIS.KC_C)):
@@ -47,6 +43,5 @@
body = self.createRandomObject(OgreOde.Geometry.Class_Convex) #TriangleMesh)
elif (keyinput.isKeyDown(OIS.KC_G)):
self.createRagDoll()
-# print "Returning from frameended"
\ No newline at end of file
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-28 12:39:02 UTC (rev 825)
+++ trunk/python-ogre/environment.py 2008-12-04 13:12:10 UTC (rev 826)
@@ -1835,28 +1835,33 @@
descText = "Use Flash controls within Ogre"
descLink = "http://hikari-library.googlecode.com/"
-# class mygui:
-# active = False
-# pythonModule = True
-# version="2.2.0RC1"
-# name='mygui'
-# parent="ogre/gui"
-# cflags = ""
-# include_dirs = [ Config.PATH_Boost,
-# Config.PATH_INCLUDE_mygui
-# , Config.PATH_INCLUDE_Ogre
-# ,Config.PATH_INCLUDE_Ogre_Dependencies
-# ]
-# lib_dirs = [Config.PATH_LIB_Boost
-# ,Config.PATH_LIB_Ogre_OgreMain
-# ,Config.PATH_LIB_mygui
-#
-# ]
-# CheckIncludes=[]
-# libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ]
-# ModuleName="mygui"
-# descText = "MyGUI Interface System"
-# descLink = "http://sourceforge.net/projects/my-gui/"
+class mygui:
+ active = False
+ pythonModule = True
+ version="2.2.0RC1"
+ name='mygui'
+ parent="ogre/gui"
+ cflags = ""
+ source =[
+ ["wget", "http://downloads.sourceforge.net/my-gui/MyGUI_2.2.0_RC1_source.zip",downloadPath],
+ ]
+ buildCmds = [
+ [0, unzip + os.path.join(downloadPath, "MyGUI_2.2.0_RC1_source.zip"), '']
+ ]
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_INCLUDE_mygui
+ , Config.PATH_INCLUDE_Ogre
+ ,Config.PATH_INCLUDE_Ogre_Dependencies
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost
+ ,Config.PATH_LIB_Ogre_OgreMain
+ ,Config.PATH_LIB_mygui
+ ]
+ CheckIncludes=[]
+ libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ]
+ ModuleName="mygui"
+ descText = "MyGUI Interface System"
+ descLink = "http://sourceforge.net/projects/my-gui/"
############################################################################################
@@ -1899,7 +1904,7 @@
, 'ogrepcz' : ogrepcz
, 'hydrax' : hydrax
, 'hikari' : hikari
-# , 'mygui' : mygui
+ , 'mygui' : mygui
}
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-28 12:39:12
|
Revision: 825
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=825&view=rev
Author: andy_miller
Date: 2008-11-28 12:39:02 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
Added comments to the sample framework showing alternate ways to use OIS
Modified Paths:
--------------
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
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-28 12:12:52 UTC (rev 824)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-11-28 12:39:02 UTC (rev 825)
@@ -313,15 +313,23 @@
else:
windowHnd = self.renderWindow.getCustomAttributeInt("WINDOW")
+ #
+ # Here is where we create the OIS input system using a helper function that takes python list of tuples
+ #
t= self._inputSystemParameters()
params = [("WINDOW",str(windowHnd))]
params.extend(t)
self.InputManager = OIS.createPythonInputSystem( params )
- #pl = OIS.ParamList()
- #windowHndStr = str ( windowHnd)
- #pl.insert("WINDOW", windowHndStr)
- #im = OIS.InputManager.createInputSystem( pl )
+ #
+ # an alternate way is to use a multimap which is exposed in ogre
+ #
+# pl = ogre.SettingsMultiMap()
+# windowHndStr = str(windowHnd)
+# pl.insert("WINDOW", windowHndStr)
+# for v in self._inputSystemParameters():
+# pl.insert(v[0],v[1])
+# im = OIS.InputManager.createInputSystem( pl )
#Create all devices (We only catch joystick exceptions here, as, most people have Key/Mouse)
self.Keyboard = self.InputManager.createInputObjectKeyboard( OIS.OISKeyboard, self.bufferedKeys )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-28 12:12:57
|
Revision: 824
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=824&view=rev
Author: andy_miller
Date: 2008-11-28 12:12:52 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
Improvements to ssgLoad function in plib wrapper
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/code_generators/plib/generate_code.py
trunk/python-ogre/code_generators/plib/hand_made_wrappers.py
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2008-11-28 01:03:31 UTC (rev 823)
+++ trunk/python-ogre/ChangeLog.txt 2008-11-28 12:12:52 UTC (rev 824)
@@ -11,6 +11,7 @@
Update: SampleFramework will now look for plugins.cfg or plugins.cfg.<platform name> ('nt' or 'linux') in the current and
parent directories -- this will allow a single demo tree to automatically work on any platform unstead of the
current suitation of having to manually edit the plugins file..
+Update: Plib ssgLoaderOptions (ssgLoad) can now be subclassed and createBranch/createState used as callback functions
November 14 2008 : Release 1.6.0
Modified: trunk/python-ogre/code_generators/plib/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/plib/generate_code.py 2008-11-28 01:03:31 UTC (rev 823)
+++ trunk/python-ogre/code_generators/plib/generate_code.py 2008-11-28 12:12:52 UTC (rev 824)
@@ -7,6 +7,11 @@
import os, sys, time, shutil
+try:
+ import psyco
+ psyco.full()
+except ImportError:
+ pass
#add environment to the path
sys.path.append( os.path.join( '..', '..' ) )
@@ -33,15 +38,10 @@
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
import common_utils.ogre_properties as ogre_properties
+from common_utils import docit
MAIN_NAMESPACE = ''
-## small helper function
-def docit ( general, i, o ):
- docs = "Python-Ogre Modified Function Call\\n" + general +"\\n"
- docs = docs + "Input: " + i + "\\n"
- docs = docs + "Output: " + o + "\\n\\\n"
- return '"'+docs+'"'
############################################################
##
@@ -88,15 +88,17 @@
,'::ssgIndexArray::get'
,'::ssgSimpleList::raw_get'
- ,'::ssgSimpleState::getTextureFilename' # char pointers
- ,'::ssgStateSelector::getTextureFilename'
- ,'::ssgTexture::getFilename'
+# ,'::ssgSimpleState::getTextureFilename' # char pointers
+# ,'::ssgStateSelector::getTextureFilename'
+# ,'::ssgTexture::getFilename'
,'::ssgVtxArray::getIndex' ## returns a short
,'::ssgLoaderOptions::make_path'
,'::ssgBase::copy_from'
,'::ulLinkedList::unlinkNode'
+ ,'::ssgLoaderOptions::createBranch' # call back functions taking a char * which we need to hand wrap
+ ,'::ssgLoaderOptions::createState'
## ,'::ssgBase::getName'
@@ -123,8 +125,10 @@
main_ns.free_functions(e).exclude()
## Classes
- excludes = ['ssgEntityBinding','ssgHit',
- 'ssgSimpleState','ssgSimpleStateArray'
+ excludes = [ 'ssgEntityBinding'
+ ,'ssgHit'
+ ,'ssgSimpleState'
+ ,'ssgSimpleStateArray'
,'ssgTextureArray'
]
for e in excludes:
@@ -184,7 +188,27 @@
def ManualFixes ( mb ):
global_ns = mb.global_ns
-
+ main_ns = global_ns
+ funcs = [
+ '::ssgBranch::getByName'
+ ,'::ssgBranch::getByPath'
+ ,'::ssgEntity::getByName'
+ ,'::ssgEntity::getByPath'
+ ]
+# for f in funcs:
+# main_ns.member_functions(f).call_policies = call_policies.default_call_policies()
+
+ # bug in Py++ where is uses the wrong call policies on a transformed function
+ for fun in main_ns.member_functions(allow_empty=True):
+ if fun.transformations:
+ if declarations.is_pointer(fun.return_type ) :
+ rawarg = declarations.remove_declarated(
+ declarations.remove_const(
+ declarations.remove_reference(
+ declarations.remove_pointer ( fun.return_type ))))
+ if not declarations.is_arithmetic (rawarg) and not declarations.is_void(rawarg):
+ fun.call_policies = call_policies.default_call_policies()
+ print "Changed call policies on ", fun
############################################################
##
@@ -243,36 +267,6 @@
## Now for the AUTOMATIC stuff that should just work
##
###############################################################################
-
-
-def AutoExclude( mb ):
- """ Automaticaly exclude a range of things that don't convert well from C++ to Python
- """
- global_ns = mb.global_ns
- main_ns = global_ns
-
- # vars that are static consts but have their values set in the header file are bad
- Remove_Static_Consts ( main_ns )
-
- ## Exclude protected and private that are not pure virtual
- query = declarations.access_type_matcher_t( 'private' ) \
- & ~declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.PURE_VIRTUAL )
- non_public_non_pure_virtual = main_ns.calldefs( query )
- non_public_non_pure_virtual.exclude()
-
- #Virtual functions that return reference could not be overriden from Python
- query = declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.VIRTUAL ) \
- & declarations.custom_matcher_t( lambda decl: declarations.is_reference( decl.return_type ) )
- try:
- main_ns.calldefs( query ).virtuality = declarations.VIRTUALITY_TYPES.NOT_VIRTUAL
- except:
- pass
-
- f=main_ns.free_function("ssgLoadAC")
- print "\n\n",f,"\n\n"
-# f.include()
- print f.exportable, f.ignore
- print "\n\n"
def AutoInclude( mb ):
main_ns = mb.global_ns ## doesn't have it's own namespace..
@@ -308,18 +302,17 @@
global_ns = mb.global_ns
main_ns = global_ns
- # arguments passed as refs but not const are not liked by boost
- #Fix_Ref_Not_Const ( main_ns )
- # Functions that have void pointers in their argument list need to change to unsigned int's
- Fix_Void_Ptr_Args ( main_ns )
-
# and change functions that return a variety of pointers to instead return unsigned int's
- Fix_Pointer_Returns ( main_ns )
+# pointee_types=['unsigned int','int', 'float', '::Ogre::Real', '::Ogre::uchar', '::Ogre::uint8', 'unsigned char', 'char']
+# ignore_names=[]## 'ptr', 'useCountPointer'] # these are function names we know it's cool to exclude
+ common_utils.Fix_Pointer_Returns ( main_ns ) ##, pointee_types, ignore_names )
# functions that need to have implicit conversions turned off
- Fix_Implicit_Conversions ( main_ns)
+ ImplicitClasses=[] ##'Radian','Degree', 'TimeIndex', 'LiSPSMShadowCameraSetup' ]
+ common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
+
if os.name =='nt':
Fix_NT( mb )
elif os.name =='posix':
@@ -346,132 +339,14 @@
"""
-def Fix_Implicit_Conversions ( mb ):
- """By default we disable explicit conversion, however sometimes it makes sense
- """
- pass
def Add_Auto_Conversions( mb ):
pass
-def Set_Call_Policies( mb ):
- """ set the return call policies on classes that this hasn't already been done for.
- Set the default policy to deal with pointer/reference return types to reference_existing object
- """
- mem_funs = mb.calldefs ()
- mem_funs.create_with_signature = True #Generated code will not compile on
- #MSVC 7.1 if function has throw modifier.
- for mem_fun in mem_funs:
- if mem_fun.call_policies:
- continue
- if not mem_fun.call_policies and \
- (declarations.is_reference (mem_fun.return_type) or declarations.is_pointer (mem_fun.return_type) ):
- mem_fun.call_policies = call_policies.return_value_policy(
- call_policies.reference_existing_object )
-
-
def Set_Exception(mb):
pass
- #~ """We don't exclude Exception, because it contains functionality, that could
- #~ be useful to user. But, we will provide automatic exception translator
- #~ """
- #~ Exception = mb.namespace( 'Ogre' ).class_( 'Exception' )
- #~ Exception.include()
- #~ Exception.mem_fun('what').exclude() # declared with empty throw
- #~ Exception.mem_fun('getNumber').exclude() # declared with empty throw
- #~ Exception.translate_exception_to_string( 'PyExc_RuntimeError', 'exc.getFullDescription().c_str()' )
-
-def _ReturnUnsignedInt( type_ ):
- """helper to return an UnsignedInt call for tranformation functions
- """
- return declarations.cpptypes.unsigned_int_t()
-
-def Fix_Void_Ptr_Args ( mb ):
- """ we modify functions that take void *'s in their argument list to instead take
- unsigned ints, which allows us to use CTypes buffers
- """
- for fun in mb.member_functions():
- arg_position = 0
- for arg in fun.arguments:
- if declarations.type_traits.is_void_pointer(arg.type) or arg.type.decl_string == "void const *":
- fun.add_transformation( ft.modify_type(arg_position,_ReturnUnsignedInt ), alias=fun.name )
- fun.documentation = docit ("Modified Input Argument to work with CTypes",
- "Argument "+arg.name+ "(pos:" + str(arg_position)\
- +") takes a CTypes.adddressof(xx)", "...")
- print "Fixed Void Ptr", fun, arg_position
- break
- arg_position +=1
-
- ## lets go and look for stuff that might be a problem
- pointee_types=['unsigned int',' int ', ' float ', ' Real ', 'uchar', 'uint8',
- 'unsigned char']
-
- function_names=[]
- for fun in mb.member_functions():
- if fun.documentation or fun.ignore: continue ## means it's been tweaked somewhere else
- for n in function_names:
- if n in fun.name:
- print "CHECK :", fun
- break
- arg_position = 0
- for arg in fun.arguments:
- if declarations.is_pointer(arg.type): ## and "const" not in arg.type.decl_string:
- for i in pointee_types:
- if i in arg.type.decl_string:
- print '"',arg.type.decl_string, '"'
- print "CHECK ", fun, str(arg_position)
- fun.documentation=docit("SUSPECT - MAYBE BROKEN", "....", "...")
- break
- arg_position +=1
-
-## NEED To do the same for constructors
- for fun in mb.constructors():
- arg_position = 0
- for arg in fun.arguments:
- if declarations.is_pointer(arg.type): ## and "const" not in arg.type.decl_string:
- for i in pointee_types:
- if i in arg.type.decl_string:
- print '"',arg.type.decl_string, '"'
- print "Excluding: ", fun
- fun.exclude()
- break
- arg_position +=1
-
-def Fix_Pointer_Returns ( mb ):
- """ Change out functions that return a variety of pointer to base types and instead
- have them return the address the pointer is pointing to (the pointer value)
- This allow us to use CTypes to handle in memory buffers from Python
-
- Also - if documentation has been set then ignore the class/function as it means it's been tweaked else where
- """
- pointee_types=['unsigned int','int', 'float', 'unsigned char']
- known_names=[] # these are function names we know it's cool to exclude
- for fun in mb.member_functions():
- if declarations.is_pointer (fun.return_type) and not fun.documentation:
- for i in pointee_types:
- if fun.return_type.decl_string.startswith ( i ) and not fun.documentation:
- if not fun.name in known_names:
- print "Excluding (function):", fun, "as it returns (pointer)", i
- fun.exclude()
- for fun in mb.member_operators(allow_empty=True):
- if declarations.is_pointer (fun.return_type) and not fun.documentation:
- for i in pointee_types:
- if fun.return_type.decl_string.startswith ( i ) and not fun.documentation:
- print "Excluding (operator):", fun
- fun.exclude()
-
-
-
-def query_containers_with_ptrs(decl):
- if not isinstance( decl, declarations.class_types ):
- return False
- if not decl.indexing_suite:
- return False
- return declarations.is_pointer( decl.indexing_suite.element_type )
-
-
def Remove_Static_Consts ( mb ):
""" linux users have compile problems with vars that are static consts AND have values set in the .h files
we can simply leave these out """
@@ -554,43 +429,49 @@
AutoInclude ( mb )
- AutoExclude ( mb )
+ common_utils.AutoExclude ( mb )
ManualExclude ( mb )
ManualInclude ( mb )
# here we fixup functions that expect to modifiy their 'passed' variables
ManualTransformations ( mb )
AutoFixes ( mb )
+ common_utils.Auto_Functional_Transformation ( main_ns ) ##, special_vars=['::Ogre::Real &','::Ogre::ushort &','size_t &'] )
ManualFixes ( mb )
#
# We need to tell boost how to handle calling (and returning from) certain functions
#
- Set_Call_Policies ( mb.global_ns )
-
+ common_utils.Set_DefaultCall_Policies ( mb.global_ns )
+
#
# the manual stuff all done here !!!
#
hand_made_wrappers.apply( mb )
+ f = global_ns.member_function('::ssgEntity::cull')
+ f.include()
NoPropClasses = [""]
for cls in main_ns.classes():
if cls.name not in NoPropClasses:
cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
+
+ common_utils.Auto_Document( mb, MAIN_NAMESPACE )
+
## add additional version information to the module to help identify it correctly
- common_utils.addDetailVersion ( mb, environment, environment.plib )
+ common_utils.addDetailVersion ( mb, environment, environment.ogre )
+
+ common_utils.Find_Problem_Transformations ( main_ns )
- f = global_ns.member_function('::ssgEntity::cull')
- f.include()
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
#
##########################################################################################
- extractor = exdoc.doc_extractor("") # I'm excluding the UTFstring docs as lots about nothing
- mb.build_code_creator (module_name='_plib_' ) ## no docs as issues here, doc_extractor= extractor )
+ extractor = exdoc.doc_extractor("")
+ mb.build_code_creator (module_name='_plib_', doc_extractor= extractor ) ## no docs as issues here, doc_extractor= extractor )
for inc in environment.plib.include_dirs:
mb.code_creator.user_defined_directories.append(inc )
Modified: trunk/python-ogre/code_generators/plib/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/plib/hand_made_wrappers.py 2008-11-28 01:03:31 UTC (rev 823)
+++ trunk/python-ogre/code_generators/plib/hand_made_wrappers.py 2008-11-28 12:12:52 UTC (rev 824)
@@ -317,6 +317,95 @@
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());"""
]
+#################################################################
+WRAPPER_DEFINITION_ssgLoaderOptions_wrapper = \
+"""
+virtual ::ssgBranch * createBranch ( char * text ) const {
+ namespace bpl = boost::python;
+ // a little sanity to ensure stuff doesn't get broken
+ size_t len = strlen ( text );
+ if ( len > 1024 ) len = 1024;
+ if ( len <= 0 ) return NULL;
+
+ if( bpl::override func_createBranch = this->get_override( "createBranch" ) ){
+// return func_createBranch( boost::python::str(text, len ) ) ; //text );
+ bpl::object py_result = bpl::call<bpl::object>( func_createBranch.ptr(), boost::python::str(text, len ) );
+ return bpl::extract< ::ssgBranch * >( pyplus_conv::get_out_argument( py_result, 0 ) );
+ }
+ else {
+ return this->ssgLoaderOptions::createBranch( text );
+ }
+ }
+
+
+ ::ssgBranch * default_createBranch( char * text ) const {
+ return ssgLoaderOptions::createBranch( text );
+ }
+
+
+virtual ssgState * createState( char * text ) const {
+ namespace bpl = boost::python;
+ // a little sanity to ensure stuff doesn't get broken
+ size_t len = strlen ( text );
+ if ( len > 1024 ) len = 1024;
+ if ( len <= 0 ) return NULL;
+
+ if( bpl::override func_createState = this->get_override( "createState" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_createState.ptr(), boost::python::str(text, len ) );
+ return bpl::extract< ::ssgState * >( pyplus_conv::get_out_argument( py_result, 0 ) );
+ }
+ else {
+ return this->ssgLoaderOptions::createState( text );
+ }
+ }
+
+ ::ssgState * default_createState( char * text ) const {
+ return ssgLoaderOptions::createState( text );
+ }
+
+"""
+
+WRAPPER_DEFINITION_ssgLoaderOptions_declaration = \
+"""
+{ //::ssgLoaderOptions::createBranch
+
+ typedef ::ssgBranch * ( ::ssgLoaderOptions::*createBranch_function_type )( char * ) const;
+ typedef ::ssgBranch * ( ssgLoaderOptions_wrapper::*default_createBranch_function_type )( char * ) const;
+
+ ssgLoaderOptions_exposer.def(
+ "createBranch"
+ , createBranch_function_type(&::ssgLoaderOptions::createBranch)
+ , default_createBranch_function_type(&ssgLoaderOptions_wrapper::default_createBranch)
+ , ( bp::arg("text") )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+{ //::ssgLoaderOptions::createState
+
+ typedef ::ssgState * ( ::ssgLoaderOptions::*createState_function_type )( char * ) const;
+ typedef ::ssgState * ( ssgLoaderOptions_wrapper::*default_createState_function_type )( char * ) const;
+
+ ssgLoaderOptions_exposer.def(
+ "createState"
+ , createState_function_type(&::ssgLoaderOptions::createState)
+ , default_createState_function_type(&ssgLoaderOptions_wrapper::default_createState)
+ , ( bp::arg("text") )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
+ }
+
+"""
+
+WRAPPER_REGISTRATION_ssgLoaderOptions = [
+ """def( "createBranch", &ssgLoaderOptions_wrapper::createBranch,
+ "Python-Ogre Helper Function: call back for ssgLoadXXX.",
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());"""
+ ,"""def( "createState", &ssgLoaderOptions_wrapper::createState,
+ "Python-Ogre Helper Function: call back for ssgLoadXXX.",
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());"""
+ ]
+
+
#################################################################################################
#################################################################################################
@@ -350,11 +439,16 @@
rt = mb.class_( 'ssgBaseTransform' )
rt.add_wrapper_code( WRAPPER_DEFINITION_ssgBaseTransform_Wrapper )
-# rt = mb.class_( 'ssgTransform' )
-# rt = mb
-# rt.add_declaration_code( WRAPPER_DEFINITION_ssgTransform )
-# apply_reg (rt, WRAPPER_REGISTRATION_ssgTransform )
+ rt = mb.class_( 'ssgTransform' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_ssgTransform )
+ apply_reg (rt, WRAPPER_REGISTRATION_ssgTransform )
+ rt = mb.class_( 'ssgLoaderOptions' )
+ rt.add_wrapper_code( WRAPPER_DEFINITION_ssgLoaderOptions_wrapper )
+ rt.add_registration_code( WRAPPER_DEFINITION_ssgLoaderOptions_declaration, False )
+
+# apply_reg (rt, WRAPPER_REGISTRATION_ssgLoaderOptions )
+
# mb.add_declaration_code( WRAPPER_DEFINITION_Free )
# apply_reg (mb, WRAPPER_REGISTRATION_Free )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-28 01:03:36
|
Revision: 823
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=823&view=rev
Author: andy_miller
Date: 2008-11-28 01:03:31 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
Updated collision/opcode demos to match latest API changes
Modified Paths:
--------------
trunk/python-ogre/demos/opcode/Demo_OgreCollision01.py
trunk/python-ogre/demos/opcode/Demo_OpcodeBoxes.py
trunk/python-ogre/demos/opcode/Demo_OpcodeCollision01.py
Modified: trunk/python-ogre/demos/opcode/Demo_OgreCollision01.py
===================================================================
--- trunk/python-ogre/demos/opcode/Demo_OgreCollision01.py 2008-11-27 09:56:08 UTC (rev 822)
+++ trunk/python-ogre/demos/opcode/Demo_OgreCollision01.py 2008-11-28 01:03:31 UTC (rev 823)
@@ -31,11 +31,11 @@
# create the floor
plane = ogre.Plane()
- plane.normal = ogre.Vector3.UNIT_Y
+ plane.normal = ogre.Vector3().UNIT_Y
plane.d = 200
mm = ogre.MeshManager.getSingleton()
mm.createPlane('FloorPlane', 'General', plane, 200000.0, 200000.0,
- 20, 20, True, 1, 50, 50, ogre.Vector3.UNIT_Z)
+ 20, 20, True, 1, 50, 50, ogre.Vector3().UNIT_Z)
entity = sceneManager.createEntity('floor', 'FloorPlane')
entity.setMaterialName('Examples/RustySteel')
sceneManager.getRootSceneNode().createChildSceneNode().attachObject(entity)
Modified: trunk/python-ogre/demos/opcode/Demo_OpcodeBoxes.py
===================================================================
--- trunk/python-ogre/demos/opcode/Demo_OpcodeBoxes.py 2008-11-27 09:56:08 UTC (rev 822)
+++ trunk/python-ogre/demos/opcode/Demo_OpcodeBoxes.py 2008-11-28 01:03:31 UTC (rev 823)
@@ -38,11 +38,11 @@
light.setPosition (20, 80, 50)
plane = ogre.Plane()
- plane.normal = ogre.Vector3.UNIT_Y
+ plane.normal = ogre.Vector3().UNIT_Y
plane.d = 200
mm = ogre.MeshManager.getSingleton()
mm.createPlane('FloorPlane', 'General', plane, 200000.0, 200000.0,
- 20, 20, True, 1, 50, 50, ogre.Vector3.UNIT_Z)
+ 20, 20, True, 1, 50, 50, ogre.Vector3().UNIT_Z)
entity = sceneManager.createEntity('floor', 'FloorPlane')
entity.setMaterialName('Examples/RustySteel')
@@ -62,7 +62,7 @@
# add some fog
sceneManager.setFog(ogre.FOG_EXP, (1, 1, 1), 0.0002) ## change .0002 to .002 for lots of fog
- self.numBoxes =1000
+ self.numBoxes =300
@@ -83,6 +83,7 @@
class OpcodeBoxesListener(sf.FrameListener):
+
def __init__(self, renderWindow, camera, sm, num):
sf.FrameListener.__init__(self, renderWindow, camera)
# Create an intersection query
@@ -98,6 +99,7 @@
def frameStarted(self, frameEvent):
self.intersectSceneQuery.execute( self.querylistener )
return sf.FrameListener.frameStarted(self, frameEvent)
+
def frameEnded ( self, ev ):
self.UpdateBoxes()
return sf.FrameListener.frameEnded(self, ev)
Modified: trunk/python-ogre/demos/opcode/Demo_OpcodeCollision01.py
===================================================================
--- trunk/python-ogre/demos/opcode/Demo_OpcodeCollision01.py 2008-11-27 09:56:08 UTC (rev 822)
+++ trunk/python-ogre/demos/opcode/Demo_OpcodeCollision01.py 2008-11-28 01:03:31 UTC (rev 823)
@@ -235,11 +235,11 @@
# create the floor
plane = ogre.Plane()
- plane.normal = ogre.Vector3.UNIT_Y
+ plane.normal = ogre.Vector3().UNIT_Y
plane.d = 200
mm = ogre.MeshManager.getSingleton()
mm.createPlane('FloorPlane', 'General', plane, 200000.0, 200000.0,
- 20, 20, True, 1, 50, 50, ogre.Vector3.UNIT_Z)
+ 20, 20, True, 1, 50, 50, ogre.Vector3().UNIT_Z)
entity = sceneManager.createEntity('floor', 'FloorPlane')
entity.setMaterialName('Examples/RustySteel')
sceneManager.getRootSceneNode().createChildSceneNode().attachObject(entity)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-27 09:56:12
|
Revision: 822
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=822&view=rev
Author: andy_miller
Date: 2008-11-27 09:56:08 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
Adding Noise Landscape demo from the Wiki
Added Paths:
-----------
trunk/python-ogre/demos/noise/Demo_Noise_02.py
Added: trunk/python-ogre/demos/noise/Demo_Noise_02.py
===================================================================
--- trunk/python-ogre/demos/noise/Demo_Noise_02.py (rev 0)
+++ trunk/python-ogre/demos/noise/Demo_Noise_02.py 2008-11-27 09:56:08 UTC (rev 822)
@@ -0,0 +1,159 @@
+# This code is in the Public Domain
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre
+# For the latest info, see http://python-ogre.org/
+#
+# It is likely based on original code from OGRE and/or PyOgre
+# For the latest info, see http://www.ogre3d.org/
+#
+# You may use this sample code for anything you like, it is not covered by the
+# LGPL.
+# -----------------------------------------------------------------------------
+import ogre.renderer.OGRE as ogre
+import SampleFramework as sf
+import ogre.addons.noise as noise
+
+
+def sinFunction( tl, br ):
+ return 20.0 * ogre.Math.Sin(tl.x - br.y)
+
+def CreatePerlinCache(topLeft, bottomRight, edgeLength):
+ perl = noise.Perlin()
+ perl = noise.Perlin()
+ perl.SetFrequency(0.024)
+ perl.SetOctaveCount(3)
+
+ step = float( edgeLength ) / (bottomRight[0] - topLeft[0])
+ pos = topLeft
+
+ cache = []
+
+ for x in range(edgeLength):
+ ly = []
+ for y in range(edgeLength):
+ val = perl.GetValue( pos[0], pos[1], 0 )
+ ly.append(val)
+ pos[1] += step
+ cache.append(ly)
+ pos[0] += step
+
+ del perl
+ return cache
+
+class LandTile:
+ def __init__(self, topLeft, bottomRight, quads=48):
+ self.tl = topLeft # the base value
+ self.br = bottomRight
+
+ self.topLeft = ogre.Vector2(topLeft.x, topLeft.y) # an incremented value
+
+ self.numVerts = quads
+
+ self.verts = []
+ self.uvs = []
+ self.normals = []
+ self.triangles = []
+
+ self.isGenerated = False
+ self.edgeDist = self.br.x - self.tl.x
+
+ self.heightMapFunction = sinFunction
+
+ self.perlin = noise.Perlin()
+ self.perlin.SetFrequency(0.012)
+ self.perlin.SetOctaveCount(2)
+
+ def getRandom(self, pos):
+ return 30.0 * self.perlin.GetValue( pos.x, pos.y, 0 )
+
+ def calcTriangleNormal( self, v1, v2, v3 ):
+ return (v2-v1).crossProduct(v3-v1).normalisedCopy()
+
+
+ def generate(self):
+ incr = float ( (self.br.x - self.tl.x) / self.numVerts )
+ mNumVerts = 0
+
+ for xv in range( 0, self.numVerts, 4):
+ for yv in range(0 , self.numVerts, 4):
+ v1 = ( self.topLeft.x + incr, self.getRandom(ogre.Vector2( self.topLeft.x + incr, self.topLeft.y )), self.topLeft.y )
+ v2 = ( self.topLeft.x, self.getRandom( ogre.Vector2( self.topLeft.x, self.topLeft.y + incr ) ), self.topLeft.y + incr)
+ v3 = ( self.topLeft.x + incr, self.getRandom(self.topLeft + incr), self.topLeft.y + incr)
+ v4 = ( self.topLeft.x, self.getRandom(self.topLeft), self.topLeft.y)
+
+ self.verts += [v1, v2, v3, v4]
+
+ tri1 = (mNumVerts+3, mNumVerts+1, mNumVerts) # [ (0,3,2), (3,2,1) ]
+ tri2 = (mNumVerts+1, mNumVerts+2, mNumVerts)
+
+ self.triangles += [ tri1, tri2 ]
+
+ u0 = (self.topLeft.x - self.tl.x) / self.edgeDist
+ v0 = (self.topLeft.y - self.tl.y) / self.edgeDist
+ u1 = (self.topLeft.x + incr - self.tl.x) / self.edgeDist
+ v1 = (self.topLeft.y + incr - self.tl.y) / self.edgeDist
+
+ self.uvs += [ (u1,v0), (u0,v1), (u1,v1), (u0,v0) ]
+ self.topLeft.y += incr
+ mNumVerts += 4
+ self.topLeft.x += incr
+ self.topLeft.y = self.tl.y
+
+ self.normals = [[0,0,0]] * len(self.verts)
+
+ for tri in self.triangles:
+ v1 = ogre.Vector3(*self.verts[tri[0]])
+ v2 = ogre.Vector3(*self.verts[tri[1]])
+ v3 = ogre.Vector3(*self.verts[tri[2]])
+
+ norm = self.calcTriangleNormal( v1, v2, v3 )
+
+ self.normals[ tri[0] ] = [norm.x, norm.y, norm.z]
+ self.normals[ tri[1] ] = [norm.x, norm.y, norm.z]
+ self.normals[ tri[2] ] = [norm.x, norm.y, norm.z]
+
+
+ def buildGeometry(self, msh):
+ msh.begin( "Ogre/Skin" )
+ for x in range(len(self.verts)):
+ msh.position(*self.verts[x])
+ if len(self.normals):
+ msh.normal(*self.normals[x])
+ if len(self.uvs):
+ msh.textureCoord(*self.uvs[x])
+
+ for x in range(len(self.triangles)):
+ msh.triangle(*self.triangles[x])
+
+ msh.end()
+
+
+class NoiseApplication(sf.Application):
+ def _createScene( self ):
+ sceneManager = self.sceneManager
+ camera = self.camera
+
+ sceneManager.ambientLight = ogre.ColourValue (0.5, 0.5, 0.5)
+
+ sceneManager.setSkyBox(True, "Examples/CloudyNoonSkyBox")
+
+ light = sceneManager.createLight('MainLight')
+ light.setPosition (20, 20, 50)
+ light.setDirection(ogre.Vector3(-1.0, 0, 0.0))
+
+ manObj = sceneManager.createManualObject("NoisyLand")
+
+ test = LandTile( ogre.Vector2( 0,0 ), ogre.Vector2( 2000, 2000 ), 512 )
+ test.generate()
+ test.buildGeometry( manObj )
+
+ node = sceneManager.getRootSceneNode().createChildSceneNode()
+ node.attachObject( manObj )
+
+
+if __name__ == '__main__':
+ try:
+ application = NoiseApplication()
+ application.go()
+ except ogre.OgreException, e:
+ print e
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-27 05:46:28
|
Revision: 821
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=821&view=rev
Author: andy_miller
Date: 2008-11-27 05:46:23 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
Update ChangeLog
Fix Ogre wrapper to exclude Mutex Vars that are not exposed (boost::recursive_mutex)
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/demos/ogre/Demo_Bezier.py
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2008-11-27 02:09:10 UTC (rev 820)
+++ trunk/python-ogre/ChangeLog.txt 2008-11-27 05:46:23 UTC (rev 821)
@@ -1,3 +1,18 @@
+xxx : Release SVN
+=================
+Fix: Improved extract_document functions to improve pydoc stings - remove excess leading whitespace and wraps at 100 chars
+Fix: PhysX library exposes various NxArray objects that previously were excluded due to compile issues
+Fix: Ogre library excludes xxxMutex variables from a few classes (Pass etc) as these are not correctly exposed
+
+Update: PhysX can now be 'retrieved' and 'built' from windows (BuildModule.py -r -b physx)
+Update: Extend the PhysX demo a little
+Update: Update Bullet libraries to bullet 2.72
+Update: SampleFramework now uses a 'PythonOgre' overlay
+Update: SampleFramework will now look for plugins.cfg or plugins.cfg.<platform name> ('nt' or 'linux') in the current and
+ parent directories -- this will allow a single demo tree to automatically work on any platform unstead of the
+ current suitation of having to manually edit the plugins file..
+
+
November 14 2008 : Release 1.6.0
==================================
Run "python ReportVersion.py" to get the module version information
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-11-27 02:09:10 UTC (rev 820)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-11-27 05:46:23 UTC (rev 821)
@@ -304,7 +304,17 @@
cls.decl_string.startswith("::Ogre::CategorisedAllocPolicy") :
print "Excluding Allocator class", cls
cls.exclude()
-
+
+ # turns out there are some variables we didn't catch that are actually classes of boost::recursive_mutex
+ # which isn't exposed... May be related only to threading ??
+ # could limit it to known classes however safer to handle everything
+# ec = ['Pass', 'ResourceBackgroundQueue', 'SceneManager']
+ for c in main_ns.classes():
+ for v in c.variables( allow_empty=True):
+ if v.name.endswith('Mutex'):
+ print "Excluding possible Mutex Variable:", v
+ v.exclude()
+
####################b########################################
##
## And there are things that manually need to be INCLUDED
@@ -831,11 +841,11 @@
## handle a problem hashmap
mb.member_function('::Ogre::Mesh::getSubMeshNameMap').exclude()
stdex_ns = mb.global_ns.namespace("__gnu_cxx")
- stdex_ns.class_('hash_map<std::string, unsigned short, __gnu_cxx::hash<std::string>, std::equal_to<std::string>, std::allocator<unsigned short> >').exclude
- for f in mb.member_functions():
- if f.name == 'getChildIterator':
- print "LINUX SPECIAL:", f
- ###f.exclude()
+ stdex_ns.class_('hash_map<std::string, unsigned short, __gnu_cxx::hash<std::string>, std::equal_to<std::string>, std::allocator<unsigned short> >').exclude
+ for f in mb.member_functions():
+ if f.name == 'getChildIterator':
+ print "LINUX SPECIAL:", f
+ ###f.exclude()
#mb.member_function('::Ogre::Node::getChildIterator').exclude()
# mb.member_functions('::Ogre::Bone::getChildIterator').exclude()
@@ -1081,8 +1091,8 @@
undefine_symbols=[]
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
- if environment.isWindows():
- defined_symbols.append('BOOST_HAS_WINTHREADS')
+ if environment.isWindows():
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
defined_symbols.append( 'OGRE_VERSION_' + environment.ogre.version )
Modified: trunk/python-ogre/demos/ogre/Demo_Bezier.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Bezier.py 2008-11-27 02:09:10 UTC (rev 820)
+++ trunk/python-ogre/demos/ogre/Demo_Bezier.py 2008-11-27 05:46:23 UTC (rev 821)
@@ -231,6 +231,11 @@
pMat.getTechnique(0).getPass(0).createTextureUnitState( "BumpyMetal.jpg" )
patchEntity.setMaterialName("TextMat")
patchPass = pMat.getTechnique(0).getPass(0)
+
+ print patchPass
+ print dir(patchPass)
+ print patchPass.msDirtyHashListMutex
+ sys.exit()
## Attach the entity to the root of the scene
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-27 02:09:15
|
Revision: 820
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=820&view=rev
Author: andy_miller
Date: 2008-11-27 02:09:10 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
Fix for bullet libraries - working in both windows and linx
Improvements to docstrings -- remove excess white space and wrap long lines
Windows bullet now using 2.72 (same as Linux)
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/common_utils/extract_documentation.py
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/code_generators/ogrenewt/generate_code.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-11-26 06:01:27 UTC (rev 819)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-11-27 02:09:10 UTC (rev 820)
@@ -72,7 +72,7 @@
PATH_opensteer = os.path.join(BASE_DIR, 'opensteer', 'trunk')
PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
-PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.70')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.72')
PATH_PhysX= "c:/program files/NVIDIA Corporation/NVIDIA Physx SDK/v2.8.1/SDKs"
PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
PATH_ffmpeg= os.path.join(PATH_THIRDPARTY,'extra')
Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py 2008-11-26 06:01:27 UTC (rev 819)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py 2008-11-27 02:09:10 UTC (rev 820)
@@ -81,7 +81,6 @@
,'::btCompoundShape::createAabbTreeFromChildren'
,'::btCollisionAlgorithm::getDispatcherId'
,'::btCollisionAlgorithmConstructionInfo::getDispatcherId'
- ,'::btQuantizedBvh::walkRecursiveQuantizedTreeAgainstQuantizedTree'
,'::btCapsuleShape::calculateLocalInertia'
,'::btCapsuleShape::localGetSupportingVertexWithoutMargin'
@@ -99,9 +98,9 @@
,'::btMultiSapBroadphase::createProxy'
,'::btMultiSapBroadphase::quicksort'
,'::btBvhTriangleMeshShape::setOptimizedBvh' # new in 2.70
+ ,'::btQuantizedBvh::walkRecursiveQuantizedTreeAgainstQuantizedTree' # 2.72
+ ]
-
- ]
for e in excludes:
print "excluding function", e
global_ns.member_functions(e).exclude()
@@ -126,11 +125,6 @@
# ,'btAlignedAllocator<btDbvt::sStkNPS, 16u>'
,'btAlignedAllocator<btMultiSapBroadphase::btBridgeProxy*, 16u>'
,'btAlignedAllocator<btMultiSapBroadphase::btMultiSapProxy*, 16u>'
-# ,'btAlignedAllocator<btOdeContactJoint, 16u>'
-# ,'btAlignedAllocator<btOdeJoint*, 16u>'
-# ,'btAlignedAllocator<btOdeSolverBody, 16u>'
-# ,'btAlignedAllocator<btOdeSolverBody*, 16u>'
-# ,'btAlignedAllocator<btOdeTypedJoint, 16u>'
,'btAlignedAllocator<unsigned int, 16u>'
,'btAlignedAllocator<unsigned short, 16u>'
# ,'btAlignedObjectArray<btDbvt::Node const*>'
@@ -150,10 +144,18 @@
# ,'btAlignedObjectArray<btQuantizedBvhNode>'
# ,'btAlignedObjectArray<btOptimizedBvhNode>'
# ,'btAlignedObjectArray<btCollisionObject*>'
- ,'btDbvtBroadphase'
+ ,'btDbvtBroadphase'
,'btContinuousDynamicsWorld'
# ,'btSorLcpSolver'
]
+# # if environment.isWindows():
+# # excludes.extend(['btAlignedAllocator<btOdeContactJoint, 16u>'
+# # ,'btAlignedAllocator<btOdeJoint*, 16u>'
+# # ,'btAlignedAllocator<btOdeSolverBody, 16u>'
+# # ,'btAlignedAllocator<btOdeSolverBody*, 16u>'
+# # ,'btAlignedAllocator<btOdeTypedJoint, 16u>'
+# # ] )
+
for e in excludes:
print "excluding class", e
global_ns.class_(e).exclude()
Modified: trunk/python-ogre/code_generators/common_utils/extract_documentation.py
===================================================================
--- trunk/python-ogre/code_generators/common_utils/extract_documentation.py 2008-11-26 06:01:27 UTC (rev 819)
+++ trunk/python-ogre/code_generators/common_utils/extract_documentation.py 2008-11-27 02:09:10 UTC (rev 820)
@@ -96,7 +96,9 @@
return ""
ret =""
if doc_lines:
- doc_lines = remove_leading_blanks ( doc_lines )
+ doc_lines = removeBlankLines ( doc_lines )
+ doc_lines = removeLeadingSpace ( doc_lines )
+ doc_lines = wrapLines ( doc_lines )
#print "Extracted Doc String for:", declaration, "[", len(doc_lines),"]"
## we need to cope with strings longer than 2048 for MSVC
ret = "\\\n".join(doc_lines)
@@ -123,42 +125,89 @@
# # self.outfile.write("***============================*****\n" + declaration.decl_string + "\n")
# # self.outfile.write( str(len(basedoc)) + " " + str(len(newret)) + "\n" )
# # self.outfile.write( newret )
+
return '"' + basedoc + newret.lstrip() + '"'
else: return ""
-def remove_leading_blanks ( docin ):
+#===============================================================
+def removeBlankLines ( docin ):
"""
- remove any initial lines that are '\n\'
- """
- returnlist=[]
-
- if docin[0].strip() != "\\n":
-# # print "** ", docin[0]
- return docin # nothing to fix so return the original list..
+ remove leading and trailing blank lines
+ """
+ # first remove leading blank lines
+ x = 0
+ while x < len ( docin ) - 1 :
+ if docin[x].strip() == "\\n" or docin[x].strip() == '':
+ del docin[x]
+ x = x - 1
+ else:
+ break
+ x += 1
- fixed = False
- for line in docin:
- if not fixed:
- if line.strip() != "\\n":
- fixed = True
- if fixed:
- returnlist.append(line)
- return returnlist
-
-
-def get_generic_doc(declaration):
+ # now from the bottom up
+ x = len ( docin ) -1
+ while x >= 0:
+ if docin[x].strip() == "\\n":
+ del docin[x]
+ else:
+ break
+ x = len ( docin )- 1
+
+ return docin
+
+#===============================================================
+def removeLeadingSpace ( docin ):
"""
- generate call information about function or method
+ remove leading spaces/tabs to bring minimize space usage
"""
- try:
- return '"' + "Help on %s\n" % str(declaration) + '"'
- except:
- pass
+ import string as string
+ c = 0
+ for x in range ( len (docin) ):
+ docin[x] = docin[x].expandtabs(3) # replace tab characters with 3 spaces
- return ''
-
-
-
+ remove = -1 # use to track number of leading spaces to remove. -1 indicates first time through
+ for x in range ( len (docin) ):
+ c = 0
+ for y in range ( len ( docin[x]) ): # now lets count any leading spaces
+ if docin[x][y] in string.whitespace:
+ c +=1
+ else:
+ break
+ if c > 0: # Ok so we found leading space
+ if remove < 0: # must be first time through
+ remove = c
+ else:
+ if c < remove: # ensure we get the lowest common value
+ remove = c
+ else: # Ok we found a line without any leading spaces so it's all off
+ remove = -1
+ break
+ if remove > 0: # lets do it again and remove a set of leading spaces
+ for x in range ( len (docin) ):
+ docin[x] = docin[x][remove:]
+ return docin
+
+#===============================================================
+def wrapLines ( docin, maxlen = 100 ):
+ """
+ Break line length to a max while retaining the leading spaces...
+ """
+ import textwrap as textwrap
+ import string
+ docout = []
+ for line in docin:
+ prefix=0
+ for c in line:
+ if c in string.whitespace:
+ prefix += 1
+ else:
+ break
+ for l in textwrap.wrap( line, maxlen ):
+ line = ' '*prefix + l.lstrip()
+ docout.append ( line )
+ return docout
+
+
def code(str):
"""
detect str is code?
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-11-26 06:01:27 UTC (rev 819)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2008-11-27 02:09:10 UTC (rev 820)
@@ -57,16 +57,16 @@
if MAIN_NAMESPACE:
main_ns = global_ns.namespace( MAIN_NAMESPACE )
else:
- main_ns = global_ns
- excludes=['::btSimulationIslandManager'
- ]
+ main_ns = global_ns
+ excludes=[]
+ if environment.isLinux():
+ excludes.append('::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)
+ global_ns.class_(e).exclude()
+# for c in global_ns.classes():
+# #if not c.ignore:
+# print c
############################################################
##
Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2008-11-26 06:01:27 UTC (rev 819)
+++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2008-11-27 02:09:10 UTC (rev 820)
@@ -6,7 +6,12 @@
#
#
-import os, sys, time
+import os, sys, time, shutil
+try:
+ import psyco
+ psyco.full()
+except ImportError:
+ pass
#add environment to the path
sys.path.append( os.path.join( '..', '..' ) )
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-11-26 06:01:27 UTC (rev 819)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-11-27 02:09:10 UTC (rev 820)
@@ -384,6 +384,7 @@
else:
defined_symbols = ['LINUX','NX_DISABLE_FLUIDS']
defined_symbols.append( 'VERSION_' + environment.physx.version )
+ defined_symbols.append ( '__PYTHONOGRE_BUILD_CODE' )
#
# build the core Py++ system from the GCCXML created source
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-26 06:01:27 UTC (rev 819)
+++ trunk/python-ogre/environment.py 2008-11-27 02:09:10 UTC (rev 820)
@@ -1327,6 +1327,14 @@
CheckIncludes=[]
if isWindows():
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader' ]
+ source = [
+ [wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_Core.msi", downloadPath]
+ ]
+ buildCmds = [
+ [0, os.path.join(downloadPath, "PhysX_2.8.1_SDK_Core.msi"),'' ],
+ [0, 'sed -i s/"#ifdef WIN32"/"#if (defined WIN32) \&\& !(defined __PYTHONOGRE_BUILD_CODE)"/ NxMath.h',
+ 'c:\\program files\\NVIDIA Corporation\\NVIDIA PhysX SDK\\v2.8.1\\SDKs\\Foundation\\include']
+ ]
elif isLinux():
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
libs.append ( boost_python_index.lib )
@@ -1542,15 +1550,14 @@
base = "bullet-" + version
baseDir = os.path.join(os.getcwd(), base)
parent = "ogre/physics"
- libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics','LibLinearMath']
+ libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics','LibBulletSoftBody','LibBulletMultiThreaded']
if isWindows():
- pass
- #libs.append('libbulletMath')
+ libs.append('libbulletMath')
else:
- #libs.append('libbulletmath')
- libs.append('LibBulletSoftBody')
+ libs.append('LibLinearMath')
+# libs.append('LibBulletSoftBody')
#libs.append('libbulletcolladaconverter')
- libs.append('LibBulletMultiThreaded')
+# libs.append('LibBulletMultiThreaded')
libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
@@ -1595,12 +1602,12 @@
cflags = ""
parent = "ogre/physics"
libs = [boost.lib, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath'
+ 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody'
]
-# if isWindows():
-# libs.append('libbulletmath')
-# else:
-# libs.append('liblinearmath')
+ if isLinux():
+ libs.append('LibLinearMath')
+ else:
+ libs.append('libbulletmath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -1627,9 +1634,13 @@
name='ogrebulletd'
cflags = ""
parent = "ogre/physics"
- libs = [boost.lib, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath'
- ]
+
+ libs=[boost.lib, 'OgreMain', 'LibBulletCollision', 'LibBulletDynamics','LibBulletSoftBody','LibBulletMultiThreaded']
+ if isWindows():
+ libs.append('libbulletMath')
+ else:
+ libs.append('LibLinearMath')
+
# if isWindows():
# libs.append('libbulletmath')
# else:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-26 06:01:37
|
Revision: 819
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=819&view=rev
Author: andy_miller
Date: 2008-11-26 06:01:27 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
Fixed sampleframework to look for platform specific plugin files
It still defaults to plugins.cfg howeve rwill fall back to something more useful
Modified Paths:
--------------
trunk/python-ogre/demos/ogreode/resources.cfg
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
Added Paths:
-----------
trunk/python-ogre/demos/plugins.cfg.linux
trunk/python-ogre/demos/plugins.cfg.nt
Removed Paths:
-------------
trunk/python-ogre/demos/plugins.cfg
Modified: trunk/python-ogre/demos/ogreode/resources.cfg
===================================================================
--- trunk/python-ogre/demos/ogreode/resources.cfg 2008-11-26 04:04:08 UTC (rev 818)
+++ trunk/python-ogre/demos/ogreode/resources.cfg 2008-11-26 06:01:27 UTC (rev 819)
@@ -11,7 +11,7 @@
FileSystem=../media/materials/scripts
FileSystem=../media/materials/textures
#FileSystem=../media/models
-#FileSystem=../media/overlays
+FileSystem=../media/overlays
#FileSystem=../media/particle
#FileSystem=../media/gui
#Zip=../media/packs/cubemap.zip
Deleted: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg 2008-11-26 04:04:08 UTC (rev 818)
+++ trunk/python-ogre/demos/plugins.cfg 2008-11-26 06:01:27 UTC (rev 819)
@@ -1,19 +0,0 @@
-# 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_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
-
-##
-## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
Added: trunk/python-ogre/demos/plugins.cfg.linux
===================================================================
--- trunk/python-ogre/demos/plugins.cfg.linux (rev 0)
+++ trunk/python-ogre/demos/plugins.cfg.linux 2008-11-26 06:01:27 UTC (rev 819)
@@ -0,0 +1,13 @@
+# Defines plugins to load
+
+## Use this for Windows
+
+
+##
+## 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
Added: trunk/python-ogre/demos/plugins.cfg.nt
===================================================================
--- trunk/python-ogre/demos/plugins.cfg.nt (rev 0)
+++ trunk/python-ogre/demos/plugins.cfg.nt 2008-11-26 06:01:27 UTC (rev 819)
@@ -0,0 +1,13 @@
+# 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/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-11-26 04:04:08 UTC (rev 818)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-11-26 06:01:27 UTC (rev 819)
@@ -22,13 +22,16 @@
###import OgreRefApp
def getPluginPath():
- """Return the absolute path to a valid plugins.cfg file."""
+ """ Return the absolute path to a valid plugins.cfg file.
+ look in the current directory for plugins.cfg followed by plugins.cfg.nt|linux
+ If not found look one directory up
+ """
paths = [os.path.join(os.getcwd(), 'plugins.cfg'),
+ os.path.join(os.getcwd(), 'plugins.cfg.'+os.name),
os.path.join(os.getcwd(), '..','plugins.cfg'),
- '/etc/OGRE/plugins.cfg',
- os.path.join(os.path.dirname(os.path.abspath(__file__)),
- 'plugins.cfg')]
+ os.path.join(os.getcwd(), '..','plugins.cfg.'+os.name),
+ ]
for path in paths:
if os.path.exists(path):
return path
@@ -37,7 +40,7 @@
"** Warning: Unable to locate a suitable plugins.cfg file.\n"
"** Warning: Please check your ogre installation and copy a\n"
"** Warning: working plugins.cfg file to the current directory.\n\n")
- raise ogre.Exception(0, "can't locate the 'plugins.cfg' file", "")
+ raise ogre.Exception(0, "can't locate a suitable 'plugins' file", "")
# def isUnitTest():
# """Looks for a magic file to determine if we want to do a unittest"""
@@ -113,18 +116,18 @@
if not self.root.renderOneFrame():
break
-
-
def _setUp(self):
"""This sets up the ogre application, and returns false if the user
hits "cancel" in the dialog box."""
- if self.unittest:
- if os.path.isfile('ogre.cfg'):
- self.root = ogre.Root(getPluginPath())
- else:
- self.root = ogre.Root(getPluginPath(), '../ogre.cfg')
+
+ pluginFile = getPluginPath() ## option here to switch to manually loading file if it doesn't exist
+ if self.unittest:
+ if os.path.isfile('ogre.cfg'):
+ self.root = ogre.Root( pluginFile )
+ else:
+ self.root = ogre.Root( pluginFile, '../ogre.cfg')
else:
- self.root = ogre.Root(getPluginPath())
+ self.root = ogre.Root( pluginFile )
self.root.setFrameSmoothingPeriod (5.0)
self._setUpResources()
@@ -438,14 +441,17 @@
# return True
def frameEnded(self, frameEvent):
- self._updateStatistics()
+ if self.statisticsOn:
+ self._updateStatistics()
return True
def showDebugOverlay(self, show):
"""Turns the debug overlay (frame statistics) on or off."""
overlay = ogre.OverlayManager.getSingleton().getByName('POCore/DebugOverlay')
if overlay is None:
- raise ogre.Exception(111, "Could not find overlay POCore/DebugOverlay", "SampleFramework.py")
+ self.statisticsOn = False
+ ogre.LogManager.getSingleton().logMessage( "ERROR in sf_OIS.py: Could not find overlay POCore/DebugOverlay" )
+ return
if show:
overlay.show()
else:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-26 04:04:18
|
Revision: 818
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=818&view=rev
Author: andy_miller
Date: 2008-11-26 04:04:08 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
Fix to is64 function as it only works on Linux (uses unam) and broken Windows operations
Change to document string when aliasing functions to make it a little easier
Updates to Bullet demos
Removed tab characters from BuildModule (only want spaces..)
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
trunk/python-ogre/demos/hydrax/Demo_Hydrax01.py
trunk/python-ogre/demos/plugins.cfg
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/demos/bullet/test01.py
trunk/python-ogre/demos/bullet/test03.py
Removed Paths:
-------------
trunk/python-ogre/demos/bullet/test01.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2008-11-24 00:08:28 UTC (rev 817)
+++ trunk/python-ogre/BuildModule.py 2008-11-26 04:04:08 UTC (rev 818)
@@ -97,7 +97,7 @@
env["LDFLAGS"]+="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin"
env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages"
if environment.is64():
- env["PYTHONPATH"]=PREFIX+"/lib64/python"+environment.PythonVersionString+"/site-packages"
+ env["PYTHONPATH"]=PREFIX+"/lib64/python"+environment.PythonVersionString+"/site-packages"
env["ZZIPLIB_LIBS"]="-lzzip"
env["PATH"]=PREFIX+"/bin:" + PATH
@@ -264,10 +264,10 @@
exit("Was not able to copy the debian %s." % file)
ret = spawnTask( "sed --in-place "+filepath+' ' + \
- ' -e"s|%%SHORTDATE%%|`date +%Y%m%d`|" ' + \
- ' -e"s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|" ' + \
- ' -e"s|%%VERSION%%|'+module.source_version+'|"'
- , srcdir)
+ ' -e"s|%%SHORTDATE%%|`date +%Y%m%d`|" ' + \
+ ' -e"s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|" ' + \
+ ' -e"s|%%VERSION%%|'+module.source_version+'|"'
+ , srcdir)
if ret != 0:
exit("Was not able to update the debian %s." % file)
@@ -280,7 +280,7 @@
' -e "s|%%SHORTDATE%%|`date +%Y%m%d`|" ' + \
' -e "s|%%LONGDATE%%|`date +\'%a, %d %b %Y %H:%m:%S %z\'`|" ' + \
' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^"' + \
- ' -e "s|%%VERSION%%|'+module.source_version+'|g"'
+ ' -e "s|%%VERSION%%|'+module.source_version+'|g"'
, buildbase)
# Do some cleanup
Modified: trunk/python-ogre/code_generators/common_utils/__init__.py
===================================================================
--- trunk/python-ogre/code_generators/common_utils/__init__.py 2008-11-24 00:08:28 UTC (rev 817)
+++ trunk/python-ogre/code_generators/common_utils/__init__.py 2008-11-26 04:04:08 UTC (rev 818)
@@ -335,6 +335,7 @@
aliases[keyname] = aliases[keyname] + 1
else:
aliases[keyname] = 1
+ desc = desc + "\\\nWARNING FUNCTION NAME CHANGE - from "+fun.name + " -- " + fun.decl_string +" to " + new_alias + " \\n"
print "INFO: Adjusting Alias as multiple overlapping functions:", new_alias
print "AUTOFT OK: Tranformed ", fun, "(",new_alias,")"
Modified: trunk/python-ogre/code_generators/physx/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/physx/hand_made_wrappers.py 2008-11-24 00:08:28 UTC (rev 817)
+++ trunk/python-ogre/code_generators/physx/hand_made_wrappers.py 2008-11-26 04:04:08 UTC (rev 818)
@@ -240,4 +240,28 @@
# rt = mb.class_( 'NxImplicitScreenMesh' )
# rt.add_wrapper_code(WRAPPER_WRAPPER_DEF_NxImplicitScreenMesh)
-
\ No newline at end of file
+# # virtual ::NxActiveTransform * getActiveTransforms( ::NxU32 & nbTransformsOut ) {
+# # namespace bpl = boost::python;
+# # if( bpl::override func_getActiveTransforms = this->get_override( "getActiveTransforms" ) ){
+# # bpl::object py_result = bpl::call<bpl::object>( func_getActiveTransforms.ptr(), nbTransformsOut );
+# # nbTransformsOut = boost::python::extract< unsigned int >( pyplus_conv::get_out_argument( py_result, "nbTransformsOut" ) );
+# # return bpl::extract< ::NxActiveTransform * >( pyplus_conv::get_out_argument( py_result, 0 ) );
+# # }
+# # else{
+# # return NxScene::getActiveTransforms( nbTransformsOut );
+# # }
+# # }
+# #
+# # static boost::python::tuple default_getActiveTransforms( ::NxScene & inst, unsigned int nbTransformsOut ){
+# # NxActiveTransform * result;
+# # if( dynamic_cast< NxScene_wrapper * >( boost::addressof( inst ) ) ){
+# # result = inst.::NxScene::getActiveTransforms(nbTransformsOut);
+# # }
+# # else{
+# # result = inst.getActiveTransforms(nbTransformsOut);
+# # }
+# # typedef bp::return_value_policy< bp::reference_existing_object > call_policies_t;
+# # return bp::make_tuple( pyplusplus::call_policies::make_object< call_policies_t, ::NxActiveTransform * >( result )
+# # , nbTransformsOut );
+# # }
+
\ No newline at end of file
Deleted: trunk/python-ogre/demos/bullet/test01.py
===================================================================
--- trunk/python-ogre/demos/bullet/test01.py 2008-11-24 00:08:28 UTC (rev 817)
+++ trunk/python-ogre/demos/bullet/test01.py 2008-11-26 04:04:08 UTC (rev 818)
@@ -1,78 +0,0 @@
-import sys
-sys.path.insert(0,'..')
-import PythonOgreConfig
-
-import ogre.renderer.OGRE as ogre
-import ogre.physics.bullet as bullet
-t = bullet.btTransform()
-ms = bullet.btDefaultMotionState (t)
-s = bullet.btBoxShape(bullet.btVector3(10,10,10))
-body = bullet.btRigidBody(1, ms, s)
-print body
-
-
-collisionConfiguration = bullet.btDefaultCollisionConfiguration()
-dispatcher = bullet.btCollisionDispatcher (collisionConfiguration)
-
-worldAabbMin = bullet.btVector3(-1000,-1000,-1000)
-worldAabbMax = bullet.btVector3(1000,1000,1000)
-maxProxies = 32766
-
-broadphase = bullet.btAxisSweep3(worldAabbMin, worldAabbMax, maxProxies)
-
-solver = bullet.btSequentialImpulseConstraintSolver()
-
-world = bullet.btDiscreteDynamicsWorld(dispatcher, broadphase , solver, collisionConfiguration)
-world.getDispatchInfo().m_enableSPU = True
-world.setGravity(bullet.btVector3(0,-10,0))
-
-print world
-print dir(world)
-print solver
-print broadphase
-print dispatcher
-print collisionConfiguration
-for x in range (30):
- world.stepSimulation( x * 1/30)
-
-world.stepSimulation(0)
-world.stepSimulation(-0.333)
-
-
-class OgreMotionState(bullet.btMotionState):
- def __init__(self, initalPosition):
- bullet.btMotionState.__init__(self)
- self.Pos=initalPosition
- self.Position=ogre.Vector3()
- self.Quaternion=ogre.Quaternion()
-
- def getWorldTransform(self, WorldTrans):
- print WorldTrans
- print WorldTrans.Rotation.x(),WorldTrans.Rotation.y(),WorldTrans.Rotation.z()
- print self.Pos.getOrigin()
- WorldTrans.setOrigin(self.Pos.getOrigin())
- WorldTrans.setBasis(self.Pos.getBasis())
-
- print WorldTrans.Rotation.x(),WorldTrans.Rotation.y(),WorldTrans.Rotation.z()
- print WorldTrans
- print "Pos", self.Pos
- t=self.Pos
- print "T", t
- t.setOrigin(WorldTrans.getOrigin())
- print "T1", t
-
-
-
-
- def setWorldTransform(WorldTrans):
- print "setWorldTrans", WorldTrans
- self.Position=ogre.Vector3(WorldTrans.getOrigin().x(),WorldTrans.getOrigin().y(),WorldTrans.getOrigin().z())
- self.Quaternion=ogre.Quaternion(WorldTrans.getRoation().w(),WorldTrans.getRoation().x(),WorldTrans.getRoation().y(),WorldTrans.getRoation().z())
- print "setWorldTrans", WorldTrans
-
-shape=bullet.btCapsuleShape(10, 20)
-print "Creating motionState"
-motionState=OgreMotionState(bullet.btTransform(bullet.btMatrix3x3(1.0,1.0,1.0,-1.0,-1.0,-1.0,2,-2,-1)))
-Object=bullet.btRigidBody(10.0, motionState, shape) # ...this should work in my eyes
-
-#Object=bullet.btRigidBody(bullet.btRigidBodyConstructionInfo()) ...well obviously not in bullet 2.6.9
\ No newline at end of file
Added: trunk/python-ogre/demos/bullet/test01.py
===================================================================
--- trunk/python-ogre/demos/bullet/test01.py (rev 0)
+++ trunk/python-ogre/demos/bullet/test01.py 2008-11-26 04:04:08 UTC (rev 818)
@@ -0,0 +1,96 @@
+#
+# Updated to calculate a falling sphere:
+# http://www.bulletphysics.com/mediawiki-1.5.8/index.php?title=Hello_World
+#
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.physics.bullet as bullet
+t = bullet.btTransform()
+ms = bullet.btDefaultMotionState (t)
+s = bullet.btBoxShape(bullet.btVector3(10,10,10))
+body = bullet.btRigidBody(1, ms, s)
+print body
+
+
+collisionConfiguration = bullet.btDefaultCollisionConfiguration()
+dispatcher = bullet.btCollisionDispatcher (collisionConfiguration)
+
+worldAabbMin = bullet.btVector3(-1000,-1000,-1000)
+worldAabbMax = bullet.btVector3(1000,1000,1000)
+maxProxies = 32766
+
+broadphase = bullet.btAxisSweep3(worldAabbMin, worldAabbMax, maxProxies)
+
+solver = bullet.btSequentialImpulseConstraintSolver()
+
+world = bullet.btDiscreteDynamicsWorld(dispatcher, broadphase , solver, collisionConfiguration)
+world.getDispatchInfo().m_enableSPU = True
+world.setGravity(bullet.btVector3(0,-10,0))
+
+print world
+print dir(world)
+print solver
+print broadphase
+print dispatcher
+print collisionConfiguration
+for x in range (30):
+ world.stepSimulation( x * 1/30)
+
+world.stepSimulation(0)
+world.stepSimulation(-0.333)
+
+
+class OgreMotionState(bullet.btMotionState):
+ def __init__(self, initalPosition):
+ bullet.btMotionState.__init__(self)
+ self.Pos=initalPosition
+ self.Position=ogre.Vector3()
+ self.Quaternion=ogre.Quaternion()
+
+ def getWorldTransform(self, WorldTrans):
+ print WorldTrans
+ print WorldTrans.Rotation.x(),WorldTrans.Rotation.y(),WorldTrans.Rotation.z()
+ print self.Pos.getOrigin()
+ WorldTrans.setOrigin(self.Pos.getOrigin())
+ WorldTrans.setBasis(self.Pos.getBasis())
+
+ print WorldTrans.Rotation.x(),WorldTrans.Rotation.y(),WorldTrans.Rotation.z()
+ print WorldTrans
+ print "Pos", self.Pos
+ t=self.Pos
+ print "T", t
+ t.setOrigin(WorldTrans.getOrigin())
+ print "T1", t
+
+ def setWorldTransform(self, WorldTrans):
+ #print "setWorldTrans", WorldTrans
+ self.Position=ogre.Vector3(WorldTrans.getOrigin().x(),WorldTrans.getOrigin().y(),WorldTrans.getOrigin().z())
+ self.Quaternion=ogre.Quaternion(WorldTrans.getRotation().w(),WorldTrans.getRotation().x(),WorldTrans.getRotation().y(),WorldTrans.getRotation().z())
+ #print "setWorldTrans", WorldTrans
+
+
+mass = 10
+fallInertia = bullet.btVector3(0, 0, 0)
+shape=bullet.btSphereShape(1)
+shape.calculateLocalInertia(mass, fallInertia)
+print "Creating motionState"
+motionState=OgreMotionState(bullet.btTransform(bullet.btQuaternion(0, 0, 0, 1), bullet.btVector3(0, 50, 0)))
+construct = bullet.btRigidBody.btRigidBodyConstructionInfo(mass, motionState, shape, fallInertia)
+Object=bullet.btRigidBody(construct) # ...this should work in my eyes
+world.addRigidBody(Object)
+
+for x in range (90):
+ world.stepSimulation( x * 1/30)
+
+ pos = Object.getMotionState().Position
+ print x, "height: " + str(pos.y)
+
+# note we need to delete the world before the Object as there are issues with the destructor on Objects causing
+# virtual functions being called errors
+del world
+
+
Copied: trunk/python-ogre/demos/bullet/test03.py (from rev 817, trunk/python-ogre/demos/bullet/test01.py)
===================================================================
--- trunk/python-ogre/demos/bullet/test03.py (rev 0)
+++ trunk/python-ogre/demos/bullet/test03.py 2008-11-26 04:04:08 UTC (rev 818)
@@ -0,0 +1,78 @@
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.physics.bullet as bullet
+t = bullet.btTransform()
+ms = bullet.btDefaultMotionState (t)
+s = bullet.btBoxShape(bullet.btVector3(10,10,10))
+body = bullet.btRigidBody(1, ms, s)
+print body
+
+
+collisionConfiguration = bullet.btDefaultCollisionConfiguration()
+dispatcher = bullet.btCollisionDispatcher (collisionConfiguration)
+
+worldAabbMin = bullet.btVector3(-1000,-1000,-1000)
+worldAabbMax = bullet.btVector3(1000,1000,1000)
+maxProxies = 32766
+
+broadphase = bullet.btAxisSweep3(worldAabbMin, worldAabbMax, maxProxies)
+
+solver = bullet.btSequentialImpulseConstraintSolver()
+
+world = bullet.btDiscreteDynamicsWorld(dispatcher, broadphase , solver, collisionConfiguration)
+world.getDispatchInfo().m_enableSPU = True
+world.setGravity(bullet.btVector3(0,-10,0))
+
+print world
+print dir(world)
+print solver
+print broadphase
+print dispatcher
+print collisionConfiguration
+for x in range (30):
+ world.stepSimulation( x * 1/30)
+
+world.stepSimulation(0)
+world.stepSimulation(-0.333)
+
+
+class OgreMotionState(bullet.btMotionState):
+ def __init__(self, initalPosition):
+ bullet.btMotionState.__init__(self)
+ self.Pos=initalPosition
+ self.Position=ogre.Vector3()
+ self.Quaternion=ogre.Quaternion()
+
+ def getWorldTransform(self, WorldTrans):
+ print WorldTrans
+ print WorldTrans.Rotation.x(),WorldTrans.Rotation.y(),WorldTrans.Rotation.z()
+ print self.Pos.getOrigin()
+ WorldTrans.setOrigin(self.Pos.getOrigin())
+ WorldTrans.setBasis(self.Pos.getBasis())
+
+ print WorldTrans.Rotation.x(),WorldTrans.Rotation.y(),WorldTrans.Rotation.z()
+ print WorldTrans
+ print "Pos", self.Pos
+ t=self.Pos
+ print "T", t
+ t.setOrigin(WorldTrans.getOrigin())
+ print "T1", t
+
+
+
+
+ def setWorldTransform(WorldTrans):
+ print "setWorldTrans", WorldTrans
+ self.Position=ogre.Vector3(WorldTrans.getOrigin().x(),WorldTrans.getOrigin().y(),WorldTrans.getOrigin().z())
+ self.Quaternion=ogre.Quaternion(WorldTrans.getRoation().w(),WorldTrans.getRoation().x(),WorldTrans.getRoation().y(),WorldTrans.getRoation().z())
+ print "setWorldTrans", WorldTrans
+
+shape=bullet.btCapsuleShape(10, 20)
+print "Creating motionState"
+motionState=OgreMotionState(bullet.btTransform(bullet.btMatrix3x3(1.0,1.0,1.0,-1.0,-1.0,-1.0,2,-2,-1)))
+Object=bullet.btRigidBody(10.0, motionState, shape) # ...this should work in my eyes
+
+#Object=bullet.btRigidBody(bullet.btRigidBodyConstructionInfo()) ...well obviously not in bullet 2.6.9
\ No newline at end of file
Modified: trunk/python-ogre/demos/hydrax/Demo_Hydrax01.py
===================================================================
--- trunk/python-ogre/demos/hydrax/Demo_Hydrax01.py 2008-11-24 00:08:28 UTC (rev 817)
+++ trunk/python-ogre/demos/hydrax/Demo_Hydrax01.py 2008-11-26 04:04:08 UTC (rev 818)
@@ -179,14 +179,14 @@
# Create our projected grid module
self.noise= Hydrax.Perlin() ## Default options (8, 0.085, 0.49, 1.4, 1.27f)
self.Module = Hydrax.ProjectedGrid(# Hydrax parent pointer
- self.hydrax,
- # Noise module
- self.noise,
- # Base plane
- ogre.Plane(ogre.Vector3(0,1,0), ogre.Vector3(0,0,0)),
- Hydrax.MaterialManager.NM_VERTEX,
- # Projected grid options (Can be updated each frame . setOptions(...))
- Hydrax.ProjectedGrid.Options(264 ))
+ self.hydrax,
+ # Noise module
+ self.noise,
+ # Base plane
+ ogre.Plane(ogre.Vector3(0,1,0), ogre.Vector3(0,0,0)),
+ Hydrax.MaterialManager.NM_VERTEX,
+ # Projected grid options (Can be updated each frame . setOptions(...))
+ Hydrax.ProjectedGrid.Options(264 ))
# Set our module
self.hydrax.setModule(self.Module)
Modified: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg 2008-11-24 00:08:28 UTC (rev 817)
+++ trunk/python-ogre/demos/plugins.cfg 2008-11-26 04:04:08 UTC (rev 818)
@@ -1,13 +1,19 @@
# 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_OctreeSceneManager.dll
+Plugin=Plugin_CgProgramManager.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
+# 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-24 00:08:28 UTC (rev 817)
+++ trunk/python-ogre/environment.py 2008-11-26 04:04:08 UTC (rev 818)
@@ -42,8 +42,9 @@
return False
def is64():
- if os.uname()[4] == 'x86_64':
- return True
+ if isLinux():
+ if os.uname()[4] == 'x86_64': # TOFIX - can we use sys.platform for this as uname is linux specific..
+ return True
return False
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-11-24 00:08:31
|
Revision: 817
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=817&view=rev
Author: mithro
Date: 2008-11-24 00:08:28 +0000 (Mon, 24 Nov 2008)
Log Message:
-----------
Another AMD64 fix.
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2008-11-23 15:50:26 UTC (rev 816)
+++ trunk/python-ogre/BuildModule.py 2008-11-24 00:08:28 UTC (rev 817)
@@ -96,6 +96,8 @@
env["CCFLAGS"]+=" "+env["CFLAGS"]
env["LDFLAGS"]+="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin"
env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages"
+ if environment.is64():
+ env["PYTHONPATH"]=PREFIX+"/lib64/python"+environment.PythonVersionString+"/site-packages"
env["ZZIPLIB_LIBS"]="-lzzip"
env["PATH"]=PREFIX+"/bin:" + PATH
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-11-23 15:50:40
|
Revision: 816
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=816&view=rev
Author: mithro
Date: 2008-11-23 15:50:26 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Remove all that extra whitespace.
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2008-11-23 15:49:24 UTC (rev 815)
+++ trunk/python-ogre/BuildModule.py 2008-11-23 15:50:26 UTC (rev 816)
@@ -34,36 +34,36 @@
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
"""
dict = {}
for c in dir(environment):
var = environment.__dict__[c]
- if isinstance ( var, types.ClassType ) : ## OK so we know it's a class
+ if isinstance ( var, types.ClassType ) : ## OK so we know it's a class
# logger.debug ( "getClassList: Checking %s" % c )
if hasattr(var, 'active') and hasattr(var, 'pythonModule'): # and it looks like one we care about
# logger.debug ( "getClassList: it's one of ours")
dict[c] = var
return dict
-
+
def exit( ExitMessage ):
logger.error( ExitMessage )
sys.exit( -1 )
-
-## This stuff has to be in my spawing sub process
+
+## This stuff has to be in my spawing sub process
# # export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PREFIX/lib/pkgconfig
# # export LD_LIBRARY_PATH=$PREFIX/lib
# # export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
# # export CXXFLAGS=$CFLAGS
# # export LDFLAGS="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin"
# # export PATH=$PREFIX/bin:$PATH
-# # export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
-
-
+# # export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
+
+
def spawnTask ( task, cwdin = '', getoutput=None ):
"""Execute a command line task and manage the return code etc
"""
@@ -76,7 +76,7 @@
env["PKG_CONFIG_PATH"]=os.path.join(PREFIX,"lib/pkgconfig")
env["LD_LIBRARY_PATH"]=os.path.join(PREFIX,"lib")
if environment.isMac():
- env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
+ env["CFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
env["CXXFLAGS"]="-I"+PREFIX+"/include -L"+PREFIX+"/lib"
##env["LDFLAGS"]="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin" ### Mac GCC 4.0.1 doesn't support rpath
env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages"
@@ -84,23 +84,23 @@
for FLAGS in "CFLAGS", "CXXFLAGS", "CCFLAGS", "LDFLAGS":
if not FLAGS in env:
env[FLAGS] = ""
- if environment.isWindows():
+ if environment.isWindows():
env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")
else:
env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib")
if environment.is64():
env["CFLAGS"]+=" -L"+os.path.join(PREFIX,"lib64")
-
+
env["CXXFLAGS"]+=" "+env["CFLAGS"]
env["CCFLAGS"]+=" "+env["CFLAGS"]
env["LDFLAGS"]+="-Wl,-rpath='$$ORIGIN/../../lib' -Wl,-rpath='$$ORIGIN' -Wl,-z,origin"
env["PYTHONPATH"]=PREFIX+"/lib/python"+environment.PythonVersionString+"/site-packages"
env["ZZIPLIB_LIBS"]="-lzzip"
-
+
env["PATH"]=PREFIX+"/bin:" + PATH
- ENV_SET=True
-
+ ENV_SET=True
+
logger.debug ( "Spawning '%s' in '%s'" % (task,cwdin) )
if VERBOSE:
@@ -114,7 +114,7 @@
returncode = process.returncode
except:
returncode = -1
-
+
if getoutput is not None:
if returncode != -1:
getoutput.write(out)
@@ -128,14 +128,14 @@
logger.warning ( "Full Logging ON" )
logger.debug ( out )
logger.debug ( err )
-
+
if returncode != 0 and FAILHARD:
exit(" The following command failed %s" % task)
- return returncode
-
+ return returncode
+
def retrieveSource ( module ):
""" Here's we we retrieve the necessary source files
- """
+ """
for cmd,args,cwd in module.source:
logger.info ("Retrieving %s" % args )
ret = spawnTask ( cmd+ " " + args, cwd )
@@ -149,7 +149,7 @@
path = os.getcwd()
ret = spawnTask ( cmd, path )
-
+
def buildModule ( module ):
""" Execute the build commands for the module
"""
@@ -163,7 +163,7 @@
logger.debug ("Compiling %s " % cmd )
code = compile ( cmd, '<string>', 'exec' )
logger.debug ("executing codeblock " )
- exec code
+ exec code
logger.debug ( "Exec done")
from cStringIO import StringIO
@@ -191,7 +191,7 @@
ret = spawnTask("cp -rvf %s %s" % (debianour, debiandir), os.getcwd())
if ret != 0:
exit("Was not able to copy the debian directory over")
-
+
# Rewrite any place holders
for file in os.listdir(debiandir):
if not os.path.isfile(os.path.join(debiandir, file)):
@@ -199,7 +199,7 @@
ret = spawnTask( "sed --in-place "+os.path.join(debiandir,file)+" -e\"s|%%SHORTDATE%%|`date +%Y%m%d`|\" -e\"s|%%LONGDATE%%|`date +'%a, %d %b %Y %H:%m:%S %z'`|\" -e\"s|%%VERSION%%|"+module.source_version+"|\"", srcdir)
if ret != 0:
exit("Was not able to update the debian %s." % file)
-
+
# Check that all the dependencies for this package are avaliable
c = StringIO()
ret = spawnTask("dpkg-checkbuilddeps", srcdir, c)
@@ -280,7 +280,7 @@
' -e "s^%%BUILDDEPS%%^`cat '+os.path.join(debiandir, "control")+' | grep Build-Depends:`^"' + \
' -e "s|%%VERSION%%|'+module.source_version+'|g"'
, buildbase)
-
+
# Do some cleanup
spawnTask("rm -rf %s" % builddir, buildbase)
spawnTask("rm %s.md5sum" % module.base, buildbase)
@@ -296,22 +296,22 @@
if ret != 0:
logger.warning("Was not able to the install package!")
logger.info("Package installed.")
-
+
def generateCode ( module ):
""" Generate the C++ wrapper code
"""
logger.info ( "Building Source code for " + module.name )
### AJM -- note the assumption that environment.py is sitting in the 'python-ogre' directory...
- ret = spawnTask ( 'python generate_code.py'+('', ' --usesystem')[environment.UseSystem], os.path.join(environment.root_dir, 'code_generators', module.name) )
+ ret = spawnTask ( 'python generate_code.py'+('', ' --usesystem')[environment.UseSystem], os.path.join(environment.root_dir, 'code_generators', module.name) )
def compileCode ( module ):
""" Compile the wrapper code and make the modules
"""
logger.info ( "Compiling Source code for " + module.name )
### AJM -- note the assumption that environment.py is sitting in the 'python-ogre' directory...
- ret = spawnTask ( 'scons PROJECTS='+module.name, os.path.join(environment.root_dir) )
+ ret = spawnTask ( 'scons PROJECTS='+module.name, os.path.join(environment.root_dir) )
if ret != 0 :
- time.sleep(5) ## not sure why scons doesn't work after first failure
+ time.sleep(5) ## not sure why scons doesn't work after first failure
FAILHARD=False
def parseInput():
@@ -329,21 +329,21 @@
parser.add_option("-l", "--logfilename", default="log.out" ,dest="logfilename", help="Override the default log file name")
parser.add_option("-G", "--genall", action="store_true", default=False ,dest="gencodeall", help="Generate Source Code for all possible modules")
parser.add_option("-C", "--compileall", action="store_true", default=False ,dest="compilecodeall", help="Compile Source Code for all posssible modules")
- parser.add_option("-e", "--failhard", action="store_true", default=False, dest="failhard", help="Exit with failure code on first error.")
-
+ parser.add_option("-e", "--failhard", action="store_true", default=False, dest="failhard", help="Exit with failure code on first error.")
+
(options, args) = parser.parse_args()
return (options,args)
-
+
if __name__ == '__main__':
classList = getClassList ()
-
+
(options, args) = parseInput()
if len(args) == 0 and not (options.compilecodeall or options.gencodeall):
exit("The module to build wasn't specified. Use -h for help")
setupLogging(options.logfilename)
logger = logging.getLogger('PythonOgre.BuildModule')
-
+
if options.retrieve==False and options.build==False and options.gencode==False and options.compilecode==False\
and options.compilecodeall==False and options.gencodeall==False and options.builddeb==False\
and options.installdeb==False and options.buildservice==False:
@@ -355,25 +355,25 @@
VERBOSE=options.verbose
if not os.path.exists( environment.downloadPath ):
- os.mkdir ( environment.downloadPath )
+ os.mkdir ( environment.downloadPath )
if not os.path.exists( environment.Config.ROOT_DIR ):
- os.mkdir ( environment.Config.ROOT_DIR )
+ os.mkdir ( environment.Config.ROOT_DIR )
if not os.path.exists( os.path.join(environment.Config.ROOT_DIR, 'usr' ) ):
- os.mkdir ( os.path.join(environment.Config.ROOT_DIR, 'usr' ) )
+ os.mkdir ( os.path.join(environment.Config.ROOT_DIR, 'usr' ) )
if options.gencodeall or options.compilecodeall:
for name,cls in environment.projects.items():
if cls.active and cls.pythonModule:
if options.gencodeall:
generateCode( cls )
if options.compilecodeall:
- compileCode( cls )
+ compileCode( cls )
else:
- for moduleName in args:
+ for moduleName in args:
if not classList.has_key( moduleName ):
exit("Module specificed was not found (%s is not in environment.py) " % moduleName )
- if options.retrieve:
+ if options.retrieve:
retrieveSource ( classList[ moduleName ] )
if options.buildservice:
buildService( classList[ moduleName ] )
@@ -382,7 +382,7 @@
if options.installdeb:
buildInstall( classList[ moduleName ] )
- if options.build :
+ if options.build :
buildModule ( classList[ moduleName ] )
if options.gencode :
if classList[ moduleName ].pythonModule == True:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-11-23 15:49:27
|
Revision: 815
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=815&view=rev
Author: mithro
Date: 2008-11-23 15:49:24 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Also search the lib64 directory on 64bit arch's.
Modified Paths:
--------------
trunk/python-ogre/BuildModule.py
Modified: trunk/python-ogre/BuildModule.py
===================================================================
--- trunk/python-ogre/BuildModule.py 2008-11-23 15:39:04 UTC (rev 814)
+++ trunk/python-ogre/BuildModule.py 2008-11-23 15:49:24 UTC (rev 815)
@@ -88,6 +88,9 @@
env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")
else:
env["CFLAGS"]+=" "+"-I"+os.path.join(PREFIX,"include")+ " -L"+os.path.join(PREFIX,"lib")
+ if environment.is64():
+ env["CFLAGS"]+=" -L"+os.path.join(PREFIX,"lib64")
+
env["CXXFLAGS"]+=" "+env["CFLAGS"]
env["CCFLAGS"]+=" "+env["CFLAGS"]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-11-23 15:39:08
|
Revision: 814
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=814&view=rev
Author: mithro
Date: 2008-11-23 15:39:04 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Remove all that extra whitespace.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-23 15:37:17 UTC (rev 813)
+++ trunk/python-ogre/environment.py 2008-11-23 15:39:04 UTC (rev 814)
@@ -7,7 +7,7 @@
## Jan 2007 modification
##
## This will now look for external config files.
-##
+##
## first it will look for PythonOgreConfig_<username>.py
##
## if that fails it will look for PythonOgreConfig_<platform>.py
@@ -24,15 +24,15 @@
print __file__, "LOG::", instring
def isWindows():
- if os.name == 'nt':
+ if os.name == 'nt':
return True
return False
-
+
def isLinux():
if os.name == 'posix' and os.sys.platform != 'darwin':
return True
- return False
-
+ return False
+
def isDebian():
return os.path.exists("/etc/debian_version")
@@ -44,9 +44,9 @@
def is64():
if os.uname()[4] == 'x86_64':
return True
- return False
+ return False
-
+
##
## set this to True if you compiled Ogre with Threads enabled
##
@@ -54,12 +54,12 @@
_USE_THREADS = True
else:
_USE_THREADS = False
-
-
+
+
PythonOgreMajorVersion = "1"
-PythonOgreMinorVersion = "6"
+PythonOgreMinorVersion = "6"
PythonOgrePatchVersion = "0"
-
+
##
## these should be fine with auto create - however override them as necessary
##
@@ -67,7 +67,7 @@
## I want a version string 2.4 or 2.5 etc
PythonVersionString = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
-if isWindows():
+if isWindows():
python_include_dirs = os.path.join ( PATH_Python, 'include')
python_lib_dirs = os.path.join ( PATH_Python, 'libs' )
##
@@ -89,8 +89,8 @@
sys.path.append( os.path.join( root_dir, 'common_utils' ) )
shared_ptr_dir = os.path.join( root_dir, 'shared_ptr' )
include_dir = os.path.join( root_dir, 'include' )
-generated_dir_name = 'generated'
-package_dir_name = 'packages'+ "_" + PythonVersionString
+generated_dir_name = 'generated'
+package_dir_name = 'packages'+ "_" + PythonVersionString
generated_dir = os.path.join( root_dir, generated_dir_name )
declarations_cache_dir = os.path.join( root_dir, 'code_generators', 'cache' )
@@ -119,26 +119,26 @@
s= 'PythonOgreConfig_system'
else:
s= 'PythonOgreConfig_' + _SystemType ## + '.py'
-
+
Config = __import__( s )
_ConfigSet = True
log ( "Loaded Config (based on systemtype) from %s" % (s))
except ImportError:
- pass
+ pass
if not _ConfigSet:
log ( " Going to use internal config setting")
## These need to be adjusted based upon your system
##
## PLEASE use an external PythonOgreConfig_<username>.py to hold these value !!!!
- ##
+ ##
print "\n\n You DO need to create a PythonOgreConfig_%s.py file with config details" % ( _SystemType)
sys.exit(-1)
_STABLE = os.path.exists(os.path.join(os.path.split(__file__)[0], "STABLE")) # set to true if using specific versions of CVS and SVN checkouts..
######################
-downloadPath = os.path.abspath("downloads")
+downloadPath = os.path.abspath("downloads")
wget = "wget -c -nc "
tar = "tar "
gzip = "gzip "
@@ -163,13 +163,13 @@
sed_ = "sed -i '' "
else:
sed_ = "sed --in-place "
-
-if isMac():
+
+if isMac():
Config.PATH_Boost = os.path.join(Config.LOCAL_INCLUDE, 'boost-1_34_1')
Config.LIB_Boost = 'libboost_python-1_34_1'
Config.RPATH=""
-
-## BIG assumption about where you want things put
+
+## BIG assumption about where you want things put
if UseSystem:
ROOT = '/'
PREFIX = '/usr'
@@ -191,12 +191,12 @@
]
return ret
-
+
####################################################
##
-## These are the base tools and libraries
+## These are the base tools and libraries
##
####################################################
class gccxml:
@@ -219,39 +219,39 @@
[0,"cmake ../gccxml -DCMAKE_INSTALL_PREFIX:PATH="+ PREFIX,os.path.join(os.getcwd(),'gccxml-build')],
[0,"make", os.path.join(os.getcwd(),'gccxml-build')],
[0,"make install",os.path.join(os.getcwd(),'gccxml-build')]
- ]
+ ]
else:
-
- buildCmds = [
+
+ buildCmds = [
[0,'echo Please use CMAKE to create a msvc build projects for gccxml',''],
[0,'echo ie. Run Cmake (from the windows menu)',''],
[0,'echo specific the gccxml for both directories and run configure',''],
[0,'echo ignore any errors - you will need to run configure twice and then OK',''],
[0,'echo Now run MSVC and load the gccxml project (in the gccxml directory) and build it','']
]
-
+
class install:
pythonModule = False
active = True
source = [
]
-
+
buildCmds = [
[0,"python setup.py install --prefix=%s" % PREFIX, os.path.join(os.getcwd(),'python-ogre')]
- ]
-
+ ]
+
class newton:
pythonModule = False
active = True
# if not os.path.exists( os.path.join(os.getcwd(), 'ogreaddons/ogrenewt')):
-# os.makedirs ( os.path.join(os.getcwd(), 'ogreaddons/ogrenewt') )
+# os.makedirs ( os.path.join(os.getcwd(), 'ogreaddons/ogrenewt') )
if isLinux():
base = 'newton'
source = [
[wget, "http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz", downloadPath]
]
-
+
buildCmds = [
[0, "tar zxf " + os.path.join(downloadPath, "newtonLinux-1.53.tar.gz"), ''],
[0,"patch -s -i ./python-ogre/patch/Newton.patch -p0 ", ''],
@@ -264,7 +264,7 @@
source = [
[wget, "http://www.newtondynamics.com/downloads/NewtonMac-1.53.zip", downloadPath]
]
-
+
buildCmds = [
[0, "unzip -q -o " + os.path.join(downloadPath, "NewtonMac-1.53.zip"), ''],
[0,"patch -s -i ./python-ogre/patch/Newton.patch -p0 ", ''],
@@ -272,18 +272,18 @@
[0, "cp newtonSDK/sdk/*.a %s/lib" % PREFIX, ''],
[0, "cp newtonSDK/sdk/*.a ogreaddons/ogrenewt" , '']
]
-
+
if isWindows():
base = 'newton'
source = [
[wget, "http://www.newtondynamics.com/downloads/NewtonWin-1.53.zip", downloadPath]
]
-
+
buildCmds = [
[0, unzip + os.path.join(downloadPath, "NewtonWin-1.53.zip"), ''],
[0, "setup.exe", ''],
]
-
+
class pygccxml:
pythonModule = False
active = True
@@ -293,23 +293,23 @@
source = [
[svn, " co -r 1383 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
]
- else:
+ else:
source_version = "1446"
source = [
[svn, " co -r 1446 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pygccxml_dev "+base, os.getcwd()]
- ]
+ ]
if isLinux() or isMac() :
buildCmds = [
# # [0, "patch -s -N -i ../python-ogre/patch/pygccxml.patch -p0 ", os.path.join(os.getcwd(), base) ],
[0,"python setup.py install --prefix="+ PREFIX , os.path.join (os.getcwd(), base) ],
- ]
+ ]
if isWindows():
buildCmds = [
# # [0, "patch -s -N -i ../python-ogre/patch/pygccxml.patch -p0 ", os.path.join(os.getcwd(), base) ],
[0,"python setup.py install " , os.path.join (os.getcwd(), base) ],
- ]
-
+ ]
+
class pyplusplus:
pythonModule = False
active = True
@@ -319,23 +319,23 @@
source = [
[svn, " co -r 1383 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
]
- else:
+ else:
source_version = "1446"
source = [
[svn, " co -r 1446 https://pygccxml.svn.sourceforge.net/svnroot/pygccxml/pyplusplus_dev "+base, os.getcwd()]
- ]
+ ]
if isLinux() or isMac() :
buildCmds = [
[0,"python setup.py install --prefix=" + PREFIX , os.path.join (os.getcwd(), base) ]
- ]
+ ]
if isWindows():
buildCmds = [
[0,"python setup.py install " , os.path.join (os.getcwd(), base) ]
- ]
-
+ ]
+
class cg:
## we don't need this for Windows as it's part of the Ogre dependencies package
-
+
pythonModule = False
active = True
if isLinux():
@@ -346,20 +346,20 @@
source = [
[wget, " http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0015/"+base+".tgz",downloadPath]
]
-
+
buildCmds = [
[0,tar + " xvzf "+ os.path.join(downloadPath,base) + ".tgz --overwrite", ROOT], # unpack it directly into 'our' root
- ]
+ ]
if isMac():
source = [
[wget, "http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0015/Cg-2.0_May2008.dmg", downloadPath ]
-
- ]
+
+ ]
buildCmds = [
]
-## "http://downloads.sourceforge.net/ogre/OgreDependenciesOSX_20070929.zip"
+## "http://downloads.sourceforge.net/ogre/OgreDependenciesOSX_20070929.zip"
-
+
class zziplib:
## The 'install' "fails" on the mac however it's actually OK
pythonModule = False
@@ -369,16 +369,16 @@
source = [
[wget, " http://downloads.sourceforge.net/zziplib/"+base+".tar.bz2",downloadPath],
]
-
+
buildCmds = [
- [0,tar + " xjf "+ os.path.join(downloadPath,base) + ".tar.bz2 --overwrite", ''],
+ [0,tar + " xjf "+ os.path.join(downloadPath,base) + ".tar.bz2 --overwrite", ''],
[0,"aclocal", os.path.join(os.getcwd(), base) ],
[0,"./configure --prefix=%s --datadir=%s/share --includedir=%s/include " % (PREFIX,PREFIX,PREFIX), os.path.join(os.getcwd(), base) ],
[0,"make" ,os.path.join(os.getcwd(), base) ],
[0,"make install",os.path.join(os.getcwd(), base) ]
- ]
-
-
+ ]
+
+
class freeimage:
pythonModule = False
active = True
@@ -387,12 +387,12 @@
source = [
[wget, " http://downloads.sourceforge.net/freeimage/FreeImage3110.zip",downloadPath],
]
-
+
if isLinux():
buildCmds = [
[0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3110.zip", ''],
##
- # Note the use of a single command that does multiple sed's
+ # Note the use of a single command that does multiple sed's
##
[0, """sed --in-place -s 's|/usr/include|\$(DESTINC)|' Makefile.*\n\
sed --in-place -s 's|/usr/lib|\$(DESTLIB)|' Makefile.*\n\
@@ -400,35 +400,35 @@
sed --in-place -s 's|ldconfig||' Makefile.*""", os.path.join(os.getcwd(), base) ],
[0, "make", os.path.join(os.getcwd(), base) ],
[0, "make DESTINC=%s/include DESTLIB=%s/lib install " % (PREFIX, PREFIX) ,os.path.join(os.getcwd(), base) ]
- ]
+ ]
if isMac(): ## mac has a crap sed command implementation and a different shell interaction, plus make file is a little different (or course)
buildCmds = [
[0, unzip + " -q -o " + os.path.join(downloadPath,base) + "3110.zip", ''],
##
- # Note the use of a single command that does multiple sed's
+ # Note the use of a single command that does multiple sed's
##
[0, """sed -i '' 's|/usr/local|$(DEST)|' Makefile.*\n\
sed -i '' 's|-o root -g wheel||' Makefile.*\n\
sed -i '' 's|ldconfig||' Makefile.*""", os.path.join(os.getcwd(), base) ],
[0, "make", os.path.join(os.getcwd(), base) ],
[0, "make DEST=%s install " % PREFIX ,os.path.join(os.getcwd(), base) ]
- ]
-
-
+ ]
+
+
class cmake:
pythonModule = False
active = True
if isLinux() or isMac():
base = 'cmake-2.6.2-Linux-i386'
-
+
if isMac():
base = 'cmake-2.6.2-Darwin-universal'
-
+
source = [
[wget, "http://www.cmake.org/files/v2.6/"+base+".tar.gz",downloadPath],
]
-
-
+
+
buildCmds = [
[0,tar + " xzf "+ os.path.join(downloadPath,base) + ".tar.gz --overwrite", ''], # unpack it
[0,cp + "-R * " + PREFIX, os.path.join (os.getcwd(), base) ] # copy to our bin area
@@ -438,8 +438,8 @@
buildCmds = [
[0, os.path.join(downloadPath, "cmake-2.6.2-win32-x86.exe"), '' ]
]
-
-
+
+
class scons:
pythonModule = False
active = True
@@ -447,20 +447,20 @@
source = [
[wget, "http://prdownloads.sourceforge.net/scons/"+base+".tar.gz",downloadPath],
]
-
- # the utils in Windows don't handle paths or tar spawing gzip hence the work arounds
+
+ # the utils in Windows don't handle paths or tar spawing gzip hence the work arounds
if isLinux() or isMac():
buildCmds = [
[0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",'' ],
[0,"python setup.py install --prefix=%s" % PREFIX , os.path.join (os.getcwd(), base) ]
]
-
+
else:
buildCmds = unTarGz( base, downloadPath ) +\
[
[0,"python setup.py install ", os.path.join (os.getcwd(), base) ]
]
-
+
class boost: ## also included bjam
active = True
version = "3.5"
@@ -472,7 +472,7 @@
base = 'boost_1_36_0'
lib = 'boost_python-vc90-mt-1_36'
versionBase = '1_36' ## the version used on the library name
- else:
+ else:
base = 'boost_1_36_0'
lib = 'boost_python-vc90-mt-1_36'
versionBase = '1_36' ## the version used on the library name
@@ -495,18 +495,18 @@
else:
bjambuilddir = 'bin.linuxx86'
bjambuildset = 'gcc'
-
+
source = [
[wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.16.tgz', downloadPath],
[wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
- ]
+ ]
buildCmds = [
## first handle bjam
[0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''],
[0,"./build.sh " + bjambuildset, os.path.join(os.getcwd(), bjambase )],
[0,"mkdir -p %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase )],
[0,cp + " bjam %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase, bjambuilddir )], ## may need to change on 64 bit systems
-
+
## and now boost
[0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''],
[0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ],
@@ -517,14 +517,14 @@
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )],
]
-
+
if isWindows():
bjambase = 'boost-jam-3.1.16-1-ntx86'
source = [
[wget,'http://downloads.sourceforge.net/boost/'+bjambase+'.zip',downloadPath] ,
[wget,'http://downloads.sourceforge.net/boost/'+base+'.zip',downloadPath]
- ]
-
+ ]
+
buildCmds = [
[0,unzip + os.path.join(downloadPath, bjambase+".zip"), ''],
[0,unzip + os.path.join(downloadPath, base + ".zip"), ''],
@@ -535,7 +535,7 @@
[0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
[0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
]
-
+
if not isWindows():
# Figure out the gcc version we are running - this is needed by Boost
# FIXME: This assumes that the gcc we are building with now was what we built boost with
@@ -543,7 +543,7 @@
gccp = subprocess.Popen (["gcc", "--version"], stdout=subprocess.PIPE)
import re
gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0].split('.')
- # FIXME: Should this be the multithreaded version!?
+ # FIXME: Should this be the multithreaded version!?
lib = "boost_python-gcc%s%s-mt-%s" % (gcc_version[0], gcc_version[1], versionBase)
class boost_python_index:
@@ -564,7 +564,7 @@
[0,'make all %s' % FLAGS, os.path.join(os.getcwd(), base)],
[0,'make install %s' % FLAGS, os.path.join(os.getcwd(), base)],
]
-
+
lib = boost.lib.replace("python", "python_index")
####################################################
@@ -572,7 +572,7 @@
## Now for the actual Python-Ogre Modules
##
####################################################
-
+
class ogre:
active = True
pythonModule = True
@@ -586,9 +586,9 @@
myLibraryPaths = []
myLibraries = ['OgreMain']
libraries = myLibraries
-
- if isWindows():
-
+
+ if isWindows():
+
if _STABLE or not _STABLE: ## temp force to this version...
version="1.6.0"
source = [
@@ -601,9 +601,9 @@
os.path.join(os.getcwd(), 'ogre') ],
[0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
[0,'echo Please use MSVC Express Edition to build Ogre Release.','']
- ]
+ ]
# else:
-#
+#
# version="trunk"
# source = [
# [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath],
@@ -614,8 +614,8 @@
# os.path.join(os.getcwd(), 'ogre') ],
# [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.patch -p0 ", os.getcwd()],
# [0,'echo Please use MSVC Express Edition to build Ogre Release.','']
-# ]
-
+# ]
+
# requirements to build a precompiled header on the fly
if _PreCompiled:
pchstop = 'python_ogre_precompiled.h'
@@ -629,8 +629,8 @@
, Config.PATH_LIB_Ogre_Dependencies #needed for ceguibase.lib etc
, Config.PATH_LIB_CEGUI
]
- include_dirs = [ Config.PATH_Boost
- , Config.PATH_INCLUDE_Ogre
+ include_dirs = [ Config.PATH_Boost
+ , Config.PATH_INCLUDE_Ogre
, Config.PATH_INCLUDE_NEDMALLOC
]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 '
@@ -667,19 +667,19 @@
lib_dirs=[Config.LOCAL_LIB]
include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D__PYTHONOGRE_BUILD_CODE '
-
+
source = [
[wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
]
-
+
elif isMac():
version = "1.6.0RC1"
base = "ogre-linux_osx-v1-4-9"
basedep = "OgreDependenciesOSX_20070929"
source = [
[wget, "http://prdownloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
- [wget, "http://downloads.sourceforge.net/ogre/" +basedep +".zip",downloadPath],
+ [wget, "http://downloads.sourceforge.net/ogre/" +basedep +".zip",downloadPath],
]
buildCmds = [
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
@@ -696,21 +696,21 @@
[0, "xcodebuild -project ogre/Mac/Samples/Samples.xcodeproj -configuration Release", ''],
[0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ]
]
-
+
libs=[boost.lib]
lib_dirs = [ Config.PATH_LIB_Boost ]
- include_dirs = [ Config.PATH_Boost
+ include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
, python_include_dirs
]
-
+
CCFLAGS = ''
LINKFLAGS = ''
cflags += ''
-
+
CheckIncludes=['boost/python.hpp', 'Ogre.h']
-
-
+
+
class ois:
active = True
pythonModule = True
@@ -735,7 +735,7 @@
# [0,'make', os.path.join(os.getcwd(), base )],
# [0,'make install', os.path.join(os.getcwd(), base )]
# ]
-
+
buildCmds = [
[0, tar + " zxf " + os.path.join(downloadPath,'ois_1.2.0')+".tar.gz --overwrite",os.getcwd() ],
[0, "./bootstrap" ,os.path.join(os.getcwd(), base )],
@@ -751,23 +751,23 @@
# [0, '"c:/Program Files/Microsoft Visual Studio 8/vc/vcpackages/vcbuild.exe" /useenv ois_VC8.sln ', os.path.join(os.getcwd(), base, 'Win32' )],
# [0, VCBUILD + " ois_vc8.sln " + "\"Release|Win32\"", os.path.join(os.getcwd(), base, 'Win32' )]
]
-
+
if os.name=='nt':
if _PreCompiled:
pchstop = 'OIS.h'
pchbuild = 'buildpch.cpp'
pchincludes = ['boost/python.hpp', 'OIS.h']
-
+
libs=['OIS_Static',boost.lib]
else:
libs=['OIS',boost.lib]
libs.append ( boost_python_index.lib )
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
- include_dirs = [ Config.PATH_Boost
+ include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_OIS
]
- lib_dirs = [ Config.PATH_LIB_Boost
+ lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_OIS
]
ModuleName = 'OIS'
@@ -777,7 +777,7 @@
LINKFLAGS = '-framework Python -framework Carbon'
else:
LINKFLAGS = "-l%s" % boost_python_index.lib
-
+
class ogrerefapp:
active = True
pythonModule = True
@@ -803,7 +803,7 @@
, Config.PATH_LIB_ODE
, Config.PATH_LIB_OgreRefApp
]
- include_dirs = [ Config.PATH_Boost
+ include_dirs = [ Config.PATH_Boost
,Config.PATH_INCLUDE_Ogre
,Config.PATH_INCLUDE_OgreRefApp
,Config.PATH_INCLUDE_ODE
@@ -811,7 +811,7 @@
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'OgreRefApp'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'OgreReferenceAppLayer.h', 'ode/ode.h']
-
+
class ogrenewt:
active = True
pythonModule = True
@@ -834,7 +834,7 @@
]
baseDir = os.path.join(os.getcwd(), base )
buildCmds = [
- [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
+ [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
#[0, "cp SConscript OgreNewt_Main", baseDir],
#[0, "rm SConscript", baseDir],
[0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
@@ -842,13 +842,13 @@
]
if isWindows():
buildCmds = [
- [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
+ [0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
[0, "rm -r ./OgreNewt_Main/inc/boost", baseDir],
]
include_dirs = [Config.PATH_Boost
, Config.PATH_Newton # only one path for Newton
- , Config.PATH_INCLUDE_Ogre
+ , Config.PATH_INCLUDE_Ogre
, Config.PATH_INCLUDE_OgreNewt
, Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h
]
@@ -856,21 +856,21 @@
,Config.PATH_LIB_Newton
,Config.PATH_LIB_OgreNewt
, Config.PATH_LIB_Ogre_OgreMain
-
+
]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'OgreNewt'
CheckIncludes=['boost/python.hpp', 'Ogre.h', 'OgreNewt.h', 'Newton.h']
-
+
class cegui:
active = True
pythonModule = True
parent = "ogre/gui"
name = 'cegui'
if _STABLE:
- version = "0.5.0b"
+ version = "0.5.0b"
else:
- version = "0.6.1"
+ version = "0.6.1"
if isWindows():
if _PreCompiled:
pchstop = 'cegui.h'
@@ -892,7 +892,7 @@
source=[
[wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.1.tar.gz?download", downloadPath]
]
-
+
buildCmds = [
[0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
# [0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
@@ -905,19 +905,19 @@
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )]
]
- if isWindows():
- version = "0.6.1"
+ if isWindows():
+ version = "0.6.1"
base = "CEGUI-0.6.1"
source=[
[wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.1.zip?download", downloadPath]
]
buildCmds = [
[0, unzip + " " + os.path.join(downloadPath,base)+".zip", os.getcwd()],
- [0, 'echo Now run build_vs2008.bat from the CEGUI makefiles\premake directory',''],
+ [0, 'echo Now run build_vs2008.bat from the CEGUI makefiles\premake directory',''],
[0, 'echo then use MSVC to build the CEGUI Release project',''],
[0, 'echo WARNING - Check that RTTI is enabled in the compiler options',''],
[0, 'echo Then ensure that OgreGUIRender is compiled with this version of CEGUI','']
- ]
+ ]
include_dirs = [Config.PATH_Boost
,Config.PATH_INCLUDE_CEGUI
,Config.PATH_CEGUI
@@ -925,16 +925,16 @@
, Config.PATH_INCLUDE_Ogre
, Config.PATH_INCLUDE_Ogre_Dependencies ## needed as OgreCEGUI uses CEGUI/.. in #includes
]
-
+
lib_dirs = [ Config.PATH_LIB_Boost
##, Config.PATH_LIB_Ogre_CEGUIRenderer
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_CEGUI
- , Config.PATH_LIB_Ogre_Dependencies
+ , Config.PATH_LIB_Ogre_Dependencies
]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
ModuleName = 'CEGUI'
- CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
+ CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
if isLinux():
LINKFLAGS = "-l%s" % boost_python_index.lib
@@ -947,22 +947,22 @@
parent = "ogre/physics"
odeLibraryName = 'ode'
libs=[boost.lib, odeLibraryName]
-
+
if isWindows():
odeLibraryName = 'ode_single'
libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
else:
- libs.append ( boost_python_index.lib )
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_ODE
]
- include_dirs = [ Config.PATH_Boost
+ include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_ODE
, os.path.join(Config.PATH_ODE, 'OPCODE')
]
ModuleName = 'ODE'
- CheckIncludes = ['boost/python.hpp', 'ode/ode.h']
+ CheckIncludes = ['boost/python.hpp', 'ode/ode.h']
baseDir = os.path.join(os.getcwd(),"ode-0.10.1")
if not isWindows():
source = [
@@ -976,7 +976,7 @@
[0, "./configure --prefix=%s --includedir=%s/include" %(PREFIX, PREFIX), baseDir],
[0, "make", baseDir],
[0, "make install", baseDir]
-
+
]
else:
source = [
@@ -984,9 +984,9 @@
]
buildCmds = [
[0, unzip + os.path.join(downloadPath,"ode-src-0.10.1.zip"), ''],
- ]
-
-
+ ]
+
+
class opcode:
active = True
pythonModule = True
@@ -998,15 +998,15 @@
libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
]
- include_dirs = [ Config.PATH_Boost
+ include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_OPCODE
, os.path.join(Config.PATH_INCLUDE_OPCODE, 'Ice' )
]
CCFLAGS = ' -DBAN_OPCODE_AUTOLINK -DICE_NO_DLL '
ModuleName = 'Opcode'
- CheckIncludes = ['boost/python.hpp', 'Opcode.h']
-
+ CheckIncludes = ['boost/python.hpp', 'Opcode.h']
+
class caelum:
active = True
pythonModule = True
@@ -1024,11 +1024,11 @@
CheckIncludes=[]
if isLinux():
libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ]
- else:
+ else:
libs=[ boost.lib, 'OgreMain' ]
-
- ModuleName="caelum"
-
+
+ ModuleName="caelum"
+
class ogreode:
active = True
pythonModule = True
@@ -1046,7 +1046,7 @@
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
]
- include_dirs = [ Config.PATH_Boost
+ include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_ODE
, Config.PATH_INCLUDE_OgreOde
, Config.PATH_INCLUDE_OgreOdePrefab
@@ -1062,7 +1062,7 @@
[svn, " co https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogreode " + baseDir, os.getcwd()]
]
buildCmds = [
- [0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir],
+ [0, "patch -s -N -i ../../python-ogre/patch/ogreode.patch -p0", baseDir],
[0, "chmod +x autogen.sh", baseDir],
[0, "./autogen.sh", baseDir],
[0, "./configure --without-SAMPLES --prefix=%s" % PREFIX, baseDir],
@@ -1075,13 +1075,13 @@
libs.append('ode')
libs.append ( boost_python_index.lib )
else:
- libs.append('ode_single')
+ libs.append('ode_single')
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
- CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h',
- 'Ogreode_Prefab.h']
-
+ CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h',
+ 'Ogreode_Prefab.h']
+
ModuleName='OgreOde'
-
+
class quickgui:
active = True
pythonModule = True
@@ -1089,9 +1089,9 @@
name ='quickgui'
parent="ogre/gui"
## note the defined for _QuickGUIExport forces non dll usage
- if os.name=='nt':
- ## note the defined for _QuickGUIExport forces non dll usage
- CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_QuickGUIExport="" -D_PRECOMP'
+ if os.name=='nt':
+ ## note the defined for _QuickGUIExport forces non dll usage
+ CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_QuickGUIExport="" -D_PRECOMP'
# if _PreCompiled:
# pchstop = 'boost/python.hpp'
# pchbuild = 'buildpch.cpp'
@@ -1112,7 +1112,7 @@
libs=[ boost.lib, 'OgreMain' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="QuickGUI"
+ ModuleName="QuickGUI"
class navi:
active = False
@@ -1120,7 +1120,7 @@
version="1.6"
parent="ogre/gui"
name ='navi'
- CCFLAGS = '-D"WIN32" -D"NDEBUG", -D"WINDOWS", -D"_WIN32", -D"NAVI_DYNAMIC_LIB" '
+ CCFLAGS = '-D"WIN32" -D"NDEBUG", -D"WINDOWS", -D"_WIN32", -D"NAVI_DYNAMIC_LIB" '
cflags=""
base = 'navi'
include_dirs = [ Config.PATH_Boost
@@ -1137,12 +1137,12 @@
libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Astral', 'user32',
'kernel32.lib', 'gdi32.lib', 'winspool.lib', 'comdlg32.lib', 'advapi32.lib',
'shell32.lib','ole32.lib','oleaut32.lib','uuid.lib' ]
- ModuleName="navi"
+ ModuleName="navi"
source = [
[svn, " checkout http://navi.googlecode.com/svn/trunk/ "+base, os.getcwd()]
]
-
-
+
+
class betagui:
active = True
pythonModule = True
@@ -1167,9 +1167,9 @@
libs.append ( "User32" ) # needed for static linking
else:
libs.append ( boost_python_index.lib )
-
- ModuleName="betagui"
+ ModuleName="betagui"
+
class ogreforests:
active = True
pythonModule = True
@@ -1189,16 +1189,16 @@
libs=[ boost.lib, 'OgreMain' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="ogreforests"
+ ModuleName="ogreforests"
-
+
class particleuniverse:
active = True
pythonModule = True
version="0.81"
name='particleuniverse'
parent="ogre/addons"
- CCFLAGS = ' '
+ CCFLAGS = ' '
cflags=""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
@@ -1212,8 +1212,8 @@
libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="particleuniverse"
-
+ ModuleName="particleuniverse"
+
class nxogre:
active = True
pythonModule = True
@@ -1235,7 +1235,7 @@
# pchincludes = ['boost/python.hpp', 'nxogre.h']
else:
- CCFLAGS = ' -DNX_LINUX -DLINUX -DNX_DISABLE_FLUIDS '
+ CCFLAGS = ' -DNX_LINUX -DLINUX -DNX_DISABLE_FLUIDS '
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
Config.PATH_LIB_NxOgre,
@@ -1248,10 +1248,10 @@
else:
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
libs.append ( boost_python_index.lib )
- ModuleName="NxOgre"
-
-
-
+ ModuleName="NxOgre"
+
+
+
class theora:
active = True
pythonModule = True
@@ -1263,14 +1263,14 @@
Config.PATH_INCLUDE_Ogre,
Config.PATH_INCLUDE_Theora,
Config.PATH_INCLUDE_TheoraDemo
-
+
]
for d in Config.PATH_INCLUDE_OggVorbisTheora:
include_dirs.append( d )
-
+
if os.name == 'nt':
CCFLAGS = ' -D"WIN32" '
-
+
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
Config.PATH_LIB_Theora,
@@ -1279,8 +1279,8 @@
libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="theora"
-
+ ModuleName="theora"
+
class plib:
active = True
pythonModule = True
@@ -1288,12 +1288,12 @@
name='plib'
parent="ogre/addons"
cflags=""
- CCFLAGS = ' -D"_CRT_SECURE_NO_WARNINGS" '
+ CCFLAGS = ' -D"_CRT_SECURE_NO_WARNINGS" '
include_dirs= [ Config.PATH_INCLUDE_plib,
Config.PATH_THIRDPARTY # needed as net.h includes via plib/xxxx
]
lib_dirs = [ Config.PATH_LIB_Boost,
- ]
+ ]
ModuleName = "plib"
CheckIncludes=[]
if os.name == "nt":
@@ -1301,7 +1301,7 @@
else:
libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
libs.append ( boost_python_index.lib )
-
+
class physx:
active = True
pythonModule = True
@@ -1318,7 +1318,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" -D"NX_USE_SDK_DLLS" -D"_USRDLL" -D"NX_DISABLE_FLUIDS" '
+ 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
@@ -1332,7 +1332,7 @@
source = [
[wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz", downloadPath]
]
-
+
buildCmds = [
[0, "tar zxf " + os.path.join(downloadPath, "PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz"), ''],
[0, "sudo dpkg -i libphysx-common_2.8.1-4_i386.deb", ''],
@@ -1341,7 +1341,7 @@
[0, "sudo dpkg -i libphysx-extras-2.8.1_4_i386.deb", '']
]
- ModuleName="PhysX"
+ ModuleName="PhysX"
# class nxogre_09:
# active = False # True
@@ -1358,9 +1358,9 @@
# include_dirs.append( d )
# if os.name == 'nt':
# CCFLAGS = ' -DWIN32 -DNxExport="" '
-#
+#
# else:
-# CCFLAGS = ' -DNX_LINUX -DLINUX -DNX_DISABLE_FLUIDS '
+# CCFLAGS = ' -DNX_LINUX -DLINUX -DNX_DISABLE_FLUIDS '
# lib_dirs = [Config.PATH_LIB_Boost,
# Config.PATH_LIB_Ogre_OgreMain,
# Config.PATH_LIB_PhysX
@@ -1370,7 +1370,7 @@
# libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader','OgreMain' ]
# else:
# libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain' ]
-# ModuleName="NxOgre_09"
+# ModuleName="NxOgre_09"
class ogreal:
active = True
@@ -1378,33 +1378,33 @@
version="r115"
name='ogreal'
cflags = ''
-
+
parent = "ogre/sound"
-
+
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
, Config.PATH_INCLUDE_OgreAL
, Config.PATH_INCLUDE_OGG
, Config.PATH_INCLUDE_VORBIS
, Config.PATH_INCLUDE_OPENAL
- ]
-
- if isWindows():
+ ]
+
+ if isWindows():
lib_dirs = [ Config.PATH_LIB_Boost
- ,Config.PATH_LIB_Ogre_OgreMain
+ ,Config.PATH_LIB_Ogre_OgreMain
,os.path.join(Config.PATH_OGG, 'win32', 'Static_Release')
,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, 'Release' ) #'libs','Win32')
,Config.PATH_LIB_OgreAL
- ]
- CCFLAGS = ' -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS ' #-DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER '
- libs=[boost.lib, 'OgreMain',
- 'ogg_static',
+ ]
+ CCFLAGS = ' -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS ' #-DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER '
+ libs=[boost.lib, 'OgreMain',
+ 'ogg_static',
'vorbis_static','vorbisfile_static',
#'vorbisenc_static',
- 'OpenAL32',
+ 'OpenAL32',
#'EFX-Util'
] # -- going to compile OgreAL ourselves
@@ -1423,8 +1423,8 @@
]
else:
lib_dirs = [ Config.PATH_LIB_Boost
- ,Config.PATH_LIB_Ogre_OgreMain
- ]
+ ,Config.PATH_LIB_Ogre_OgreMain
+ ]
source = [
# ["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",downloadPath],
["wget", "http://connect.creativelabs.com/openal/Downloads/openal-soft-1.5.304.tar.bz2",downloadPath],
@@ -1441,24 +1441,24 @@
[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,"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',
+ #'ogg',
#'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
- libs.append ( boost_python_index.lib )
+ libs.append ( boost_python_index.lib )
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
-
+
class ogrevideoffmpeg:
active = False
pythonModule = True
@@ -1484,7 +1484,7 @@
'libvorbisenc','libvorbisfile','libtheora','libgsm','libvfw32','libgcc' ]
else:
libs=[ boost.lib, 'OgreMain', 'avformat', 'avcodec', 'avutil', 'z', 'GL', 'GLU', 'Xxf86vm', 'Xext', 'X11' ]
- ModuleName="ogrevideoffmpeg"
+ ModuleName="ogrevideoffmpeg"
class ogredshow:
active = False
@@ -1492,9 +1492,9 @@
version="0.1"
name='ogredshow'
parent="ogre/addons"
- if os.name=='nt':
- ## note the defined for _ETManagerExport forces non dll usage
- CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_ETManagerExport="" '
+ if os.name=='nt':
+ ## note the defined for _ETManagerExport forces non dll usage
+ CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_ETManagerExport="" '
else:
CCFLAGS = ''
cflags = ""
@@ -1504,12 +1504,12 @@
]
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
-
+
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain','Strmiids' , 'ole32']
- ModuleName="ogredshow"
-
+ ModuleName="ogredshow"
+
class et: ## editable terrain
active = True
pythonModule = True
@@ -1520,7 +1520,7 @@
libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ]
else:
libs=[ boost.lib, 'OgreMain' ]
-
+
lib_dirs = [ Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain
]
@@ -1529,10 +1529,10 @@
Config.PATH_et
]
ModuleName = 'et'
- CheckIncludes = ['boost/python.hpp']
+ CheckIncludes = ['boost/python.hpp']
CCFLAGS = " "
cflags=''
-
+
class bullet:
active = True
pythonModule = True
@@ -1555,7 +1555,7 @@
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Bullet
]
- include_dirs = [ Config.PATH_Boost
+ include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
]
if not isWindows():
@@ -1581,19 +1581,19 @@
buildCmds = [
[0, unzip +os.path.join(downloadPath, base)+".zip", ''],
]
-
+
ModuleName = 'bullet'
- CheckIncludes = ['boost/python.hpp']
+ CheckIncludes = ['boost/python.hpp']
cflags = ""
-
-class ogrebulletc: #
+
+class ogrebulletc: #
active = True
pythonModule = True
name='ogrebulletc'
version = "r2493"
cflags = ""
parent = "ogre/physics"
- libs = [boost.lib, 'OgreMain',
+ libs = [boost.lib, 'OgreMain',
'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath'
]
# if isWindows():
@@ -1603,8 +1603,8 @@
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
- , Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
+ , Config.PATH_INCLUDE_Ogre
+ , Config.PATH_INCLUDE_Ogre_Dependencies
]
lib_dirs = [ Config.PATH_LIB_Boost
,Config.PATH_LIB_Bullet
@@ -1616,17 +1616,17 @@
CCFLAGS = ' -D_PRECOMP -fno-inline '
libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletC'
- CheckIncludes=['boost/python.hpp', 'Ogre.h']
+ CheckIncludes=['boost/python.hpp', 'Ogre.h']
-class ogrebulletd: #
+class ogrebulletd: #
active = True
pythonModule = True
version = "r2493"
name='ogrebulletd'
cflags = ""
parent = "ogre/physics"
- libs = [boost.lib, 'OgreMain',
+ libs = [boost.lib, 'OgreMain',
'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibLinearMath'
]
# if isWindows():
@@ -1637,8 +1637,8 @@
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, os.path.join(Config.PATH_OgreBullet, 'Dynamics' )
- , Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
+ , Config.PATH_INCLUDE_Ogre
+ , Config.PATH_INCLUDE_Ogre_Dependencies
]
lib_dirs = [ Config.PATH_LIB_Boost
,Config.PATH_LIB_Bullet
@@ -1650,9 +1650,9 @@
CCFLAGS = ' -D_PRECOMP -fno-inline '
libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletD'
- CheckIncludes=['boost/python.hpp', 'Ogre.h']
+ CheckIncludes=['boost/python.hpp', 'Ogre.h']
descText = "Ogre Bullet Dynamics (physics) implementation"
-
+
class noise:
active = True
pythonModule = True
@@ -1671,9 +1671,9 @@
libs=[ boost.lib]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="noise"
+ ModuleName="noise"
descText = "Generate 'noise'"
-
+
class watermesh:
active = True
pythonModule = True
@@ -1692,9 +1692,9 @@
libs=[ boost.lib, 'OgreMain' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="watermesh"
+ ModuleName="watermesh"
descText = "C++ code from Ogre Water demo -- use Hydrax instead"
-
+
class ofusion:
active = True
pythonModule = True
@@ -1713,9 +1713,9 @@
libs=[ boost.lib, 'OgreMain' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="ofusion"
+ ModuleName="ofusion"
descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter"
-
+
class cadunetree:
active = True
pythonModule = True
@@ -1734,8 +1734,8 @@
libs=[ boost.lib, 'OgreMain' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="cadunetree"
- descText = "Generate realistic trees"
+ ModuleName="cadunetree"
+ descText = "Generate realistic trees"
class ogrepcz:
active = True
@@ -1756,9 +1756,9 @@
libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="ogrepcz"
- descText = "Portal SceneManager - seamlessly move from interior to exterior scene management"
-
+ ModuleName="ogrepcz"
+ descText = "Portal SceneManager - seamlessly move from interior to exterior scene management"
+
class opensteer:
active = False
pythonModule = True
@@ -1777,7 +1777,7 @@
libs=[ boost.lib, 'opensteer' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="opensteer"
+ ModuleName="opensteer"
class hydrax:
active = True
@@ -1797,8 +1797,8 @@
libs=[ boost.lib, 'OgreMain' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="hydrax"
- descText = "Fantastic water/ocean effects"
+ ModuleName="hydrax"
+ descText = "Fantastic water/ocean effects"
class hikari:
active = True
@@ -1819,7 +1819,7 @@
libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
if isLinux():
libs.append ( boost_python_index.lib )
- ModuleName="hikari"
+ ModuleName="hikari"
descText = "Use Flash controls within Ogre"
descLink = "http://hikari-library.googlecode.com/"
@@ -1838,19 +1838,19 @@
# lib_dirs = [Config.PATH_LIB_Boost
# ,Config.PATH_LIB_Ogre_OgreMain
# ,Config.PATH_LIB_mygui
-#
+#
# ]
# CheckIncludes=[]
# libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ]
-# ModuleName="mygui"
+# ModuleName="mygui"
# descText = "MyGUI Interface System"
# descLink = "http://sourceforge.net/projects/my-gui/"
-
+
############################################################################################
## Here is the master list....
## Keep eveything here in lowercase so the over rides work :)
-
+
projects = {
'ois' : ois
, 'ogre' : ogre
@@ -1888,11 +1888,11 @@
, 'hydrax' : hydrax
, 'hikari' : hikari
# , 'mygui' : mygui
-}
+}
#
# let's setup some defaults
-#
+#
def CheckPaths ( cls , name):
""" lets check we can find files listed in the CheckIncludes list somewhere in the include_dirs directories
also look for libs in the lib_dirs.
@@ -1908,7 +1908,7 @@
if not found:
pass
# print "WARNING: Unable to find %s include file (%s class) in include_dirs" % (incfile, name)
-# # if os.name =='nt':
+# # if os.name =='nt':
# # for libfile in cls.libs :
# # libfile += '.lib'
# # found = False
@@ -1919,14 +1919,14 @@
# # break
# # if not found:
# # print "WARNING: Unable to find %s library (%s class) in lib_dirs" % (libfile, name)
-
+
#
# a couple of specials that should be done differently
gccxml_bin = Config.gccxml_bin
-pyplusplus_install_dir = Config.pyplusplus_install_dir
-
-rpath= Config.RPATH
-
+pyplusplus_install_dir = Config.pyplusplus_install_dir
+
+rpath= Config.RPATH
+
for name, cls in projects.items():
# little hack to allow overriding of settings from the PythonOgreConfig_xxxxx.py file
@@ -1935,10 +1935,10 @@
_class = Config.__dict__[name] # get the class
for key, value in _class.__dict__.items():
if not key.startswith('_'):
- cls.__dict__[key] = value
- print "Set %s.%s to %s" % (name, key, value)
-
-
+ cls.__dict__[key] = value
+ print "Set %s.%s to %s" % (name, key, value)
+
+
##CheckPaths( cls, name )
cls.root_dir = os.path.join( root_dir, 'code_generators', name )
cls.dir_name = name + '_' + str(cls.version)
@@ -1946,8 +1946,8 @@
cls.cache_file = os.path.join( declarations_cache_dir, cls.dir_name + '_cache.xml' )
if isMac(): # On the mac the Ogre library is lined in with the -framework command in scons
- try:
- cls.libs.remove('OgreMain')
+ try:
+ cls.libs.remove('OgreMain')
except:
pass
## and we have a commond set of flags that I will set here...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-11-23 15:37:20
|
Revision: 813
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=813&view=rev
Author: mithro
Date: 2008-11-23 15:37:17 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Add a few extra 64bit build differences.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-23 12:24:12 UTC (rev 812)
+++ trunk/python-ogre/environment.py 2008-11-23 15:37:17 UTC (rev 813)
@@ -40,6 +40,12 @@
if os.sys.platform == 'darwin':
return True
return False
+
+def is64():
+ if os.uname()[4] == 'x86_64':
+ return True
+ return False
+
##
## set this to True if you compiled Ogre with Threads enabled
@@ -53,8 +59,7 @@
PythonOgreMajorVersion = "1"
PythonOgreMinorVersion = "6"
PythonOgrePatchVersion = "0"
-
-
+
##
## these should be fine with auto create - however override them as necessary
##
@@ -334,7 +339,10 @@
pythonModule = False
active = True
if isLinux():
- base = 'Cg-2.0_May2008_x86'
+ if is64():
+ base = 'Cg-2.0_May2008_x86_64'
+ else:
+ base = 'Cg-2.0_May2008_x86'
source = [
[wget, " http://developer.download.nvidia.com/cg/Cg_2.0/2.0.0015/"+base+".tgz",downloadPath]
]
@@ -482,7 +490,10 @@
bjambuilddir = 'bin.macosxx86'
bjambuildset = 'darwin'
else:
- bjambuilddir = 'bin.linuxx86_64'
+ if is64():
+ bjambuilddir = 'bin.linuxx86_64'
+ else:
+ bjambuilddir = 'bin.linuxx86'
bjambuildset = 'gcc'
source = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-11-23 12:24:16
|
Revision: 812
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=812&view=rev
Author: mithro
Date: 2008-11-23 12:24:12 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Initial try at supporting Suse/OpenSuse.
Modified Paths:
--------------
trunk/python-ogre/scripts/00-PreReqs.sh
Modified: trunk/python-ogre/scripts/00-PreReqs.sh
===================================================================
--- trunk/python-ogre/scripts/00-PreReqs.sh 2008-11-23 07:56:36 UTC (rev 811)
+++ trunk/python-ogre/scripts/00-PreReqs.sh 2008-11-23 12:24:12 UTC (rev 812)
@@ -1,27 +1,53 @@
#!/bin/bash
# Part of the Python-Ogre installation
-sudo apt-get install \
- g++ \
- libfreetype6-dev \
- libpcre3-dev \
- autoconf \
- automake1.9 \
- libgl1-mesa-dev \
- libx11-dev \
- libglut3-dev \
- libtool \
- libxaw7-dev \
- libxxf86vm-dev \
- patch \
- libxrandr-dev \
- cvs \
- subversion \
- libxt-dev \
- libexpat1-dev \
- python \
- python-dev \
- python-celementtree \
- libglew-dev \
- jam \
-
+if [ -x /usr/bin/apt-get ]; then
+ sudo apt-get install \
+ g++ \
+ libfreetype6-dev \
+ libpcre3-dev \
+ autoconf \
+ automake1.9 \
+ libgl1-mesa-dev \
+ libx11-dev \
+ libglut3-dev \
+ libtool \
+ libxaw7-dev \
+ libxxf86vm-dev \
+ patch \
+ libxrandr-dev \
+ cvs \
+ subversion \
+ libxt-dev \
+ libexpat1-dev \
+ python \
+ python-dev \
+ python-celementtree \
+ libglew-dev \
+ jam \
+fi
+
+#
+if [ -x /usr/bin/zypper ]; then
+ sudo zypper install \
+ gcc-c++ \
+ freetype2-devel \
+ pcre-devel \
+ autoconf \
+ automake \
+ Mesa-devel \
+ xorg-x11-libX11-devel \
+ freeglut-devel \
+ libtool \
+ xaw3d-devel \
+ patch \
+ cvs \
+ subversion \
+ xorg-x11-libXt-devel \
+ libexpat1 \
+ python \
+ python-devel \
+ glew-devel \
+ jam \
+
+fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-23 07:56:42
|
Revision: 811
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=811&view=rev
Author: andy_miller
Date: 2008-11-23 07:56:36 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Removed MyGui from environemtn until furthre tested
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-23 07:41:33 UTC (rev 810)
+++ trunk/python-ogre/environment.py 2008-11-23 07:56:36 UTC (rev 811)
@@ -1812,28 +1812,28 @@
descText = "Use Flash controls within Ogre"
descLink = "http://hikari-library.googlecode.com/"
-class mygui:
- active = True
- pythonModule = True
- version="2.2.0RC1"
- name='mygui'
- parent="ogre/gui"
- cflags = ""
- include_dirs = [ Config.PATH_Boost,
- Config.PATH_INCLUDE_mygui
- , Config.PATH_INCLUDE_Ogre
- ,Config.PATH_INCLUDE_Ogre_Dependencies
- ]
- lib_dirs = [Config.PATH_LIB_Boost
- ,Config.PATH_LIB_Ogre_OgreMain
- ,Config.PATH_LIB_mygui
-
- ]
- CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ]
- ModuleName="mygui"
- descText = "MyGUI Interface System"
- descLink = "http://sourceforge.net/projects/my-gui/"
+# class mygui:
+# active = False
+# pythonModule = True
+# version="2.2.0RC1"
+# name='mygui'
+# parent="ogre/gui"
+# cflags = ""
+# include_dirs = [ Config.PATH_Boost,
+# Config.PATH_INCLUDE_mygui
+# , Config.PATH_INCLUDE_Ogre
+# ,Config.PATH_INCLUDE_Ogre_Dependencies
+# ]
+# lib_dirs = [Config.PATH_LIB_Boost
+# ,Config.PATH_LIB_Ogre_OgreMain
+# ,Config.PATH_LIB_mygui
+#
+# ]
+# CheckIncludes=[]
+# libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ]
+# ModuleName="mygui"
+# descText = "MyGUI Interface System"
+# descLink = "http://sourceforge.net/projects/my-gui/"
############################################################################################
@@ -1876,7 +1876,7 @@
, 'ogrepcz' : ogrepcz
, 'hydrax' : hydrax
, 'hikari' : hikari
- , 'mygui' : mygui
+# , 'mygui' : mygui
}
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-11-23 07:41:39
|
Revision: 810
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=810&view=rev
Author: mithro
Date: 2008-11-23 07:41:33 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Fixed the line endings.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-23 02:15:43 UTC (rev 809)
+++ trunk/python-ogre/environment.py 2008-11-23 07:41:33 UTC (rev 810)
@@ -482,7 +482,7 @@
bjambuilddir = 'bin.macosxx86'
bjambuildset = 'darwin'
else:
- bjambuilddir = 'bin.linuxx86'
+ bjambuilddir = 'bin.linuxx86_64'
bjambuildset = 'gcc'
source = [
@@ -749,7 +749,7 @@
libs=['OIS_Static',boost.lib]
else:
- libs=['OIS',boost.lib]
+ libs=['OIS',boost.lib]
libs.append ( boost_python_index.lib )
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
@@ -785,7 +785,7 @@
if isWindows():
libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer']
else:
- libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Ogre_OgreMain
@@ -811,14 +811,14 @@
if isWindows():
libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain']
else:
- libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
+ libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
libs.append ( boost_python_index.lib )
if _STABLE:
source = [
[cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
]
else:
- source = [
+ source = [
[svn, " co https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/ogrenewt " + base, os.getcwd()]
]
baseDir = os.path.join(os.getcwd(), base )
@@ -867,7 +867,7 @@
pchincludes = ['boost/python.hpp', 'cegui.h']
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
else:
- libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
libs.append ( boost_python_index.lib )
if isLinux():
@@ -940,7 +940,7 @@
if isWindows():
odeLibraryName = 'ode_single'
libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
- else:
+ else:
libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_ODE
@@ -982,8 +982,8 @@
version= "1.3"
name = 'opcode'
parent = "ogre/physics"
- libs=[boost.lib]
- if isLinux():
+ libs=[boost.lib]
+ if isLinux():
libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
]
@@ -1061,7 +1061,7 @@
libs=[boost.lib, 'OgreMain', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
if isLinux():
- libs.append('ode')
+ libs.append('ode')
libs.append ( boost_python_index.lib )
else:
libs.append('ode_single')
@@ -1098,8 +1098,8 @@
##,Config.PATH_LIB_quickgui
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="QuickGUI"
@@ -1153,8 +1153,8 @@
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain', 'OIS_Static' ]
if os.name=="nt":
- libs.append ( "User32" ) # needed for static linking
- else:
+ libs.append ( "User32" ) # needed for static linking
+ else:
libs.append ( boost_python_index.lib )
ModuleName="betagui"
@@ -1175,8 +1175,8 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="ogreforests"
@@ -1198,8 +1198,8 @@
Config.PATH_LIB_particleuniverse
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
- if isLinux():
+ libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="particleuniverse"
@@ -1235,7 +1235,7 @@
if os.name =='nt':
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain','NxOgre' ] #, 'NxOgreStatic'] #'NxExtensions',
else:
- libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
libs.append ( boost_python_index.lib )
ModuleName="NxOgre"
@@ -1265,8 +1265,8 @@
Config.PATH_LIB_Theora,
]
CheckIncludes=[]
- libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
- if isLinux():
+ libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="theora"
@@ -1288,7 +1288,7 @@
if os.name == "nt":
libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ]
else:
- libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
+ libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
libs.append ( boost_python_index.lib )
class physx:
@@ -1316,7 +1316,7 @@
if isWindows():
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader' ]
elif isLinux():
- libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
libs.append ( boost_python_index.lib )
source = [
[wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz", downloadPath]
@@ -1532,13 +1532,13 @@
parent = "ogre/physics"
libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics','LibLinearMath']
if isWindows():
- pass
+ pass
#libs.append('libbulletMath')
else:
#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
@@ -1558,8 +1558,8 @@
[0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
[0, "make", baseDir],
# [0, "make install", baseDir],
-# [0, "jam", baseDir],
-# [0, "jam install", baseDir]
+# [0, "jam", baseDir],
+# [0, "jam install", baseDir]
[0, "find . -name *.a -execdir cp {} %s/lib \;" % PREFIX, baseDir]
]
@@ -1602,10 +1602,10 @@
if isWindows():
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
- CCFLAGS = ' -D_PRECOMP -fno-inline '
+ CCFLAGS = ' -D_PRECOMP -fno-inline '
libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletC'
- CheckIncludes=['boost/python.hpp', 'Ogre.h']
+ CheckIncludes=['boost/python.hpp', 'Ogre.h']
class ogrebulletd: #
@@ -1636,7 +1636,7 @@
if isWindows():
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
- CCFLAGS = ' -D_PRECOMP -fno-inline '
+ CCFLAGS = ' -D_PRECOMP -fno-inline '
libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletD'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
@@ -1655,10 +1655,10 @@
os.path.join(Config.PATH_INCLUDE_noise, 'module')
]
lib_dirs = [Config.PATH_LIB_Boost
- ]
+ ]
CheckIncludes=[]
libs=[ boost.lib]
- if isLinux():
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="noise"
descText = "Generate 'noise'"
@@ -1678,8 +1678,8 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="watermesh"
descText = "C++ code from Ogre Water demo -- use Hydrax instead"
@@ -1699,8 +1699,8 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="ofusion"
descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter"
@@ -1720,8 +1720,8 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="cadunetree"
descText = "Generate realistic trees"
@@ -1738,12 +1738,12 @@
Config.PATH_INCLUDE_ogrepcz
]
lib_dirs = [Config.PATH_LIB_Boost,
- Config.PATH_LIB_Ogre_OgreMain,
+ Config.PATH_LIB_Ogre_OgreMain,
os.path.join(Config.PATH_LIB_Ogre_OgreMain, 'OGRE')
]
CheckIncludes=[]
- libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
- if isLinux():
+ libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="ogrepcz"
descText = "Portal SceneManager - seamlessly move from interior to exterior scene management"
@@ -1763,8 +1763,8 @@
Config.PATH_LIB_opensteer
]
CheckIncludes=[]
- libs=[ boost.lib, 'opensteer' ]
- if isLinux():
+ libs=[ boost.lib, 'opensteer' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="opensteer"
@@ -1783,8 +1783,8 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="hydrax"
descText = "Fantastic water/ocean effects"
@@ -1805,8 +1805,8 @@
Config.PATH_LIB_hikari
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
- if isLinux():
+ libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
+ if isLinux():
libs.append ( boost_python_index.lib )
ModuleName="hikari"
descText = "Use Flash controls within Ogre"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-23 02:15:46
|
Revision: 809
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=809&view=rev
Author: andy_miller
Date: 2008-11-23 02:15:43 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Physx update
New overlay in demos
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/demos/hydrax/resources.cfg
trunk/python-ogre/environment.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
Added Paths:
-----------
trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel
trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel.material
trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel.overlay
trunk/python-ogre/demos/media/overlays/panel.png
trunk/python-ogre/demos/media/overlays/popanel.png
trunk/python-ogre/demos/media/overlays/pythonogretext.png
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-11-21 04:45:57 UTC (rev 808)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-11-23 02:15:43 UTC (rev 809)
@@ -83,6 +83,7 @@
PATH_hydrax = os.path.join(PATH_THIRDPARTY, 'Hydrax')
PATH_hikari = os.path.join(PATH_THIRDPARTY, 'Hikari' ) #BASE_DIR, 'hikari', 'hikari')
+PATH_mygui = os.path.join(BASE_DIR, 'MyGUI_2.2.0_RC1_source' )
# it's time for the SDK version
if SDK:
@@ -130,8 +131,8 @@
PATH_LIB_opensteer = os.path.join(PATH_opensteer, 'win32','release')
PATH_LIB_hikari = os.path.join(PATH_hikari ) # , 'lib')
+PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
-
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')
@@ -181,6 +182,7 @@
PATH_INCLUDE_ogrepcz = os.path.join(PATH_ogrepcz,'include')
PATH_INCLUDE_hydrax= PATH_hydrax
PATH_INCLUDE_hikari = os.path.join(PATH_hikari ) #, 'include')
+PATH_INCLUDE_mygui = os.path.join(PATH_mygui,'MyGUIEngine','include')
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-11-21 04:45:57 UTC (rev 808)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-11-23 02:15:43 UTC (rev 809)
@@ -79,7 +79,7 @@
]
if os.name =='nt':
- excludes.append('::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry')
+ excludes.append('::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry')
for e in excludes:
print "excluding function", e
@@ -93,17 +93,19 @@
print "Excluding:", e
global_ns.free_functions(e).exclude()
- excludes = ['NxArray<NxShapeDesc*, NxAllocatorDefault>', ## doesn't have a defult constructor for ElemType
- 'NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault>', ## Elemtype issue
- 'NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault>', ## Elemtype issue
+ excludes = [
+ #'NxArray<NxShapeDesc*, NxAllocatorDefault>', ## doesn't have a defult constructor for ElemType
+ #'NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault>', ## Elemtype issue
+ #'NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault>', ## Elemtype issue
'NxForceFieldShapeGroup' ## seems to have access issues..
]
# for c in global_ns.classes():
# print c
- if os.name =='nt':
- excludes.append('NxArray<NxFluidEmitterDesc, NxAllocatorDefault>') ## needs ElemType changed to NxFluidEmitterDesc
- else:
+ if os.name =='nt':
+ pass
+# excludes.append('NxArray<NxFluidEmitterDesc, NxAllocatorDefault>') ## needs ElemType changed to NxFluidEmitterDesc
+ else:
excludes.append ( '::NxFluidUserNotify')
for e in excludes:
print "Excluding Class:", e
@@ -141,13 +143,24 @@
############################################################
def ManualFixes ( mb ):
- global_ns = mb.global_ns
- # this change was for 1.7 but also needed for 1.4
+ 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
+ global_ns.class_(c).noncopyable = True
+ for c in global_ns.constructors():
+ for x in range ( len ( c.arguments ) ):
+ if c.arguments[x].default_value:
+ if "ElemType" in c.arguments[x].default_value:
+ c.arguments[x].default_value=''
+ for c in global_ns.mem_funs():
+ for x in range ( len ( c.arguments ) ):
+ if c.arguments[x].default_value:
+ if "ElemType" in c.arguments[x].default_value:
+ c.arguments[x].default_value=''
+
# known = ['points', 'triangles']
# for c in global_ns.classes():
# if c.name.startswith ('Nx'):
Modified: trunk/python-ogre/demos/hydrax/resources.cfg
===================================================================
--- trunk/python-ogre/demos/hydrax/resources.cfg 2008-11-21 04:45:57 UTC (rev 808)
+++ trunk/python-ogre/demos/hydrax/resources.cfg 2008-11-23 02:15:43 UTC (rev 809)
@@ -3,7 +3,7 @@
# Resource locations to be added to the default path
[General]
-
+FileSystem=../media/overlays
FileSystem=./media
FileSystem=./media/materials/programs
FileSystem=./media/materials/scripts
Added: trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel
===================================================================
--- trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel (rev 0)
+++ trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel 2008-11-23 02:15:43 UTC (rev 809)
@@ -0,0 +1,154 @@
+// Ogre overlay scripts
+POCore/DebugOverlay
+{
+ zorder 500
+ // Stats block
+ container BorderPanel(POCore/StatPanel)
+ {
+ metrics_mode pixels
+ vert_align bottom
+ left 5
+ top -107
+ width 220
+ height 102
+ material Core/StatsBlockCenter
+ border_size 1 1 1 1
+ border_material Core/StatsBlockBorder
+ border_topleft_uv 0.0000 1.0000 0.0039 0.9961
+ border_top_uv 0.0039 1.0000 0.9961 0.9961
+ border_topright_uv 0.9961 1.0000 1.0000 0.9961
+ border_left_uv 0.0000 0.9961 0.0039 0.0039
+ border_right_uv 0.9961 0.9961 1.0000 0.0039
+ border_bottomleft_uv 0.0000 0.0039 0.0039 0.0000
+ border_bottom_uv 0.0039 0.0039 0.9961 0.0000
+ border_bottomright_uv 0.9961 0.0039 1.0000 0.0000
+
+ container Panel(POCore/BreakPanel)
+ {
+ metrics_mode pixels
+ left 5
+ top 22
+ width 210
+ height 1
+ material Core/StatsBreak
+ }
+
+ element TextArea(POCore/CurrFps)
+ {
+ metrics_mode pixels
+ left 5
+ top 5
+ width 90
+ height 30
+ font_name BlueHighway
+ char_height 19
+ caption Current FPS:
+ colour_top 1 1 0.7
+ colour_bottom 1 1 0.7
+ }
+ element TextArea(POCore/AverageFps)
+ {
+ metrics_mode pixels
+ left 5
+ top 25
+ width 90
+ height 30
+ font_name BlueHighway
+ char_height 16
+ caption AVERAGE FPS:
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(POCore/WorstFps)
+ {
+ metrics_mode pixels
+ left 5
+ top 40
+ width 90
+ height 30
+ font_name BlueHighway
+ char_height 16
+ caption WORST FPS:
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(POCore/BestFps)
+ {
+ metrics_mode pixels
+ left 5
+ top 55
+ width 90
+ height 30
+ font_name BlueHighway
+ char_height 16
+ caption BEST FPS:
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(POCore/NumTris)
+ {
+ metrics_mode pixels
+ left 5
+ top 70
+ width 90
+ height 30
+ font_name BlueHighway
+ char_height 16
+ caption Triangle Count:
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(POCore/NumBatches)
+ {
+ metrics_mode pixels
+ left 5
+ top 85
+ width 90
+ height 30
+ font_name BlueHighway
+ char_height 16
+ caption Batch Count:
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(POCore/DebugText)
+ {
+ metrics_mode pixels
+ left 230
+ top 70
+ width 200
+ height 30
+ font_name BlueHighway
+ char_height 16
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+
+ }
+ container Panel(POCore/LogoPanel)
+ {
+ metrics_mode pixels
+ horz_align right
+ vert_align bottom
+ top -75
+ left -165
+ width 150
+ height 75
+ material Core/OgreText
+ }
+}
+
+// A silly example of how you would do a 3D cockpit
+//Examples/KnotCockpit
+//{
+// zorder 100
+// entity knot.mesh(hudKnot)
+// {
+// position 0 0 -50
+// rotation 0 0 0 0
+// }
+//
+//}
+
+
+
Added: trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel.material
===================================================================
--- trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel.material (rev 0)
+++ trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel.material 2008-11-23 02:15:43 UTC (rev 809)
@@ -0,0 +1,52 @@
+material POCore/StatsBlockCenter
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend alpha_blend
+ depth_check off
+
+ texture_unit
+ {
+// texture New_Ogre_Border_Center.png
+ texture popanel.png
+ }
+ }
+ }
+}
+material POCore/OgreText
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend alpha_blend
+ depth_check off
+
+ texture_unit
+ {
+ texture pythonogretext.png
+ }
+ }
+ }
+}
+material POCore/Panel
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend alpha_blend
+ depth_check off
+
+ texture_unit
+ {
+ texture popanel.png
+ }
+ }
+ }
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel.overlay
===================================================================
--- trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel.overlay (rev 0)
+++ trunk/python-ogre/demos/media/overlays/PythonOgreDebugPanel.overlay 2008-11-23 02:15:43 UTC (rev 809)
@@ -0,0 +1,119 @@
+// Ogre overlay scripts
+POCore/DebugOverlay
+{
+ zorder 500
+ // Stats block
+ container BorderPanel(POCore/StatPanel1)
+ {
+ metrics_mode pixels
+ vert_align bottom
+ left 3
+ top -92
+ width 637
+ height 90
+ material POCore/StatsBlockCenter
+
+
+ element TextArea(POCore/CurrFps)
+ {
+ metrics_mode pixels
+ left 500
+ top 15
+ width 140
+ height 20
+ font_name BlueHighway
+ char_height 16
+ caption FPS:
+ colour_top 0.4 0.4 0.2
+ //1 1 0.7
+ colour_bottom 0 0 0.0
+ //1 1 0.7
+ }
+ element TextArea(POCore/AverageFps)
+ {
+ metrics_mode pixels
+ left 500
+ top 30
+ width 90
+ height 20
+ font_name BlueHighway
+ char_height 16
+ caption AVG FPS:
+ colour_top 0.4 0.4 0.2
+ //0.5 0.7 0.5
+ colour_bottom 0 0 0.0
+ //0.3 0.5 0.3
+ }
+ element TextArea(POCore/NumTris)
+ {
+ metrics_mode pixels
+ left 500
+ top 45
+ width 90
+ height 20
+ font_name BlueHighway
+ char_height 16
+ caption Triangles:
+ colour_top 0.4 0.4 0.2
+ //0.5 0.7 0.5
+ colour_bottom 0 0 0.0
+ //0.3 0.5 0.3
+ }
+ element TextArea(POCore/NumBatches)
+ {
+ metrics_mode pixels
+ left 500
+ top 60
+ width 90
+ height 20
+ font_name BlueHighway
+ char_height 16
+ caption Batches:
+ colour_top 0.4 0.4 0.2
+ //0.5 0.7 0.5
+ colour_bottom 0 0 0.0
+ //0.3 0.5 0.3
+ }
+ element TextArea(POCore/DebugText)
+ {
+ metrics_mode pixels
+ left 105
+ top 73
+ width 400
+ height 30
+ font_name BlueHighway
+ char_height 14
+ colour_top 1 1 0.7
+ // 0.5 0.7 0.5
+ colour_bottom 1 1 0.7
+ //0.3 0.5 0.3
+ }
+
+ }
+// container Panel(POCore/LogoPanel)
+// {
+// metrics_mode pixels
+// horz_align right
+// vert_align bottom
+// top -95
+// left -165
+// width 160
+// height 93
+// material POCore/OgreText
+// }
+//}
+
+// A silly example of how you would do a 3D cockpit
+//Examples/KnotCockpit
+//{
+// zorder 100
+// entity knot.mesh(hudKnot)
+// {
+// position 0 0 -50
+// rotation 0 0 0 0
+// }
+//
+//}
+
+
+
Added: trunk/python-ogre/demos/media/overlays/panel.png
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/overlays/panel.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/media/overlays/popanel.png
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/overlays/popanel.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/media/overlays/pythonogretext.png
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/media/overlays/pythonogretext.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-21 04:45:57 UTC (rev 808)
+++ trunk/python-ogre/environment.py 2008-11-23 02:15:43 UTC (rev 809)
@@ -44,10 +44,10 @@
##
## set this to True if you compiled Ogre with Threads enabled
##
-if isWindows():
- _USE_THREADS = True
-else:
- _USE_THREADS = False
+if isWindows():
+ _USE_THREADS = True
+else:
+ _USE_THREADS = False
PythonOgreMajorVersion = "1"
@@ -643,7 +643,7 @@
base = "ogre-v1-6-0"
buildCmds = [
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
- [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
[0, "sed --in-place -s 's|#define OGRE_THREAD_SUPPORT 1|#define OGRE_THREAD_SUPPORT 0|' OgreConfig.h",os.path.join(os.getcwd(),"ogre","OgreMain", "include")],
[0, "aclocal", os.path.join(os.getcwd(), 'ogre')],
[0, "./bootstrap", os.path.join(os.getcwd(), 'ogre')],
@@ -655,7 +655,7 @@
libs.append ( boost_python_index.lib )
lib_dirs=[Config.LOCAL_LIB]
include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre]
- CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D__PYTHONOGRE_BUILD_CODE '
+ CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D__PYTHONOGRE_BUILD_CODE '
source = [
[wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath],
@@ -1811,6 +1811,29 @@
ModuleName="hikari"
descText = "Use Flash controls within Ogre"
descLink = "http://hikari-library.googlecode.com/"
+
+class mygui:
+ active = True
+ pythonModule = True
+ version="2.2.0RC1"
+ name='mygui'
+ parent="ogre/gui"
+ cflags = ""
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_INCLUDE_mygui
+ , Config.PATH_INCLUDE_Ogre
+ ,Config.PATH_INCLUDE_Ogre_Dependencies
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost
+ ,Config.PATH_LIB_Ogre_OgreMain
+ ,Config.PATH_LIB_mygui
+
+ ]
+ CheckIncludes=[]
+ libs=[ boost.lib, 'OgreMain', 'MyGUI' ] ##, 'hikari' ]
+ ModuleName="mygui"
+ descText = "MyGUI Interface System"
+ descLink = "http://sourceforge.net/projects/my-gui/"
############################################################################################
@@ -1853,6 +1876,7 @@
, 'ogrepcz' : ogrepcz
, 'hydrax' : hydrax
, 'hikari' : hikari
+ , 'mygui' : mygui
}
#
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-21 04:45:57 UTC (rev 808)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-11-23 02:15:43 UTC (rev 809)
@@ -443,9 +443,9 @@
def showDebugOverlay(self, show):
"""Turns the debug overlay (frame statistics) on or off."""
- overlay = ogre.OverlayManager.getSingleton().getByName('Core/DebugOverlay')
+ overlay = ogre.OverlayManager.getSingleton().getByName('POCore/DebugOverlay')
if overlay is None:
- raise ogre.Exception(111, "Could not find overlay Core/DebugOverlay", "SampleFramework.py")
+ raise ogre.Exception(111, "Could not find overlay POCore/DebugOverlay", "SampleFramework.py")
if show:
overlay.show()
else:
@@ -566,14 +566,16 @@
def _updateStatistics(self):
statistics = self.renderWindow
- self._setGuiCaption('Core/AverageFps', 'Average FPS: %f' % statistics.getAverageFPS())
- self._setGuiCaption('Core/CurrFps', 'Current FPS: %f' % statistics.getLastFPS())
- self._setGuiCaption('Core/BestFps',
- 'Best FPS: %f %d ms' % (statistics.getBestFPS(), statistics.getBestFrameTime()))
- self._setGuiCaption('Core/WorstFps',
- 'Worst FPS: %f %d ms' % (statistics.getWorstFPS(), statistics.getWorstFrameTime()))
- self._setGuiCaption('Core/NumTris', 'Triangle Count: %d' % statistics.getTriangleCount())
- self._setGuiCaption('Core/DebugText', Application.debugText)
+ self._setGuiCaption('POCore/AverageFps', 'Avg FPS: %u' % statistics.getAverageFPS())
+ self._setGuiCaption('POCore/CurrFps', 'FPS: %u' % statistics.getLastFPS())
+# self._setGuiCaption('POCore/BestFps',
+# 'Best FPS: %f %d ms' % (statistics.getBestFPS(), statistics.getBestFrameTime()))
+# self._setGuiCaption('POCore/WorstFps',
+# 'Worst FPS: %f %d ms' % (statistics.getWorstFPS(), statistics.getWorstFrameTime()))
+ self._setGuiCaption('POCore/NumTris', 'Trianges: %u' % statistics.getTriangleCount())
+ self._setGuiCaption('POCore/NumBatches', 'Batches: %u' % statistics.batchCount)
+
+ self._setGuiCaption('POCore/DebugText', Application.debugText)
def _setGuiCaption(self, elementName, text):
element = ogre.OverlayManager.getSingleton().getOverlayElement(elementName, False)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
