Coding style

src/definition/DiffManager.h

@@ -53,7 +53,7 @@ class DEFINITIONSHARED_EXPORT DiffManager {
      */
     void redo();
 
-protected:
+  protected:
     /**
      * Publish a diff to the registered watchers.
      *

src/definition/WaterDefinition.h

@@ -36,7 +36,8 @@ class DEFINITIONSHARED_EXPORT WaterDefinition : public DefinitionNode, public De
         return depth_color;
     }
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override;
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override;
 
     typedef enum { WATER_PRESET_LAKE, WATER_PRESET_SEA } WaterPreset;
     void applyPreset(WaterPreset preset, RandomGenerator &random = RandomGeneratorDefault);

src/interface/modeler/AtmosphereModeler.h

@@ -12,7 +12,8 @@ class AtmosphereModeler : protected BaseModelerTool {
   public:
     AtmosphereModeler(MainModelerWindow *ui);
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override;
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override;
 };
 }
 }

src/interface/modeler/FloatPropertyBind.h

@@ -20,7 +20,8 @@ class FloatPropertyBind : public QObject, public DefinitionWatcher {
     FloatPropertyBind(MainModelerWindow *window, const string &object_name, const string &property_name,
                       FloatNode *node);
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override;
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override;
 
   private slots:
     void propertyChanged();

src/interface/modeler/IntPropertyBind.h

@@ -19,7 +19,8 @@ class IntPropertyBind : public QObject, public DefinitionWatcher {
   public:
     IntPropertyBind(MainModelerWindow *window, const string &object_name, const string &property_name, IntNode *node);
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override;
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override;
 
   private slots:
     void propertyChanged();

src/interface/modeler/ModelerCameras.h

@@ -50,7 +50,8 @@ class ModelerCameras : public QObject, public DefinitionWatcher {
   protected:
     virtual void timerEvent(QTimerEvent *event) override;
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override;
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override;
 
     /**
      * Validate current camera, pushing it to rendered scenery if needed.

src/render/opengl/OpenGLSkybox.h

@@ -18,7 +18,8 @@ class OPENGLSHARED_EXPORT OpenGLSkybox : public OpenGLPart, public DefinitionWat
     virtual void update() override;
     virtual void render() override;
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override;
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override;
     virtual void floatNodeChanged(const string &path, double new_value, double old_value) override;
 
   private:

src/render/opengl/OpenGLVegetation.h

@@ -32,7 +32,8 @@ class OPENGLSHARED_EXPORT OpenGLVegetation : public OpenGLPart, public Definitio
     virtual void update() override;
     virtual void render() override;
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override;
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override;
 
     /**
      * Get the currently rendered scenery.

src/render/opengl/OpenGLWater.h

@@ -18,7 +18,8 @@ class OPENGLSHARED_EXPORT OpenGLWater : public OpenGLPart, public DefinitionWatc
     virtual void update() override;
     virtual void render() override;
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override;
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override;
 
     /**
      * Enable or disable the water surface rendering.

src/render/software/AtmosphereModelBruneton.cpp

@@ -860,7 +860,7 @@ static Color _getInscatterColor(Vector3 *_x, double *_t, Vector3 v, Vector3 s, d
 /* direct sun light for ray x+tv, when sun in direction s (=L0) */
 static Color _sunColor(Vector3 v, Vector3 s, double r, double mu, double radius) {
     Color transmittance = r <= Rt ? _transmittanceWithShadow(r, mu) : COLOR_WHITE; /* T(x,xo) */
-    double isun = step(cos(radius), v.dotProduct(s)) * ISun; /* Lsun */
+    double isun = step(cos(radius), v.dotProduct(s)) * ISun;                       /* Lsun */
     transmittance.r *= isun;
     transmittance.g *= isun;
     transmittance.b *= isun;
@@ -1157,7 +1157,8 @@ bool AtmosphereModelBruneton::getLightsAt(vector<LightComponent> &result, const
 
     result.push_back(sun);
 
-    irradiance.color = _irradiance(_irradianceTexture, r0, muS).scaled(1.0 - min(location.y / Scenery::ATMOSPHERE_WIDTH_SCALED, 1.0));
+    irradiance.color =
+        _irradiance(_irradianceTexture, r0, muS).scaled(1.0 - min(location.y / Scenery::ATMOSPHERE_WIDTH_SCALED, 1.0));
     irradiance.direction = VECTOR_DOWN;
     irradiance.reflection = 0.0;
     irradiance.altered = 0;

src/render/software/MoonRenderer.cpp

@@ -75,7 +75,8 @@ Color MoonRenderer::getColor(const Vector3 &eye, const Vector3 &direction, Light
 
             auto normal = p1.getNormal3(p2, p3);
 
-            double gradient = 2.3 + 8.0 * impl->noise.get3d(0.01, 0.3 * p1.x + 12.0, 0.3 * p1.y - 4.8, -0.3 * p1.z + 7.4);
+            double gradient =
+                2.3 + 8.0 * impl->noise.get3d(0.01, 0.3 * p1.x + 12.0, 0.3 * p1.y - 4.8, -0.3 * p1.z + 7.4);
             SurfaceMaterial material(Color(gradient, gradient, gradient));
 
             auto moon_color = lighting->apply(eye, nearest, normal, material);

src/tests/TestToolDefinition.h

@@ -14,10 +14,11 @@ class RecordingDefinitionWatcher : public DefinitionWatcher {
     RecordingDefinitionWatcher() {
     }
 
-    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff, const DefinitionNode *parent) override {
+    virtual void nodeChanged(const DefinitionNode *node, const DefinitionDiff *diff,
+                             const DefinitionNode *parent) override {
         RecordedChange change;
         change.node = node;
-        change.diff = diff;  // FIXME Referenced diff may get deleted by the diff manager
+        change.diff = diff; // FIXME Referenced diff may get deleted by the diff manager
         change.parent = parent;
         changes.push_back(change);
     }
@@ -31,5 +32,4 @@ class RecordingDefinitionWatcher : public DefinitionWatcher {
 };
 }
 
-
 #endif // TESTTOOLDEFINITION_H