make code forward-compatible with 1.13

Author: paroj

CMakeLists.txt

@@ -35,7 +35,7 @@ if(WIN32)
    set(CMAKE_MODULE_PATH "$ENV{OGRE_HOME}/CMake/;${CMAKE_MODULE_PATH}")
 endif(WIN32)
 
-find_package(OGRE 1.11 REQUIRED)
+find_package(OGRE REQUIRED CONFIG)
 find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
 
 add_subdirectory(Engine)

Engine/EngineCore/RenderView.cpp

@@ -259,7 +259,7 @@ void RenderView::update()
     }
     else
     {
-        mOverlay->hide();
+        //mOverlay->hide();
     }
 
     mRenderWindow->update();

Engine/GPU2DOperation/GPU2DOperationRenderableQuad.cpp

@@ -211,6 +211,25 @@ void GPU2DOperationRenderableQuad::setMaterialTexture(const string& aliasName,
     mAliasTextureMap[aliasName] = textureName;
 }
 
+static void applyTextureAliases(const Ogre::Technique* t, const Ogre::NameValuePairList& aliasList)
+{
+    for (auto p : t->getPasses())
+    {
+        for (auto tus : p->getTextureUnitStates())
+        {
+            auto aliasIt = aliasList.find(tus->getTextureNameAlias());
+            if (aliasIt == aliasList.end())
+                continue;
+
+            if (tus->getNumFrames() > 1)
+                tus->setAnimatedTextureName(aliasIt->second, tus->getNumFrames(),
+                                            tus->getAnimationDuration());
+            else
+                tus->setTextureName(aliasIt->second, tus->getTextureType());
+        }
+    }
+}
+
 void GPU2DOperationRenderableQuad::prepareForRender(Ogre::ushort zOrder)
 {
     mZOrder = zOrder;
@@ -231,11 +250,11 @@ void GPU2DOperationRenderableQuad::prepareForRender(Ogre::ushort zOrder)
     // Update material texture(s) if necessary
     if (newMaterial)
     {
-        technique->applyTextureAliases(mAliasTextureMap, true);
+        applyTextureAliases(technique, mAliasTextureMap);
     }
     else
     {
-        technique->applyTextureAliases(mNewAliasTextureMap, true);
+        applyTextureAliases(technique, mNewAliasTextureMap);
     }
     mNewAliasTextureMap.clear();
 

Engine/Utils/Utils.cpp

@@ -7,6 +7,10 @@
 #include "ScapeEngineStableHeaders.h"
 #include "Utils.h"
 
+#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#include <unistd.h>
+#endif
+
 using namespace ScapeEngine;
 
 const string Utils::emptyString = _T("");