Moved caelum resources into the right place in the repo, instead of having cmake make redundant copies. Also fixed file modes/line endings.
2
.gitignore
vendored
|
@ -13,4 +13,4 @@ build
|
|||
plugins.cfg
|
||||
openmw.cfg
|
||||
Doxygen
|
||||
|
||||
.thumbnails
|
||||
|
|
2
apps/openmw/mwrender/sky.cpp
Executable file → Normal file
|
@ -35,7 +35,7 @@ namespace MWRender
|
|||
|
||||
// Load the Caelum resources
|
||||
//
|
||||
ResourceGroupManager::getSingleton().addResourceLocation("resources\\caelum", "FileSystem", "Caelum");
|
||||
ResourceGroupManager::getSingleton().addResourceLocation("resources/caelum", "FileSystem", "Caelum");
|
||||
ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
|
||||
|
||||
// Load the Caelum resources
|
||||
|
|
0
apps/openmw/mwrender/sky.hpp
Executable file → Normal file
47
extern/caelum/CMakeLists.txt
vendored
Executable file → Normal file
|
@ -8,50 +8,3 @@ 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)
|
||||
|
|
0
extern/caelum/include/Astronomy.h
vendored
Executable file → Normal file
0
extern/caelum/include/Caelum.h
vendored
Executable file → Normal file
0
extern/caelum/include/CaelumExceptions.h
vendored
Executable file → Normal file
0
extern/caelum/include/CaelumPlugin.h
vendored
Executable file → Normal file
0
extern/caelum/include/CaelumPrecompiled.h
vendored
Executable file → Normal file
0
extern/caelum/include/CaelumPrerequisites.h
vendored
Executable file → Normal file
0
extern/caelum/include/CaelumScriptTranslator.h
vendored
Executable file → Normal file
0
extern/caelum/include/CaelumSystem.h
vendored
Executable file → Normal file
0
extern/caelum/include/CameraBoundElement.h
vendored
Executable file → Normal file
0
extern/caelum/include/CloudSystem.h
vendored
Executable file → Normal file
0
extern/caelum/include/DepthComposer.h
vendored
Executable file → Normal file
0
extern/caelum/include/FastGpuParamRef.h
vendored
Executable file → Normal file
0
extern/caelum/include/FlatCloudLayer.h
vendored
Executable file → Normal file
0
extern/caelum/include/GroundFog.h
vendored
Executable file → Normal file
0
extern/caelum/include/ImageStarfield.h
vendored
Executable file → Normal file
0
extern/caelum/include/InternalUtilities.h
vendored
Executable file → Normal file
0
extern/caelum/include/Moon.h
vendored
Executable file → Normal file
0
extern/caelum/include/PointStarfield.h
vendored
Executable file → Normal file
0
extern/caelum/include/PrecipitationController.h
vendored
Executable file → Normal file
0
extern/caelum/include/PrivatePtr.h
vendored
Executable file → Normal file
0
extern/caelum/include/SkyDome.h
vendored
Executable file → Normal file
0
extern/caelum/include/SkyLight.h
vendored
Executable file → Normal file
0
extern/caelum/include/Sun.h
vendored
Executable file → Normal file
0
extern/caelum/include/TypeDescriptor.h
vendored
Executable file → Normal file
0
extern/caelum/include/UniversalClock.h
vendored
Executable file → Normal file
0
extern/caelum/src/Astronomy.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/BrightStarCatalogue.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/CaelumDefaultTypeDescriptorData.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/CaelumPlugin.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/CaelumPrecompiled.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/CaelumScriptTranslator.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/CaelumSystem.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/CameraBoundElement.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/CloudSystem.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/DepthComposer.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/FastGpuParamRef.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/FlatCloudLayer.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/GroundFog.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/ImageStarfield.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/InternalUtilities.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/Moon.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/PointStarfield.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/PrecipitationController.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/SkyDome.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/SkyLight.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/Sun.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/TypeDescriptor.cpp
vendored
Executable file → Normal file
0
extern/caelum/src/UniversalClock.cpp
vendored
Executable file → Normal file
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 220 B |
Before Width: | Height: | Size: 262 B After Width: | Height: | Size: 262 B |
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 462 KiB After Width: | Height: | Size: 462 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 569 KiB After Width: | Height: | Size: 569 KiB |
Before Width: | Height: | Size: 347 KiB After Width: | Height: | Size: 347 KiB |
Before Width: | Height: | Size: 429 KiB After Width: | Height: | Size: 429 KiB |
Before Width: | Height: | Size: 423 KiB After Width: | Height: | Size: 423 KiB |
Before Width: | Height: | Size: 440 KiB After Width: | Height: | Size: 440 KiB |
Before Width: | Height: | Size: 390 KiB After Width: | Height: | Size: 390 KiB |
Before Width: | Height: | Size: 426 KiB After Width: | Height: | Size: 426 KiB |
Before Width: | Height: | Size: 479 KiB After Width: | Height: | Size: 479 KiB |
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 3 KiB |