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

Make OpenMW work with Ogre 1.9

Browse source
This commit is contained in:
scrawl 2013-01-12 08:23:15 +01:00
parent 2c3719a6f5
commit e4f140841e
7 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/launcher/graphicspage.cpp
View file

@ -122,6 +122,7 @@ bool GraphicsPage::setupOgre()
pluginDir = absPluginPath.string(); pluginDir = absPluginPath.string();
Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mOgre); Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mOgre);
Files::loadOgrePlugin(pluginDir, "RenderSystem_GL3Plus", *mOgre);
Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mOgre); Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mOgre);
#ifdef ENABLE_PLUGIN_GL #ifdef ENABLE_PLUGIN_GL

1
apps/openmw/mwrender/localmap.cpp
View file

@ -1,6 +1,5 @@
#include "localmap.hpp" #include "localmap.hpp"
#include <OgreOverlayManager.h>
#include <OgreMaterialManager.h> #include <OgreMaterialManager.h>
#include <OgreHardwarePixelBuffer.h> #include <OgreHardwarePixelBuffer.h>

5
apps/openmw/mwrender/shadows.cpp
View file

@ -9,9 +9,6 @@
#include <OgreShadowCameraSetupPSSM.h> #include <OgreShadowCameraSetupPSSM.h>
#include <OgreHardwarePixelBuffer.h> #include <OgreHardwarePixelBuffer.h>
#include <OgreOverlayContainer.h>
#include <OgreOverlayManager.h>
#include <extern/shiny/Main/Factory.hpp> #include <extern/shiny/Main/Factory.hpp>
#include "renderconst.hpp" #include "renderconst.hpp"
@ -125,6 +122,7 @@ void Shadows::recreate()
// -------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------
// --------------------------- Debug overlays to display the content of shadow maps ----------------------------------- // --------------------------- Debug overlays to display the content of shadow maps -----------------------------------
// -------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------
/*
if (Settings::Manager::getBool("debug", "Shadows")) if (Settings::Manager::getBool("debug", "Shadows"))
{ {
OverlayManager& mgr = OverlayManager::getSingleton(); OverlayManager& mgr = OverlayManager::getSingleton();
@ -181,6 +179,7 @@ void Shadows::recreate()
if ((overlay = mgr.getByName("DebugOverlay"))) if ((overlay = mgr.getByName("DebugOverlay")))
mgr.destroy(overlay); mgr.destroy(overlay);
} }
*/
} }
PSSMShadowCameraSetup* Shadows::getPSSMSetup() PSSMShadowCameraSetup* Shadows::getPSSMSetup()

1
apps/openmw/mwrender/terrainmaterial.hpp
View file

@ -67,6 +67,7 @@ namespace MWRender
void setGlobalColourMapEnabled(bool enabled); void setGlobalColourMapEnabled(bool enabled);
void setGlobalColourMap (Ogre::Terrain* terrain, const std::string& name); void setGlobalColourMap (Ogre::Terrain* terrain, const std::string& name);
virtual void setLightmapEnabled(bool) {}
private: private:
sh::MaterialInstance* mMaterial; sh::MaterialInstance* mMaterial;

3
apps/openmw/mwrender/water.cpp
View file

@ -8,9 +8,6 @@
#include <OgreCompositorInstance.h> #include <OgreCompositorInstance.h>
#include <OgreCompositorChain.h> #include <OgreCompositorChain.h>
#include <OgreRoot.h> #include <OgreRoot.h>
#include <OgreOverlayManager.h>
#include <OgreOverlayContainer.h>
#include <OgreOverlayElement.h>
#include "sky.hpp" #include "sky.hpp"
#include "renderingmanager.hpp" #include "renderingmanager.hpp"

5
components/bsa/bsa_archive.cpp
View file

@ -403,6 +403,11 @@ public:
return new BSAArchive(name); return new BSAArchive(name);
} }
virtual Archive* createInstance(const String& name, bool readOnly)
{
return new BSAArchive(name);
}
void destroyInstance( Archive* arch) { delete arch; } void destroyInstance( Archive* arch) { delete arch; }
}; };

1
libs/openengine/ogre/renderer.cpp
View file

@ -192,6 +192,7 @@ void OgreRenderer::configure(const std::string &logPath,
pluginDir = absPluginPath.string(); pluginDir = absPluginPath.string();
Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mRoot); Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mRoot);
Files::loadOgrePlugin(pluginDir, "RenderSystem_GL3Plus", *mRoot);
Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mRoot); Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mRoot);
Files::loadOgrePlugin(pluginDir, "Plugin_CgProgramManager", *mRoot); Files::loadOgrePlugin(pluginDir, "Plugin_CgProgramManager", *mRoot);