From 7f757bbcb7956f0cbf0b677eb9726f08b1335cc1 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 16 Aug 2016 09:41:13 +0200 Subject: [PATCH 1/3] Use correct normal for RenderableRings closing (#124) --- modules/base/shaders/rings_fs.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/base/shaders/rings_fs.glsl b/modules/base/shaders/rings_fs.glsl index 9b12688943..8a7c237de3 100644 --- a/modules/base/shaders/rings_fs.glsl +++ b/modules/base/shaders/rings_fs.glsl @@ -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 From f9e66c315c12ecc1073214540f551e9465d24b26 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 16 Aug 2016 10:49:52 +0200 Subject: [PATCH 2/3] Enable Edit and Continue in Visual Studio --- support/cmake/support_macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake index b2781d778b..4bb9480342 100644 --- a/support/cmake/support_macros.cmake +++ b/support/cmake/support_macros.cmake @@ -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 () From c9cd968d34f691fe34e68cf7e68abff201f72b30 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 17 Aug 2016 15:08:27 +0200 Subject: [PATCH 3/3] Add rosettaimages to the .data file for automatic download --- data/scene/rosetta/67P/67P.data | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/scene/rosetta/67P/67P.data b/data/scene/rosetta/67P/67P.data index 0cfd6a4b07..3c899a9480 100644 --- a/data/scene/rosetta/67P/67P.data +++ b/data/scene/rosetta/67P/67P.data @@ -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" },