Cleanup (#600)

 * General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings

apps/Wormhole/main.cpp

@@ -62,7 +62,7 @@ int main(int argc, char** argv) {
     );
 
     std::stringstream defaultPassword;
-    defaultPassword << std::hex << std::setfill('0') << std::setw(6) << 
+    defaultPassword << std::hex << std::setfill('0') << std::setw(6) <<
         (std::hash<size_t>{}(
             std::chrono::system_clock::now().time_since_epoch().count()
         ) % 0xffffff);

ghoul @ f0e8a06c

-Subproject commit fd1187437c59553f2dba74684b791220cbb8d7fc
+Subproject commit f0e8a06c9a92a282d2c7197c9388db1301d797ce

sgct @ 03a8cd87

-Subproject commit 52e2943cd74bb8346db0411bf17ed3dab4245e03
+Subproject commit 03a8cd877e540beb2e4762be6036cf895ee77647

include/openspace/engine/configurationmanager.h

@@ -86,9 +86,10 @@ public:
 
     /// The key that stores the factory documentation values
     static constexpr const char* KeyFactoryDocumentation = "FactoryDocumentation";
-    /// The key that decides whether or not we should require incoming web socket connections
-    /// to authorize or not
-    static constexpr const char* KeyRequireSocketAuthentication = "RequireSocketAuthentication";
+    /// The key that decides whether or not we should require incoming web socket
+    /// connections to authorize or not
+    static constexpr const char* KeyRequireSocketAuthentication =
+                                                            "RequireSocketAuthentication";
 
     /// The key that stores the location of the asset file that is initially loaded
     static constexpr const char* KeyConfigAsset = "Asset";

include/openspace/network/messagestructures.h

@@ -206,7 +206,7 @@ struct TimeKeyframe {
         // Timestamp
         size = sizeof(_timestamp);
         memcpy(&_timestamp, buffer.data() + offset, size);
-        offset += size;
+        // offset += size;
     };
 };
 

include/openspace/properties/binaryproperty.h

 /*****************************************************************************************
-*                                                                                       *
-* OpenSpace                                                                             *
-*                                                                                       *
-* Copyright (c) 2014-2017                                                               *
-*                                                                                       *
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
-* software and associated documentation files (the "Software"), to deal in the Software *
-* without restriction, including without limitation the rights to use, copy, modify,    *
-* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
-* permit persons to whom the Software is furnished to do so, subject to the following   *
-* conditions:                                                                           *
-*                                                                                       *
-* The above copyright notice and this permission notice shall be included in all copies *
-* or substantial portions of the Software.                                              *
-*                                                                                       *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
-* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
-* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
-* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
-* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
-****************************************************************************************/
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2018                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
 
 #ifndef __OPENSPACE_CORE___BINARYPROPERTY___H__
 #define __OPENSPACE_CORE___BINARYPROPERTY___H__

include/openspace/properties/numericalproperty.h

@@ -70,7 +70,7 @@ public:
     void setInterpolationTarget(ghoul::any value) override;
     void setLuaInterpolationTarget(lua_State* state) override;
     void setStringInterpolationTarget(std::string value) override;
-    
+
     void interpolateValue(float t,
         ghoul::EasingFunc<float> easingFunc = nullptr) override;
 

include/openspace/properties/numericalproperty.inl

