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

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

Revision: 595
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=595&view=rev
Author:   andy_miller
Date:     2008-06-15 03:03:54 -0700 (Sun, 15 Jun 2008)

Log Message:
-----------
Further updatesd for 1.2 -- Physx and cegui updates

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_nt.py
    trunk/python-ogre/code_generators/cegui/generate_code.py
    trunk/python-ogre/code_generators/physx/customization_data.py
    trunk/python-ogre/code_generators/physx/generate_code.py
    trunk/python-ogre/code_generators/physx/python_physx_aliases.h
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py	2008-06-14 14:18:41 UTC (rev 594)
+++ trunk/python-ogre/PythonOgreConfig_nt.py	2008-06-15 10:03:54 UTC (rev 595)
@@ -97,7 +97,7 @@
 PATH_LIB_Newton =               os.path.join( PATH_Newton ,'dll')  ##NOTE Posix platforms this lives in 'lib-mt'
 PATH_LIB_OIS =                  os.path.join( PATH_OIS, 'lib') ## NOTE Posix platforms this lives in'lib' not 'dll'
 PATH_LIB_CEGUI =                os.path.join( PATH_CEGUI, 'lib' )
-PATH_LIB_ODE =                  os.path.join( PATH_ODE, 'lib/releaselib')## probable releaselib for posix
+PATH_LIB_ODE =                  os.path.join( PATH_ODE, 'lib/releasedll')## probable releaselib for posix
 PATH_LIB_OPCODE =               os.path.join( PATH_OPCODE ) 
 PATH_LIB_OgreOde =              os.path.join( PATH_OgreOde, 'lib/Release') 
 # # PATH_LIB_OgreBullet =              os.path.join( PATH_OgreBullet, 'lib/Release') 

Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py	2008-06-14 14:18:41 UTC (rev 594)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py	2008-06-15 10:03:54 UTC (rev 595)
@@ -38,9 +38,9 @@
     CEGUI_ns = global_ns.namespace( 'CEGUI' )
     CEGUI_ns.include()
     
-    ## not available at link time.. seems fixed in CEGUI 0.6.0
-#     CEGUI_ns.free_function("lbi_greater").exclude()
-#     CEGUI_ns.free_function("lbi_less").exclude()
+    ## not available at link time.. 
+    CEGUI_ns.free_functions("lbi_greater").exclude()
+    CEGUI_ns.free_functions("lbi_less").exclude()
     
     ## Dumb fix to remove all Properties classes -  unfortunately the properties in these classes are indicated as public
     ## however within their 'parent' class they are defined as private..
@@ -88,31 +88,12 @@
     ## this one fails at link time
     mb.class_( 'ScriptFunctor' ).exclude()   
     mb.class_( 'CEGUIRQListener' ).exclude()     
-    ## one version of createFont fails so lets find it and exclude it
-#     fm = mb.class_( 'FontManager' )
-#     ## can't use the simple, if it had 2 args exclude it as there is a version with 2 args that we want
-#     ## i.e.      fm.member_function( 'createFont', arg_types=[None,None ] ).exclude() 
-#     ## so instead need a function that looks for arg 2 to be XMLAttributes
-#     is_my_case = lambda decl: len( decl.arguments ) == 2 and 'XMLAttributes' in decl.arguments[1].type.decl_string 
-#     fm.member_function( name='createFont', function=is_my_case ).exclude()
-#   
-    ## couple of functions that fail when compiling
-    ## Not sure why this is related to Ogre 1.4 and not the CEGUI version...
-#     if environment.ogre.version == "1.4":    
-#         CEGUI_ns.class_( "RawDataContainer" ).member_functions( 'getDataPtr' ).exclude()
-#         CEGUI_ns.class_( "ItemListBase" ).member_functions( 'getSortCallback' ).exclude()
-#     else:   
-#         CEGUI_ns.class_("DataContainer<unsigned char>").exclude()
-#         CEGUI_ns.class_("Menubar").exclude()
-#         CEGUI_ns.class_("MenuBase").exclude()
-#         CEGUI_ns.class_("PopupMenu").exclude()
-#         CEGUI_ns.class_("Referenced").exclude()
-#         CEGUI_ns.class_("System").member_functions("getXMLParser").exclude()
 
     ## now have functions in String that return uint arrays a need to be wrapped
     sc = CEGUI_ns.class_( "String" )
     sc.member_functions('data').exclude()
     sc.member_functions('ptr').exclude()
+    
     ## and only remove the at functions that are not returning constants
     ## the const version returns by value which is good, the non const returns a reference which doesn't compile
     sc.member_function( 'at', lambda decl: decl.has_const == False ).exclude()
@@ -161,13 +142,19 @@
     CEGUI_ns.class_('GlobalEventSet').noncopyable = True
     CEGUI_ns.class_('MouseCursor').noncopyable = True
     CEGUI_ns.class_('OgreCEGUIRenderer').noncopyable = True
+
+    # changes to latest py++ can gccxml etc June 15 2008
+    excludes = ['::CEGUI::ItemListBase::getSortCallback'  ]
+    for f in excludes:
+        CEGUI_ns.member_function(f).exclude()
+    CEGUI_ns.class_('RawDataContainer').exclude() # has pointers that need to be handled -- hopefully not needed    
+    CEGUI_ns.member_function("::CEGUI::WindowManager::loadWindowLayout", arg_types=[None,None,None,None,None]).exclude()   
     
