[Python-ogre-commit] SF.net SVN: python-ogre:[713] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre:[713] trunk/python-ogre
|
From: <and...@us...> - 2008-08-31 01:29:08
|
Revision: 713
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=713&view=rev
Author: andy_miller
Date: 2008-08-31 01:29:13 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
Updates ready for next release (1.6 RC1)
Fix to QuickGui due to OGRE api change (_setAlphaRejects)
Depreciated Dshow and FFMPEG modules
Disabled Navi module (issue with MSVC runtimes)
Support for hikari module
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertexBuffer.cpp
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/demos/bullet/test01.py
trunk/python-ogre/environment.py
trunk/python-ogre/patch/ogre_1.6.patch
trunk/python-ogre/scripts/compilesource.bat
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/packages_2.5/ogre/gui/hikari/
trunk/python-ogre/packages_2.5/ogre/gui/hikari/__init__.py
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/ChangeLog.txt 2008-08-31 01:29:13 UTC (rev 713)
@@ -1,10 +1,23 @@
-???? ?? 2008 : SVN Updates..
-============================
-Added CEGUI::Tree to handmadewrapper (Thanks Dermont)
-Change to CEGUI_framework.py to force loading of CEGUIBase lib in the correct mode under Linux - means we don't need to
-patch the CEGUI source...
-
-
+August 29 2008 : Release 1.6 RC1
+================================
+Version numbering change to match the Ogre release versions.
+Ogre 1.6 RC1
+OIS 1.2
+CEGUI 0.6.1
+Particle Universe 0.8
+Hydrax 0.3
+Bullet 2.70
+OgreBullet - patched to match API change in Bullet 2.7
+PhysX (NVIDA) 2.8.1
+ODE 0.10.1
+QuickGui R350
+OgreAL R115
+
+Added CEGUI::Tree to handmadewrapper (Thanks Dermont)
+Change to CEGUI_framework.py to force loading of CEGUIBase lib in the correct mode under Linux - means we don't need to
+patch the CEGUI source...
+
+
June 20 2008: Release 1.2 RC2
============================='
OK, so it's been a while -- what can I say, I have to live in the real world as well as the opensource one :)
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-08-31 01:29:13 UTC (rev 713)
@@ -13,16 +13,14 @@
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-# # # # # # PATH_Boost = os.path.join(BASE_DIR, 'boost_1_34_1')
-# PATH_Boost = os.path.join(BASE_DIR, 'boost_1_35_0')
-PATH_Boost = os.path.join(BASE_DIR, 'boost-trunk')
+PATH_Boost = os.path.join(BASE_DIR, 'boost_1_36_0' ) #-trunk')
## Path to your boost_pythonxxxx lib file
-# PATH_LIB_Boost = os.path.join(BASE_DIR, PATH_Boost,'bin.v2/libs/python/build/msvc-8.0/release/threading-multi')
-# # # # # # # PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc/release/threading-multi')
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
-LIB_Boost = r'boost_python-vc90-mt-1_36'
+## 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'
@@ -84,6 +82,7 @@
PATH_ogrepcz = os.path.join(PATH_Ogre, 'PlugIns', 'PCZSceneManager' )
PATH_hydrax = os.path.join(PATH_THIRDPARTY, 'hydrax')
+PATH_hikari = os.path.join(BASE_DIR, 'hikari', 'hikari')
# it's time for the SDK version
if SDK:
@@ -130,6 +129,7 @@
PATH_LIB_CEGUI = os.path.join( PATH_Ogre, 'lib' )
PATH_LIB_opensteer = os.path.join(PATH_opensteer, 'win32','release')
+PATH_LIB_hikari = os.path.join(PATH_hikari, 'lib')
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
@@ -179,6 +179,7 @@
PATH_INCLUDE_particleuniverse = os.path.join(PATH_particleuniverse, 'include' )
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_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-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-08-31 01:29:13 UTC (rev 713)
@@ -80,6 +80,7 @@
PATH_opensteer = os.path.join(BASE_DIR, 'opensteer', 'trunk')
PATH_ogrepcz = os.path.join(PATH_Ogre, 'PlugIns', 'PCZSceneManager' )
PATH_hydrax = os.path.join(PATH_THIRDPARTY, 'hydrax')
+PATH_hikari = os.path.join(BASE_DIR, 'hikari', 'hikari')
###
### these paths assume you've left all the directory structure as standard
@@ -118,8 +119,7 @@
PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
PATH_LIB_particleuniverse = os.path.join(PATH_particleuniverse, 'bin', 'release')
PATH_LIB_opensteer = os.path.join(LOCAL_LIB)
-PATH_INCLUDE_ogrepcz = os.path.join(PATH_ogrepcz,'include')
-PATH_INCLUDE_hydrax= PATH_hydrax
+PATH_LIB_hikari = os.path.join(PATH_hikari, 'lib')
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')
@@ -188,3 +188,7 @@
]
PATH_INCLUDE_opensteer = os.path.join(LOCAL_INCLUDE, 'OpenSteer')
PATH_INCLUDE_opensteer_opensteer = os.path.join(LOCAL_INCLUDE, 'OpenSteer')
+PATH_INCLUDE_ogrepcz = os.path.join(PATH_ogrepcz,'include')
+PATH_INCLUDE_hydrax= PATH_hydrax
+PATH_INCLUDE_hikari = os.path.join(PATH_hikari, 'include')
+
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertexBuffer.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertexBuffer.cpp 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertexBuffer.cpp 2008-08-31 01:29:13 UTC (rev 713)
@@ -122,7 +122,7 @@
mRenderSystem->_setTextureUnitFiltering(0, Ogre::FO_LINEAR, Ogre::FO_LINEAR, Ogre::FO_POINT);
mRenderSystem->_setTextureAddressingMode(0, mTextureAddressMode);
mRenderSystem->_setTextureMatrix(0, Ogre::Matrix4::IDENTITY);
- mRenderSystem->_setAlphaRejectSettings(Ogre::CMPF_ALWAYS_PASS, 0);
+ mRenderSystem->_setAlphaRejectSettings(Ogre::CMPF_ALWAYS_PASS, 0, false);
mRenderSystem->_setTextureBlendMode(0, mColorBlendMode);
mRenderSystem->_setTextureBlendMode(0, mAlphaBlendMode);
mRenderSystem->_disableTextureUnitsFrom(1);
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-08-31 01:29:13 UTC (rev 713)
@@ -238,8 +238,8 @@
main_ns.class_(c).noncopyable = True
- # changes for Ogre 1.7
- if environment.ogre.version =="1.7":
+ # changes for Ogre 1.6 and on
+ if environment.ogre.version =="1.7" or environment.ogre.version =="1.6":
# 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()
Modified: trunk/python-ogre/demos/bullet/test01.py
===================================================================
--- trunk/python-ogre/demos/bullet/test01.py 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/demos/bullet/test01.py 2008-08-31 01:29:13 UTC (rev 713)
@@ -45,13 +45,34 @@
self.Pos=initalPosition
self.Position=ogre.Vector3()
self.Quaternion=ogre.Quaternion()
+
def getWorldTransform(self, WorldTrans):
- worldTrans=self.Pos
- def setWorldTransform(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)
-motionState=OgreMotionState(bullet.btTransform())
+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/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/environment.py 2008-08-31 01:29:13 UTC (rev 713)
@@ -452,13 +452,13 @@
version = "3.5"
pythonModule = False
ModuleName = ""
- # AJM Changed so stable is 1.35 as this seems fine....
+
if _STABLE:
- base = 'boost_1_34_1'
- lib= 'boost_python-vc90-mt-1_34_1'
+ base = 'boost_1_36_0'
+ lib= 'boost_python-vc90-mt-1_36'
else:
- base = 'boost_1_35_0'
- lib = 'boost_python-vc90-mt-1_36'
+ base = 'boost_1_37'
+ lib = 'boost_python-vc90-mt-1_37'
if isLinux() or isMac():
bjambase = 'boost-jam-3.1.16'
@@ -506,7 +506,7 @@
[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 --toolset=msvc-8',os.path.join(os.getcwd(),base)]
+ [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
@@ -547,7 +547,7 @@
active = True
pythonModule = True
if _STABLE:
- version="1.4"
+ version="1.6"
else:
version = "1.7"
name='ogre'
@@ -562,16 +562,29 @@
if isWindows():
- source = [
- [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC8SP1_Eihort_20071227.zip", downloadPath],
- [ wget, "http://downloads.sourceforge.net/ogre/ogre-win32-v1-4-9.zip", downloadPath],
- ]
- buildCmds = [
- [0, unzip + os.path.join(downloadPath,"ogre-win32-v1-4-9.zip"),os.getcwd() ],
- [0, unzip + os.path.join(downloadPath,"OgreDependencies_VC8SP1_Eihort_20071227.zip"),
- os.path.join(os.getcwd(), 'ogrenew') ],
- [0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()]
- ]
+ if _STABLE:
+ source = [
+ [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath],
+ [ wget, "http://downloads.sourceforge.net/ogre/ogre-v1-6-0RC1.zip", downloadPath],
+ ]
+ buildCmds = [
+ [0, unzip + os.path.join(downloadPath,"ogre-v1-6-0RC1.zip"),os.getcwd() ],
+ [0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"),
+ 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.','']
+ ]
+ else:
+ source = [
+ [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath],
+ [ svn, "https://svn.ogre3d.org/svnroot/ogre/branches/v1-6", os.path.join(os.getcwd(), 'ogre')]
+ ]
+ buildCmds = [
+ [0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"),
+ 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:
@@ -591,7 +604,7 @@
]
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 '
LINKFLAGS = ''
- externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', Config.LIB_Boost+'.dll']
+ externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', boost.lib+'.dll']
elif isLinux():
version = "1.4" #### UGLY OVERRIDE AT MOMENT...
libs=[boost.lib, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
@@ -1351,7 +1364,7 @@
class ogrevideoffmpeg:
- active = True
+ active = False
pythonModule = True
version="0.2.1"
name='ogrevideoffmpeg'
@@ -1378,7 +1391,7 @@
ModuleName="ogrevideoffmpeg"
class ogredshow:
- active = True
+ active = False
pythonModule = True
version="0.1"
name='ogredshow'
@@ -1646,7 +1659,26 @@
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
ModuleName="hydrax"
-
+
+class hikari:
+ active = True
+ pythonModule = True
+ version="0.22"
+ name='hikari'
+ parent="ogre/gui"
+ cflags = ""
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_INCLUDE_hikari
+ , Config.PATH_INCLUDE_Ogre
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost,
+ Config.PATH_LIB_Ogre_OgreMain,
+ Config.PATH_LIB_hikari
+ ]
+ CheckIncludes=[]
+ libs=[ boost.lib, 'OgreMain', 'hikari' ]
+ ModuleName="hikari"
+
############################################################################################
## Here is the master list....
@@ -1684,9 +1716,10 @@
, 'ofusion' : ofusion
, 'particleuniverse' : particleuniverse
, 'cadunetree' : cadunetree
- ,'opensteer' : opensteer
- ,'ogrepcz' : ogrepcz
+ , 'opensteer' : opensteer
+ , 'ogrepcz' : ogrepcz
, 'hydrax' : hydrax
+ , 'hikari' : hikari
}
#
Added: trunk/python-ogre/packages_2.5/ogre/gui/hikari/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/gui/hikari/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.5/ogre/gui/hikari/__init__.py 2008-08-31 01:29:13 UTC (rev 713)
@@ -0,0 +1 @@
+from _hikari_ import *
Modified: trunk/python-ogre/patch/ogre_1.6.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.patch 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/patch/ogre_1.6.patch 2008-08-31 01:29:13 UTC (rev 713)
@@ -3,234 +3,234 @@
--- OgreMain/include/OgreMovableObject.h (revision 7873)
+++ OgreMain/include/OgreMovableObject.h (working copy)
@@ -482,7 +482,7 @@
- included too.
- */
- virtual void visitRenderables(Renderable::Visitor* visitor,
-- bool debugRenderables = false) = 0;
-+ bool debugRenderables = false) { throw std::runtime_error ( std::string ("Virtual function MovableObject::visitRenderables called!") ); }
-
- /** Sets whether or not the debug display of this object is enabled.
- @remarks
+ included too.
+ */
+ virtual void visitRenderables(Renderable::Visitor* visitor,
+- bool debugRenderables = false) = 0;
++ bool debugRenderables = false) { throw std::runtime_error ( std::string ("Virtual function MovableObject::visitRenderables called!") ); }
+
+ /** Sets whether or not the debug display of this object is enabled.
+ @remarks
Index: OgreMain/include/OgreRenderQueueListener.h
===================================================================
--- OgreMain/include/OgreRenderQueueListener.h (revision 7873)
+++ OgreMain/include/OgreRenderQueueListener.h (working copy)
@@ -31,7 +31,9 @@
-
- #include "OgrePrerequisites.h"
- #include "OgreRenderQueue.h"
-+#include <stdexcept>
-
-+
- namespace Ogre {
-
- /** Abstract interface which classes must implement if they wish to receive
-@@ -64,8 +66,8 @@
- rendered. Note that in this case the renderQueueEnded event will not be raised
- for this queue group.
- */
-- virtual void renderQueueStarted(uint8 queueGroupId, const String& invocation,
-- bool& skipThisInvocation) = 0;
-+ virtual bool renderQueueStarted(uint8 queueGroupId, const String& invocation,
-+ bool skipThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueStarted called!") ); }
-
- /** Event raised after a queue group is rendered.
- @remarks
+
+ #include "OgrePrerequisites.h"
+ #include "OgreRenderQueue.h"
++#include <stdexcept>
+
++
+ namespace Ogre {
+
+ /** Abstract interface which classes must implement if they wish to receive
+@@ -66,8 +68,8 @@
+ rendered. Note that in this case the renderQueueEnded event will not be raised
+ for this queue group.
+ */
+- virtual void renderQueueStarted(uint8 queueGroupId, const String& invocation,
+- bool& skipThisInvocation) = 0;
++ virtual bool renderQueueStarted(uint8 queueGroupId, const String& invocation,
++ bool skipThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueStarted called!") ); }
+
+ /** Event raised after a queue group is rendered.
+ @remarks
@@ -79,8 +81,8 @@
- rendered will be repeated, and the renderQueueStarted and renderQueueEnded
- events will also be fired for it again.
- */
-- virtual void renderQueueEnded(uint8 queueGroupId, const String& invocation,
-- bool& repeatThisInvocation) = 0;
-+ virtual bool renderQueueEnded(uint8 queueGroupId, const String& invocation,
-+ bool repeatThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueEnded called!") ); }
- };
-
- }
+ rendered will be repeated, and the renderQueueStarted and renderQueueEnded
+ events will also be fired for it again.
+ */
+- virtual void renderQueueEnded(uint8 queueGroupId, const String& invocation,
+- bool& repeatThisInvocation) = 0;
++ virtual bool renderQueueEnded(uint8 queueGroupId, const String& invocation,
++ bool repeatThisInvocation) { throw std::runtime_error ( std::string ("Virtual function RenderQueueListener::renderQueueEnded called!") ); }
+ };
+
+ }
Index: OgreMain/include/OgreResourceGroupManager.h
===================================================================
--- OgreMain/include/OgreResourceGroupManager.h (revision 7873)
+++ OgreMain/include/OgreResourceGroupManager.h (working copy)
@@ -37,6 +37,7 @@
- #include "OgreArchive.h"
- #include "OgreIteratorWrappers.h"
- #include <ctime>
-+#include <stdexcept>
-
- namespace Ogre {
-
+ #include "OgreArchive.h"
+ #include "OgreIteratorWrappers.h"
+ #include <ctime>
++#include <stdexcept>
+
+ namespace Ogre {
+
@@ -92,7 +93,7 @@
- parsed. Note that in this case the scriptParseEnded event will not be raised
- for this script.
- */
-- virtual void scriptParseStarted(const String& scriptName, bool& skipThisScript) = 0;
-+ virtual bool scriptParseStarted(const String& scriptName, bool skipThisScript) { throw std::runtime_error ( std::string ("Virtual function ResourceGroupListener::scriptParseStarted called!") ); }
-
- /** This event is fired when the script has been fully parsed.
- */
+ parsed. Note that in this case the scriptParseEnded event will not be raised
+ for this script.
+ */
+- virtual void scriptParseStarted(const String& scriptName, bool& skipThisScript) = 0;
++ virtual bool scriptParseStarted(const String& scriptName, bool skipThisScript) { throw std::runtime_error ( std::string ("Virtual function ResourceGroupListener::scriptParseStarted called!") ); }
+
+ /** This event is fired when the script has been fully parsed.
+ */
@@ -350,7 +351,7 @@
- /// Internal event firing method
- void fireResourceGroupScriptingStarted(const String& groupName, size_t scriptCount);
- /// Internal event firing method
-- void fireScriptStarted(const String& scriptName, bool &skipScript);
-+ bool fireScriptStarted(const String& scriptName, bool skipScript);
- /// Internal event firing method
- void fireScriptEnded(const String& scriptName, bool skipped);
- /// Internal event firing method
+ /// Internal event firing method
+ void fireResourceGroupScriptingStarted(const String& groupName, size_t scriptCount);
+ /// Internal event firing method
+- void fireScriptStarted(const String& scriptName, bool &skipScript);
++ bool fireScriptStarted(const String& scriptName, bool skipScript);
+ /// Internal event firing method
+ void fireScriptEnded(const String& scriptName, bool skipped);
+ /// Internal event firing method
Index: OgreMain/include/OgreDataStream.h
===================================================================
--- OgreMain/include/OgreDataStream.h (revision 7873)
+++ OgreMain/include/OgreDataStream.h (working copy)
@@ -33,6 +33,7 @@
- #include "OgreString.h"
- #include "OgreSharedPtr.h"
- #include <istream>
-+#include <stdexcept>
-
- namespace Ogre {
-
+ #include "OgreString.h"
+ #include "OgreSharedPtr.h"
+ #include <istream>
++#include <stdexcept>
+
+ namespace Ogre {
+
@@ -79,7 +80,7 @@
- @param count Number of bytes to read
- @returns The number of bytes read
- */
-- virtual size_t read(void* buf, size_t count) = 0;
-+ virtual size_t read(void* buf, size_t count) { throw std::runtime_error ( std::string ("Virtual function DataStream::read called!") ); }
- /** Get a single line from the stream.
- @remarks
- The delimiter character is not included in the data
+ @param count Number of bytes to read
+ @returns The number of bytes read
+ */
+- virtual size_t read(void* buf, size_t count) = 0;
++ virtual size_t read(void* buf, size_t count) { throw std::runtime_error ( std::string ("Virtual function DataStream::read called!") ); }
+ /** Get a single line from the stream.
+ @remarks
+ The delimiter character is not included in the data
Index: OgreMain/include/OgreHardwareBuffer.h
===================================================================
--- OgreMain/include/OgreHardwareBuffer.h (revision 7873)
+++ OgreMain/include/OgreHardwareBuffer.h (working copy)
@@ -31,7 +31,9 @@
-
- // Precompiler options
- #include "OgrePrerequisites.h"
-+#include <stdexcept>
-
-+
- namespace Ogre {
-
- /** Abstract class defining common features of hardware buffers.
+
+ // Precompiler options
+ #include "OgrePrerequisites.h"
++#include <stdexcept>
+
++
+ namespace Ogre {
+
+ /** Abstract class defining common features of hardware buffers.
@@ -244,7 +246,7 @@
- @param pDest The area of memory in which to place the data, must be large enough to
- accommodate the data!
- */
-- virtual void readData(size_t offset, size_t length, void* pDest) = 0;
-+ virtual void readData(size_t offset, size_t length, void* pDest) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::readData called!") ); }
- /** Writes data to the buffer from an area of system memory; note that you must
- ensure that your buffer is big enough.
- @param offset The byte offset from the start of the buffer to start writing
+ @param pDest The area of memory in which to place the data, must be large enough to
+ accommodate the data!
+ */
+- virtual void readData(size_t offset, size_t length, void* pDest) = 0;
++ virtual void readData(size_t offset, size_t length, void* pDest) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::readData called!") ); }
+ /** Writes data to the buffer from an area of system memory; note that you must
+ ensure that your buffer is big enough.
+ @param offset The byte offset from the start of the buffer to start writing
@@ -254,7 +256,7 @@
- such that DMA stalls can be avoided; use if you can.
- */
- virtual void writeData(size_t offset, size_t length, const void* pSource,
-- bool discardWholeBuffer = false) = 0;
-+ bool discardWholeBuffer = false) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::writeData called!") ); }
-
- /** Copy data from another buffer into this one.
- @remarks
+ such that DMA stalls can be avoided; use if you can.
+ */
+ virtual void writeData(size_t offset, size_t length, const void* pSource,
+- bool discardWholeBuffer = false) = 0;
++ bool discardWholeBuffer = false) { throw std::runtime_error ( std::string ("Virtual function HardwareBuffer::writeData called!") ); }
+
+ /** Copy data from another buffer into this one.
+ @remarks
Index: OgreMain/include/OgreCompositorChain.h
===================================================================
--- OgreMain/include/OgreCompositorChain.h (revision 7873)
+++ OgreMain/include/OgreCompositorChain.h (working copy)
@@ -174,10 +174,10 @@
- public:
- /** @copydoc RenderQueueListener::renderQueueStarted
- */
-- virtual void renderQueueStarted(uint8 id, const String& invocation, bool& skipThisQueue);
-+ virtual bool renderQueueStarted(uint8 id, const String& invocation, bool skipThisQueue);
- /** @copydoc RenderQueueListener::renderQueueEnded
- */
-- virtual void renderQueueEnded(uint8 id, const String& invocation, bool& repeatThisQueue);
-+ virtual bool renderQueueEnded(uint8 id, const String& invocation, bool repeatThisQueue);
-
- /** Set current operation and target */
- void setOperation(CompositorInstance::TargetOperation *op,SceneManager *sm,RenderSystem *rs);
+ public:
+ /** @copydoc RenderQueueListener::renderQueueStarted
+ */
+- virtual void renderQueueStarted(uint8 id, const String& invocation, bool& skipThisQueue);
++ virtual bool renderQueueStarted(uint8 id, const String& invocation, bool skipThisQueue);
+ /** @copydoc RenderQueueListener::renderQueueEnded
+ */
+- virtual void renderQueueEnded(uint8 id, const String& invocation, bool& repeatThisQueue);
++ virtual bool renderQueueEnded(uint8 id, const String& invocation, bool repeatThisQueue);
+
+ /** Set current operation and target */
+ void setOperation(CompositorInstance::TargetOperation *op,SceneManager *sm,RenderSystem *rs);
Index: OgreMain/src/OgreResourceGroupManager.cpp
===================================================================
--- OgreMain/src/OgreResourceGroupManager.cpp (revision 7873)
+++ OgreMain/src/OgreResourceGroupManager.cpp (working copy)
@@ -929,7 +929,7 @@
- for (FileInfoList::iterator fii = (*flli)->begin(); fii != (*flli)->end(); ++fii)
- {
- bool skipScript = false;
-- fireScriptStarted(fii->filename, skipScript);
-+ skipScript = fireScriptStarted(fii->filename, skipScript);
- if(skipScript)
- {
- LogManager::getSingleton().logMessage(
+ for (FileInfoList::iterator fii = (*flli)->begin(); fii != (*flli)->end(); ++fii)
+ {
+ bool skipScript = false;
+- fireScriptStarted(fii->filename, skipScript);
++ skipScript = fireScriptStarted(fii->filename, skipScript);
+ if(skipScript)
+ {
+ LogManager::getSingleton().logMessage(
@@ -1218,17 +1218,18 @@
- }
- }
- //-----------------------------------------------------------------------
-- void ResourceGroupManager::fireScriptStarted(const String& scriptName, bool &skipScript)
-+ bool ResourceGroupManager::fireScriptStarted(const String& scriptName, bool skipScript)
- {
- OGRE_LOCK_AUTO_MUTEX
- for (ResourceGroupListenerList::iterator l = mResourceGroupListenerList.begin();
- l != mResourceGroupListenerList.end(); ++l)
- {
- bool temp = false;
-- (*l)->scriptParseStarted(scriptName, temp);
-+ temp = (*l)->scriptParseStarted(scriptName, temp);
- if(temp)
- skipScript = true;
- }
-+ return skipScript;
- }
- //-----------------------------------------------------------------------
- void ResourceGroupManager::fireScriptEnded(const String& scriptName, bool skipped)
+ }
+ }
+ //-----------------------------------------------------------------------
+- void ResourceGroupManager::fireScriptStarted(const String& scriptName, bool &skipScript)
++ bool ResourceGroupManager::fireScriptStarted(const String& scriptName, bool skipScript)
+ {
+ OGRE_LOCK_AUTO_MUTEX
+ for (ResourceGroupListenerList::iterator l = mResourceGroupListenerList.begin();
+ l != mResourceGroupListenerList.end(); ++l)
+ {
+ bool temp = false;
+- (*l)->scriptParseStarted(scriptName, temp);
++ temp = (*l)->scriptParseStarted(scriptName, temp);
+ if(temp)
+ skipScript = true;
+ }
++ return skipScript;
+ }
+ //-----------------------------------------------------------------------
+ void ResourceGroupManager::fireScriptEnded(const String& scriptName, bool skipped)
Index: OgreMain/src/OgreCompositorChain.cpp
===================================================================
--- OgreMain/src/OgreCompositorChain.cpp (revision 7873)
+++ OgreMain/src/OgreCompositorChain.cpp (working copy)
@@ -377,8 +377,8 @@
- mViewport = vp;
- }
- //-----------------------------------------------------------------------
--void CompositorChain::RQListener::renderQueueStarted(uint8 id,
-- const String& invocation, bool& skipThisQueue)
-+bool CompositorChain::RQListener::renderQueueStarted(uint8 id,
-+ const String& invocation, bool skipThisQueue)
- {
- // Skip when not matching viewport
- // shadows update is nested within main viewport update
+ mViewport = vp;
+ }
+ //-----------------------------------------------------------------------
+-void CompositorChain::RQListener::renderQueueStarted(uint8 id,
+- const String& invocation, bool& skipThisQueue)
++bool CompositorChain::RQListener::renderQueueStarted(uint8 id,
++ const String& invocation, bool skipThisQueue)
+ {
+ // Skip when not matching viewport
+ // shadows update is nested within main viewport update
@@ -392,11 +392,13 @@
- {
- skipThisQueue = true;
- }
-+ return skipThisQueue;
- }
- //-----------------------------------------------------------------------
--void CompositorChain::RQListener::renderQueueEnded(uint8 id,
-- const String& invocation, bool& repeatThisQueue)
-+bool CompositorChain::RQListener::renderQueueEnded(uint8 id,
-+ const String& invocation, bool repeatThisQueue)
- {
-+ return repeatThisQueue;
- }
- //-----------------------------------------------------------------------
- void CompositorChain::RQListener::setOperation(CompositorInstance::TargetOperation *op,SceneManager *sm,RenderSystem *rs)
+ {
+ skipThisQueue = true;
+ }
++ return skipThisQueue;
+ }
+ //-----------------------------------------------------------------------
+-void CompositorChain::RQListener::renderQueueEnded(uint8 id,
+- const String& invocation, bool& repeatThisQueue)
++bool CompositorChain::RQListener::renderQueueEnded(uint8 id,
++ const String& invocation, bool repeatThisQueue)
+ {
++ return repeatThisQueue;
+ }
+ //-----------------------------------------------------------------------
+ void CompositorChain::RQListener::setOperation(CompositorInstance::TargetOperation *op,SceneManager *sm,RenderSystem *rs)
Index: OgreMain/src/OgreSceneManager.cpp
===================================================================
--- OgreMain/src/OgreSceneManager.cpp (revision 7873)
+++ OgreMain/src/OgreSceneManager.cpp (working copy)
@@ -3651,7 +3651,7 @@
- iend = mRenderQueueListeners.end();
- for (i = mRenderQueueListeners.begin(); i != iend; ++i)
- {
-- (*i)->renderQueueStarted(id, invocation, skip);
-+ skip = (*i)->renderQueueStarted(id, invocation, skip);
- }
- return skip;
- }
+ iend = mRenderQueueListeners.end();
+ for (i = mRenderQueueListeners.begin(); i != iend; ++i)
+ {
+- (*i)->renderQueueStarted(id, invocation, skip);
++ skip = (*i)->renderQueueStarted(id, invocation, skip);
+ }
+ return skip;
+ }
@@ -3664,7 +3664,7 @@
- iend = mRenderQueueListeners.end();
- for (i = mRenderQueueListeners.begin(); i != iend; ++i)
- {
-- (*i)->renderQueueEnded(id, invocation, repeat);
-+ repeat = (*i)->renderQueueEnded(id, invocation, repeat);
- }
- return repeat;
- }
+ iend = mRenderQueueListeners.end();
+ for (i = mRenderQueueListeners.begin(); i != iend; ++i)
+ {
+- (*i)->renderQueueEnded(id, invocation, repeat);
++ repeat = (*i)->renderQueueEnded(id, invocation, repeat);
+ }
+ return repeat;
+ }
Modified: trunk/python-ogre/scripts/compilesource.bat
===================================================================
--- trunk/python-ogre/scripts/compilesource.bat 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/scripts/compilesource.bat 2008-08-31 01:29:13 UTC (rev 713)
@@ -10,7 +10,7 @@
rem %_VCBUILD% /useenv NxOgre.VC8.Windows.sln "Release|Win32"
cd %_ROOT%\\ogreaddons\\ogreode\\scripts\\vc8
-%_VCBUILD% /useenv OgreOde_CVS.sln "Release|Win32"
+%_VCBUILD% /useenv OgreOde_Source.sln "Release|Win32"
cd %_ROOT%\\ogreaddons\\ogrenewt
%_VCBUILD% /useenv OgreNewt.sln "Release|Win32"
Modified: trunk/python-ogre/setup.py
===================================================================
--- trunk/python-ogre/setup.py 2008-08-31 01:25:05 UTC (rev 712)
+++ trunk/python-ogre/setup.py 2008-08-31 01:29:13 UTC (rev 713)
@@ -67,12 +67,13 @@
'ogre.physics.bullet','ogre.physics.PhysX','ogre.physics.NxOgre',
'ogre.physics.OgreBulletC', 'ogre.physics.OgreBulletD',
'ogre.addons','ogre.addons.theora',
- 'ogre.addons.ogrevideoffmpeg', 'ogre.addons.ogredshow',
- 'ogre.addons.plib','ogre.gui.navi',
+ # 'ogre.addons.ogrevideoffmpeg', 'ogre.addons.ogredshow',
+ 'ogre.addons.plib', # 'ogre.gui.navi',
'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum',
- 'ogre.addons.noise', 'ogre.addons.watermesh', 'ogre.addons.ofusion',
+ 'ogre.addons.noise', 'ogre.addons.watermesh', # 'ogre.addons.ofusion',
'ogre.addons.particleuniverse', 'ogre.addons.cadunetree',
- 'ogre.renderer.ogrepcz', 'ogre.addons.hydrax' ],
+ 'ogre.renderer.ogrepcz', 'ogre.addons.hydrax',
+ 'ogre.gui.hikari' ],
"package_dir": {'': 'packages_'+ PythonVersionString },
"package_data": {'': ['*.pyd', '*.dll', '*.so']}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
