diff options
Diffstat (limited to 'caelum-ogre-1.9.patch')
| -rw-r--r-- | caelum-ogre-1.9.patch | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/caelum-ogre-1.9.patch b/caelum-ogre-1.9.patch index ec452eeefc2f..900e6b08fe28 100644 --- a/caelum-ogre-1.9.patch +++ b/caelum-ogre-1.9.patch @@ -1,5 +1,5 @@ ---- main/include/CaelumPrerequisites.h Fri Sep 19 17:39:48 2014 +0300 -+++ main/include/CaelumPrerequisites.h Thu Nov 06 13:02:20 2014 +0100 +--- main/include/CaelumPrerequisites.h ++++ main/include/CaelumPrerequisites.h @@ -52,7 +52,9 @@ // By default only compile type descriptors for scripting. @@ -23,8 +23,8 @@ #if !(CAELUM_TYPE_DESCRIPTORS) #error "Caelum script support also requires type descriptors." ---- main/src/CaelumPlugin.cpp Fri Sep 19 17:39:48 2014 +0300 -+++ main/src/CaelumPlugin.cpp Thu Nov 06 13:02:20 2014 +0100 +--- main/src/CaelumPlugin.cpp ++++ main/src/CaelumPlugin.cpp @@ -134,7 +134,9 @@ assert (this->isInstalled () && "Must install CaelumPlugin before loading scripts"); @@ -37,8 +37,8 @@ #else Ogre::ResourcePtr res = getPropScriptResourceManager ()->getByName (objectName); ---- main/src/CaelumScriptTranslator.cpp Fri Sep 19 17:39:48 2014 +0300 -+++ main/src/CaelumScriptTranslator.cpp Thu Nov 06 13:02:20 2014 +0100 +--- main/src/CaelumScriptTranslator.cpp ++++ main/src/CaelumScriptTranslator.cpp @@ -422,7 +422,11 @@ //LogManager::getSingleton ().logMessage ( // "Caelum: Saved " + objNode->cls + " name " + objNode->name + " as a resource"); @@ -51,3 +51,30 @@ resource->_notifyOrigin (objNode->file); return; } + +--- main/src/GroundFog.cpp ++++ main/src/GroundFog.cpp +@@ -53,8 +53,8 @@ + mDomeNode->attachObject (mDomeEntity.get()); + + // Initialize default fog parameters +- mDensity = 0.1; +- mVerticalDecay = 0.2; ++ mDensity = 0.1f; ++ mVerticalDecay = 0.2f; + mGroundLevel = 5; + mFogColour = Ogre::ColourValue::Black; + +@@ -78,7 +78,11 @@ + Ogre::MaterialManager *matManager = Ogre::MaterialManager::getSingletonPtr(); + Ogre::MaterialManager::ResourceMapIterator matIt = matManager->getResourceIterator(); + while (matIt.hasMoreElements()) { +- Ogre::MaterialPtr mat = matIt.getNext(); ++#if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0)) ++ Ogre::MaterialPtr mat = matIt.getNext(); ++#else ++ Ogre::MaterialPtr mat = matIt.getNext().staticCast<Ogre::Material>(); ++#endif + Ogre::Material::TechniqueIterator techIt = mat->getTechniqueIterator(); + while (techIt.hasMoreElements()) { + Ogre::Technique *tech = techIt.getNext(); |