Renamed psc to powerscaledcoordinate and pss to powerscaledscalar

include/openspace/interaction/externalcontrol/externalcontrol.h

@@ -1,7 +1,7 @@
 #ifndef EXTERNALCONTROL_H
 #define EXTERNALCONTROL_H
 
-#include <openspace/util/pss.h>
+#include <openspace/util/powerscaledscalar.h>
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 

include/openspace/rendering/renderable.h

@@ -26,8 +26,8 @@
 #define __RENDERABLE_H__
 
 // open space includes
-#include <openspace/util/psc.h>
-#include <openspace/util/pss.h>
+#include <openspace/util/powerscaledcoordinate.h>
+#include <openspace/util/powerscaledscalar.h>
 #include <openspace/util/camera.h>
 #include <ghoul/misc/dictionary.h>
 #include <openspace/properties/propertyowner.h>

include/openspace/scenegraph/ephemeris.h

@@ -25,7 +25,7 @@
 #ifndef __EPHEMERIS_H__
 #define __EPHEMERIS_H__
 
-#include <openspace/util/psc.h>
+#include <openspace/util/powerscaledcoordinate.h>
 #include <ghoul/misc/dictionary.h>
 
 namespace openspace {

include/openspace/scenegraph/spiceephemeris.h

@@ -27,7 +27,7 @@
 
 #include <openspace/scenegraph/ephemeris.h>
 
-#include <openspace/util/psc.h>
+#include <openspace/util/powerscaledcoordinate.h>
 
 namespace openspace {
     

include/openspace/tests/test_powerscalecoordinates.inl

@@ -25,8 +25,8 @@
 
 #include "gtest/gtest.h"
 
-#include <openspace/util/psc.h>
-#include <openspace/util/pss.h>
+#include <openspace/util/powerscaledcoordinate.h>
+#include <openspace/util/powerscaledscalar.h>
 
 class PowerscaleCoordinatesTest : public testing::Test {
 protected:

include/openspace/util/camera.h

@@ -26,7 +26,7 @@
 #define __CAMERA_H__
 
 // open space includes
-#include <openspace/util/psc.h>
+#include <openspace/util/powerscaledcoordinate.h>
 
 // glm includes
 #include <glm/glm.hpp>
@@ -38,8 +38,15 @@ namespace openspace {
 
 //class Camera {
 //public:
+//    enum class ProjectionMode {
+//        Perspective,
+//        Orthographic,
+//        Frustum,
+//        FixedPerspective
+//    };
+//
 //    Camera();
-//    
+//
 //    void setPosition(psc pos);
 //    const psc& position() const;
 //

include/openspace/util/planet.h

@@ -11,7 +11,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #define PLANET_H
 
 // open space includes
-#include <openspace/util/pss.h>
+#include <openspace/util/powerscaledscalar.h>
 #include <openspace/util/vbo_template.h>
 
 // std includes

include/openspace/util/powerscaledsphere.h

@@ -27,8 +27,8 @@
 
 // open space includes
 #include <ghoul/opengl/ghoul_gl.h>
-#include <openspace/util/psc.h>
-#include <openspace/util/pss.h>
+#include <openspace/util/powerscaledcoordinate.h>
+#include <openspace/util/powerscaledscalar.h>
 
 
 namespace openspace {