From a26641cca17286fd98ea85ddf4343cc1d23c72e8 Mon Sep 17 00:00:00 2001 From: Nicolay Korslund Date: Mon, 28 Jun 2010 11:36:54 +0200 Subject: [PATCH] Moved caelum resources into the right place in the repo, instead of having cmake make redundant copies. Also fixed file modes/line endings. --- .gitignore | 2 +- apps/openmw/mwrender/sky.cpp | 186 +++++++++--------- apps/openmw/mwrender/sky.hpp | 0 extern/caelum/CMakeLists.txt | 67 +------ extern/caelum/include/Astronomy.h | 0 extern/caelum/include/Caelum.h | 0 extern/caelum/include/CaelumExceptions.h | 0 extern/caelum/include/CaelumPlugin.h | 0 extern/caelum/include/CaelumPrecompiled.h | 0 extern/caelum/include/CaelumPrerequisites.h | 0 .../caelum/include/CaelumScriptTranslator.h | 0 extern/caelum/include/CaelumSystem.h | 0 extern/caelum/include/CameraBoundElement.h | 0 extern/caelum/include/CloudSystem.h | 0 extern/caelum/include/DepthComposer.h | 0 extern/caelum/include/FastGpuParamRef.h | 0 extern/caelum/include/FlatCloudLayer.h | 0 extern/caelum/include/GroundFog.h | 0 extern/caelum/include/ImageStarfield.h | 0 extern/caelum/include/InternalUtilities.h | 0 extern/caelum/include/Moon.h | 0 extern/caelum/include/PointStarfield.h | 0 .../caelum/include/PrecipitationController.h | 0 extern/caelum/include/PrivatePtr.h | 0 extern/caelum/include/SkyDome.h | 0 extern/caelum/include/SkyLight.h | 0 extern/caelum/include/Sun.h | 0 extern/caelum/include/TypeDescriptor.h | 0 extern/caelum/include/UniversalClock.h | 0 extern/caelum/src/Astronomy.cpp | 0 extern/caelum/src/BrightStarCatalogue.cpp | 0 .../src/CaelumDefaultTypeDescriptorData.cpp | 0 extern/caelum/src/CaelumPlugin.cpp | 0 extern/caelum/src/CaelumPrecompiled.cpp | 0 extern/caelum/src/CaelumScriptTranslator.cpp | 0 extern/caelum/src/CaelumSystem.cpp | 0 extern/caelum/src/CameraBoundElement.cpp | 0 extern/caelum/src/CloudSystem.cpp | 0 extern/caelum/src/DepthComposer.cpp | 0 extern/caelum/src/FastGpuParamRef.cpp | 0 extern/caelum/src/FlatCloudLayer.cpp | 0 extern/caelum/src/GroundFog.cpp | 0 extern/caelum/src/ImageStarfield.cpp | 0 extern/caelum/src/InternalUtilities.cpp | 0 extern/caelum/src/Moon.cpp | 0 extern/caelum/src/PointStarfield.cpp | 0 extern/caelum/src/PrecipitationController.cpp | 0 extern/caelum/src/SkyDome.cpp | 0 extern/caelum/src/SkyLight.cpp | 0 extern/caelum/src/Sun.cpp | 0 extern/caelum/src/TypeDescriptor.cpp | 0 extern/caelum/src/UniversalClock.cpp | 0 .../caelum}/AtmosphereDepth.png | Bin .../caelum}/CaelumGroundFog.cg | 0 .../caelum}/CaelumLayeredClouds.cg | 0 .../caelum}/CaelumPhaseMoon.cg | 0 .../caelum}/CaelumPointStarfield.cg | 0 .../caelum}/CaelumSkyDome.cg | 0 .../caelum}/CloudCoverLookup.png | Bin .../caelum}/DepthComposer.cg | 0 .../caelum}/DepthComposer.compositor | 0 .../caelum}/DepthComposer.material | 0 .../caelum}/DepthRender.program | 0 .../caelum}/EarthClearSky2.png | Bin .../caelum}/GroundFog.material | 0 .../caelum}/GroundFog.program | 0 .../caelum}/Haze.program | 0 .../caelum}/LayeredClouds.material | 0 .../caelum}/MinimalCompositorVP.cg | 0 .../caelum}/MinimalCompositorVP.program | 0 .../caelum}/PointStarfield.material | 0 .../caelum}/Precipitation.cg | 0 .../caelum}/Precipitation.compositor | 0 .../caelum}/Precipitation.material | 0 .../caelum}/SkyDome.material | 0 .../caelum}/Starfield.jpg | Bin .../caelum}/Starfield.material | 0 .../caelum}/Sun.material | 0 .../caelum}/SunGradient.png | Bin .../caelum}/moon.material | 0 .../caelum}/moon_disc.dds | Bin .../resources => resources/caelum}/noise1.dds | Bin .../resources => resources/caelum}/noise2.dds | Bin .../resources => resources/caelum}/noise3.dds | Bin .../resources => resources/caelum}/noise4.dds | Bin .../caelum}/precipitation_drizzle.png | Bin .../caelum}/precipitation_hail.png | Bin .../caelum}/precipitation_icecrystals.png | Bin .../caelum}/precipitation_icepellets.png | Bin .../caelum}/precipitation_rain.png | Bin .../caelum}/precipitation_smallhail.png | Bin .../caelum}/precipitation_snow.png | Bin .../caelum}/precipitation_snowgrains.png | Bin .../caelum}/sphere.mesh | Bin .../caelum}/sun_disc.png | Bin 95 files changed, 104 insertions(+), 151 deletions(-) mode change 100755 => 100644 apps/openmw/mwrender/sky.cpp mode change 100755 => 100644 apps/openmw/mwrender/sky.hpp mode change 100755 => 100644 extern/caelum/CMakeLists.txt mode change 100755 => 100644 extern/caelum/include/Astronomy.h mode change 100755 => 100644 extern/caelum/include/Caelum.h mode change 100755 => 100644 extern/caelum/include/CaelumExceptions.h mode change 100755 => 100644 extern/caelum/include/CaelumPlugin.h mode change 100755 => 100644 extern/caelum/include/CaelumPrecompiled.h mode change 100755 => 100644 extern/caelum/include/CaelumPrerequisites.h mode change 100755 => 100644 extern/caelum/include/CaelumScriptTranslator.h mode change 100755 => 100644 extern/caelum/include/CaelumSystem.h mode change 100755 => 100644 extern/caelum/include/CameraBoundElement.h mode change 100755 => 100644 extern/caelum/include/CloudSystem.h mode change 100755 => 100644 extern/caelum/include/DepthComposer.h mode change 100755 => 100644 extern/caelum/include/FastGpuParamRef.h mode change 100755 => 100644 extern/caelum/include/FlatCloudLayer.h mode change 100755 => 100644 extern/caelum/include/GroundFog.h mode change 100755 => 100644 extern/caelum/include/ImageStarfield.h mode change 100755 => 100644 extern/caelum/include/InternalUtilities.h mode change 100755 => 100644 extern/caelum/include/Moon.h mode change 100755 => 100644 extern/caelum/include/PointStarfield.h mode change 100755 => 100644 extern/caelum/include/PrecipitationController.h mode change 100755 => 100644 extern/caelum/include/PrivatePtr.h mode change 100755 => 100644 extern/caelum/include/SkyDome.h mode change 100755 => 100644 extern/caelum/include/SkyLight.h mode change 100755 => 100644 extern/caelum/include/Sun.h mode change 100755 => 100644 extern/caelum/include/TypeDescriptor.h mode change 100755 => 100644 extern/caelum/include/UniversalClock.h mode change 100755 => 100644 extern/caelum/src/Astronomy.cpp mode change 100755 => 100644 extern/caelum/src/BrightStarCatalogue.cpp mode change 100755 => 100644 extern/caelum/src/CaelumDefaultTypeDescriptorData.cpp mode change 100755 => 100644 extern/caelum/src/CaelumPlugin.cpp mode change 100755 => 100644 extern/caelum/src/CaelumPrecompiled.cpp mode change 100755 => 100644 extern/caelum/src/CaelumScriptTranslator.cpp mode change 100755 => 100644 extern/caelum/src/CaelumSystem.cpp mode change 100755 => 100644 extern/caelum/src/CameraBoundElement.cpp mode change 100755 => 100644 extern/caelum/src/CloudSystem.cpp mode change 100755 => 100644 extern/caelum/src/DepthComposer.cpp mode change 100755 => 100644 extern/caelum/src/FastGpuParamRef.cpp mode change 100755 => 100644 extern/caelum/src/FlatCloudLayer.cpp mode change 100755 => 100644 extern/caelum/src/GroundFog.cpp mode change 100755 => 100644 extern/caelum/src/ImageStarfield.cpp mode change 100755 => 100644 extern/caelum/src/InternalUtilities.cpp mode change 100755 => 100644 extern/caelum/src/Moon.cpp mode change 100755 => 100644 extern/caelum/src/PointStarfield.cpp mode change 100755 => 100644 extern/caelum/src/PrecipitationController.cpp mode change 100755 => 100644 extern/caelum/src/SkyDome.cpp mode change 100755 => 100644 extern/caelum/src/SkyLight.cpp mode change 100755 => 100644 extern/caelum/src/Sun.cpp mode change 100755 => 100644 extern/caelum/src/TypeDescriptor.cpp mode change 100755 => 100644 extern/caelum/src/UniversalClock.cpp rename {extern/caelum/resources => resources/caelum}/AtmosphereDepth.png (100%) rename {extern/caelum/resources => resources/caelum}/CaelumGroundFog.cg (100%) rename {extern/caelum/resources => resources/caelum}/CaelumLayeredClouds.cg (100%) rename {extern/caelum/resources => resources/caelum}/CaelumPhaseMoon.cg (100%) rename {extern/caelum/resources => resources/caelum}/CaelumPointStarfield.cg (100%) rename {extern/caelum/resources => resources/caelum}/CaelumSkyDome.cg (100%) rename {extern/caelum/resources => resources/caelum}/CloudCoverLookup.png (100%) rename {extern/caelum/resources => resources/caelum}/DepthComposer.cg (100%) rename {extern/caelum/resources => resources/caelum}/DepthComposer.compositor (100%) rename {extern/caelum/resources => resources/caelum}/DepthComposer.material (100%) rename {extern/caelum/resources => resources/caelum}/DepthRender.program (100%) rename {extern/caelum/resources => resources/caelum}/EarthClearSky2.png (100%) rename {extern/caelum/resources => resources/caelum}/GroundFog.material (100%) rename {extern/caelum/resources => resources/caelum}/GroundFog.program (100%) rename {extern/caelum/resources => resources/caelum}/Haze.program (100%) rename {extern/caelum/resources => resources/caelum}/LayeredClouds.material (100%) rename {extern/caelum/resources => resources/caelum}/MinimalCompositorVP.cg (100%) rename {extern/caelum/resources => resources/caelum}/MinimalCompositorVP.program (100%) rename {extern/caelum/resources => resources/caelum}/PointStarfield.material (100%) rename {extern/caelum/resources => resources/caelum}/Precipitation.cg (100%) rename {extern/caelum/resources => resources/caelum}/Precipitation.compositor (100%) rename {extern/caelum/resources => resources/caelum}/Precipitation.material (100%) rename {extern/caelum/resources => resources/caelum}/SkyDome.material (100%) rename {extern/caelum/resources => resources/caelum}/Starfield.jpg (100%) rename {extern/caelum/resources => resources/caelum}/Starfield.material (100%) rename {extern/caelum/resources => resources/caelum}/Sun.material (100%) rename {extern/caelum/resources => resources/caelum}/SunGradient.png (100%) rename {extern/caelum/resources => resources/caelum}/moon.material (100%) rename {extern/caelum/resources => resources/caelum}/moon_disc.dds (100%) rename {extern/caelum/resources => resources/caelum}/noise1.dds (100%) rename {extern/caelum/resources => resources/caelum}/noise2.dds (100%) rename {extern/caelum/resources => resources/caelum}/noise3.dds (100%) rename {extern/caelum/resources => resources/caelum}/noise4.dds (100%) rename {extern/caelum/resources => resources/caelum}/precipitation_drizzle.png (100%) rename {extern/caelum/resources => resources/caelum}/precipitation_hail.png (100%) rename {extern/caelum/resources => resources/caelum}/precipitation_icecrystals.png (100%) rename {extern/caelum/resources => resources/caelum}/precipitation_icepellets.png (100%) rename {extern/caelum/resources => resources/caelum}/precipitation_rain.png (100%) rename {extern/caelum/resources => resources/caelum}/precipitation_smallhail.png (100%) rename {extern/caelum/resources => resources/caelum}/precipitation_snow.png (100%) rename {extern/caelum/resources => resources/caelum}/precipitation_snowgrains.png (100%) rename {extern/caelum/resources => resources/caelum}/sphere.mesh (100%) rename {extern/caelum/resources => resources/caelum}/sun_disc.png (100%) diff --git a/.gitignore b/.gitignore index 322375a54..a18c734ce 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,4 @@ build plugins.cfg openmw.cfg Doxygen - +.thumbnails diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp old mode 100755 new mode 100644 index bcd40457f..901ab405e --- a/apps/openmw/mwrender/sky.cpp +++ b/apps/openmw/mwrender/sky.cpp @@ -1,93 +1,93 @@ -#include "sky.hpp" -#include "Caelum.h" - -namespace MWRender -{ - // - // Implements a Caelum sky with default settings. - // - // Note: this is intended as a temporary solution to provide some form of - // sky rendering. This code will obviously need significant tailoring to - // support fidelity with Morrowind's rendering. Before doing major work - // 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. - // - class CaelumManager : public SkyManager - { - protected: - Caelum::CaelumSystem* mpCaelumSystem; - - public: - CaelumManager (Ogre::RenderWindow* pRenderWindow, - Ogre::Camera* pCamera); - virtual ~CaelumManager (); - }; - - CaelumManager::CaelumManager (Ogre::RenderWindow* pRenderWindow, - Ogre::Camera* pCamera) - : mpCaelumSystem (NULL) - { - using namespace Ogre; - using namespace Caelum; - - assert(pCamera); - assert(pRenderWindow); - - // Load the Caelum resources - // - ResourceGroupManager::getSingleton().addResourceLocation("resources\\caelum", "FileSystem", "Caelum"); - ResourceGroupManager::getSingleton().initialiseAllResourceGroups(); - - // Load the Caelum resources - // - Ogre::SceneManager* pScene = pCamera->getSceneManager(); - Caelum::CaelumSystem::CaelumComponent componentMask = CaelumSystem::CAELUM_COMPONENTS_DEFAULT; - mpCaelumSystem = new Caelum::CaelumSystem (Root::getSingletonPtr(), pScene, componentMask); - - // Set time acceleration. - mpCaelumSystem->getUniversalClock()->setTimeScale(128); - - // Disable fog since OpenMW is handling OGRE fog elsewhere - mpCaelumSystem->setManageSceneFog(false); - - // Change the camera far distance to make sure the sky is not clipped - pCamera->setFarClipDistance(50000); - - // Register Caelum as an OGRE listener - pRenderWindow->addListener(mpCaelumSystem); - Root::getSingletonPtr()->addFrameListener(mpCaelumSystem); - } - - CaelumManager::~CaelumManager() - { - if (mpCaelumSystem) - mpCaelumSystem->shutdown (false); - } - - /// Creates and connects the sky rendering component to OGRE. - /// - /// \return NULL on failure. - /// - SkyManager* SkyManager::create (Ogre::RenderWindow* pRenderWindow, - Ogre::Camera* pCamera) - { - SkyManager* pSkyManager = NULL; - - try - { - pSkyManager = new CaelumManager(pRenderWindow, pCamera); - } - catch (Ogre::Exception& e) - { - std::cout << "\nOGRE Exception when attempting to add sky: " - << e.getFullDescription().c_str() << std::endl; - } - catch (std::exception& e) - { - std::cout << "\nException when attempting to add sky: " - << e.what() << std::endl; - } - - return pSkyManager; - } -} +#include "sky.hpp" +#include "Caelum.h" + +namespace MWRender +{ + // + // Implements a Caelum sky with default settings. + // + // Note: this is intended as a temporary solution to provide some form of + // sky rendering. This code will obviously need significant tailoring to + // support fidelity with Morrowind's rendering. Before doing major work + // 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. + // + class CaelumManager : public SkyManager + { + protected: + Caelum::CaelumSystem* mpCaelumSystem; + + public: + CaelumManager (Ogre::RenderWindow* pRenderWindow, + Ogre::Camera* pCamera); + virtual ~CaelumManager (); + }; + + CaelumManager::CaelumManager (Ogre::RenderWindow* pRenderWindow, + Ogre::Camera* pCamera) + : mpCaelumSystem (NULL) + { + using namespace Ogre; + using namespace Caelum; + + assert(pCamera); + assert(pRenderWindow); + + // Load the Caelum resources + // + ResourceGroupManager::getSingleton().addResourceLocation("resources/caelum", "FileSystem", "Caelum"); + ResourceGroupManager::getSingleton().initialiseAllResourceGroups(); + + // Load the Caelum resources + // + Ogre::SceneManager* pScene = pCamera->getSceneManager(); + Caelum::CaelumSystem::CaelumComponent componentMask = CaelumSystem::CAELUM_COMPONENTS_DEFAULT; + mpCaelumSystem = new Caelum::CaelumSystem (Root::getSingletonPtr(), pScene, componentMask); + + // Set time acceleration. + mpCaelumSystem->getUniversalClock()->setTimeScale(128); + + // Disable fog since OpenMW is handling OGRE fog elsewhere + mpCaelumSystem->setManageSceneFog(false); + + // Change the camera far distance to make sure the sky is not clipped + pCamera->setFarClipDistance(50000); + + // Register Caelum as an OGRE listener + pRenderWindow->addListener(mpCaelumSystem); + Root::getSingletonPtr()->addFrameListener(mpCaelumSystem); + } + + CaelumManager::~CaelumManager() + { + if (mpCaelumSystem) + mpCaelumSystem->shutdown (false); + } + + /// Creates and connects the sky rendering component to OGRE. + /// + /// \return NULL on failure. + /// + SkyManager* SkyManager::create (Ogre::RenderWindow* pRenderWindow, + Ogre::Camera* pCamera) + { + SkyManager* pSkyManager = NULL; + + try + { + pSkyManager = new CaelumManager(pRenderWindow, pCamera); + } + catch (Ogre::Exception& e) + { + std::cout << "\nOGRE Exception when attempting to add sky: " + << e.getFullDescription().c_str() << std::endl; + } + catch (std::exception& e) + { + std::cout << "\nException when attempting to add sky: " + << e.what() << std::endl; + } + + return pSkyManager; + } +} diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp old mode 100755 new mode 100644 diff --git a/extern/caelum/CMakeLists.txt b/extern/caelum/CMakeLists.txt old mode 100755 new mode 100644 index cdc63af33..c0fea8257 --- a/extern/caelum/CMakeLists.txt +++ b/extern/caelum/CMakeLists.txt @@ -1,57 +1,10 @@ -project(Caelum) - -ADD_DEFINITIONS(-DCAELUM_LIB) -INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/extern/caelum/include ) - -file(GLOB_RECURSE CAELUM_SRC src/*) -file(GLOB_RECURSE CAELUM_HDR include/*) - -set(SOURCES ${CAELUM_SRC} ${CAELUM_HDR}) -add_library(caelum STATIC ${SOURCES}) - -# -# 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/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/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/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/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.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/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.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/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.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_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/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/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/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.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_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_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_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_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/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.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/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) +project(Caelum) + +ADD_DEFINITIONS(-DCAELUM_LIB) +INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/extern/caelum/include ) + +file(GLOB_RECURSE CAELUM_SRC src/*) +file(GLOB_RECURSE CAELUM_HDR include/*) + +set(SOURCES ${CAELUM_SRC} ${CAELUM_HDR}) +add_library(caelum STATIC ${SOURCES}) diff --git a/extern/caelum/include/Astronomy.h b/extern/caelum/include/Astronomy.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/Caelum.h b/extern/caelum/include/Caelum.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/CaelumExceptions.h b/extern/caelum/include/CaelumExceptions.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/CaelumPlugin.h b/extern/caelum/include/CaelumPlugin.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/CaelumPrecompiled.h b/extern/caelum/include/CaelumPrecompiled.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/CaelumPrerequisites.h b/extern/caelum/include/CaelumPrerequisites.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/CaelumScriptTranslator.h b/extern/caelum/include/CaelumScriptTranslator.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/CaelumSystem.h b/extern/caelum/include/CaelumSystem.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/CameraBoundElement.h b/extern/caelum/include/CameraBoundElement.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/CloudSystem.h b/extern/caelum/include/CloudSystem.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/DepthComposer.h b/extern/caelum/include/DepthComposer.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/FastGpuParamRef.h b/extern/caelum/include/FastGpuParamRef.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/FlatCloudLayer.h b/extern/caelum/include/FlatCloudLayer.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/GroundFog.h b/extern/caelum/include/GroundFog.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/ImageStarfield.h b/extern/caelum/include/ImageStarfield.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/InternalUtilities.h b/extern/caelum/include/InternalUtilities.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/Moon.h b/extern/caelum/include/Moon.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/PointStarfield.h b/extern/caelum/include/PointStarfield.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/PrecipitationController.h b/extern/caelum/include/PrecipitationController.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/PrivatePtr.h b/extern/caelum/include/PrivatePtr.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/SkyDome.h b/extern/caelum/include/SkyDome.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/SkyLight.h b/extern/caelum/include/SkyLight.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/Sun.h b/extern/caelum/include/Sun.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/TypeDescriptor.h b/extern/caelum/include/TypeDescriptor.h old mode 100755 new mode 100644 diff --git a/extern/caelum/include/UniversalClock.h b/extern/caelum/include/UniversalClock.h old mode 100755 new mode 100644 diff --git a/extern/caelum/src/Astronomy.cpp b/extern/caelum/src/Astronomy.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/BrightStarCatalogue.cpp b/extern/caelum/src/BrightStarCatalogue.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/CaelumDefaultTypeDescriptorData.cpp b/extern/caelum/src/CaelumDefaultTypeDescriptorData.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/CaelumPlugin.cpp b/extern/caelum/src/CaelumPlugin.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/CaelumPrecompiled.cpp b/extern/caelum/src/CaelumPrecompiled.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/CaelumScriptTranslator.cpp b/extern/caelum/src/CaelumScriptTranslator.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/CaelumSystem.cpp b/extern/caelum/src/CaelumSystem.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/CameraBoundElement.cpp b/extern/caelum/src/CameraBoundElement.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/CloudSystem.cpp b/extern/caelum/src/CloudSystem.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/DepthComposer.cpp b/extern/caelum/src/DepthComposer.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/FastGpuParamRef.cpp b/extern/caelum/src/FastGpuParamRef.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/FlatCloudLayer.cpp b/extern/caelum/src/FlatCloudLayer.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/GroundFog.cpp b/extern/caelum/src/GroundFog.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/ImageStarfield.cpp b/extern/caelum/src/ImageStarfield.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/InternalUtilities.cpp b/extern/caelum/src/InternalUtilities.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/Moon.cpp b/extern/caelum/src/Moon.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/PointStarfield.cpp b/extern/caelum/src/PointStarfield.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/PrecipitationController.cpp b/extern/caelum/src/PrecipitationController.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/SkyDome.cpp b/extern/caelum/src/SkyDome.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/SkyLight.cpp b/extern/caelum/src/SkyLight.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/Sun.cpp b/extern/caelum/src/Sun.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/TypeDescriptor.cpp b/extern/caelum/src/TypeDescriptor.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/src/UniversalClock.cpp b/extern/caelum/src/UniversalClock.cpp old mode 100755 new mode 100644 diff --git a/extern/caelum/resources/AtmosphereDepth.png b/resources/caelum/AtmosphereDepth.png similarity index 100% rename from extern/caelum/resources/AtmosphereDepth.png rename to resources/caelum/AtmosphereDepth.png diff --git a/extern/caelum/resources/CaelumGroundFog.cg b/resources/caelum/CaelumGroundFog.cg similarity index 100% rename from extern/caelum/resources/CaelumGroundFog.cg rename to resources/caelum/CaelumGroundFog.cg diff --git a/extern/caelum/resources/CaelumLayeredClouds.cg b/resources/caelum/CaelumLayeredClouds.cg similarity index 100% rename from extern/caelum/resources/CaelumLayeredClouds.cg rename to resources/caelum/CaelumLayeredClouds.cg diff --git a/extern/caelum/resources/CaelumPhaseMoon.cg b/resources/caelum/CaelumPhaseMoon.cg similarity index 100% rename from extern/caelum/resources/CaelumPhaseMoon.cg rename to resources/caelum/CaelumPhaseMoon.cg diff --git a/extern/caelum/resources/CaelumPointStarfield.cg b/resources/caelum/CaelumPointStarfield.cg similarity index 100% rename from extern/caelum/resources/CaelumPointStarfield.cg rename to resources/caelum/CaelumPointStarfield.cg diff --git a/extern/caelum/resources/CaelumSkyDome.cg b/resources/caelum/CaelumSkyDome.cg similarity index 100% rename from extern/caelum/resources/CaelumSkyDome.cg rename to resources/caelum/CaelumSkyDome.cg diff --git a/extern/caelum/resources/CloudCoverLookup.png b/resources/caelum/CloudCoverLookup.png similarity index 100% rename from extern/caelum/resources/CloudCoverLookup.png rename to resources/caelum/CloudCoverLookup.png diff --git a/extern/caelum/resources/DepthComposer.cg b/resources/caelum/DepthComposer.cg similarity index 100% rename from extern/caelum/resources/DepthComposer.cg rename to resources/caelum/DepthComposer.cg diff --git a/extern/caelum/resources/DepthComposer.compositor b/resources/caelum/DepthComposer.compositor similarity index 100% rename from extern/caelum/resources/DepthComposer.compositor rename to resources/caelum/DepthComposer.compositor diff --git a/extern/caelum/resources/DepthComposer.material b/resources/caelum/DepthComposer.material similarity index 100% rename from extern/caelum/resources/DepthComposer.material rename to resources/caelum/DepthComposer.material diff --git a/extern/caelum/resources/DepthRender.program b/resources/caelum/DepthRender.program similarity index 100% rename from extern/caelum/resources/DepthRender.program rename to resources/caelum/DepthRender.program diff --git a/extern/caelum/resources/EarthClearSky2.png b/resources/caelum/EarthClearSky2.png similarity index 100% rename from extern/caelum/resources/EarthClearSky2.png rename to resources/caelum/EarthClearSky2.png diff --git a/extern/caelum/resources/GroundFog.material b/resources/caelum/GroundFog.material similarity index 100% rename from extern/caelum/resources/GroundFog.material rename to resources/caelum/GroundFog.material diff --git a/extern/caelum/resources/GroundFog.program b/resources/caelum/GroundFog.program similarity index 100% rename from extern/caelum/resources/GroundFog.program rename to resources/caelum/GroundFog.program diff --git a/extern/caelum/resources/Haze.program b/resources/caelum/Haze.program similarity index 100% rename from extern/caelum/resources/Haze.program rename to resources/caelum/Haze.program diff --git a/extern/caelum/resources/LayeredClouds.material b/resources/caelum/LayeredClouds.material similarity index 100% rename from extern/caelum/resources/LayeredClouds.material rename to resources/caelum/LayeredClouds.material diff --git a/extern/caelum/resources/MinimalCompositorVP.cg b/resources/caelum/MinimalCompositorVP.cg similarity index 100% rename from extern/caelum/resources/MinimalCompositorVP.cg rename to resources/caelum/MinimalCompositorVP.cg diff --git a/extern/caelum/resources/MinimalCompositorVP.program b/resources/caelum/MinimalCompositorVP.program similarity index 100% rename from extern/caelum/resources/MinimalCompositorVP.program rename to resources/caelum/MinimalCompositorVP.program diff --git a/extern/caelum/resources/PointStarfield.material b/resources/caelum/PointStarfield.material similarity index 100% rename from extern/caelum/resources/PointStarfield.material rename to resources/caelum/PointStarfield.material diff --git a/extern/caelum/resources/Precipitation.cg b/resources/caelum/Precipitation.cg similarity index 100% rename from extern/caelum/resources/Precipitation.cg rename to resources/caelum/Precipitation.cg diff --git a/extern/caelum/resources/Precipitation.compositor b/resources/caelum/Precipitation.compositor similarity index 100% rename from extern/caelum/resources/Precipitation.compositor rename to resources/caelum/Precipitation.compositor diff --git a/extern/caelum/resources/Precipitation.material b/resources/caelum/Precipitation.material similarity index 100% rename from extern/caelum/resources/Precipitation.material rename to resources/caelum/Precipitation.material diff --git a/extern/caelum/resources/SkyDome.material b/resources/caelum/SkyDome.material similarity index 100% rename from extern/caelum/resources/SkyDome.material rename to resources/caelum/SkyDome.material diff --git a/extern/caelum/resources/Starfield.jpg b/resources/caelum/Starfield.jpg similarity index 100% rename from extern/caelum/resources/Starfield.jpg rename to resources/caelum/Starfield.jpg diff --git a/extern/caelum/resources/Starfield.material b/resources/caelum/Starfield.material similarity index 100% rename from extern/caelum/resources/Starfield.material rename to resources/caelum/Starfield.material diff --git a/extern/caelum/resources/Sun.material b/resources/caelum/Sun.material similarity index 100% rename from extern/caelum/resources/Sun.material rename to resources/caelum/Sun.material diff --git a/extern/caelum/resources/SunGradient.png b/resources/caelum/SunGradient.png similarity index 100% rename from extern/caelum/resources/SunGradient.png rename to resources/caelum/SunGradient.png diff --git a/extern/caelum/resources/moon.material b/resources/caelum/moon.material similarity index 100% rename from extern/caelum/resources/moon.material rename to resources/caelum/moon.material diff --git a/extern/caelum/resources/moon_disc.dds b/resources/caelum/moon_disc.dds similarity index 100% rename from extern/caelum/resources/moon_disc.dds rename to resources/caelum/moon_disc.dds diff --git a/extern/caelum/resources/noise1.dds b/resources/caelum/noise1.dds similarity index 100% rename from extern/caelum/resources/noise1.dds rename to resources/caelum/noise1.dds diff --git a/extern/caelum/resources/noise2.dds b/resources/caelum/noise2.dds similarity index 100% rename from extern/caelum/resources/noise2.dds rename to resources/caelum/noise2.dds diff --git a/extern/caelum/resources/noise3.dds b/resources/caelum/noise3.dds similarity index 100% rename from extern/caelum/resources/noise3.dds rename to resources/caelum/noise3.dds diff --git a/extern/caelum/resources/noise4.dds b/resources/caelum/noise4.dds similarity index 100% rename from extern/caelum/resources/noise4.dds rename to resources/caelum/noise4.dds diff --git a/extern/caelum/resources/precipitation_drizzle.png b/resources/caelum/precipitation_drizzle.png similarity index 100% rename from extern/caelum/resources/precipitation_drizzle.png rename to resources/caelum/precipitation_drizzle.png diff --git a/extern/caelum/resources/precipitation_hail.png b/resources/caelum/precipitation_hail.png similarity index 100% rename from extern/caelum/resources/precipitation_hail.png rename to resources/caelum/precipitation_hail.png diff --git a/extern/caelum/resources/precipitation_icecrystals.png b/resources/caelum/precipitation_icecrystals.png similarity index 100% rename from extern/caelum/resources/precipitation_icecrystals.png rename to resources/caelum/precipitation_icecrystals.png diff --git a/extern/caelum/resources/precipitation_icepellets.png b/resources/caelum/precipitation_icepellets.png similarity index 100% rename from extern/caelum/resources/precipitation_icepellets.png rename to resources/caelum/precipitation_icepellets.png diff --git a/extern/caelum/resources/precipitation_rain.png b/resources/caelum/precipitation_rain.png similarity index 100% rename from extern/caelum/resources/precipitation_rain.png rename to resources/caelum/precipitation_rain.png diff --git a/extern/caelum/resources/precipitation_smallhail.png b/resources/caelum/precipitation_smallhail.png similarity index 100% rename from extern/caelum/resources/precipitation_smallhail.png rename to resources/caelum/precipitation_smallhail.png diff --git a/extern/caelum/resources/precipitation_snow.png b/resources/caelum/precipitation_snow.png similarity index 100% rename from extern/caelum/resources/precipitation_snow.png rename to resources/caelum/precipitation_snow.png diff --git a/extern/caelum/resources/precipitation_snowgrains.png b/resources/caelum/precipitation_snowgrains.png similarity index 100% rename from extern/caelum/resources/precipitation_snowgrains.png rename to resources/caelum/precipitation_snowgrains.png diff --git a/extern/caelum/resources/sphere.mesh b/resources/caelum/sphere.mesh similarity index 100% rename from extern/caelum/resources/sphere.mesh rename to resources/caelum/sphere.mesh diff --git a/extern/caelum/resources/sun_disc.png b/resources/caelum/sun_disc.png similarity index 100% rename from extern/caelum/resources/sun_disc.png rename to resources/caelum/sun_disc.png