@@ -388,10 +388,14 @@ void NumericalProperty<T>::setExponent(float exponent) {
 template <typename T>
 std::string NumericalProperty<T>::generateAdditionalJsonDescription() const {
     std::string result = "{ ";
-    result += "\"" + MinimumValueKey + "\": " + luaToJson(std::to_string(_minimumValue)) + ",";
-    result += "\"" + MaximumValueKey + "\": " + luaToJson(std::to_string(_maximumValue)) + ",";
-    result += "\"" + SteppingValueKey + "\": " + luaToJson(std::to_string(_stepping)) + ",";
-    result += "\"" + ExponentValueKey + "\": " + luaToJson(std::to_string(_exponent));
+    result +=
+      "\"" + MinimumValueKey + "\": " + luaToJson(std::to_string(_minimumValue)) + ",";
+    result +=
+      "\"" + MaximumValueKey + "\": " + luaToJson(std::to_string(_maximumValue)) + ",";
+    result +=
+      "\"" + SteppingValueKey + "\": " + luaToJson(std::to_string(_stepping)) + ",";
+    result +=
+      "\"" + ExponentValueKey + "\": " + luaToJson(std::to_string(_exponent));
     result += " }";
     return result;
 }

include/openspace/properties/property.h

@@ -396,8 +396,8 @@ public:
     const ghoul::Dictionary& metaData() const;
 
     /**
-     * Convert the Property into a string containing a JSON representation of the Property.
-     * Includes description of the object.
+     * Convert the Property into a string containing a JSON representation of the
+     * Property. Includes description of the object.
      * @return the JSON string
      */
     virtual std::string toJson() const;
@@ -412,7 +412,7 @@ public:
     virtual void setInterpolationTarget(ghoul::any value);
     virtual void setLuaInterpolationTarget(lua_State* state);
     virtual void setStringInterpolationTarget(std::string value);
-    
+
     virtual void interpolateValue(float t,
         ghoul::EasingFunc<float> easingFunction = nullptr);
 

include/openspace/properties/propertyowner.h

@@ -83,8 +83,8 @@ public:
     /**
      * Sets the identifier for this PropertyOwner. If the PropertyOwner does not have an
      * owner itself, the identifier must be globally unique. If the PropertyOwner has an
-     * owner, the identifier must be unique to the owner (including the owner's 
-     * properties). No uniqueness check will be preformed here, but rather in the 
+     * owner, the identifier must be unique to the owner (including the owner's
+     * properties). No uniqueness check will be preformed here, but rather in the
      * PropertyOwner::addProperty and PropertyOwner::addPropertySubOwner methods).
      *
      * \param identifier The identifier of this PropertyOwner. It must not contain any
@@ -102,7 +102,7 @@ public:
     std::string identifier() const;
 
     /**
-     * Sets the user-facing name of this PropertyOwner. This name does not have to be 
+     * Sets the user-facing name of this PropertyOwner. This name does not have to be
      * unique, but it is recommended to be.
      *
      * \param guiName The new user-facing name for this PropertyOwner

include/openspace/rendering/renderable.h

@@ -101,7 +101,7 @@ public:
 protected:
     properties::BoolProperty _enabled;
     properties::FloatProperty _opacity;
-    
+
     void registerUpdateRenderBinFromOpacity();
 
 private:

include/openspace/scene/scene.h

@@ -176,7 +176,7 @@ public:
      * Adds an interpolation request for the passed \p prop that will run for
      * \p durationSeconds seconds. Every time the #updateInterpolations method is called
      * the Property will be notified that it has to update itself using the stored
-     * interpolation values. If an interpolation record already exists for the passed 
+     * interpolation values. If an interpolation record already exists for the passed
      * \p prop, the previous record will be overwritten and the remaining time of the old
      * interpolation is ignored.
      *
@@ -186,7 +186,7 @@ public:
      *
      * \pre \p prop must not be \c nullptr
      * \pre \p durationSeconds must be positive and not 0
-     * \post A new interpolation record exists for \p that is not expired 
+     * \post A new interpolation record exists for \p that is not expired
      */
     void addInterpolation(properties::Property* prop, float durationSeconds,
         ghoul::EasingFunction easingFunction = ghoul::EasingFunction::Linear);

modules/atmosphere/atmospheremodule.cpp

@@ -23,16 +23,15 @@
  ****************************************************************************************/
 
 #include <modules/atmosphere/atmospheremodule.h>
-#include <openspace/util/factorymanager.h>
-#include <ghoul/misc/assert.h>
-
-#include <openspace/rendering/renderable.h>
 
 #include <modules/atmosphere/rendering/renderableatmosphere.h>
+#include <openspace/rendering/renderable.h>
+#include <openspace/util/factorymanager.h>
+#include <ghoul/misc/assert.h>
 
 namespace openspace {
 
-AtmosphereModule::AtmosphereModule() : OpenSpaceModule("Atmosphere") {}
+AtmosphereModule::AtmosphereModule() : OpenSpaceModule(Name) {}
 
 void AtmosphereModule::internalInitialize(const ghoul::Dictionary&) {
     auto fRenderable = FactoryManager::ref().factory<Renderable>();

modules/atmosphere/atmospheremodule.h

@@ -26,12 +26,13 @@
 #define __OPENSPACE_MODULE_ATMOSPHERE___ATMOSPHERE_MODULE___H__
 
 #include <openspace/util/openspacemodule.h>
-#include <openspace/properties/scalar/floatproperty.h>
 
 namespace openspace {
 
 class AtmosphereModule : public OpenSpaceModule {
 public:
+    constexpr static const char* Name = "Atmosphere";
+
     AtmosphereModule();
 
 private:

modules/atmosphere/rendering/atmospheredeferredcaster.cpp

@@ -59,14 +59,8 @@
  */
 
 #include <modules/atmosphere/rendering/atmospheredeferredcaster.h>
-#include <modules/atmosphere/rendering/renderableatmosphere.h>
 
-#include <ghoul/glm.h>
-#include <ghoul/opengl/ghoul_gl.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/filesystem/filesystem.h>
+#include <modules/atmosphere/rendering/renderableatmosphere.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/util/powerscaledcoordinate.h>
 #include <openspace/util/updatestructures.h>
@@ -74,12 +68,17 @@
 #include <openspace/rendering/renderable.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/rendering/renderer.h>
+#include <ghoul/glm.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/opengl/ghoul_gl.h>
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/texture.h>
+#include <ghoul/opengl/textureunit.h>
 #include <glm/gtx/string_cast.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/vector_angle.hpp>
 #include <glm/gtc/quaternion.hpp>
-
 #include <sstream>
 #include <fstream>
 
@@ -90,16 +89,16 @@
 
 
 namespace {
-    const char* _loggerCat             = "AtmosphereDeferredcaster";
-    const char* GlslDeferredcastPath   =
+    constexpr const char* _loggerCat             = "AtmosphereDeferredcaster";
+    constexpr const char* GlslDeferredcastPath   =
         "${MODULES}/atmosphere/shaders/atmosphere_deferred_fs.glsl";
-    const char* GlslDeferredcastFSPath =
+    constexpr const char* GlslDeferredcastFSPath =
         "${MODULES}/atmosphere/shaders/atmosphere_deferred_fs.glsl";
-    const char* GlslDeferredcastVsPath =
+    constexpr const char* GlslDeferredcastVsPath =
         "${MODULES}/atmosphere/shaders/atmosphere_deferred_vs.glsl";
 
-    const float ATM_EPS = 2.0;
-    const double KM_TO_M = 1000.0;
+    constexpr const float ATM_EPS = 2.f;
+    constexpr const float KM_TO_M = 1000.f;
 } // namespace
 
 namespace openspace {

modules/atmosphere/shaders/atmosphere_deferred_vs.glsl

@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2016                                                               *
+ * Copyright (c) 2014-2018                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *

modules/atmosphere/shaders/deltaE_calc_fs.glsl

@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2016                                                               *
+ * Copyright (c) 2014-2018                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *

modules/atmosphere/shaders/deltaE_calc_vs.glsl

@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2016                                                               *
+ * Copyright (c) 2014-2018                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *

modules/atmosphere/shaders/deltaJ_calc_fs.glsl

@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2016                                                               *
+ * Copyright (c) 2014-2018                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *

modules/atmosphere/shaders/deltaJ_calc_gs.glsl

@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2016                                                               *
+ * Copyright (c) 2014-2018                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *