[Python-ogre-commit] SF.net SVN: python-ogre: [627] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2008-07-01 07:26:50
|
Revision: 627 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=627&view=rev Author: andy_miller Date: 2008-07-01 00:26:57 -0700 (Tue, 01 Jul 2008) Log Message: ----------- Few tweaks for latest Ogre SVN R7695 Modified Paths: -------------- trunk/python-ogre/PythonOgreInstallCreator.iss trunk/python-ogre/code_generators/ogre/generate_code.py trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h trunk/python-ogre/demos/caelum/Demo_Caelum01.py Modified: trunk/python-ogre/PythonOgreInstallCreator.iss =================================================================== --- trunk/python-ogre/PythonOgreInstallCreator.iss 2008-06-28 23:57:01 UTC (rev 626) +++ trunk/python-ogre/PythonOgreInstallCreator.iss 2008-07-01 07:26:57 UTC (rev 627) @@ -3,19 +3,19 @@ ; [Setup] AppName=Python-Ogre -AppVerName=Python-Ogre 1.2 RC1 +AppVerName=Python-Ogre 1.2 RC2 DefaultDirName=C:\PythonOgre DefaultGroupName=Python-Ogre OutputBaseFilename=PythonOgreInstaller OutputDir=C:\temp SourceDir=C:\Development\PythonOgreRelease -VersionInfoDescription=Release 1.2 RC1 of Python-Ogre +VersionInfoDescription=Release 1.2 RC2 of Python-Ogre AllowNoIcons=true AppPublisher=OpenSource (Andy and Team) AppPublisherURL=http://www.python-ogre.org AppSupportURL=http://www.python-ogre.org AppUpdatesURL=http://www.python-ogre.org -AppVersion=1.2.0 +AppVersion=1.2.1 LicenseFile=LICENSE.GPL Compression=lzma InfoBeforeFile=InstallWarning.rtf @@ -23,13 +23,13 @@ SolidCompression=true AppCopyright=LPGL VersionInfoCompany=OpenSource (Andy and Team) -VersionInfoTextVersion=1.2.0 +VersionInfoTextVersion=1.2.1 VersionInfoCopyright=PythonOgre Development Team RestartIfNeededByRun=false UninstallDisplayName=PythonOgre WizardImageFile=compiler:WizModernImage-IS.bmp WizardSmallImageFile=compiler:WizModernSmallImage-IS.bmp -VersionInfoVersion=1.2.0 +VersionInfoVersion=1.2.1 [Files] ; base files, demos and tools Source: *; DestDir: {app} Modified: trunk/python-ogre/code_generators/ogre/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogre/generate_code.py 2008-06-28 23:57:01 UTC (rev 626) +++ trunk/python-ogre/code_generators/ogre/generate_code.py 2008-07-01 07:26:57 UTC (rev 627) @@ -115,7 +115,10 @@ # functions that take pointers to pointers main_ns.class_( 'VertexElement').member_functions('baseVertexPointerToElement').exclude() ## now as a transformed funct - mb.global_ns.mem_fun('::Ogre::InstancedGeometry::BatchInstance::getObjectsAsArray').exclude() + + if environment.ogre.version =="1.4": + mb.global_ns.mem_fun('::Ogre::InstancedGeometry::BatchInstance::getObjectsAsArray').exclude() + #all constructors in this class are private, also some of them are public. main_ns.free_functions ('any_cast').exclude () #not relevant for Python @@ -227,14 +230,14 @@ if func.virtuality == declarations.VIRTUALITY_TYPES.PURE_VIRTUAL: continue func.exclude() - print '{*} function "%s" is marked as internal' % declarations.full_name( func ) + print '{*} function "%s" is marked as internal' % declarations.full_name( func ) # this change was for 1.7 but also needed for 1.4 noncopy=['Camera','Frustum', 'Log'] for c in noncopy: - main_ns.class_(c).noncopyable = True - + main_ns.class_(c).noncopyable = True + # changes for Ogre 1.7 if environment.ogre.version =="1.7": # main_ns.class_("ResourceBackgroundQueue").exclude() # Ogre::ResourceBackgroundQueue::_fireBackgroundLoadingComplete isn't implemented Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h =================================================================== --- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2008-06-28 23:57:01 UTC (rev 626) +++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2008-07-01 07:26:57 UTC (rev 627) @@ -3,6 +3,8 @@ // sizeof ( Ogre::ConstVectorIterator ); // sizeof ( Ogre::ConstMapIterator ); + + sizeof ( Ogre::MapIterator< std::multimap<Ogre::String, Ogre::String> > ); sizeof ( Ogre::MapIterator< std::map<Ogre::String, std::multimap<Ogre::String, Ogre::String>*> > ); sizeof ( Ogre::MaterialPtr ); @@ -18,6 +20,19 @@ #else sizeof ( Ogre::ResourceBackgroundQueue ); + sizeof ( Ogre::AllocatedObject ); + sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)0> > ); + sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)1> > ); + sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)2> > ); + sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)3> > ); + sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)4> > ); + sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)5> > ); + sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)6> > ); + sizeof ( Ogre::AllocatedObject<Ogre::CategorisedAllocPolicy<(Ogre::MemoryCategory)7> > ); + sizeof ( Ogre::ConstVectorIterator<std::vector<Ogre::Technique::GPUVendorRule, std::allocator<Ogre::Technique::GPUVendorRule> > > ); + sizeof ( Ogre::MapIterator<std::map<int, Ogre::InstancedGeometry::InstancedObject*, std::less<int>, std::allocator<std::pair<const int, Ogre::InstancedGeometry::InstancedObject*> > > > ); + sizeof ( Ogre::ConstVectorIterator<std::vector<Ogre::Technique::GPUDeviceNameRule, std::allocator<Ogre::Technique::GPUDeviceNameRule> > > ); + #endif Modified: trunk/python-ogre/demos/caelum/Demo_Caelum01.py =================================================================== --- trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2008-06-28 23:57:01 UTC (rev 626) +++ trunk/python-ogre/demos/caelum/Demo_Caelum01.py 2008-07-01 07:26:57 UTC (rev 627) @@ -234,13 +234,13 @@ 0 ) print componentMask ## Initialise Caelum - self.caelumSystem = caelum.CaelumSystem(self.root.getSingletonPtr(), self.sceneManager,componentMask ) + self.caelumSystem = caelum.CaelumSystem(self.root.getSingletonPtr(), self.sceneManager ) ##,componentMask ) self.caelumSystem.setManageSceneFog(True) self.caelumSystem.setSceneFogDensityMultiplier(0.0015) - self.caelumSystem.setManageAmbientLight (true) - - + self.caelumSystem.setManageAmbientLight (True) + self.caelumSystem.setMinimumAmbientLight (ogre.ColourValue (0, 0, 0.5)) + ## This is how you switch the sun implementation. ## This here is a no-op; but it's useful to test caelum doesn't crash when the second sun is created. self.spheresun = caelum.SphereSun(self.sceneManager, self.caelumSystem.getRootNode ()) @@ -253,38 +253,22 @@ self.caelumSystem.getSun ().setSpecularMultiplier (ogre.ColourValue (5, 5, 5)) self.caelumSystem.getSun ().setAutoDisable (True) self.caelumSystem.getSun ().setAutoDisableThreshold (0.1) - - ## Setup fog options. - if self.caelumSystem.getGroundFog(): - self.caelumSystem.getGroundFog().findFogPassesByName() - - ## Setup cloud options. - ## Tweak these settings to make the demo look pretty. + if (self.caelumSystem.getMoon ()): + self.caelumSystem.getMoon ().setAutoDisable (True) + self.caelumSystem.getMoon ().setAutoDisableThreshold (0.1) + +# ## Setup cloud options. +# ## Tweak these settings to make the demo look pretty. if self.caelumSystem.getClouds (): self.caelumSystem.getClouds ().setCloudSpeed(ogre.Vector2(0.000005, -0.000009)) self.caelumSystem.getClouds ().setCloudBlendTime(3600 * 24) self.caelumSystem.getClouds ().setCloudCover(0.3) - ## Setup starfield options - if self.caelumSystem.getStarfield (): - self.caelumSystem.getStarfield ().setInclination (ogre.Degree (13)) - - ## Set time acceleration. - self.caelumSystem.getUniversalClock ().setTimeScale (512) - - ## Winter dawn in the southern hemisphere, looking north - self.caelumSystem.getUniversalClock ().setGregorianDateTime (2008, 7, 4, 20, 33, 0) - self.caelumSystem.getSolarSystemModel ().setObserverLongitude (ogre.Degree(103 + 48 / 60)) - - ## Singapore - self.caelumSystem.getSolarSystemModel ().setObserverLatitude (ogre.Degree(1 + 22 / 60)) - ## Beyond the southern polar circle, no sunrise - ##mCaelumSystem.getSolarSystemModel ().setObserverLatitude (ogre.Degree(-70)) - ## Beyond the northern polar circle, no sunset - ##mCaelumSystem.getSolarSystemModel ().setObserverLatitude (ogre.Degree(70)) - + + ## Register caelum to the render target self.renderWindow.addListener (self.caelumSystem) + ogre.Root.getSingletonPtr().addFrameListener( self.caelumSystem ) ## Put some terrain in the scene self.sceneManager.setWorldGeometry ("CaelumDemoTerrain.cfg") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |