Fixed merged issues

glfw @ 7ef34eb0

+Subproject commit 7ef34eb06de54dd9186d3d21a401b2ef819b59e7

sgct @ 25c8d30b

-Subproject commit 8d672fd0a7c7ef0e6c48e1d43bacbddce1f0a10d
+Subproject commit 25c8d30bde216066840d197e4443def196c70e17

data/tasks/volume/debristasks/generate_cartesian_volume.task

 return {{
 	Type = "GenerateDebrisVolumeTask",
-	Dimensions = {48, 48, 48},
+	Dimensions = {64, 64, 64},
 	LowerDomainBound = {-0.5, -0.5, -0.5},
 	UpperDomainBound = {0.5, 0.5, 0.5},
 	InputPath = "${SYNC}/url/satellite_tle_data_DebrisAll/files/allDebrisInOneTLE.txt",
 	StartTime = "2019-07-27T10:00:00",
-	TimeStep = "2",
-	EndTime = "2019-07-27T12:00:00",
+	TimeStep = "10",
+	EndTime = "2019-07-27T11:00:00",
     GridType = "Cartesian",
 	RawVolumeOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generatedCartesian/singleDebris.rawvolume",
 	DictionaryOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generatedCartesian/singleDebris.dictionary"

data/tasks/volume/debristasks/generate_spherical_volume.task

 return {{
 	Type = "GenerateDebrisVolumeTask",
-	Dimensions = {45, 30, 40},
+	Dimensions = {32, 32, 64},
 	LowerDomainBound = {0, 0, 0},
 	UpperDomainBound = {1, math.pi, 2 * math.pi},
     InputPath = "${SYNC}/url/satellite_tle_data_DebrisAll/files/allDebrisInOneTLE.txt",
 	StartTime = "2019-07-27T10:00:00",
-	TimeStep = "2",
-	EndTime = "2019-07-27T12:00:00",
+	TimeStep = "10",
+	EndTime = "2019-07-27T11:00:00",
 	GridType = "Spherical",
 	RawVolumeOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generated/singleDebris.rawvolume",
 	DictionaryOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generated/singleDebris.dictionary"

ghoul @ 526b27cb

-Subproject commit 9045871f1e9a387708e8235c3bb809da7d860e6f
+Subproject commit 526b27cb653fe9befc324278debc701297694207

modules/digitaluniverse/rendering/renderablebillboardscloud.cpp

@@ -845,6 +845,19 @@ void RenderableBillboardsCloud::renderLabels(const RenderData& data,
     glm::vec4 textColor = _textColor;
     textColor.a *= fadeInVariable;
     textColor.a *= _opacity;
+    ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
+    labelInfo.orthoRight = orthoRight;
+    labelInfo.orthoUp = orthoUp;
+    labelInfo.minSize = static_cast<int>(_textMinSize);
+    labelInfo.maxSize = static_cast<int>(_textMaxSize);
+    labelInfo.cameraPos = data.camera.positionVec3();
+    labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
+    labelInfo.renderType = _renderOption;
+    labelInfo.mvpMatrix = modelViewProjectionMatrix;
+    labelInfo.scale = pow(10.f, _textSize);
+    labelInfo.enableDepth = true;
+    labelInfo.enableFalseDepth = false;
+
     for (const std::pair<glm::vec3, std::string>& pair : _labelData) {
         //glm::vec3 scaledPos(_transformationMatrix * glm::dvec4(pair.first, 1.0));
         glm::vec3 scaledPos(pair.first);
@@ -853,16 +866,8 @@ void RenderableBillboardsCloud::renderLabels(const RenderData& data,
             *_font,
             scaledPos,
             pair.second,
-            textColor,
-            pow(10.f, _textSize.value()),
-            static_cast<int>(_textMinSize),
-            static_cast<int>(_textMaxSize),
-            modelViewProjectionMatrix,
-            orthoRight,
-            orthoUp,
-            data.camera.positionVec3(),
-            data.camera.lookUpVectorWorldSpace(),
-            _renderOption.value()
+            _textColor,
+            labelInfo
         );
     }
 }

modules/digitaluniverse/rendering/renderabledumeshes.cpp

@@ -549,6 +549,19 @@ void RenderableDUMeshes::renderLabels(const RenderData& data,
             break;
     }
 
+    ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
+    labelInfo.orthoRight = orthoRight;
+    labelInfo.orthoUp = orthoUp;
+    labelInfo.minSize = static_cast<int>(_textMinSize);
+    labelInfo.maxSize = static_cast<int>(_textMaxSize);
+    labelInfo.cameraPos = data.camera.positionVec3();
+    labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
+    labelInfo.renderType = _renderOption;
+    labelInfo.mvpMatrix = modelViewProjectionMatrix;
+    labelInfo.scale = pow(10.f, _textSize);
+    labelInfo.enableDepth = true;
+    labelInfo.enableFalseDepth = false;
+
     for (const std::pair<glm::vec3, std::string>& pair : _labelData) {
         //glm::vec3 scaledPos(_transformationMatrix * glm::dvec4(pair.first, 1.0));
         glm::vec3 scaledPos(pair.first);
@@ -558,15 +571,7 @@ void RenderableDUMeshes::renderLabels(const RenderData& data,
             scaledPos,
             pair.second,
             _textColor,
-            pow(10.f, _textSize.value()),
-            static_cast<int>(_textMinSize),
-            static_cast<int>(_textMaxSize),
-            modelViewProjectionMatrix,
-            orthoRight,
-            orthoUp,
-            data.camera.positionVec3(),
-            data.camera.lookUpVectorWorldSpace(),
-            _renderOption.value()
+            labelInfo
         );
     }
 }

modules/digitaluniverse/rendering/renderableplanescloud.cpp

@@ -652,6 +652,19 @@ void RenderablePlanesCloud::renderLabels(const RenderData& data,
 
     glm::vec4 textColor = _textColor;
     textColor.a *= fadeInVariable;
+    ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
+    labelInfo.orthoRight = orthoRight;
+    labelInfo.orthoUp = orthoUp;
+    labelInfo.minSize = static_cast<int>(_textMinSize);
+    labelInfo.maxSize = static_cast<int>(_textMaxSize);
+    labelInfo.cameraPos = data.camera.positionVec3();
+    labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
+    labelInfo.renderType = _renderOption;
+    labelInfo.mvpMatrix = modelViewProjectionMatrix;
+    labelInfo.scale = pow(10.f, _textSize);
+    labelInfo.enableDepth = true;
+    labelInfo.enableFalseDepth = false;
+
     for (const std::pair<glm::vec3, std::string>& pair : _labelData) {
         //glm::vec3 scaledPos(_transformationMatrix * glm::dvec4(pair.first, 1.0));
         glm::vec3 scaledPos(pair.first);
@@ -660,16 +673,8 @@ void RenderablePlanesCloud::renderLabels(const RenderData& data,
             *_font,
             scaledPos,
             pair.second,
-            textColor,
-            pow(10.f, _textSize.value()),
-            _textMinSize,
-            _textMaxSize,
-            modelViewProjectionMatrix,
-            orthoRight,
-            orthoUp,
-            data.camera.positionVec3(),
-            data.camera.lookUpVectorWorldSpace(),
-            _renderOption.value()
+            _textColor,
+            labelInfo
         );
     }
 }

modules/space/shaders/debrisViz_vs.glsl

@@ -73,6 +73,9 @@ void main() {
     int intfrac = int(nrOfRevolutions);
     double doublefrac = double(intfrac);
     double periodFraction = nrOfRevolutions - doublefrac;
+    if (periodFraction < 0.0) {
+        periodFraction += 1.0;
+    }
     periodFraction_f = float(periodFraction);
 
     // same procedure for the current vertex

modules/space/tasks/generatedebrisvolumetask.cpp

@@ -442,11 +442,12 @@ std::vector<glm::dvec3> getPositionBuffer(std::vector<KeplerParameters> tleData,
         
         
     }
+    /*
     LINFO(fmt::format("max theta: {} ", maxTheta));
     LINFO(fmt::format("max phi: {} ", maxPhi));
     LINFO(fmt::format("min theta: {} ", minTheta));
     LINFO(fmt::format("min phi: {} ", minPhi));
-
+    */
     return positionBuffer;
 }
 

openspace.cfg

@@ -6,13 +6,13 @@
 -- occurs in a single window, a fisheye projection, or a dome cluster system
 
 -- A regular 1280x720 window
---SGCTConfig = sgct.config.single{}
+SGCTConfig = sgct.config.single{}
 
 -- A regular 1920x1080 window
 -- SGCTConfig = sgct.config.single{1920, 1080}
 
 -- A windowed 1920x1080 fullscreen
- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"}
+ --SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"}
 
 -- A 1k fisheye rendering
 -- SGCTConfig = sgct.config.fisheye{1024, 1024}