Removed unused transformations.

modules/digitaluniverse/rendering/renderablebillboardscloud.cpp

@@ -709,14 +709,6 @@ namespace openspace {
         }
         );
 
-        _uniformCache.modelViewMatrix = _program->uniformLocation(
-            "modelViewMatrix"
-        );
-
-        _uniformCache.projectionMatrix = _program->uniformLocation(
-            "projectionMatrix"
-        );
-
         _uniformCache.cameraViewProjectionMatrix = _program->uniformLocation(
             "cameraViewProjectionMatrix"
         );
@@ -830,8 +822,6 @@ namespace openspace {
         _program->setUniform(_uniformCache.cameraPos, data.camera.positionVec3());
         _program->setUniform(_uniformCache.cameraLookup, data.camera.lookUpVectorWorldSpace());
         _program->setUniform(_uniformCache.renderOption, _renderOption.value());
-        _program->setUniform(_uniformCache.modelViewMatrix, data.camera.combinedViewMatrix() * modelMatrix);
-        _program->setUniform(_uniformCache.projectionMatrix, glm::dmat4(data.camera.projectionMatrix()));
         _program->setUniform(_uniformCache.modelMatrix, modelMatrix);
         _program->setUniform(_uniformCache.cameraViewProjectionMatrix,
             glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix());

modules/digitaluniverse/rendering/renderablebillboardscloud.h

@@ -147,12 +147,11 @@ namespace openspace {
         ghoul::opengl::ProgramObject* _program;
         ghoul::opengl::ProgramObject* _renderToPolygonProgram;
         UniformCache(
-            modelViewMatrix, projectionMatrix, cameraViewProjectionMatrix,
-            modelMatrix, cameraPos, cameraLookup, renderOption, minBillboardSize, 
-            maxBillboardSize, correctionSizeEndDistance, correctionSizeFactor, 
-            color, sides, alphaValue, scaleFactor, up, right, fadeInValue, screenSize,
-            spriteTexture, polygonTexture, hasPolygon, hasColormap, 
-            enabledRectSizeControl
+            cameraViewProjectionMatrix, modelMatrix, cameraPos, cameraLookup, 
+            renderOption, minBillboardSize, maxBillboardSize, correctionSizeEndDistance,
+            correctionSizeFactor, color, sides, alphaValue, scaleFactor, up, right, 
+            fadeInValue, screenSize, spriteTexture, polygonTexture, hasPolygon, 
+            hasColormap, enabledRectSizeControl
         ) _uniformCache;
         std::shared_ptr<ghoul::fontrendering::Font> _font;
 

modules/digitaluniverse/shaders/billboard_gs.glsl

@@ -39,8 +39,6 @@ uniform vec2 screenSize;
 uniform float maxBillboardSize;
 uniform float minBillboardSize;
 
-uniform dmat4 modelViewMatrix;
-uniform dmat4 projectionMatrix;
 uniform dmat4 cameraViewProjectionMatrix;
 uniform dmat4 modelMatrix;
 
@@ -130,12 +128,12 @@ void main() {
         // width and height
         vec2 sizes = abs(halfViewSize * (topRight - bottomLeft));
         
-        bool rectangularViewPort = false;
-        if (rectangularViewPort && ((sizes.y > maxBillboardSize) ||
+        if (enabledRectSizeControl && ((sizes.y > maxBillboardSize) ||
             (sizes.x > maxBillboardSize))) {        
             //Set maximum size as Carter's instructions
-            float correctionScale = sizes.y > maxBillboardSize ? maxBillboardSize / sizes.y :
-                                                                maxBillboardSize / sizes.x;
+            float correctionScale = 
+                sizes.y > maxBillboardSize ? maxBillboardSize / sizes.y :
+                                             maxBillboardSize / sizes.x;
             
             scaledRight *= correctionScale;
             scaledUp    *= correctionScale;