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

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

Revision: 850
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=850&view=rev
Author:   andy_miller
Date:     2009-01-25 12:44:39 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
Updates for the 1.6.1 release

Modified Paths:
--------------
    trunk/python-ogre/ChangeLog.txt
    trunk/python-ogre/PythonOgreInstallCreator.iss
    trunk/python-ogre/demos/ogrepcz/plugins.cfg
    trunk/python-ogre/environment.py
    trunk/python-ogre/patch/navi.patch

Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt	2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/ChangeLog.txt	2009-01-25 12:44:39 UTC (rev 850)
@@ -1,18 +1,25 @@
-xxx : Release SVN
-=================
+Janurary 25 2009 : Release 1.6.1
+================================
+Latest build using Ogre 1.6.1 -- Note that the underlying Ogre C++ is NOT Patched!! 
+
 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: Update Bullet libraries to bullet 2.73
 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.. 
-Update: Plib ssgLoaderOptions (ssgLoad) can now be subclassed and createBranch/createState used as callback functions        
+Update: Plib ssgLoaderOptions (ssgLoad) can now be subclassed and createBranch/createState used as callback functions 
+Update: Latest QuickGUI, OgreForest (Paging), OgreBullet 
+Update/Fix: Using OIS CVS version as it fixes issues with joystick/slider 'drivers'...      
 
+Change: Using latest Py++ which has boost indexing implemented as header files (BOOST is NOT Patched!)
+Change: Added Canvas module
+Change: Removed OgreRefApp and Watermesh modules 
 
 November 14 2008 : Release 1.6.0 
 ==================================

Modified: trunk/python-ogre/PythonOgreInstallCreator.iss
===================================================================
--- trunk/python-ogre/PythonOgreInstallCreator.iss	2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/PythonOgreInstallCreator.iss	2009-01-25 12:44:39 UTC (rev 850)
@@ -3,19 +3,19 @@
 ;
 [Setup]
 AppName=Python-Ogre
-AppVerName=Python-Ogre 1.6.0
+AppVerName=Python-Ogre 1.6.1
 DefaultDirName=C:\PythonOgre
 DefaultGroupName=Python-Ogre
 OutputBaseFilename=PythonOgreInstaller
 OutputDir=C:\temp
 SourceDir=C:\Development\PythonOgreRelease
-VersionInfoDescription=Release 1.6.0 of Python-Ogre
+VersionInfoDescription=Release 1.6.1 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.6.0
+AppVersion=1.6.1
 LicenseFile=LICENSE.GPL
 Compression=lzma
 InfoBeforeFile=InstallWarning.rtf
@@ -23,13 +23,13 @@
 SolidCompression=yes
 AppCopyright=LPGL
 VersionInfoCompany=OpenSource (Andy and Team)
-VersionInfoTextVersion=1.6.0
+VersionInfoTextVersion=1.6.1
 VersionInfoCopyright=PythonOgre Development Team
 RestartIfNeededByRun=false
 UninstallDisplayName=PythonOgre
 WizardImageFile=compiler:WizModernImage-IS.bmp
 WizardSmallImageFile=compiler:WizModernSmallImage-IS.bmp
-VersionInfoVersion=1.6.0
+VersionInfoVersion=1.6.1
 
 [Files]
 ; base files, demos and tools

Modified: trunk/python-ogre/demos/ogrepcz/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogrepcz/plugins.cfg	2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/demos/ogrepcz/plugins.cfg	2009-01-25 12:44:39 UTC (rev 850)
@@ -2,24 +2,24 @@
 
 ## Use this for Windows
 # Define plugin folder
-#PluginFolder=../../plugins
-#Plugin=RenderSystem_GL.dll
-#Plugin=RenderSystem_Direct3D9.dll
-#Plugin=Plugin_ParticleFX.dll
+PluginFolder=../../plugins
+Plugin=RenderSystem_GL.dll
+Plugin=RenderSystem_Direct3D9.dll
+Plugin=Plugin_ParticleFX.dll
 #Plugin=Plugin_BSPSceneManager.dll
 #Plugin=Plugin_CgProgramManager.dll
-#Plugin=Plugin_PCZSceneManager.dll
-#Plugin=Plugin_OctreeZone.dll
-#Plugin=Plugin_OctreeSceneManager.dll
+Plugin=Plugin_PCZSceneManager.dll
+Plugin=Plugin_OctreeZone.dll
+Plugin=Plugin_OctreeSceneManager.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=libPlugin_PCZSceneManager
+#PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#Plugin=RenderSystem_GL
+#Plugin=Plugin_ParticleFX
+#Plugin=Plugin_BSPSceneManager
+#Plugin=libPlugin_PCZSceneManager
 #Plugin=Plugin_OctreeZone
-Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
+#Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/environment.py	2009-01-25 12:44:39 UTC (rev 850)
@@ -1116,7 +1116,7 @@
     lib_dirs = [boost.PATH_LIB,
                 Config.PATH_LIB_Ogre_OgreMain
                 ,Config.PATH_LIB_navi
-                ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib')
+                ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib', 'release')
                 ]
     CheckIncludes=[]
     libs=[  boost.lib, 'Navi_DLL', 'OgreMain','Awesomium', 'user32',

Modified: trunk/python-ogre/patch/navi.patch
===================================================================
--- trunk/python-ogre/patch/navi.patch	2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/patch/navi.patch	2009-01-25 12:44:39 UTC (rev 850)
@@ -1,45 +1,72 @@
---- Navi/Include/Navi.h	(revision 25)
-+++ Navi/Include/Navi.h	(working copy)
-@@ -34,7 +34,7 @@
- {
- 	class _NaviExport Navi : public LLEmbeddedBrowserWindowObserver, public Ogre::WindowEventListener, public Ogre::ManualResourceLoader
- 	{
--		friend NaviManager;
-+		friend class NaviManager;
+Index: NaviDemo/Source/InputManager.cpp
+===================================================================
+--- NaviDemo/Source/InputManager.cpp	(revision 43)
++++ NaviDemo/Source/InputManager.cpp	(working copy)
+@@ -64,13 +64,13 @@
+         mInputSystem = OIS::InputManager::createInputSystem( paramList );
  
- 		std::string naviName;
- 		unsigned short naviWidth;
-@@ -69,8 +69,8 @@
- 		std::multimap<std::string, NaviDelegate> delegateMap;
- 		std::multimap<std::string, NaviDelegate>::iterator delegateIter;
- 		std::pair<std::multimap<std::string, NaviDelegate>::iterator, std::multimap<std::string, NaviDelegate>::iterator> dmBounds;
--		std::map<std::string, std::vector<std::string>> ensureKeysMap;
--		std::map<std::string, std::vector<std::string>>::iterator ensureKeysMapIter;
-+		std::map<std::string, std::vector<std::string> > ensureKeysMap;
-+		std::map<std::string, std::vector<std::string> >::iterator ensureKeysMapIter;
- 		bool okayToDelete;
- 		bool isVisible;
- 		bool fadingOut;
-
---- Navi/Include/NaviMouse.h	(revision 25)
-+++ Navi/Include/NaviMouse.h	(working copy)
-@@ -41,7 +41,7 @@
- 	class _NaviExport NaviMouse : public Singleton<NaviMouse>, public Ogre::ManualResourceLoader
- 	{
- 		friend class NaviManager;
--		friend NaviCursor;
-+		friend class NaviCursor;
- 		int mouseX, mouseY;
- 		unsigned short width, height;
- 		unsigned short texWidth, texHeight;
-
---- Navi/Include/NaviManager.h	(revision 25)
+         // If possible create a buffered keyboard
+-        if( mInputSystem->numKeyboards() > 0 ) {
++//       if( mInputSystem->numKeyboards() > 0 ) {
+             mKeyboard = static_cast<OIS::Keyboard*>( mInputSystem->createInputObject( OIS::OISKeyboard, true ) );
+             mKeyboard->setEventCallback( this );
+-        }
++//        }
+ 
+         // If possible create a buffered mouse
+-        if( mInputSystem->numMice() > 0 ) {
++//        if( mInputSystem->numMice() > 0 ) {
+             mMouse = static_cast<OIS::Mouse*>( mInputSystem->createInputObject( OIS::OISMouse, true ) );
+             mMouse->setEventCallback( this );
+ 
+@@ -81,10 +81,10 @@
+ 
+             // Set mouse region
+             this->setWindowExtents( width, height );
+-        }
++//        }
+ 
+         // If possible create all joysticks in buffered mode
+-        if( mInputSystem->numJoySticks() > 0 ) {
++/*		if( 0 ) { //mInputSystem->numJoySticks() > 0 ) {
+             mJoysticks.resize( mInputSystem->numJoySticks() );
+ 
+             itJoystick    = mJoysticks.begin();
+@@ -93,7 +93,7 @@
+                 (*itJoystick) = static_cast<OIS::JoyStick*>( mInputSystem->createInputObject( OIS::OISJoyStick, true ) );
+                 (*itJoystick)->setEventCallback( this );
+             }
+-        }
++        } */
+     }
+ }
+ 
+Index: Navi/Include/NaviManager.h
+===================================================================
+--- Navi/Include/NaviManager.h	(revision 43)
 +++ Navi/Include/NaviManager.h	(working copy)
-@@ -37,6 +37,7 @@
- 
+@@ -30,6 +30,16 @@
+ #include "NaviUtilities.h"
+ #include "NaviSingleton.h"
+ #include "WebCore.h"
++
++#ifdef min
++#undef min
++#endif
++
++#ifdef max
++#undef max
++#endif
++
++
+ #include "Ogre.h"
+ #include "OgrePanelOverlayElement.h"
+ #include "KeyboardHook.h"
+@@ -39,6 +49,7 @@
+ */
  namespace NaviLibrary
  {
-+    class Navi; // needed for Python-Ogre gccxml processing
++    class Navi;  // need to delcare to make gccxml happy
  	/**
  	* Enumerates relative positions. Used by NaviManager::NaviPosition
  	*/


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