mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 14:09:39 +00:00
Code Issues Releases Wiki Activity

Merge upstream

Browse source
This commit is contained in:
athile 2010-06-28 12:44:55 -07:00
parent 97feee6cb6
commit 59a2e8dcf7
57 changed files with 222 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,5 +1,6 @@
screenshot*.png screenshot*.png
*.o *.o
*.a
*~ *~
data data
CMakeFiles CMakeFiles
@ -13,4 +14,5 @@ build
plugins.cfg plugins.cfg
openmw.cfg openmw.cfg
Doxygen Doxygen
.thumbnails
resources

86
CMakeLists.txt
View file

@ -8,8 +8,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
# source directory: apps # source directory: apps
set(GAME apps/openmw/main.cpp apps/openmw/engine.cpp) set(GAME
set(GAME_HEADER apps/openmw/mwinput/inputmanager.hpp apps/openmw/engine.hpp) apps/openmw/main.cpp
apps/openmw/engine.cpp)
set(GAME_HEADER
apps/openmw/mwinput/inputmanager.hpp
apps/openmw/engine.hpp)
source_group(game FILES ${GAME} ${GAME_HEADER}) source_group(game FILES ${GAME} ${GAME_HEADER})
set(GAMEREND set(GAMEREND
@ -26,7 +30,8 @@ set(GAMEREND_HEADER
source_group(game_renderer FILES ${GAMEREND} ${GAMEREND_HEADER}) source_group(game_renderer FILES ${GAMEREND} ${GAMEREND_HEADER})
# set(GAMEINPUT) # set(GAMEINPUT)
set(GAMEINPUT_HEADER apps/openmw/mwinput/inputmanager.hpp) set(GAMEINPUT_HEADER
apps/openmw/mwinput/inputmanager.hpp)
source_group(game_input FILES ${GAMEINPUT} ${GAMEINPUT_HEADER}) source_group(game_input FILES ${GAMEINPUT} ${GAMEINPUT_HEADER})
set(APPS ${GAME} ${GAMEREND} ${GAMEINPUT}) set(APPS ${GAME} ${GAMEREND} ${GAMEINPUT})
@ -34,48 +39,80 @@ set(APPS_HEADER ${GAME_HEADER} ${GAMEREND_HEADER} ${GAMEINPUT_HEADER})
# source directory: components # source directory: components
set(BSA components/bsa/bsa_archive.cpp components/bsa/bsa_file.cpp) set(BSA
set(BSA_HEADER components/bsa/bsa_archive.hpp components/bsa/bsa_file.hpp) components/bsa/bsa_archive.cpp
components/bsa/bsa_file.cpp)
set(BSA_HEADER
components/bsa/bsa_archive.hpp
components/bsa/bsa_file.hpp)
source_group(bsa FILES ${BSA} ${BSA_HEADER}) source_group(bsa FILES ${BSA} ${BSA_HEADER})
set(NIF components/nif/nif_file.cpp) set(NIF
set(NIF_HEADER components/nif/controlled.hpp components/nif/effect.hpp components/nif/nif_file.cpp)
components/nif/nif_types.hpp components/nif/record.hpp set(NIF_HEADER
components/nif/controller.hpp components/nif/extra.hpp components/nif/node.hpp components/nif/controlled.hpp
components/nif/effect.hpp
components/nif/nif_types.hpp
components/nif/record.hpp
components/nif/controller.hpp
components/nif/extra.hpp
components/nif/node.hpp
components/nif/record_ptr.hpp components/nif/record_ptr.hpp
components/nif/data.hpp components/nif/nif_file.hpp components/nif/property.hpp) components/nif/data.hpp
components/nif/nif_file.hpp
components/nif/property.hpp)
source_group(nif FILES ${NIF} ${NIF_HEADER}) source_group(nif FILES ${NIF} ${NIF_HEADER})
set(NIFOGRE components/nifogre/ogre_nif_loader.cpp) set(NIFOGRE
set(NIFOGRE_HEADER components/nifogre/ogre_nif_loader.hpp) components/nifogre/ogre_nif_loader.cpp)
set(NIFOGRE_HEADER
components/nifogre/ogre_nif_loader.hpp)
source_group(nifogre FILES ${NIFOGRE} ${NIFOGRE_HEADER}) source_group(nifogre FILES ${NIFOGRE} ${NIFOGRE_HEADER})
set(ESM_STORE components/esm_store/store.cpp components/esm_store/cell_store.cpp) set(ESM_STORE
set(ESM_STORE_HEADER components/esm_store/cell_store.hpp components/esm_store/store.cpp
components/esm_store/reclists.hpp components/esm_store/store.hpp) components/esm_store/cell_store.cpp)
set(ESM_STORE_HEADER
components/esm_store/cell_store.hpp
components/esm_store/reclists.hpp
components/esm_store/store.hpp)
source_group(esm_store FILES ${ESM_STORE} ${ESM_STORE_HEADER}) source_group(esm_store FILES ${ESM_STORE} ${ESM_STORE_HEADER})
file(GLOB ESM_HEADER components/esm/*.hpp) file(GLOB ESM_HEADER components/esm/*.hpp)
source_group(esm_header FILES ${ESM_HEADER}) source_group(esm_header FILES ${ESM_HEADER})
set(OGRE components/engine/ogre/renderer.cpp) set(OGRE
set(OGRE_HEADER components/engine/ogre/renderer.hpp) components/engine/ogre/renderer.cpp)
set(OGRE_HEADER
components/engine/ogre/renderer.hpp)
source_group(ogre FILES ${OGRE} ${OGRE_HEADER}) source_group(ogre FILES ${OGRE} ${OGRE_HEADER})
set(INPUT components/engine/input/oismanager.cpp) set(INPUT
set(INPUT_HEADER components/engine/input/oismanager.hpp components/engine/input/listener.hpp components/engine/input/oismanager.cpp)
components/engine/input/func_binder.hpp components/engine/input/dispatch_map.hpp set(INPUT_HEADER
components/engine/input/dispatcher.hpp components/engine/input/poller.hpp) components/engine/input/oismanager.hpp
components/engine/input/listener.hpp
components/engine/input/func_binder.hpp
components/engine/input/dispatch_map.hpp
components/engine/input/dispatcher.hpp
components/engine/input/poller.hpp)
source_group(input FILES ${INPUT} ${INPUT_HEADER}) source_group(input FILES ${INPUT} ${INPUT_HEADER})
set(MISC
components/misc/stringops.cpp
components/misc/fileops.cpp)
set(MISC_HEADER
components/misc/fileops.hpp
components/misc/slice_array.hpp
components/misc/stringops.hpp)
source_group(misc FILES ${MISC} ${MISC_HEADER})
set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${ESM_STORE} ${OGRE} ${INPUT} ${MISC}) set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${ESM_STORE} ${OGRE} ${INPUT} ${MISC})
set(COMPONENTS_HEADER ${BSA_HEADER} ${NIF_HEADER} ${NIFOGRE_HEADER} ${ESM_STORE_HEADER} set(COMPONENTS_HEADER ${BSA_HEADER} ${NIF_HEADER} ${NIFOGRE_HEADER} ${ESM_STORE_HEADER}
${ESM_HEADER} ${OGRE_HEADER} ${INPUT_HEADER} ${MISC_HEADER}) ${ESM_HEADER} ${OGRE_HEADER} ${INPUT_HEADER} ${MISC_HEADER})
# source directory: libs # source directory: libs
ADD_SUBDIRECTORY( libs/platform )
set(MANGLE_VFS libs/mangle/vfs/servers/ogre_vfs.cpp) set(MANGLE_VFS libs/mangle/vfs/servers/ogre_vfs.cpp)
source_group(mangle_vfs FILES ${MANGLE_VFS}) source_group(mangle_vfs FILES ${MANGLE_VFS})
@ -97,7 +134,7 @@ find_package(OIS REQUIRED)
include_directories("." include_directories("."
${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
${PLATFORM_INCLUDE_DIR} ${PLATFORM_INCLUDE_DIR}
${CMAKE_HOME_DIRECTORY}/extern/caelum/include ) ${CMAKE_HOME_DIRECTORY}/extern/caelum/include)
link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR}) link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR})
ADD_SUBDIRECTORY( extern/caelum ) ADD_SUBDIRECTORY( extern/caelum )
@ -145,7 +182,6 @@ target_link_libraries(openmw
${OGRE_LIBRARIES} ${OGRE_LIBRARIES}
${OIS_LIBRARIES} ${OIS_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
platform
caelum) caelum)
if (APPLE) if (APPLE)

4
apps/openmw/engine.cpp
View file

@ -7,7 +7,7 @@
#include "components/esm_store/cell_store.hpp" #include "components/esm_store/cell_store.hpp"
#include "components/bsa/bsa_archive.hpp" #include "components/bsa/bsa_archive.hpp"
#include "components/engine/ogre/renderer.hpp" #include "components/engine/ogre/renderer.hpp"
#include "libs/platform/fileops.hpp" #include "components/misc/fileops.hpp"
#include "apps/openmw/mwrender/interior.hpp" #include "apps/openmw/mwrender/interior.hpp"
#include "mwinput/inputmanager.hpp" #include "mwinput/inputmanager.hpp"
@ -104,7 +104,7 @@ void OMW::Engine::go()
const char* plugCfg = "plugins.cfg"; const char* plugCfg = "plugins.cfg";
mOgre.configure(!OMW::Platform::isFile("ogre.cfg"), plugCfg, false); mOgre.configure(!isFile("ogre.cfg"), plugCfg, false);
addResourcesDirectory (mDataDir / "Meshes"); addResourcesDirectory (mDataDir / "Meshes");
addResourcesDirectory (mDataDir / "Textures"); addResourcesDirectory (mDataDir / "Textures");

186
apps/openmw/mwrender/sky.cpp Executable file → Normal file
View file

@ -1,93 +1,93 @@
#include "sky.hpp" #include "sky.hpp"
#include "Caelum.h" #include "Caelum.h"
namespace MWRender namespace MWRender
{ {
// //
// Implements a Caelum sky with default settings. // Implements a Caelum sky with default settings.
// //
// Note: this is intended as a temporary solution to provide some form of // Note: this is intended as a temporary solution to provide some form of
// sky rendering. This code will obviously need significant tailoring to // sky rendering. This code will obviously need significant tailoring to
// support fidelity with Morrowind's rendering. Before doing major work // support fidelity with Morrowind's rendering. Before doing major work
// on this class, more research should be done to determine whether // on this class, more research should be done to determine whether
// Caelum or another plug-in such as SkyX would be best for the long-term. // Caelum or another plug-in such as SkyX would be best for the long-term.
// //
class CaelumManager : public SkyManager class CaelumManager : public SkyManager
{ {
protected: protected:
Caelum::CaelumSystem* mpCaelumSystem; Caelum::CaelumSystem* mpCaelumSystem;
public: public:
CaelumManager (Ogre::RenderWindow* pRenderWindow, CaelumManager (Ogre::RenderWindow* pRenderWindow,
Ogre::Camera* pCamera); Ogre::Camera* pCamera);
virtual ~CaelumManager (); virtual ~CaelumManager ();
}; };
CaelumManager::CaelumManager (Ogre::RenderWindow* pRenderWindow, CaelumManager::CaelumManager (Ogre::RenderWindow* pRenderWindow,
Ogre::Camera* pCamera) Ogre::Camera* pCamera)
: mpCaelumSystem (NULL) : mpCaelumSystem (NULL)
{ {
using namespace Ogre; using namespace Ogre;
using namespace Caelum; using namespace Caelum;
assert(pCamera); assert(pCamera);
assert(pRenderWindow); assert(pRenderWindow);
// Load the Caelum resources // Load the Caelum resources
// //
ResourceGroupManager::getSingleton().addResourceLocation("resources\\caelum", "FileSystem", "Caelum"); ResourceGroupManager::getSingleton().addResourceLocation("resources/caelum", "FileSystem", "Caelum");
ResourceGroupManager::getSingleton().initialiseAllResourceGroups(); ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
// Load the Caelum resources // Load the Caelum resources
// //
Ogre::SceneManager* pScene = pCamera->getSceneManager(); Ogre::SceneManager* pScene = pCamera->getSceneManager();
Caelum::CaelumSystem::CaelumComponent componentMask = CaelumSystem::CAELUM_COMPONENTS_DEFAULT; Caelum::CaelumSystem::CaelumComponent componentMask = CaelumSystem::CAELUM_COMPONENTS_DEFAULT;
mpCaelumSystem = new Caelum::CaelumSystem (Root::getSingletonPtr(), pScene, componentMask); mpCaelumSystem = new Caelum::CaelumSystem (Root::getSingletonPtr(), pScene, componentMask);
// Set time acceleration. // Set time acceleration.
mpCaelumSystem->getUniversalClock()->setTimeScale(128); mpCaelumSystem->getUniversalClock()->setTimeScale(128);
// Disable fog since OpenMW is handling OGRE fog elsewhere // Disable fog since OpenMW is handling OGRE fog elsewhere
mpCaelumSystem->setManageSceneFog(false); mpCaelumSystem->setManageSceneFog(false);
// Change the camera far distance to make sure the sky is not clipped // Change the camera far distance to make sure the sky is not clipped
pCamera->setFarClipDistance(50000); pCamera->setFarClipDistance(50000);
// Register Caelum as an OGRE listener // Register Caelum as an OGRE listener
pRenderWindow->addListener(mpCaelumSystem); pRenderWindow->addListener(mpCaelumSystem);
Root::getSingletonPtr()->addFrameListener(mpCaelumSystem); Root::getSingletonPtr()->addFrameListener(mpCaelumSystem);
} }
CaelumManager::~CaelumManager() CaelumManager::~CaelumManager()
{ {
if (mpCaelumSystem) if (mpCaelumSystem)
mpCaelumSystem->shutdown (false); mpCaelumSystem->shutdown (false);
} }
/// Creates and connects the sky rendering component to OGRE. /// Creates and connects the sky rendering component to OGRE.
/// ///
/// \return NULL on failure. /// \return NULL on failure.
/// ///
SkyManager* SkyManager::create (Ogre::RenderWindow* pRenderWindow, SkyManager* SkyManager::create (Ogre::RenderWindow* pRenderWindow,
Ogre::Camera* pCamera) Ogre::Camera* pCamera)
{ {
SkyManager* pSkyManager = NULL; SkyManager* pSkyManager = NULL;
try try
{ {
pSkyManager = new CaelumManager(pRenderWindow, pCamera); pSkyManager = new CaelumManager(pRenderWindow, pCamera);
} }
catch (Ogre::Exception& e) catch (Ogre::Exception& e)
{ {
std::cout << "\nOGRE Exception when attempting to add sky: " std::cout << "\nOGRE Exception when attempting to add sky: "
<< e.getFullDescription().c_str() << std::endl; << e.getFullDescription().c_str() << std::endl;
} }
catch (std::exception& e) catch (std::exception& e)
{ {
std::cout << "\nException when attempting to add sky: " std::cout << "\nException when attempting to add sky: "
<< e.what() << std::endl; << e.what() << std::endl;
} }
return pSkyManager; return pSkyManager;
} }
} }

0
apps/openmw/mwrender/sky.hpp Executable file → Normal file
View file

6
components/esm/esm_reader.hpp
View file

@ -12,7 +12,7 @@
#include <libs/mangle/stream/stream.hpp> #include <libs/mangle/stream/stream.hpp>
#include <libs/mangle/stream/servers/file_stream.hpp> #include <libs/mangle/stream/servers/file_stream.hpp>
#include <libs/mangle/tools/str_exception.hpp> #include <libs/mangle/tools/str_exception.hpp>
#include "libs/platform/stringops.hpp" #include <components/misc/stringops.hpp>
#ifdef __APPLE__ #ifdef __APPLE__
// need our own implementation of strnlen // need our own implementation of strnlen
@ -217,9 +217,7 @@ public:
/// Raw opening. Opens the file and sets everything up but doesn't /// Raw opening. Opens the file and sets everything up but doesn't
/// parse the header. /// parse the header.
void openRaw(Mangle::Stream::StreamPtr _esm, const std::string &name) void openRaw(Mangle::Stream::StreamPtr _esm, const std::string &name)
{ {
using namespace OMW::Platform;
close(); close();
esm = _esm; esm = _esm;
c.filename = name; c.filename = name;

4
components/nif/nif_file.cpp
View file

@ -23,7 +23,7 @@
#include "nif_file.hpp" #include "nif_file.hpp"
#include "record.hpp" #include "record.hpp"
#include "libs/platform/stringops.hpp" #include "components/misc/stringops.hpp"
#include "extra.hpp" #include "extra.hpp"
#include "controlled.hpp" #include "controlled.hpp"
@ -44,8 +44,6 @@ using namespace Nif;
void NIFFile::parse() void NIFFile::parse()
{ {
using namespace OMW::Platform;
// Check the header string // Check the header string
const char* head = getString(40); const char* head = getString(40);
if(!begins(head, "NetImmerse File Format")) if(!begins(head, "NetImmerse File Format"))

3
components/nif/nif_file.hpp
View file

@ -27,8 +27,7 @@
#include <libs/mangle/stream/stream.hpp> #include <libs/mangle/stream/stream.hpp>
#include <libs/mangle/stream/filters/buffer_stream.hpp> #include <libs/mangle/stream/filters/buffer_stream.hpp>
#include <libs/mangle/tools/str_exception.hpp> #include <libs/mangle/tools/str_exception.hpp>
#include <components/misc/slice_array.hpp>
#include "libs/platform/slice_array.hpp"
#include <vector> #include <vector>
#include <string> #include <string>

114
extern/caelum/CMakeLists.txt vendored
View file

@ -1,57 +1,57 @@
project(Caelum) project(Caelum)
ADD_DEFINITIONS(-DCAELUM_LIB) ADD_DEFINITIONS(-DCAELUM_LIB)
INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/extern/caelum/include ) INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/extern/caelum/include )
file(GLOB_RECURSE CAELUM_SRC src/*) file(GLOB_RECURSE CAELUM_SRC src/*)
file(GLOB_RECURSE CAELUM_HDR include/*) file(GLOB_RECURSE CAELUM_HDR include/*)
set(SOURCES ${CAELUM_SRC} ${CAELUM_HDR}) set(SOURCES ${CAELUM_SRC} ${CAELUM_HDR})
add_library(caelum STATIC ${SOURCES}) add_library(caelum STATIC ${SOURCES})
# #
# Resources # Resources
# #
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/AtmosphereDepth.png "${OpenMW_BINARY_DIR}/resources/caelum/AtmosphereDepth.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/AtmosphereDepth.png "${OpenMW_BINARY_DIR}/resources/caelum/AtmosphereDepth.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumGroundFog.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumGroundFog.cg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumGroundFog.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumGroundFog.cg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumLayeredClouds.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumLayeredClouds.cg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumLayeredClouds.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumLayeredClouds.cg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumPhaseMoon.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumPhaseMoon.cg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumPhaseMoon.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumPhaseMoon.cg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumPointStarfield.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumPointStarfield.cg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumPointStarfield.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumPointStarfield.cg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumSkyDome.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumSkyDome.cg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumSkyDome.cg "${OpenMW_BINARY_DIR}/resources/caelum/CaelumSkyDome.cg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CloudCoverLookup.png "${OpenMW_BINARY_DIR}/resources/caelum/CloudCoverLookup.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CloudCoverLookup.png "${OpenMW_BINARY_DIR}/resources/caelum/CloudCoverLookup.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/DepthComposer.cg "${OpenMW_BINARY_DIR}/resources/caelum/DepthComposer.cg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/DepthComposer.cg "${OpenMW_BINARY_DIR}/resources/caelum/DepthComposer.cg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/DepthComposer.compositor "${OpenMW_BINARY_DIR}/resources/caelum/DepthComposer.compositor" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/DepthComposer.compositor "${OpenMW_BINARY_DIR}/resources/caelum/DepthComposer.compositor" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/DepthComposer.material "${OpenMW_BINARY_DIR}/resources/caelum/DepthComposer.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/DepthComposer.material "${OpenMW_BINARY_DIR}/resources/caelum/DepthComposer.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/DepthRender.program "${OpenMW_BINARY_DIR}/resources/caelum/DepthRender.program" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/DepthRender.program "${OpenMW_BINARY_DIR}/resources/caelum/DepthRender.program" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/EarthClearSky2.png "${OpenMW_BINARY_DIR}/resources/caelum/EarthClearSky2.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/EarthClearSky2.png "${OpenMW_BINARY_DIR}/resources/caelum/EarthClearSky2.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/GroundFog.material "${OpenMW_BINARY_DIR}/resources/caelum/GroundFog.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/GroundFog.material "${OpenMW_BINARY_DIR}/resources/caelum/GroundFog.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/GroundFog.program "${OpenMW_BINARY_DIR}/resources/caelum/GroundFog.program" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/GroundFog.program "${OpenMW_BINARY_DIR}/resources/caelum/GroundFog.program" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Haze.program "${OpenMW_BINARY_DIR}/resources/caelum/Haze.program" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Haze.program "${OpenMW_BINARY_DIR}/resources/caelum/Haze.program" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/LayeredClouds.material "${OpenMW_BINARY_DIR}/resources/caelum/LayeredClouds.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/LayeredClouds.material "${OpenMW_BINARY_DIR}/resources/caelum/LayeredClouds.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/MinimalCompositorVP.cg "${OpenMW_BINARY_DIR}/resources/caelum/MinimalCompositorVP.cg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/MinimalCompositorVP.cg "${OpenMW_BINARY_DIR}/resources/caelum/MinimalCompositorVP.cg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/MinimalCompositorVP.program "${OpenMW_BINARY_DIR}/resources/caelum/MinimalCompositorVP.program" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/MinimalCompositorVP.program "${OpenMW_BINARY_DIR}/resources/caelum/MinimalCompositorVP.program" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/moon.material "${OpenMW_BINARY_DIR}/resources/caelum/moon.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/moon.material "${OpenMW_BINARY_DIR}/resources/caelum/moon.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/moon_disc.dds "${OpenMW_BINARY_DIR}/resources/caelum/moon_disc.dds" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/moon_disc.dds "${OpenMW_BINARY_DIR}/resources/caelum/moon_disc.dds" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/noise1.dds "${OpenMW_BINARY_DIR}/resources/caelum/noise1.dds" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/noise1.dds "${OpenMW_BINARY_DIR}/resources/caelum/noise1.dds" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/noise2.dds "${OpenMW_BINARY_DIR}/resources/caelum/noise2.dds" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/noise2.dds "${OpenMW_BINARY_DIR}/resources/caelum/noise2.dds" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/noise3.dds "${OpenMW_BINARY_DIR}/resources/caelum/noise3.dds" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/noise3.dds "${OpenMW_BINARY_DIR}/resources/caelum/noise3.dds" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/noise4.dds "${OpenMW_BINARY_DIR}/resources/caelum/noise4.dds" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/noise4.dds "${OpenMW_BINARY_DIR}/resources/caelum/noise4.dds" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/PointStarfield.material "${OpenMW_BINARY_DIR}/resources/caelum/PointStarfield.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/PointStarfield.material "${OpenMW_BINARY_DIR}/resources/caelum/PointStarfield.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Precipitation.cg "${OpenMW_BINARY_DIR}/resources/caelum/Precipitation.cg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Precipitation.cg "${OpenMW_BINARY_DIR}/resources/caelum/Precipitation.cg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Precipitation.compositor "${OpenMW_BINARY_DIR}/resources/caelum/Precipitation.compositor" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Precipitation.compositor "${OpenMW_BINARY_DIR}/resources/caelum/Precipitation.compositor" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Precipitation.material "${OpenMW_BINARY_DIR}/resources/caelum/Precipitation.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Precipitation.material "${OpenMW_BINARY_DIR}/resources/caelum/Precipitation.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_drizzle.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_drizzle.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_drizzle.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_drizzle.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_hail.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_hail.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_hail.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_hail.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_icecrystals.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_icecrystals.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_icecrystals.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_icecrystals.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_icepellets.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_icepellets.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_icepellets.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_icepellets.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_rain.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_rain.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_rain.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_rain.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_smallhail.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_smallhail.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_smallhail.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_smallhail.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_snow.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_snow.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_snow.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_snow.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_snowgrains.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_snowgrains.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/precipitation_snowgrains.png "${OpenMW_BINARY_DIR}/resources/caelum/precipitation_snowgrains.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/SkyDome.material "${OpenMW_BINARY_DIR}/resources/caelum/SkyDome.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/SkyDome.material "${OpenMW_BINARY_DIR}/resources/caelum/SkyDome.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/sphere.mesh "${OpenMW_BINARY_DIR}/resources/caelum/sphere.mesh" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/sphere.mesh "${OpenMW_BINARY_DIR}/resources/caelum/sphere.mesh" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Starfield.jpg "${OpenMW_BINARY_DIR}/resources/caelum/Starfield.jpg" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Starfield.jpg "${OpenMW_BINARY_DIR}/resources/caelum/Starfield.jpg" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Starfield.material "${OpenMW_BINARY_DIR}/resources/caelum/Starfield.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Starfield.material "${OpenMW_BINARY_DIR}/resources/caelum/Starfield.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Sun.material "${OpenMW_BINARY_DIR}/resources/caelum/Sun.material" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/Sun.material "${OpenMW_BINARY_DIR}/resources/caelum/Sun.material" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/SunGradient.png "${OpenMW_BINARY_DIR}/resources/caelum/SunGradient.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/SunGradient.png "${OpenMW_BINARY_DIR}/resources/caelum/SunGradient.png" COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/sun_disc.png "${OpenMW_BINARY_DIR}/resources/caelum/sun_disc.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/sun_disc.png "${OpenMW_BINARY_DIR}/resources/caelum/sun_disc.png" COPYONLY)

0
extern/caelum/include/Astronomy.h vendored Executable file → Normal file
View file

0
extern/caelum/include/Caelum.h vendored Executable file → Normal file
View file

0
extern/caelum/include/CaelumExceptions.h vendored Executable file → Normal file
View file

0
extern/caelum/include/CaelumPlugin.h vendored Executable file → Normal file
View file

0
extern/caelum/include/CaelumPrecompiled.h vendored Executable file → Normal file
View file

0
extern/caelum/include/CaelumPrerequisites.h vendored Executable file → Normal file
View file

0
extern/caelum/include/CaelumScriptTranslator.h vendored Executable file → Normal file
View file

0
extern/caelum/include/CaelumSystem.h vendored Executable file → Normal file
View file

0
extern/caelum/include/CameraBoundElement.h vendored Executable file → Normal file
View file

0
extern/caelum/include/CloudSystem.h vendored Executable file → Normal file
View file

0
extern/caelum/include/DepthComposer.h vendored Executable file → Normal file
View file

0
extern/caelum/include/FastGpuParamRef.h vendored Executable file → Normal file
View file

0
extern/caelum/include/FlatCloudLayer.h vendored Executable file → Normal file
View file

0
extern/caelum/include/GroundFog.h vendored Executable file → Normal file
View file

0
extern/caelum/include/ImageStarfield.h vendored Executable file → Normal file
View file

0
extern/caelum/include/InternalUtilities.h vendored Executable file → Normal file
View file

0
extern/caelum/include/Moon.h vendored Executable file → Normal file
View file

0
extern/caelum/include/PointStarfield.h vendored Executable file → Normal file
View file

0
extern/caelum/include/PrecipitationController.h vendored Executable file → Normal file
View file

0
extern/caelum/include/PrivatePtr.h vendored Executable file → Normal file
View file

0
extern/caelum/include/SkyDome.h vendored Executable file → Normal file
View file

0
extern/caelum/include/SkyLight.h vendored Executable file → Normal file
View file

0
extern/caelum/include/Sun.h vendored Executable file → Normal file
View file

0
extern/caelum/include/TypeDescriptor.h vendored Executable file → Normal file
View file

0
extern/caelum/include/UniversalClock.h vendored Executable file → Normal file
View file

0
extern/caelum/src/Astronomy.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/BrightStarCatalogue.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/CaelumDefaultTypeDescriptorData.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/CaelumPlugin.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/CaelumPrecompiled.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/CaelumScriptTranslator.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/CameraBoundElement.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/CloudSystem.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/DepthComposer.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/FastGpuParamRef.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/FlatCloudLayer.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/GroundFog.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/ImageStarfield.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/InternalUtilities.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/Moon.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/PointStarfield.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/PrecipitationController.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/SkyDome.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/SkyLight.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/Sun.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/TypeDescriptor.cpp vendored Executable file → Normal file
View file

0
extern/caelum/src/UniversalClock.cpp vendored Executable file → Normal file
View file

2
libs/platform/strings.h
View file

@ -6,6 +6,8 @@
#pragma warning(disable: 4996) #pragma warning(disable: 4996)
#define strcasecmp stricmp #define strcasecmp stricmp
#define snprintf _snprintf #define snprintf _snprintf
#else
#include <strings.h>
#endif #endif
#endif #endif