From e869f5b9ca7a06a8ba6c65de440e24cbf3275f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Mon, 18 Jan 2016 22:22:56 +0100 Subject: [PATCH] Coding style --- src/definition/DiffManager.h | 2 +- src/definition/WaterDefinition.h | 3 ++- src/interface/modeler/AtmosphereModeler.h | 3 ++- src/interface/modeler/FloatPropertyBind.h | 3 ++- src/interface/modeler/IntPropertyBind.h | 3 ++- src/interface/modeler/ModelerCameras.h | 3 ++- src/render/opengl/OpenGLSkybox.h | 3 ++- src/render/opengl/OpenGLVegetation.h | 3 ++- src/render/opengl/OpenGLWater.h | 3 ++- src/render/software/AtmosphereModelBruneton.cpp | 5 +++-- src/render/software/MoonRenderer.cpp | 3 ++- src/tests/TestToolDefinition.h | 6 +++--- 12 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/definition/DiffManager.h b/src/definition/DiffManager.h index b64c6f7..876fa00 100644 --- a/src/definition/DiffManager.h +++ b/src/definition/DiffManager.h @@ -53,7 +53,7 @@ class DEFINITIONSHARED_EXPORT DiffManager { */ void redo(); -protected: + protected: /** * Publish a diff to the registered watchers. * diff --git a/src/definition/WaterDefinition.h b/src/definition/WaterDefinition.h index 62514f8..a476e3c 100644 --- a/src/definition/WaterDefinition.h +++ b/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); diff --git a/src/interface/modeler/AtmosphereModeler.h b/src/interface/modeler/AtmosphereModeler.h index 659aaf3..e65781d 100644 --- a/src/interface/modeler/AtmosphereModeler.h +++ b/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; }; } } diff --git a/src/interface/modeler/FloatPropertyBind.h b/src/interface/modeler/FloatPropertyBind.h index 86d5cc0..584732d 100644 --- a/src/interface/modeler/FloatPropertyBind.h +++ b/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(); diff --git a/src/interface/modeler/IntPropertyBind.h b/src/interface/modeler/IntPropertyBind.h index 8588e6b..26fad36 100644 --- a/src/interface/modeler/IntPropertyBind.h +++ b/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(); diff --git a/src/interface/modeler/ModelerCameras.h b/src/interface/modeler/ModelerCameras.h index 65f49e3..d62d87e 100644 --- a/src/interface/modeler/ModelerCameras.h +++ b/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. diff --git a/src/render/opengl/OpenGLSkybox.h b/src/render/opengl/OpenGLSkybox.h index 2714175..1feed9a 100644 --- a/src/render/opengl/OpenGLSkybox.h +++ b/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: diff --git a/src/render/opengl/OpenGLVegetation.h b/src/render/opengl/OpenGLVegetation.h index b71d60a..c68bb05 100644 --- a/src/render/opengl/OpenGLVegetation.h +++ b/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. diff --git a/src/render/opengl/OpenGLWater.h b/src/render/opengl/OpenGLWater.h index 57bb3f4..6fcef3b 100644 --- a/src/render/opengl/OpenGLWater.h +++ b/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. diff --git a/src/render/software/AtmosphereModelBruneton.cpp b/src/render/software/AtmosphereModelBruneton.cpp index fe2e32d..44aa60a 100644 --- a/src/render/software/AtmosphereModelBruneton.cpp +++ b/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 &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; diff --git a/src/render/software/MoonRenderer.cpp b/src/render/software/MoonRenderer.cpp index a08b363..f09dcad 100644 --- a/src/render/software/MoonRenderer.cpp +++ b/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); diff --git a/src/tests/TestToolDefinition.h b/src/tests/TestToolDefinition.h index eac73f0..8af53f3 100644 --- a/src/tests/TestToolDefinition.h +++ b/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