[Python-ogre-commit] SF.net SVN: python-ogre: [630] trunk/python-ogre/patch/ogre_1.7.patch
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2008-07-02 08:39:08
|
Revision: 630 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=630&view=rev Author: andy_miller Date: 2008-07-02 01:39:16 -0700 (Wed, 02 Jul 2008) Log Message: ----------- Improvements to the Ogre Patch for the 1.7 SVN head version Modified Paths: -------------- trunk/python-ogre/patch/ogre_1.7.patch Modified: trunk/python-ogre/patch/ogre_1.7.patch =================================================================== --- trunk/python-ogre/patch/ogre_1.7.patch 2008-07-02 08:10:50 UTC (rev 629) +++ trunk/python-ogre/patch/ogre_1.7.patch 2008-07-02 08:39:16 UTC (rev 630) @@ -1,16 +1,7 @@ - ---- ogre/configure.in 2007-05-15 22:43:31.000000000 +0800 -+++ ogre/configure.in 2007-05-15 22:43:18.000000000 +0800 -@@ -59,6 +58,7 @@ - ;; - esac - ]) -+CFLAGS_VISIBILITY="" - AC_SUBST(CFLAGS_VISIBILITY) - AC_LANG_POP - ---- ogre/OgreMain/include/OgreDataStream.h 23 Aug 2006 08:18:33 -0000 1.12 -+++ ogre/OgreMain/include/OgreDataStream.h 24 Nov 2007 00:35:47 -0000 +Index: ogre/OgreMain/include/OgreDataStream.h +=================================================================== +--- ogre/OgreMain/include/OgreDataStream.h (revision 7701) ++++ ogre/OgreMain/include/OgreDataStream.h (working copy) @@ -33,6 +33,7 @@ #include "OgreString.h" #include "OgreSharedPtr.h" @@ -28,27 +19,20 @@ /** Get a single line from the stream. @remarks The delimiter character is not included in the data -@@ -146,7 +147,7 @@ - /** Returns the total size of the data to be read from the stream, - or 0 if this is indeterminate for this stream. - */ -- size_t size(void) const { return mSize; } -+ virtual size_t size(void) const { return mSize; } +Index: ogre/OgreMain/include/OgreHardwareBuffer.h +=================================================================== +--- ogre/OgreMain/include/OgreHardwareBuffer.h (revision 7701) ++++ ogre/OgreMain/include/OgreHardwareBuffer.h (working copy) +@@ -31,7 +31,9 @@ - /** Close the stream; this makes further operations invalid. */ - virtual void close(void) = 0; - ---- ogre/OgreMain/include/OgreHardwareBuffer.h 23 Aug 2006 08:18:33 -0000 1.17 -+++ ogre/OgreMain/include/OgreHardwareBuffer.h 24 Nov 2007 00:37:00 -0000 -@@ -31,6 +31,8 @@ - // 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! @@ -58,18 +42,42 @@ /** 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 - ---- ogre/OgreMain/include/OgreRenderQueueListener.h 23 Aug 2006 08:18:35 -0000 1.10 -+++ ogre/OgreMain/include/OgreRenderQueueListener.h 24 Nov 2007 00:34:52 -0000 -@@ -31,6 +31,8 @@ +@@ -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 +Index: ogre/OgreMain/include/OgreMovableObject.h +=================================================================== +--- ogre/OgreMain/include/OgreMovableObject.h (revision 7701) ++++ ogre/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 +Index: ogre/OgreMain/include/OgreRenderQueueListener.h +=================================================================== +--- ogre/OgreMain/include/OgreRenderQueueListener.h (revision 7701) ++++ ogre/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 @@ -65,7 +67,7 @@ for this queue group. */ @@ -88,4 +96,16 @@ }; } +Index: ogre/OgreMain/include/OgreResourceGroupManager.h +=================================================================== +--- ogre/OgreMain/include/OgreResourceGroupManager.h (revision 7701) ++++ ogre/OgreMain/include/OgreResourceGroupManager.h (working copy) +@@ -91,7 +91,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 void 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. + */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |