Merged master into NewAtmosphere.

include/openspace/util/powerscaledcoordinate.h

@@ -25,17 +25,13 @@
 #ifndef __OPENSPACE_CORE___POWERSCALEDCOORDINATE___H__
 #define __OPENSPACE_CORE___POWERSCALEDCOORDINATE___H__
 
-// open space includes
-// glm includes
 #include <ghoul/glm.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <iostream>
 
-namespace openspace
-{
+namespace openspace {
 
-// forward declare the power scaled scalars
 class PowerScaledScalar;
 
 class PowerScaledCoordinate {

include/openspace/util/powerscaledscalar.h

@@ -25,7 +25,6 @@
 #ifndef __OPENSPACE_CORE___POWERSCALEDSCALAR___H__
 #define __OPENSPACE_CORE___POWERSCALEDSCALAR___H__
 
-// glm includes
 #include <ghoul/glm.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>

include/openspace/util/powerscaledsphere.h

@@ -25,7 +25,6 @@
 #ifndef __OPENSPACE_CORE___POWERSCALEDSPHERE___H__
 #define __OPENSPACE_CORE___POWERSCALEDSPHERE___H__
 
-// open space includes
 #include <ghoul/opengl/ghoul_gl.h>
 #include <openspace/util/powerscaledcoordinate.h>
 #include <openspace/util/powerscaledscalar.h>

include/openspace/util/syncdata.h

@@ -46,10 +46,10 @@ protected:
     // Allowing SyncEngine synchronization methods and at the same time hiding them
     // from the used of implementations of the interface
     friend class SyncEngine;
-    virtual void presync(bool isMaster) {};
-    virtual void encode(SyncBuffer* syncBuffer) = 0;
-    virtual void decode(SyncBuffer* syncBuffer) = 0;
-    virtual void postsync(bool isMaster) {};
+    virtual void presync(bool /*isMaster*/) {};
+    virtual void encode(SyncBuffer* /*syncBuffer*/) = 0;
+    virtual void decode(SyncBuffer* /*syncBuffer*/) = 0;
+    virtual void postsync(bool /*isMaster*/) {};
 };
 
 /**
@@ -121,7 +121,6 @@ protected:
     T data;
     T doubleBufferedData;
     std::mutex _mutex;
-
 };
 
 } // namespace openspace

include/openspace/util/time.h

@@ -54,7 +54,6 @@ namespace openspace {
  *
  * The synchronization of the simulation time requires 
  */
-
 class Time {
 public:
     /**

include/openspace/util/timerange.h

@@ -32,7 +32,6 @@ namespace openspace {
 namespace documentation { struct Documentation; }
 
 struct TimeRange {
-
     /**
     * Default constructor initializes an empty time range.
     */

include/openspace/util/transformationmanager.h

@@ -27,10 +27,22 @@
 
 #include <ghoul/designpattern/singleton.h>
 #include <ghoul/glm.h>
+
 #ifdef OPENSPACE_MODULE_KAMELEON_ENABLED
+
+#ifdef WIN32
+#pragma warning (push)
+#pragma warning (disable : 4619) // #pragma warning: there is no warning number '4675'
+#endif // WIN32
+
 #include <ccmc/Kameleon.h>
+
+#ifdef WIN32
+#pragma warning (pop)
+#endif // WIN32
 #endif
 
+
 #include <set>
 
 namespace ccmc {

include/openspace/util/updatestructures.h

@@ -34,9 +34,7 @@ namespace openspace {
 class Deferredcaster;
 class VolumeRaycaster;
 
-struct InitializeData {
-
-};
+struct InitializeData {};
 
 struct TransformData {
     glm::dvec3 translation;
@@ -50,7 +48,6 @@ struct UpdateData {
     const bool doPerformanceMeasurement;
 };
 
-
 struct RenderData {
     const Camera& camera;
     // psc position to be removed in favor of the double precision position defined in