mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-14 15:40:18 +00:00
Code Issues Projects Releases Wiki Activity

builds now

Browse Source
This commit is contained in:
scrawl 2012-07-03 22:48:16 +02:00
parent 24399a45c1
commit a1e48b0feb
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -189,7 +189,7 @@ endif()
find_package(OGRE REQUIRED) find_package(OGRE REQUIRED)
find_package(MyGUI REQUIRED) find_package(MyGUI REQUIRED)
find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread) find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread wave)
find_package(OIS REQUIRED) find_package(OIS REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(Bullet REQUIRED) find_package(Bullet REQUIRED)

3
apps/openmw/CMakeLists.txt
View File

@ -101,7 +101,8 @@ target_link_libraries(openmw
${BULLET_LIBRARIES} ${BULLET_LIBRARIES}
${MYGUI_LIBRARIES} ${MYGUI_LIBRARIES}
${MYGUI_PLATFORM_LIBRARIES} ${MYGUI_PLATFORM_LIBRARIES}
components "shiny"
"shiny.OgrePlatform"
) )
# Fix for not visible pthreads functions for linker with glibc 2.15 # Fix for not visible pthreads functions for linker with glibc 2.15

8
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -14,6 +14,9 @@
#include <OgreCompositionPass.h> #include <OgreCompositionPass.h>
#include <OgreHardwarePixelBuffer.h> #include <OgreHardwarePixelBuffer.h>
#include <extern/shiny/Main/Factory.hpp>
#include <extern/shiny/Platforms/Ogre/OgrePlatform.hpp>
#include <components/esm/loadstat.hpp> #include <components/esm/loadstat.hpp>
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
@ -47,6 +50,11 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
mWater = 0; mWater = 0;
// material system
sh::OgrePlatform* platform = new sh::OgrePlatform("General", "./");
platform->setCacheFolder ("./");
mFactory = new sh::Factory(platform);
//The fog type must be set before any terrain objects are created as if the //The fog type must be set before any terrain objects are created as if the
//fog type is set to FOG_NONE then the initially created terrain won't have any fog //fog type is set to FOG_NONE then the initially created terrain won't have any fog
configureFog(1, ColourValue(1,1,1)); configureFog(1, ColourValue(1,1,1));

7
apps/openmw/mwrender/renderingmanager.hpp
View File

@ -43,6 +43,11 @@ namespace MWWorld
class CellStore; class CellStore;
} }
namespace sh
{
class Factory;
}
namespace MWRender namespace MWRender
{ {
@ -174,6 +179,8 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
private: private:
sh::Factory* mFactory;
void setAmbientMode(); void setAmbientMode();
void setMenuTransparency(float val); void setMenuTransparency(float val);

2
extern/shiny vendored

@ -1 +1 @@
Subproject commit 51b573fc66ac9a61fe780070692cc600a89f51dd Subproject commit 3928949316713d0c8aaf1ad564734d24ad773be9