mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c9cd968d34f691fe34e68cf7e68abff201f72b30' into develop

Browse Source
This commit is contained in:
Alexander Bock
2016-08-17 15:09:10 +02:00
parent d0e520943c c9cd968d34
commit 04d67d0baf
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/scene/rosetta/67P/67P.data
View File

@@ -1,6 +1,7 @@
return {
FileRequest = {
{ Identifier = "67p_textures", Destination = "textures", Version = 2 }
{ Identifier = "67p_textures", Destination = "textures", Version = 2 },
{ Identifier = "rosettaimages", Destination = "rosettaimages", Version = 1}
},
TorrentFiles = {
{ File = "67P_rotated_5_130.obj.torrent", Destination = "obj" },

4
modules/base/shaders/rings_fs.glsl
View File

@@ -73,10 +73,10 @@ Fragment getFragment() {
// The plane is oriented on the xz plane
// WARNING: This might not be the case for Uranus
if (gl_FrontFacing) {
normal = vec3(0.0, 1.0, 0.0);
normal = vec3(-1.0, 0.0, 0.0);
}
else {
normal = vec3(0.0, -1.0, 0.0);
normal = vec3(1.0, 0.0, 0.0);
}
// Reduce the color of the fragment by the user factor

2
support/cmake/support_macros.cmake
View File

@@ -68,7 +68,7 @@ function (set_compile_settings project)
set_property(TARGET ${project} PROPERTY CXX_STANDARD_REQUIRED On)
if (MSVC)
target_compile_options(${project} PUBLIC "/MP" "/wd4201" "/wd4127")
target_compile_options(${project} PUBLIC "/MP" "/ZI" "/wd4201" "/wd4127")
if (OPENSPACE_WARNINGS_AS_ERRORS)
target_compile_options(${project} PUBLIC "/WX")
endif ()