Merge branch 'develop' into feature/globebrowsing

include/openspace/engine/wrapper/sgctwindowwrapper.h

@@ -42,7 +42,7 @@ public:
     bool windowHasResized() const override;
 
     double averageDeltaTime() const override;
-	double deltaTime() const override;
+    double deltaTime() const override;
     glm::vec2 mousePosition() const override;
     uint32_t mouseButtons(int maxNumber) const override;
     glm::ivec2 currentWindowSize() const override;

include/openspace/interaction/controller.h

@@ -50,4 +50,4 @@ protected:
 } // namespace interaction
 } // namespace openspace
 
-#endif // __CONTROLLER_H__
+#endif // __CONTROLLER_H__

include/openspace/interaction/deviceidentifier.h

@@ -52,4 +52,4 @@ private:
 
 } // namespace openspace
 
-#endif
+#endif

include/openspace/interaction/externalcontrol/externalconnectioncontroller.h

@@ -21,4 +21,4 @@ private:
 
 } // namespace openspace
 
-#endif
+#endif

include/openspace/interaction/externalcontrol/externalcontrol.h

@@ -26,4 +26,4 @@ protected:
 
 } // namespace openspace
 
-#endif
+#endif

include/openspace/network/messagestructures.h

@@ -162,4 +162,4 @@ namespace openspace{
     
 } // namespace openspace
 
-#endif // __MESSAGESTRUCTURES_H__
+#endif // __MESSAGESTRUCTURES_H__

include/openspace/network/networkengine.h

@@ -75,4 +75,4 @@ private:
 
 } // namespace openspace
 
-#endif // __NETWORKENGINE_H__
+#endif // __NETWORKENGINE_H__

include/openspace/network/parallelconnection.h

@@ -205,4 +205,4 @@ namespace openspace{
     
 } // namespace openspace
 
-#endif // __OSPARALLELCONNECTION_H__
+#endif // __OSPARALLELCONNECTION_H__

include/openspace/openspace.h

@@ -39,4 +39,4 @@ const std::string OPENSPACE_VERSION_STRING = "prerelease-9 (IPS)";
 
 } // namespace openspace
 
-#endif // __OPENSPACE_H__
+#endif // __OPENSPACE_H__

include/openspace/properties/optionproperty.h

@@ -125,4 +125,4 @@ private:
 } // namespace properties
 } // namespace openspace
 
-#endif // __STRINGPROPERTY_H__
+#endif // __STRINGPROPERTY_H__

include/openspace/properties/selectionproperty.h

@@ -79,4 +79,4 @@ bool PropertyDelegate<TemplateProperty<std::vector<int>>>::toString(std::string&
 } // namespace properties
 } // namespace openspace
 
-#endif // __SELECTIONPROPERTY_H__
+#endif // __SELECTIONPROPERTY_H__

include/openspace/properties/stringproperty.h

@@ -35,4 +35,4 @@ REGISTER_TEMPLATEPROPERTY_HEADER(StringProperty, std::string);
 } // namespace properties
 } // namespace openspace
 
-#endif // __STRINGPROPERTY_H__
+#endif // __STRINGPROPERTY_H__

include/openspace/query/query.h

@@ -48,4 +48,4 @@ std::vector<properties::Property*> allProperties();
 
 } // namespace
 
-#endif // __QUERY_H__
+#endif // __QUERY_H__

include/openspace/rendering/renderengine.h

@@ -68,15 +68,15 @@ public:
         Post
     };
 
-	enum class FrametimeType {
-		DtTimeAvg = 0,
-		FPS,
-		FPSAvg
-	};
+    enum class FrametimeType {
+        DtTimeAvg = 0,
+        FPS,
+        FPSAvg
+    };
 
     static const std::string KeyFontMono;
     static const std::string KeyFontLight;
-	static const std::vector<FrametimeType> FrametimeTypes;
+    static const std::vector<FrametimeType> FrametimeTypes;
 
     RenderEngine();
     ~RenderEngine();
@@ -104,7 +104,7 @@ public:
 
     void takeScreenshot();
     void toggleInfoText(bool b);
-	void toggleFrametimeType(int t);
+    void toggleFrametimeType(int t);
 
     // Performance measurements
     void setPerformanceMeasurements(bool performanceMeasurements);

include/openspace/util/camera.h

@@ -218,4 +218,4 @@ namespace openspace {
     };
 } // namespace openspace
 
-#endif // __CAMERA_H__
+#endif // __CAMERA_H__

include/openspace/util/syncbuffer.h

@@ -116,4 +116,4 @@ private:
 
 } // namespace openspace
 
-#endif // SYNCBUFFER_H
+#endif // SYNCBUFFER_H