-        
+    
+    
     global_ns.namespace( 'Ogre' ).class_('SceneManager').include(already_exposed=True)
-            
     global_ns.namespace( 'Ogre' ).class_('RenderWindow').include(already_exposed=True)
     global_ns.namespace( 'Ogre' ).class_('TexturePtr').include(already_exposed=True)
-#     global_ns.namespace( 'Ogre' ).class_('SimpleRenderable').include(already_exposed=True)
             
     
 def set_call_policies( mb ):

Modified: trunk/python-ogre/code_generators/physx/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/physx/customization_data.py	2008-06-14 14:18:41 UTC (rev 594)
+++ trunk/python-ogre/code_generators/physx/customization_data.py	2008-06-15 10:03:54 UTC (rev 595)
@@ -4,7 +4,6 @@
         ,"NxCooking.h"
         ,"NxFoundation.h"
         ,"NxCharacter.h"
-        ,"NxExtensions.h"
         ,"PhysXLoader.h"
         ,"NxStream.h"
         ]

Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py	2008-06-14 14:18:41 UTC (rev 594)
+++ trunk/python-ogre/code_generators/physx/generate_code.py	2008-06-15 10:03:54 UTC (rev 595)
@@ -60,6 +60,8 @@
                 
                    
     excludes=[  '::NxArray<NxShapeDesc*, NxAllocatorDefault>::begin'
+                ,'::NxArray< NxForceFieldShapeDesc*, NxAllocatorDefault >::resize'
+                ,'::NxArray< NxForceFieldShapeGroup*, NxAllocatorDefault >::resize'
                 ,'::NxArray<NxFluidEmitterDesc, NxAllocatorDefault>::deleteEntry'
                 ,'::NxArray<NxShapeDesc*, NxAllocatorDefault>::end'
 #                 ,'::NxCloth::overlapAABBTriangles'  # ugly argument that boost doesn't like.. To Fix in hand wrappers
@@ -73,6 +75,8 @@
                 # not in source
                 ,'::NxBitField::rangeToDenseMask'
                 ,'::NxBitField::maskToShift'
+                ,'::NxVec3::setNotUsed'
+                ,'::NxVec3::isNotUsed'
 
                 ]
     for e in excludes:
@@ -87,11 +91,14 @@
         global_ns.free_functions(e).exclude()
         
     excludes = ['NxArray<NxShapeDesc*, NxAllocatorDefault>', ## doesn't have a defult constructor for ElemType
-                'NxArray<NxFluidEmitterDesc, NxAllocatorDefault>' ## needs ElemType changed to NxFluidEmitterDesc
+                'NxArray<NxFluidEmitterDesc, NxAllocatorDefault>', ## needs ElemType changed to NxFluidEmitterDesc
+                'NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault>', ## Elemtype issue
+                'NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault>', ## Elemtype issue
+                'NxForceFieldShapeGroup' ## seems to have access issues..
 
                 ]
-    for c in global_ns.classes():
-        print c                
+#     for c in global_ns.classes():
+#         print c                
     for e in excludes:
         print "Excluding Class:", e
         global_ns.class_(e).exclude()

Modified: trunk/python-ogre/code_generators/physx/python_physx_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/physx/python_physx_aliases.h	2008-06-14 14:18:41 UTC (rev 594)
+++ trunk/python-ogre/code_generators/physx/python_physx_aliases.h	2008-06-15 10:03:54 UTC (rev 595)
@@ -4,6 +4,9 @@
 typedef NxUserEntityReport<NxSweepQueryHit> EntityReportSweepQuery;
 typedef NxArray<NxShapeDesc*, NxAllocatorDefault> NxArrayShapeDesc;
 typedef NxArray<NxFluidEmitterDesc, NxAllocatorDefault> NxArrayFluidEmitterDesc; 
+typedef NxArray< NxForceFieldShapeDesc*, NxAllocatorDefault > NxArrayNxForceFieldShapeDescPtr;
+typedef NxArray< NxForceFieldShapeGroup*, NxAllocatorDefault > NxArrayNxForceFieldShapeGroupPtr;
 
 
 
+

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-06-14 14:18:41 UTC (rev 594)
+++ trunk/python-ogre/environment.py	2008-06-15 10:03:54 UTC (rev 595)
@@ -1137,7 +1137,7 @@
         include_dirs.append( d )
     if os.name == 'nt':
         CCFLAGS = ' -D"WIN32" '
-        CCFLAGS = ' ' ## try to not define WIN 32 to remove inline assembly code that GCCxml doesn't like
+        ## CCFLAGS = ' ' ## try to not define WIN 32 to remove inline assembly code that GCCxml doesn't like
     else:
         CCFLAGS = ' -D"LINUX" '                
     lib_dirs = [Config.PATH_LIB_Boost,
@@ -1146,7 +1146,7 @@
                 ]
     CheckIncludes=[]
     if os.name == 'nt':
-        libs=[  Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader' ]
+        libs=[  Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'PhysXLoader' ]
     else:
         libs=[  Config.LIB_Boost, 'NxCharacter', 'NxCooking',  'PhysXCore', 'PhysXLoader' ]
     ModuleName="PhysX"   


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