From 54a57468153a9ab0c607118e0ead8c8142960a43 Mon Sep 17 00:00:00 2001 From: Jonathas Costa Date: Thu, 22 Aug 2019 13:02:02 -0400 Subject: [PATCH] Changes in DU for have back old Stars colors and align Constellations and stars. --- modules/digitaluniverse/rendering/renderabledumeshes.cpp | 8 +++++--- modules/space/shaders/star_fs.glsl | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index ccaa706c03..72ee2ebca1 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -710,14 +710,16 @@ bool RenderableDUMeshes::readSpeckFile() { continue; } - if (line.substr(0, 4) != "mesh") { + std::size_t found = line.find("mesh"); + if (found == std::string::npos) { + //if (line.substr(0, 4) != "mesh") { // we read a line that doesn't belong to the header, so we have to jump back // before the beginning of the current line file.seekg(position); break; - } + } else { - if (line.substr(0, 4) == "mesh") { + //if (line.substr(0, 4) == "mesh") { // mesh lines are structured as follows: // mesh -t texnum -c colorindex -s style { // where textnum is the index of the texture; diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl index 0595d6dff4..63479d5f64 100644 --- a/modules/space/shaders/star_fs.glsl +++ b/modules/space/shaders/star_fs.glsl @@ -104,6 +104,7 @@ Fragment getFragment() { frag.depth = gs_screenSpaceDepth; frag.gPosition = vs_position; frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0); + frag.disableLDR2HDR = true; return frag; }