support for Ogre-Next 3.0 and 4.0

OGRECave · May 26, 2024 · 2d37345 · 2d37345
1 parent 25ea305
commit 2d37345
Show file tree

Hide file tree

Showing 23 changed files with 125 additions and 76 deletions.
diff --git a/oggsound/include/OgreOggISound.h b/oggsound/include/OgreOggISound.h
@@ -516,7 +516,7 @@ namespace OgreOggSound
 		*/
 		void _getSharedProperties(BufferListPtr& buffers, float& length, ALenum& format); 
 
-		#if OGRE_VERSION_MAJOR == 2
+		#if AV_OGRE_NEXT_VERSION >= 0x20000
 		/** Gets name
 		 */
 		virtual Ogre::String getName();
@@ -532,7 +532,7 @@ namespace OgreOggSound
 		 */
 		OgreOggISound(
 			const Ogre::String& name
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			, Ogre::SceneManager* scnMgr, Ogre::IdType id, Ogre::ObjectMemoryManager *objMemMgr, Ogre::uint8 renderQueueId
 			#endif
 		);
@@ -581,11 +581,11 @@ namespace OgreOggSound
 		 */
 		virtual void _notifyAttached(
 			Ogre::Node* node
-			#if OGRE_VERSION_MAJOR != 2
+			#if !AV_OGRE_NEXT_VERSION
 			, bool isTagPoint = false
 			#endif
 		);
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		/** Notifys object its been moved
 		@remarks
 			Overridden from MovableObject.
@@ -596,7 +596,7 @@ namespace OgreOggSound
 		 */
 		virtual void _updateRenderQueue(Ogre::RenderQueue *queue, Ogre::Camera *camera, const Ogre::Camera *lodCamera);
 		#endif
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		/** Renderable callback
 		@remarks
 			Overridden function from MovableObject.
@@ -683,7 +683,7 @@ namespace OgreOggSound
 		bool mGiveUpSource;				// Flag to indicate whether sound should release its source when stopped
 		bool mStream;					// Stream flag
 		bool mSourceRelative;			// Relative position flag
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		bool mLocalTransformDirty;		// Transformation update flag
 		#else
 		Ogre::Vector3 mPosition;		// 3D position

diff --git a/oggsound/include/OgreOggListener.h b/oggsound/include/OgreOggListener.h
@@ -50,24 +50,24 @@ namespace OgreOggSound
 			Creates a listener object to act as the ears of the user. 
 		 */
 		OgreOggListener(
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			Ogre::IdType id, Ogre::SceneManager *scnMgr, Ogre::ObjectMemoryManager *objMemMgr, Ogre::uint8 renderQueueId
 			#else
 			Ogre::SceneManager* scnMgr = NULL
 			#endif
 		): 
-			#if OGRE_VERSION_MAJOR == 2 && OGRE_VERSION_MINOR > 0
+			#if AV_OGRE_NEXT_VERSION >= 0x20100
 				MovableObject(id, objMemMgr, scnMgr, renderQueueId),
 			#endif
 			  mVelocity(Ogre::Vector3::ZERO)
-			#if OGRE_VERSION_MAJOR != 2
+			#if !AV_OGRE_NEXT_VERSION
 			, mLocalTransformDirty(false)
 			#endif
 			, mSceneMgr(scnMgr)
 		{
 			for (int i=0; i<6; ++i ) mOrientation[i]=0.f;
 			mName = "OgreOggListener";
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			setLocalAabb(Ogre::Aabb::BOX_NULL);
 			setQueryFlags(0);
 			#endif
@@ -107,7 +107,7 @@ namespace OgreOggSound
 			bounding radius for this object.
 		 */
 		virtual float getBoundingRadius(void) const;
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		void _updateRenderQueue(Ogre::RenderQueue *queue) override {}
 		void visitRenderables(Ogre::Renderable::Visitor* visitor, bool debugRenderables) override {}
 		#else
@@ -119,11 +119,11 @@ namespace OgreOggSound
 		 */
 		virtual void _notifyAttached(
 			Ogre::Node* node
-			#if OGRE_VERSION_MAJOR != 2
+			#if !AV_OGRE_NEXT_VERSION
 			, bool isTagPoint = false
 			#endif
 		);
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		/** Moved callback
 		@remarks
 			Overridden function from MovableObject.
@@ -137,7 +137,7 @@ namespace OgreOggSound
 		/** Returns scenemanager which created this listener.
 		 */
 		Ogre::SceneManager* getSceneManager() { return mSceneMgr; }
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		/** Sets scenemanager which created this listener.
 		 */
 		void setSceneManager(Ogre::SceneManager& m) { mSceneMgr=&m; }
@@ -153,7 +153,7 @@ namespace OgreOggSound
 		 */
 		Ogre::Vector3 mVelocity;		// 3D velocity
 		float mOrientation[6];			// 3D orientation
-		#if OGRE_VERSION_MAJOR == 2
+		#if AV_OGRE_NEXT_VERSION >= 0x20000
 		Ogre::Vector3 mPosition;		// 3D position
 		Ogre::Quaternion mOrient;		// 3D orientation as Quaternion
 		#else

diff --git a/oggsound/include/OgreOggSound.h b/oggsound/include/OgreOggSound.h
@@ -43,7 +43,7 @@
 #include "OgreOggSoundManager.h"
 
 #ifndef OGRE_LOG_ERROR
-#if OGRE_VERSION_MAJOR == 2
+#if AV_OGRE_NEXT_VERSION >= 0x20000
 #define OGRE_LOG_ERROR(a) Ogre::LogManager::getSingleton().logMessage(Ogre::LML_CRITICAL, a)
 #else
 #define OGRE_LOG_ERROR(a) Ogre::LogManager::getSingleton().logError(a)

diff --git a/oggsound/include/OgreOggSoundFactory.h b/oggsound/include/OgreOggSoundFactory.h
@@ -42,7 +42,7 @@ namespace OgreOggSound
 	{
 
 	protected:
-		#if OGRE_VERSION_MAJOR == 2 && OGRE_VERSION_MINOR > 0
+		#if AV_OGRE_NEXT_VERSION >= 0x20100
 			Ogre::MovableObject* createInstanceImpl(Ogre::IdType id, Ogre::ObjectMemoryManager *objectMemoryManager, Ogre::SceneManager* manager, const Ogre::NameValuePairList* params = 0);
 		#else
 			Ogre::MovableObject* createInstanceImpl(const Ogre::String& name, const Ogre::NameValuePairList* params);
@@ -55,7 +55,7 @@ namespace OgreOggSound
 
 		const Ogre::String& getType(void) const;
 
-		#if OGRE_VERSION_MAJOR == 2
+		#if AV_OGRE_NEXT_VERSION >= 0x20000
 		void destroyInstance( Ogre::MovableObject* obj);
 		#endif
 	};

diff --git a/oggsound/include/OgreOggSoundManager.h b/oggsound/include/OgreOggSoundManager.h
@@ -841,7 +841,7 @@ namespace OgreOggSound
 
 		OgreOggISound* _createSoundImpl(
 			const Ogre::String& name,
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			Ogre::IdType id,
 			#endif
 			const Ogre::String& file,

diff --git a/oggsound/include/OgreOggSoundPrereqs.h.in b/oggsound/include/OgreOggSoundPrereqs.h.in
@@ -35,6 +35,19 @@
 #include <OgreMovableObject.h>
 #include <OgreLogManager.h>
 
+// set AV_OGRE_NEXT_VERSION to easy check Ogre version
+// using separate define to avoid issue with `#define OGRE_NEXT_VERSION 0`
+// and code using `#ifndef OGRE_NEXT_VERSION` to detect Ogre1
+#ifdef OGRE_NEXT_VERSION
+    #define AV_OGRE_NEXT_VERSION OGRE_NEXT_VERSION
+#else
+  #if OGRE_VERSION_MAJOR == 2
+    #define AV_OGRE_NEXT_VERSION OGRE_VERSION
+  #else
+    #define AV_OGRE_NEXT_VERSION 0
+  #endif
+#endif
+
 /**
  * OGGSOUND_THREADED: Specifies whether to use threads for streaming
  * 0 - No multithreading

diff --git a/oggsound/include/OgreOggStaticSound.h b/oggsound/include/OgreOggStaticSound.h
@@ -91,7 +91,7 @@ namespace OgreOggSound
 		 */
 		OgreOggStaticSound(
 			const Ogre::String& name
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			, Ogre::SceneManager* scnMgr, Ogre::IdType id, Ogre::ObjectMemoryManager *objMemMgr, Ogre::uint8 renderQueueId
 			#endif
 		);

diff --git a/oggsound/include/OgreOggStaticWavSound.h b/oggsound/include/OgreOggStaticWavSound.h
@@ -128,7 +128,7 @@ namespace OgreOggSound
 		 */
 		OgreOggStaticWavSound(
 			const Ogre::String& name
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			, Ogre::SceneManager* scnMgr, Ogre::IdType id, Ogre::ObjectMemoryManager *objMemMgr, Ogre::uint8 renderQueueId
 			#endif
 		);

diff --git a/oggsound/include/OgreOggStreamBufferSound.h b/oggsound/include/OgreOggStreamBufferSound.h
@@ -95,7 +95,7 @@ namespace OgreOggSound
 		 */
 		OgreOggStreamBufferSound(
 			const Ogre::String& name
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			, Ogre::SceneManager* scnMgr, Ogre::IdType id, Ogre::ObjectMemoryManager *objMemMgr, Ogre::uint8 renderQueueId
 			#endif
 		);

diff --git a/oggsound/include/OgreOggStreamSound.h b/oggsound/include/OgreOggStreamSound.h
@@ -108,7 +108,7 @@ namespace OgreOggSound
 		 */
 		OgreOggStreamSound(
 			const Ogre::String& name
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			, Ogre::SceneManager* scnMgr, Ogre::IdType id, Ogre::ObjectMemoryManager *objMemMgr, Ogre::uint8 renderQueueId
 			#endif
 		);

diff --git a/oggsound/include/OgreOggStreamWavSound.h b/oggsound/include/OgreOggStreamWavSound.h
@@ -108,7 +108,7 @@ namespace OgreOggSound
 		 */
 		OgreOggStreamWavSound(
 			const Ogre::String& name
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			, Ogre::SceneManager* scnMgr, Ogre::IdType id, Ogre::ObjectMemoryManager *objMemMgr, Ogre::uint8 renderQueueId
 			#endif
 		);

diff --git a/oggsound/src/OgreOggISound.cpp b/oggsound/src/OgreOggISound.cpp
@@ -74,11 +74,11 @@ namespace OgreOggSound
 	/*/////////////////////////////////////////////////////////////////*/
 	OgreOggISound::OgreOggISound(
 		const Ogre::String& name
-		#if OGRE_VERSION_MAJOR == 2
+		#if AV_OGRE_NEXT_VERSION >= 0x20000
 		, Ogre::SceneManager* scnMgr, Ogre::IdType id, Ogre::ObjectMemoryManager *objMemMgr, Ogre::uint8 renderQueueId
 		#endif
 	) : 
-	#if OGRE_VERSION_MAJOR == 2 && OGRE_VERSION_MINOR > 0
+	#if AV_OGRE_NEXT_VERSION >= 0x20100
 	MovableObject(id, objMemMgr, scnMgr, renderQueueId),
 	mPosition(0,0,0),
 	mDirection(0,0,0),
@@ -115,7 +115,7 @@ namespace OgreOggSound
 	,mAudioOffset(0)
 	,mAudioEnd(0)
 	,mLoopOffset(0)
-	#if OGRE_VERSION_MAJOR != 2
+	#if !AV_OGRE_NEXT_VERSION
 	,mLocalTransformDirty(true)
 	#endif
 	,mDisable3D(false)
@@ -132,7 +132,7 @@ namespace OgreOggSound
 		mOggCallbacks.seek_func	= OOSStreamSeek;
 		mOggCallbacks.tell_func	= OOSStreamTell;
 		mBuffers.reset();
-		#if OGRE_VERSION_MAJOR == 2
+		#if AV_OGRE_NEXT_VERSION >= 0x20000
 		setLocalAabb(Ogre::Aabb::BOX_NULL);
 		setQueryFlags(0);
 		#endif
@@ -143,7 +143,7 @@ namespace OgreOggSound
 		OgreOggSoundManager::getSingletonPtr()->_releaseSoundImpl(this);
 	}
 	/*/////////////////////////////////////////////////////////////////*/
-	#if OGRE_VERSION_MAJOR == 2
+	#if AV_OGRE_NEXT_VERSION >= 0x20000
 	Ogre::String OgreOggISound::getName() {
 		return mName;
 	}
@@ -657,7 +657,7 @@ namespace OgreOggSound
 	/*/////////////////////////////////////////////////////////////////*/
 	void OgreOggISound::update(float fTime)
 	{
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		if (mLocalTransformDirty)
 		{
 			Ogre::Vector3 position(0, 0, 0);
@@ -717,20 +717,20 @@ namespace OgreOggSound
 	/*/////////////////////////////////////////////////////////////////*/
 	void OgreOggISound::_notifyAttached(
 		Ogre::Node* node
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		, bool isTagPoint
 		#endif
 	)
 	{
 		// Call base class notify
 		Ogre::MovableObject::_notifyAttached(
 			node
-			#if OGRE_VERSION_MAJOR != 2
+			#if !AV_OGRE_NEXT_VERSION
 			, isTagPoint
 			#endif
 		);
 
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		// Immediately set position/orientation when attached
 		mLocalTransformDirty = true;
 		#endif
@@ -740,7 +740,7 @@ namespace OgreOggSound
 		return;
 	}
 	/*/////////////////////////////////////////////////////////////////*/
-	#if OGRE_VERSION_MAJOR != 2
+	#if !AV_OGRE_NEXT_VERSION
 	void OgreOggISound::_notifyMoved(void) 
 	{ 
 		// Call base class notify
@@ -752,7 +752,7 @@ namespace OgreOggSound
 	void OgreOggISound::_updateRenderQueue(Ogre::RenderQueue *queue, Ogre::Camera *camera, const Ogre::Camera *lodCamera) {
 	}
 	#endif
-	#if OGRE_VERSION_MAJOR != 2
+	#if !AV_OGRE_NEXT_VERSION
 	/*/////////////////////////////////////////////////////////////////*/
 	void OgreOggISound::visitRenderables(Ogre::Renderable::Visitor* visitor, bool debugRenderables)
 	{

diff --git a/oggsound/src/OgreOggListener.cpp b/oggsound/src/OgreOggListener.cpp
@@ -43,7 +43,7 @@ namespace OgreOggSound
 	/*/////////////////////////////////////////////////////////////////*/
 	void OgreOggListener::update()
 	{
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		if(mLocalTransformDirty)
 		{
 			if ( mParentNode )
@@ -111,23 +111,23 @@ namespace OgreOggSound
 	/*/////////////////////////////////////////////////////////////////*/
 	void OgreOggListener::_notifyAttached(
 		Ogre::Node* node
-		#if OGRE_VERSION_MAJOR != 2
+		#if !AV_OGRE_NEXT_VERSION
 		, bool isTagPoint
 		#endif
 	)
 	{
 		// Call base class notify
 		Ogre::MovableObject::_notifyAttached(
 			node
-			#if OGRE_VERSION_MAJOR != 2
+			#if !AV_OGRE_NEXT_VERSION
 			, isTagPoint
 			#endif
 		);
 
 		// Immediately set position/orientation when attached
 		if (mParentNode)
 		{
-			#if OGRE_VERSION_MAJOR != 2
+			#if !AV_OGRE_NEXT_VERSION
 			mLocalTransformDirty = true;
 			#endif
 			update();
@@ -136,7 +136,7 @@ namespace OgreOggSound
 		return;
 	}
 	/*/////////////////////////////////////////////////////////////////*/
-	#if OGRE_VERSION_MAJOR != 2
+	#if !AV_OGRE_NEXT_VERSION
 	void OgreOggListener::_notifyMoved(void) 
 	{ 
 		// Call base class notify

diff --git a/oggsound/src/OgreOggSoundFactory.cpp b/oggsound/src/OgreOggSoundFactory.cpp
@@ -43,14 +43,14 @@ namespace OgreOggSound
 		return FACTORY_TYPE_NAME;
 	}
 	//-----------------------------------------------------------------------
-	#if OGRE_VERSION_MAJOR == 2 && OGRE_VERSION_MINOR > 0
+	#if AV_OGRE_NEXT_VERSION >= 0x20100
 	Ogre::MovableObject* OgreOggSoundFactory::createInstanceImpl(Ogre::IdType id, Ogre::ObjectMemoryManager *objectMemoryManager, Ogre::SceneManager* manager, const Ogre::NameValuePairList* params)
 	#else
 	Ogre::MovableObject* OgreOggSoundFactory::createInstanceImpl(const Ogre::String& name, const Ogre::NameValuePairList* params)
 	#endif
 	{
 		Ogre::String fileName;
-		#if OGRE_VERSION_MAJOR == 2
+		#if AV_OGRE_NEXT_VERSION >= 0x20000
 		Ogre::String reName = Ogre::BLANKSTRING;
 		#else
 		Ogre::String reName = name;
@@ -113,7 +113,7 @@ namespace OgreOggSound
 					"OgreOggSoundFactory::createInstance");
 			}
 
-			#if OGRE_VERSION_MAJOR == 2
+			#if AV_OGRE_NEXT_VERSION >= 0x20000
 			return OgreOggSoundManager::getSingletonPtr()->_createSoundImpl(reName, id, fileName, stream, loop, preBuffer, immediate);
 			#else
 			return OgreOggSoundManager::getSingletonPtr()->_createSoundImpl(reName, fileName, stream, loop, preBuffer, immediate);
@@ -123,7 +123,7 @@ namespace OgreOggSound
 		return 0;
 	}
 
-#if OGRE_VERSION_MAJOR == 2
+#if AV_OGRE_NEXT_VERSION >= 0x20000
 	void OgreOggSoundFactory::destroyInstance( Ogre::MovableObject* obj)
 	{
 		if ( dynamic_cast<OgreOggListener*>(obj) )