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

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

Revision: 590
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=590&view=rev
Author:   andy_miller
Date:     2008-05-20 02:42:51 -0700 (Tue, 20 May 2008)

Log Message:
-----------
Support for Ogre 1.5 - need to change Ogre version in environment.py for these to take effect

Modified Paths:
--------------
    trunk/python-ogre/code_generators/ogre/generate_code.py
    trunk/python-ogre/code_generators/ogre/python_ogre_masterlist.h
    trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h

Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py	2008-05-18 16:01:44 UTC (rev 589)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py	2008-05-20 09:42:51 UTC (rev 590)
@@ -228,7 +228,12 @@
             func.exclude()
             print '{*} function "%s" is marked as internal' % declarations.full_name( func )
 
-
+    # changes for Ogre 1.5
+    if environment.ogre.version =="1.5":
+        main_ns.class_("ResourceBackgroundQueue").exclude() # Ogre::ResourceBackgroundQueue::_fireBackgroundLoadingComplete isn't implemented
+        main_ns.class_("ResourceGroupManager").mem_fun("_notifyWorldGeometryPrepareStageEnded").exclude()
+        main_ns.class_("ResourceGroupManager").mem_fun("_notifyWorldGeometryPrepareStageStarted").exclude()
+        
 ############################################################
 ##
 ##  And there are things that manually need to be INCLUDED 

Modified: trunk/python-ogre/code_generators/ogre/python_ogre_masterlist.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_masterlist.h	2008-05-18 16:01:44 UTC (rev 589)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_masterlist.h	2008-05-20 09:42:51 UTC (rev 590)
@@ -44,7 +44,9 @@
 #include "OgreImage.h"
 // #include "OgreImageCodec.h"  // not this one
 #include "OgreIteratorWrappers.h"
-#include "OgreMaterialScriptCompiler.h"
+#if OGRE_VERSION_MINOR == 4
+    #include "OgreMaterialScriptCompiler.h"
+#endif    
 #include "OgreMemoryMacros.h"
 #include "OgreMemoryManager.h"
 #include "OgreMeshFileFormat.h"

Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h	2008-05-18 16:01:44 UTC (rev 589)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h	2008-05-20 09:42:51 UTC (rev 590)
@@ -146,7 +146,9 @@
 sizeof( Ogre::SceneQueryResultWorldFragmentList );
 sizeof( Ogre::SceneQueryResultMovableList );
 sizeof( Ogre::BackgroundProcessTicket );
-sizeof( Ogre::DLL_CREATERENDERWINDOW );
+#if OGRE_VERSION_MINOR == 4
+    sizeof( Ogre::DLL_CREATERENDERWINDOW );
+#endif
 sizeof( Ogre::RenderTargetPriorityMap );
 sizeof( Ogre::RenderTargetMap );
 sizeof( Ogre::ConfigOptionMap );


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