mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function)

Browse source
This commit is contained in:
scrawl 2014-02-16 19:04:12 +01:00
parent c9e349f60f
commit 64c9932597
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/CMakeLists.txt
View file

@ -73,6 +73,7 @@ add_component_dir (translation
translation translation
) )
add_definitions(-DTERRAIN_USE_SHADER=1)
add_component_dir (terrain add_component_dir (terrain
quadtreenode chunk world storage material quadtreenode chunk world storage material
) )

6
components/terrain/material.cpp
View file

@ -6,7 +6,9 @@
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#if TERRAIN_USE_SHADER
#include <extern/shiny/Main/Factory.hpp> #include <extern/shiny/Main/Factory.hpp>
#endif
namespace namespace
{ {
@ -64,7 +66,9 @@ namespace Terrain
assert(!renderCompositeMap || !displayCompositeMap); assert(!renderCompositeMap || !displayCompositeMap);
if (!mat.isNull()) if (!mat.isNull())
{ {
#if TERRAIN_USE_SHADER
sh::Factory::getInstance().destroyMaterialInstance(mat->getName()); sh::Factory::getInstance().destroyMaterialInstance(mat->getName());
#endif
Ogre::MaterialManager::getSingleton().remove(mat->getName()); Ogre::MaterialManager::getSingleton().remove(mat->getName());
} }
@ -144,6 +148,7 @@ namespace Terrain
return mat; return mat;
} }
#if TERRAIN_USE_SHADER
else else
{ {
sh::MaterialInstance* material = sh::Factory::getInstance().createMaterialInstance (name.str()); sh::MaterialInstance* material = sh::Factory::getInstance().createMaterialInstance (name.str());
@ -343,6 +348,7 @@ namespace Terrain
} }
} }
} }
#endif
return Ogre::MaterialManager::getSingleton().getByName(name.str()); return Ogre::MaterialManager::getSingleton().getByName(name.str());
} }

6
components/terrain/world.cpp
View file

@ -65,6 +65,12 @@ namespace Terrain
, mMaxY(0) , mMaxY(0)
, mMinY(0) , mMinY(0)
{ {
#if TERRAIN_USE_SHADER == 0
if (mShaders)
std::cerr << "Compiled Terrain without shader support, disabling..." << std::endl;
mShaders = false;
#endif
mCompositeMapSceneMgr = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC); mCompositeMapSceneMgr = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
/// \todo make composite map size configurable /// \todo make composite map size configurable