From 10bbf8078b5b40e442d4a08ead50f41328869f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Sat, 23 Jul 2016 22:58:32 +0200 Subject: [PATCH] Code format --- src/basics/CappedCylinder.cpp | 2 +- src/basics/Color.cpp | 4 +- src/basics/Curve.cpp | 2 +- src/basics/FractalNoise.cpp | 6 +- src/basics/FractalNoise.h | 2 +- src/basics/Geometry.cpp | 2 +- src/basics/InfiniteCylinder.cpp | 2 +- src/basics/InfinitePlane.cpp | 4 +- src/basics/Maths.cpp | 2 +- src/basics/Matrix4.cpp | 2 +- src/basics/NoiseFunctionPerlin.cpp | 2 +- src/basics/NoiseFunctionSimplex.cpp | 8 +-- src/basics/NoiseGenerator.cpp | 2 +- src/basics/SpaceSegment.cpp | 6 +- src/basics/Sphere.cpp | 4 +- src/basics/Texture2D.cpp | 4 +- src/basics/Texture3D.cpp | 4 +- src/basics/Texture4D.cpp | 4 +- src/basics/Vector3.cpp | 2 +- src/definition/AtmosphereDefinition.cpp | 12 ++-- src/definition/AtmosphereDefinition.h | 2 +- src/definition/CameraDefinition.cpp | 6 +- src/definition/CameraDefinition.h | 2 +- src/definition/CelestialBodyDefinition.cpp | 6 +- src/definition/CloudLayerDefinition.cpp | 6 +- src/definition/ColorDiff.h | 2 +- src/definition/ColorNode.cpp | 4 +- src/definition/ColorNode.h | 2 +- src/definition/DefinitionNode.cpp | 13 ++-- src/definition/DefinitionWatcher.cpp | 4 +- src/definition/DefinitionWatcher.h | 2 +- src/definition/DiffManager.cpp | 10 +-- src/definition/FloatNode.cpp | 4 +- src/definition/IntNode.cpp | 4 +- src/definition/Layers.cpp | 4 +- src/definition/LayersDiff.cpp | 2 +- src/definition/MaterialNode.cpp | 2 +- src/definition/MaterialNode.h | 3 +- src/definition/NoiseNode.cpp | 2 +- src/definition/PaintedGrid.cpp | 8 +-- src/definition/PaintedGridBrush.cpp | 2 +- src/definition/PaintedGridData.cpp | 2 +- src/definition/Scenery.cpp | 12 ++-- src/definition/SurfaceMaterial.cpp | 2 +- src/definition/TerrainDefinition.cpp | 10 +-- src/definition/TerrainHeightMap.cpp | 2 +- src/definition/TextureLayerDefinition.cpp | 14 ++-- src/definition/TimeManager.cpp | 6 +- src/definition/VegetationModelDefinition.cpp | 10 +-- src/definition/VegetationModelDefinition.h | 6 +- .../VegetationPresenceDefinition.cpp | 10 +-- src/definition/WaterDefinition.cpp | 10 +-- src/experiments/bruneton/Main.cpp | 16 ++--- src/interface/commandline/main.cpp | 8 +-- src/interface/commandline/render.cpp | 2 +- src/interface/commandline/tests.cpp | 70 ++++++++++--------- src/interface/modeler/AtmosphereModeler.cpp | 4 +- src/interface/modeler/BaseModelerTool.cpp | 8 +-- src/interface/modeler/FloatPropertyBind.cpp | 2 +- src/interface/modeler/FloatPropertyBind.h | 2 +- src/interface/modeler/IntPropertyBind.cpp | 2 +- src/interface/modeler/IntPropertyBind.h | 2 +- src/interface/modeler/MainModelerWindow.cpp | 14 ++-- src/interface/modeler/ModelerCameras.cpp | 8 +-- src/interface/modeler/ModelerCameras.h | 2 +- src/interface/modeler/OpenGLView.cpp | 6 +- src/interface/modeler/RenderPreviewProvider.h | 2 +- src/interface/modeler/RenderProcess.cpp | 18 ++--- src/interface/modeler/WaterModeler.cpp | 8 +-- src/interface/modeler/modeler_global.h | 2 +- src/render/opengl/OpenGLRenderer.cpp | 22 +++--- src/render/opengl/OpenGLShaderProgram.cpp | 8 +-- src/render/opengl/OpenGLSharedState.h | 2 +- src/render/opengl/OpenGLSkybox.cpp | 14 ++-- src/render/opengl/OpenGLTerrain.cpp | 10 +-- src/render/opengl/OpenGLTerrainChunk.cpp | 20 +++--- src/render/opengl/OpenGLVariable.cpp | 14 ++-- src/render/opengl/OpenGLVegetation.cpp | 4 +- .../opengl/OpenGLVegetationImpostor.cpp | 24 +++---- src/render/opengl/OpenGLVegetationLayer.cpp | 6 +- src/render/opengl/OpenGLVertexArray.cpp | 2 +- src/render/opengl/OpenGLWater.cpp | 12 ++-- .../software/AtmosphereModelBruneton.cpp | 34 ++++----- src/render/software/AtmosphereRenderer.cpp | 12 ++-- .../software/BaseCloudLayerRenderer.cpp | 2 +- src/render/software/Canvas.cpp | 2 +- src/render/software/CanvasPixelShader.cpp | 8 +-- src/render/software/CanvasPortion.cpp | 2 +- src/render/software/CanvasPreview.cpp | 4 +- .../software/CloudBasicLayerRenderer.cpp | 20 +++--- src/render/software/CloudsRenderer.cpp | 10 +-- src/render/software/FluidMediumManager.cpp | 4 +- src/render/software/GodRaysSampler.cpp | 24 +++---- src/render/software/LightStatus.cpp | 4 +- src/render/software/LightingManager.cpp | 14 ++-- src/render/software/MoonRenderer.cpp | 8 +-- src/render/software/NightSky.cpp | 18 ++--- src/render/software/OverlayRasterizer.cpp | 6 +- src/render/software/Rasterizer.cpp | 8 +-- src/render/software/RenderProgress.cpp | 2 +- src/render/software/SkyRasterizer.cpp | 18 ++--- .../software/SoftwareCanvasRenderer.cpp | 22 +++--- src/render/software/SoftwareRenderer.cpp | 36 +++++----- src/render/software/TerrainRasterizer.cpp | 14 ++-- src/render/software/TerrainRayWalker.cpp | 14 ++-- src/render/software/TerrainRenderer.cpp | 14 ++-- src/render/software/TerrainRenderer.h | 2 +- src/render/software/TexturesRenderer.cpp | 14 ++-- .../software/VegetationModelRenderer.cpp | 8 +-- src/render/software/VegetationRasterizer.cpp | 8 +-- src/render/software/VegetationRenderer.cpp | 14 ++-- src/render/software/VegetationResult.h | 2 +- src/render/software/WaterRasterizer.cpp | 6 +- src/render/software/WaterRenderer.cpp | 18 ++--- src/render/software/WaterRenderer.h | 2 +- .../software/clouds/CloudModelAltoCumulus.cpp | 2 +- .../software/clouds/CloudModelCirrus.cpp | 2 +- .../clouds/CloudModelCumuloNimbus.cpp | 2 +- .../clouds/CloudModelStratoCumulus.cpp | 2 +- src/system/CacheFile.cpp | 2 +- src/system/Logs.cpp | 2 +- src/system/Memory.cpp | 2 +- src/system/PackStream.cpp | 6 +- src/system/ParallelWork.cpp | 6 +- src/system/System.cpp | 2 +- src/tests/CanvasPortion_Test.cpp | 2 +- src/tests/CappedCylinder_Test.cpp | 2 +- src/tests/CelestialBodyDefinition_Test.cpp | 2 +- src/tests/ColorNode_Test.cpp | 2 +- src/tests/DefinitionNode_Test.cpp | 8 +-- src/tests/DefinitionWatcher_Test.cpp | 2 +- src/tests/DiffManager_Test.cpp | 4 +- src/tests/Disk_Test.cpp | 2 +- src/tests/Euclid_Test.cpp | 4 +- src/tests/FloatNode_Test.cpp | 2 +- src/tests/FluidMediumManager_Test.cpp | 6 +- src/tests/GodRaysSampler_Test.cpp | 14 ++-- src/tests/InfiniteCylinder_Test.cpp | 2 +- src/tests/InfinitePlane_Test.cpp | 2 +- src/tests/IntNode_Test.cpp | 4 +- src/tests/Interpolation_Test.cpp | 2 +- src/tests/Layers_Test.cpp | 8 +-- src/tests/LightingManager_Test.cpp | 4 +- src/tests/Maths_Test.cpp | 2 +- src/tests/NoiseFunctionSimplex_Test.cpp | 2 +- src/tests/OpenGLSkybox_Test.cpp | 6 +- src/tests/OpenGLTerrainChunk_Test.cpp | 6 +- src/tests/OpenGLVariable_Test.cpp | 2 +- src/tests/OpenGLVegetationImpostor_Test.cpp | 2 +- src/tests/OpenGLVegetationLayer_Test.cpp | 8 +-- src/tests/OpenGLVegetation_Test.cpp | 4 +- src/tests/OverlayRasterizer_Test.cpp | 6 +- src/tests/PackStream_Test.cpp | 2 +- src/tests/Rasterizer_Test.cpp | 10 +-- src/tests/Scenery_Test.cpp | 8 +-- src/tests/SpaceSegment_Test.cpp | 2 +- src/tests/TerrainPainting_Test.cpp | 8 +-- src/tests/TexturesRenderer_Test.cpp | 6 +- src/tests/Vector3_Test.cpp | 2 +- src/tests/VegetationRasterizer_Test.cpp | 4 +- src/tests/Zone_Test.cpp | 2 +- src/tests/main.cpp | 2 +- 162 files changed, 562 insertions(+), 560 deletions(-) diff --git a/src/basics/CappedCylinder.cpp b/src/basics/CappedCylinder.cpp index 8c24c39..8a3e8d6 100644 --- a/src/basics/CappedCylinder.cpp +++ b/src/basics/CappedCylinder.cpp @@ -1,7 +1,7 @@ #include "CappedCylinder.h" -#include "Vector3.h" #include "PackStream.h" +#include "Vector3.h" CappedCylinder::CappedCylinder(const Vector3 &base, const Vector3 &direction, double radius, double length) : InfiniteCylinder(InfiniteRay(base, direction), radius), length(length), diff --git a/src/basics/Color.cpp b/src/basics/Color.cpp index 47a5cda..3014966 100644 --- a/src/basics/Color.cpp +++ b/src/basics/Color.cpp @@ -1,8 +1,8 @@ #include "Color.h" -#include -#include #include "PackStream.h" +#include +#include const Color paysages::basics::COLOR_TRANSPARENT = {0.0, 0.0, 0.0, 0.0}; const Color paysages::basics::COLOR_BLACK = {0.0, 0.0, 0.0, 1.0}; diff --git a/src/basics/Curve.cpp b/src/basics/Curve.cpp index 68adfb5..effa741 100644 --- a/src/basics/Curve.cpp +++ b/src/basics/Curve.cpp @@ -1,7 +1,7 @@ #include "Curve.h" -#include #include "PackStream.h" +#include const int MAX_NB_POINTS = 30; diff --git a/src/basics/FractalNoise.cpp b/src/basics/FractalNoise.cpp index 0570aff..8d12f51 100644 --- a/src/basics/FractalNoise.cpp +++ b/src/basics/FractalNoise.cpp @@ -1,11 +1,11 @@ #include "FractalNoise.h" +#include "PackStream.h" +#include "RandomGenerator.h" +#include "Vector3.h" #include #include #include -#include "PackStream.h" -#include "Vector3.h" -#include "RandomGenerator.h" FractalNoise::FractalNoise() { scaling = 1.0; diff --git a/src/basics/FractalNoise.h b/src/basics/FractalNoise.h index 0356ff5..3123915 100644 --- a/src/basics/FractalNoise.h +++ b/src/basics/FractalNoise.h @@ -2,8 +2,8 @@ #include "basics_global.h" -#include #include "NoiseState.h" +#include namespace paysages { namespace basics { diff --git a/src/basics/Geometry.cpp b/src/basics/Geometry.cpp index 33825a8..c0ec43b 100644 --- a/src/basics/Geometry.cpp +++ b/src/basics/Geometry.cpp @@ -1,8 +1,8 @@ #include "Geometry.h" -#include #include "Maths.h" #include "Vector3.h" +#include double Geometry::get2DAngle(double x, double y) { double nx, ny, d, ret; diff --git a/src/basics/InfiniteCylinder.cpp b/src/basics/InfiniteCylinder.cpp index 5c9837f..6eb0285 100644 --- a/src/basics/InfiniteCylinder.cpp +++ b/src/basics/InfiniteCylinder.cpp @@ -1,7 +1,7 @@ #include "InfiniteCylinder.h" -#include #include "PackStream.h" +#include #define EPS 1E-8 diff --git a/src/basics/InfinitePlane.cpp b/src/basics/InfinitePlane.cpp index 4bd46b4..1e969b2 100644 --- a/src/basics/InfinitePlane.cpp +++ b/src/basics/InfinitePlane.cpp @@ -1,8 +1,8 @@ #include "InfinitePlane.h" -#include -#include "PackStream.h" #include "InfiniteRay.h" +#include "PackStream.h" +#include InfinitePlane::InfinitePlane() { } diff --git a/src/basics/Maths.cpp b/src/basics/Maths.cpp index 3bf6d9d..0f3a575 100644 --- a/src/basics/Maths.cpp +++ b/src/basics/Maths.cpp @@ -1,7 +1,7 @@ #include "Maths.h" -#include #include +#include double Maths::modInRange(double value, double min, double max) { double size = max - min; diff --git a/src/basics/Matrix4.cpp b/src/basics/Matrix4.cpp index 57c94df..43e3377 100644 --- a/src/basics/Matrix4.cpp +++ b/src/basics/Matrix4.cpp @@ -1,8 +1,8 @@ #include "Matrix4.h" -#include #include "PackStream.h" #include "Vector3.h" +#include Matrix4::Matrix4(bool identity) { b = c = d = e = g = h = 0.0; diff --git a/src/basics/NoiseFunctionPerlin.cpp b/src/basics/NoiseFunctionPerlin.cpp index 6751ad9..af6a79b 100644 --- a/src/basics/NoiseFunctionPerlin.cpp +++ b/src/basics/NoiseFunctionPerlin.cpp @@ -6,8 +6,8 @@ * Based on Ken Perlin implementation. */ -#include #include +#include NoiseFunctionPerlin::NoiseFunctionPerlin() { } diff --git a/src/basics/NoiseFunctionSimplex.cpp b/src/basics/NoiseFunctionSimplex.cpp index d52c072..6f849c4 100644 --- a/src/basics/NoiseFunctionSimplex.cpp +++ b/src/basics/NoiseFunctionSimplex.cpp @@ -6,13 +6,13 @@ * Based on Stefan Gustavson implementation. */ -#include -#include -#include -#include "Texture2D.h" #include "Color.h" #include "Geometry.h" +#include "Texture2D.h" #include "Vector3.h" +#include +#include +#include typedef struct { double x; diff --git a/src/basics/NoiseGenerator.cpp b/src/basics/NoiseGenerator.cpp index a0c330d..38b7dc3 100644 --- a/src/basics/NoiseGenerator.cpp +++ b/src/basics/NoiseGenerator.cpp @@ -2,9 +2,9 @@ #include "NoiseFunctionPerlin.h" #include "NoiseFunctionSimplex.h" +#include "NoiseState.h" #include "PackStream.h" #include "RandomGenerator.h" -#include "NoiseState.h" #include #include #include diff --git a/src/basics/SpaceSegment.cpp b/src/basics/SpaceSegment.cpp index 761849a..5b2a643 100644 --- a/src/basics/SpaceSegment.cpp +++ b/src/basics/SpaceSegment.cpp @@ -1,9 +1,9 @@ #include "SpaceSegment.h" -#include -#include -#include #include "SpaceGridIterator.h" +#include +#include +#include using namespace std; SpaceSegment::SpaceSegment(const Vector3 &start, const Vector3 &end) : start(start), end(end) { diff --git a/src/basics/Sphere.cpp b/src/basics/Sphere.cpp index d67123a..9886a4c 100644 --- a/src/basics/Sphere.cpp +++ b/src/basics/Sphere.cpp @@ -1,8 +1,8 @@ #include "Sphere.h" -#include -#include "PackStream.h" #include "InfiniteRay.h" +#include "PackStream.h" +#include Sphere::Sphere(const Vector3 ¢er, double radius) : center(center), radius(radius) { radius2 = radius * radius; diff --git a/src/basics/Texture2D.cpp b/src/basics/Texture2D.cpp index b615269..efbe65d 100644 --- a/src/basics/Texture2D.cpp +++ b/src/basics/Texture2D.cpp @@ -1,10 +1,10 @@ #include "Texture2D.h" -#include -#include #include "Color.h" #include "PackStream.h" #include "PictureWriter.h" +#include +#include Texture2D::Texture2D(int xsize, int ysize) { assert(xsize > 0 && ysize > 0); diff --git a/src/basics/Texture3D.cpp b/src/basics/Texture3D.cpp index f6a0560..2d9b1dd 100644 --- a/src/basics/Texture3D.cpp +++ b/src/basics/Texture3D.cpp @@ -1,10 +1,10 @@ #include "Texture3D.h" -#include -#include #include "Color.h" #include "PackStream.h" #include "PictureWriter.h" +#include +#include Texture3D::Texture3D(int xsize, int ysize, int zsize) { assert(xsize > 0 && ysize > 0 && zsize > 0); diff --git a/src/basics/Texture4D.cpp b/src/basics/Texture4D.cpp index 2535003..c548dfc 100644 --- a/src/basics/Texture4D.cpp +++ b/src/basics/Texture4D.cpp @@ -1,10 +1,10 @@ #include "Texture4D.h" -#include -#include #include "Color.h" #include "PackStream.h" #include "PictureWriter.h" +#include +#include Texture4D::Texture4D(int xsize, int ysize, int zsize, int wsize) { assert(xsize > 0 && ysize > 0 && zsize > 0 && wsize > 0); diff --git a/src/basics/Vector3.cpp b/src/basics/Vector3.cpp index bde9e05..664e9d5 100644 --- a/src/basics/Vector3.cpp +++ b/src/basics/Vector3.cpp @@ -1,9 +1,9 @@ #include "Vector3.h" -#include #include "Maths.h" #include "PackStream.h" #include "RandomGenerator.h" +#include const Vector3 paysages::basics::VECTOR_ZERO(0.0, 0.0, 0.0); const Vector3 paysages::basics::VECTOR_DOWN(0.0, -1.0, 0.0); diff --git a/src/definition/AtmosphereDefinition.cpp b/src/definition/AtmosphereDefinition.cpp index 1215554..2599cf3 100644 --- a/src/definition/AtmosphereDefinition.cpp +++ b/src/definition/AtmosphereDefinition.cpp @@ -1,14 +1,14 @@ #include "AtmosphereDefinition.h" -#include +#include "CelestialBodyDefinition.h" +#include "FloatNode.h" +#include "GodRaysDefinition.h" #include "Maths.h" -#include "Scenery.h" +#include "NoiseNode.h" #include "PackStream.h" #include "RandomGenerator.h" -#include "FloatNode.h" -#include "NoiseNode.h" -#include "GodRaysDefinition.h" -#include "CelestialBodyDefinition.h" +#include "Scenery.h" +#include AtmosphereDefinition::AtmosphereDefinition(DefinitionNode *parent) : DefinitionNode(parent, "atmosphere", "atmosphere") { diff --git a/src/definition/AtmosphereDefinition.h b/src/definition/AtmosphereDefinition.h index 27d848a..8518483 100644 --- a/src/definition/AtmosphereDefinition.h +++ b/src/definition/AtmosphereDefinition.h @@ -4,8 +4,8 @@ #include "DefinitionNode.h" -#include "Vector3.h" #include "Color.h" +#include "Vector3.h" namespace paysages { namespace definition { diff --git a/src/definition/CameraDefinition.cpp b/src/definition/CameraDefinition.cpp index dcc824b..3390420 100644 --- a/src/definition/CameraDefinition.cpp +++ b/src/definition/CameraDefinition.cpp @@ -1,10 +1,10 @@ #include "CameraDefinition.h" -#include -#include "Scenery.h" +#include "BoundingBox.h" #include "Maths.h" #include "PackStream.h" -#include "BoundingBox.h" +#include "Scenery.h" +#include CameraDefinition::CameraDefinition(DefinitionNode *parent) : DefinitionNode(parent, "camera", "camera") { location.x = 0.0; diff --git a/src/definition/CameraDefinition.h b/src/definition/CameraDefinition.h index e23369a..7c5cc5f 100644 --- a/src/definition/CameraDefinition.h +++ b/src/definition/CameraDefinition.h @@ -4,8 +4,8 @@ #include "DefinitionNode.h" -#include "Vector3.h" #include "Matrix4.h" +#include "Vector3.h" namespace paysages { namespace definition { diff --git a/src/definition/CelestialBodyDefinition.cpp b/src/definition/CelestialBodyDefinition.cpp index a45b5c2..3bb3e1c 100644 --- a/src/definition/CelestialBodyDefinition.cpp +++ b/src/definition/CelestialBodyDefinition.cpp @@ -1,10 +1,10 @@ #include "CelestialBodyDefinition.h" -#include -#include "Vector3.h" #include "FloatNode.h" -#include "Scenery.h" #include "NoiseNode.h" +#include "Scenery.h" +#include "Vector3.h" +#include CelestialBodyDefinition::CelestialBodyDefinition(DefinitionNode *parent, const string &name) : DefinitionNode(parent, name) { diff --git a/src/definition/CloudLayerDefinition.cpp b/src/definition/CloudLayerDefinition.cpp index 0628919..d0817da 100644 --- a/src/definition/CloudLayerDefinition.cpp +++ b/src/definition/CloudLayerDefinition.cpp @@ -1,10 +1,10 @@ #include "CloudLayerDefinition.h" #include "Curve.h" -#include "NoiseGenerator.h" -#include "SurfaceMaterial.h" -#include "PackStream.h" #include "FloatNode.h" +#include "NoiseGenerator.h" +#include "PackStream.h" +#include "SurfaceMaterial.h" CloudLayerDefinition::CloudLayerDefinition(DefinitionNode *parent, const string &name) : DefinitionNode(parent, name, "cloudlayer") { diff --git a/src/definition/ColorDiff.h b/src/definition/ColorDiff.h index 7efcbfd..a678e31 100644 --- a/src/definition/ColorDiff.h +++ b/src/definition/ColorDiff.h @@ -2,8 +2,8 @@ #include "definition_global.h" -#include "DefinitionDiff.h" #include "Color.h" +#include "DefinitionDiff.h" namespace paysages { namespace definition { diff --git a/src/definition/ColorNode.cpp b/src/definition/ColorNode.cpp index cd6a9f7..5e7e732 100644 --- a/src/definition/ColorNode.cpp +++ b/src/definition/ColorNode.cpp @@ -1,9 +1,9 @@ #include "ColorNode.h" -#include -#include #include "ColorDiff.h" #include "Logs.h" +#include +#include // TODO Could be made into a template diff --git a/src/definition/ColorNode.h b/src/definition/ColorNode.h index b69cc97..9fc79da 100644 --- a/src/definition/ColorNode.h +++ b/src/definition/ColorNode.h @@ -2,8 +2,8 @@ #include "definition_global.h" -#include "DefinitionNode.h" #include "Color.h" +#include "DefinitionNode.h" namespace paysages { namespace definition { diff --git a/src/definition/DefinitionNode.cpp b/src/definition/DefinitionNode.cpp index 8466a00..e5dee86 100644 --- a/src/definition/DefinitionNode.cpp +++ b/src/definition/DefinitionNode.cpp @@ -1,13 +1,13 @@ #include "DefinitionNode.h" +#include "DefinitionDiff.h" +#include "DefinitionWatcher.h" +#include "DiffManager.h" #include "Logs.h" #include "PackStream.h" -#include "DefinitionWatcher.h" -#include "DefinitionDiff.h" -#include "DiffManager.h" -#include #include +#include // Diff for abstract nodes class DefinitionNodeDiff : public DefinitionDiff { @@ -263,14 +263,13 @@ void DefinitionNode::addDiff(const DefinitionDiff *diff) { } } -void DefinitionNode::setRoot(DefinitionNode *root) -{ +void DefinitionNode::setRoot(DefinitionNode *root) { this->root = root; if (diffs) { delete diffs; diffs = NULL; } - for (auto &child: children) { + for (auto &child : children) { child->setRoot(root); } } diff --git a/src/definition/DefinitionWatcher.cpp b/src/definition/DefinitionWatcher.cpp index d22efc6..3f4492a 100644 --- a/src/definition/DefinitionWatcher.cpp +++ b/src/definition/DefinitionWatcher.cpp @@ -1,9 +1,9 @@ #include "DefinitionWatcher.h" -#include "IntDiff.h" -#include "FloatDiff.h" #include "DefinitionNode.h" #include "DiffManager.h" +#include "FloatDiff.h" +#include "IntDiff.h" #include "Logs.h" DefinitionWatcher::DefinitionWatcher(const string &name) : name(name) { diff --git a/src/definition/DefinitionWatcher.h b/src/definition/DefinitionWatcher.h index c9b9524..d439fef 100644 --- a/src/definition/DefinitionWatcher.h +++ b/src/definition/DefinitionWatcher.h @@ -2,8 +2,8 @@ #include "definition_global.h" -#include #include +#include namespace paysages { namespace definition { diff --git a/src/definition/DiffManager.cpp b/src/definition/DiffManager.cpp index 973c130..4111ab8 100644 --- a/src/definition/DiffManager.cpp +++ b/src/definition/DiffManager.cpp @@ -1,13 +1,13 @@ #include "DiffManager.h" -#include -#include -#include -#include -#include "DefinitionNode.h" #include "DefinitionDiff.h" +#include "DefinitionNode.h" #include "DefinitionWatcher.h" #include "Logs.h" +#include +#include +#include +#include class DiffManager::pimpl { public: diff --git a/src/definition/FloatNode.cpp b/src/definition/FloatNode.cpp index f384ed3..c23db89 100644 --- a/src/definition/FloatNode.cpp +++ b/src/definition/FloatNode.cpp @@ -1,10 +1,10 @@ #include "FloatNode.h" -#include "PackStream.h" #include "FloatDiff.h" #include "Logs.h" -#include +#include "PackStream.h" #include +#include FloatNode::FloatNode(DefinitionNode *parent, const string &name, double value) : DefinitionNode(parent, name, "float"), value(value) { diff --git a/src/definition/IntNode.cpp b/src/definition/IntNode.cpp index f2c2f35..791abf7 100644 --- a/src/definition/IntNode.cpp +++ b/src/definition/IntNode.cpp @@ -1,10 +1,10 @@ #include "IntNode.h" -#include "PackStream.h" #include "IntDiff.h" #include "Logs.h" -#include +#include "PackStream.h" #include +#include IntNode::IntNode(DefinitionNode *parent, const string &name, int value) : DefinitionNode(parent, name, "int"), value(value) { diff --git a/src/definition/Layers.cpp b/src/definition/Layers.cpp index 485cb8a..4e8010d 100644 --- a/src/definition/Layers.cpp +++ b/src/definition/Layers.cpp @@ -1,8 +1,8 @@ #include "Layers.h" -#include "PackStream.h" -#include "Logs.h" #include "LayersDiff.h" +#include "Logs.h" +#include "PackStream.h" Layers::Layers(DefinitionNode *parent, const string &name, LayerConstructor layer_constructor) : DefinitionNode(parent, name, "layers" + name), layer_constructor(layer_constructor) { diff --git a/src/definition/LayersDiff.cpp b/src/definition/LayersDiff.cpp index 56f52fa..b8373b5 100644 --- a/src/definition/LayersDiff.cpp +++ b/src/definition/LayersDiff.cpp @@ -1,8 +1,8 @@ #include "LayersDiff.h" -#include "PackStream.h" #include "Layers.h" #include "Logs.h" +#include "PackStream.h" LayersDiff::LayersDiff(const Layers *layers, LayersDiffOp op, int layer1) : DefinitionDiff(layers), op(op), layer1(layer1), saved(NULL) { diff --git a/src/definition/MaterialNode.cpp b/src/definition/MaterialNode.cpp index 7c69649..f875218 100644 --- a/src/definition/MaterialNode.cpp +++ b/src/definition/MaterialNode.cpp @@ -2,9 +2,9 @@ #include "ColorNode.h" #include "FloatNode.h" +#include "FractalNoise.h" #include "NoiseNode.h" #include "SurfaceMaterial.h" -#include "FractalNoise.h" MaterialNode::MaterialNode(DefinitionNode *parent, const string &name) : DefinitionNode(parent, name, "material") { material = make_unique(); diff --git a/src/definition/MaterialNode.h b/src/definition/MaterialNode.h index fe1192b..a482508 100644 --- a/src/definition/MaterialNode.h +++ b/src/definition/MaterialNode.h @@ -17,7 +17,8 @@ class DEFINITIONSHARED_EXPORT MaterialNode : public DefinitionNode { const SurfaceMaterial &getSurfaceMaterial() const; void setSurfaceMaterial(const SurfaceMaterial &material); - void setSurfaceMaterial(const Color &color, double reflection, double shininess, double hardness=0.5, double ambient=0.5); + void setSurfaceMaterial(const Color &color, double reflection, double shininess, double hardness = 0.5, + double ambient = 0.5); bool hasBump() const; const FractalNoise *getBumpGenerator() const; diff --git a/src/definition/NoiseNode.cpp b/src/definition/NoiseNode.cpp index 1a4ff90..8be01d1 100644 --- a/src/definition/NoiseNode.cpp +++ b/src/definition/NoiseNode.cpp @@ -1,7 +1,7 @@ #include "NoiseNode.h" -#include "NoiseFunctionSimplex.h" #include "Logs.h" +#include "NoiseFunctionSimplex.h" NoiseNode::NoiseNode(DefinitionNode *parent, const string &name) : DefinitionNode(parent, name) { noise = new NoiseFunctionSimplex(); diff --git a/src/definition/PaintedGrid.cpp b/src/definition/PaintedGrid.cpp index 49fe9cf..dcb2b47 100644 --- a/src/definition/PaintedGrid.cpp +++ b/src/definition/PaintedGrid.cpp @@ -1,11 +1,11 @@ #include "PaintedGrid.h" +#include "Interpolation.h" +#include "Memory.h" +#include "PaintedGridBrush.h" +#include "PaintedGridData.h" #include #include -#include "Memory.h" -#include "Interpolation.h" -#include "PaintedGridData.h" -#include "PaintedGridBrush.h" PaintedGrid::PaintedGrid(DefinitionNode *parent) : DefinitionNode(parent, "grid", "grid") { merged_data = new PaintedGridData; diff --git a/src/definition/PaintedGridBrush.cpp b/src/definition/PaintedGridBrush.cpp index 42497b2..a915312 100644 --- a/src/definition/PaintedGridBrush.cpp +++ b/src/definition/PaintedGridBrush.cpp @@ -1,8 +1,8 @@ #include "PaintedGridBrush.h" -#include #include "NoiseGenerator.h" #include "PaintedGrid.h" +#include PaintedGridBrush::PaintedGridBrush(double hard_radius, double smoothed_size, double total_radius) : hard_radius(hard_radius), smoothed_size(smoothed_size), total_radius(total_radius) { diff --git a/src/definition/PaintedGridData.cpp b/src/definition/PaintedGridData.cpp index f04ec90..a073bb2 100644 --- a/src/definition/PaintedGridData.cpp +++ b/src/definition/PaintedGridData.cpp @@ -1,7 +1,7 @@ #include "PaintedGridData.h" -#include #include "PackStream.h" +#include PaintedGridData::PaintedGridData() { rows_count = 0; diff --git a/src/definition/Scenery.cpp b/src/definition/Scenery.cpp index f4d10da..856cc3b 100644 --- a/src/definition/Scenery.cpp +++ b/src/definition/Scenery.cpp @@ -2,19 +2,19 @@ #include -#include "PackStream.h" #include "AtmosphereDefinition.h" #include "CameraDefinition.h" #include "CloudsDefinition.h" +#include "DiffManager.h" +#include "FloatNode.h" +#include "IntNode.h" +#include "Logs.h" +#include "PackStream.h" +#include "RandomGenerator.h" #include "TerrainDefinition.h" #include "TexturesDefinition.h" #include "VegetationDefinition.h" #include "WaterDefinition.h" -#include "DiffManager.h" -#include "Logs.h" -#include "RandomGenerator.h" -#include "IntNode.h" -#include "FloatNode.h" static const double APP_HEADER = 19866544632.125; static const int DATA_VERSION = 1; diff --git a/src/definition/SurfaceMaterial.cpp b/src/definition/SurfaceMaterial.cpp index 306f4c1..2732aba 100644 --- a/src/definition/SurfaceMaterial.cpp +++ b/src/definition/SurfaceMaterial.cpp @@ -1,7 +1,7 @@ #include "SurfaceMaterial.h" -#include "PackStream.h" #include "Color.h" +#include "PackStream.h" static SurfaceMaterial DEFAULT; diff --git a/src/definition/TerrainDefinition.cpp b/src/definition/TerrainDefinition.cpp index cc316b4..1f980a9 100644 --- a/src/definition/TerrainDefinition.cpp +++ b/src/definition/TerrainDefinition.cpp @@ -1,12 +1,12 @@ #include "TerrainDefinition.h" -#include -#include "TerrainHeightMap.h" -#include "NoiseGenerator.h" -#include "PackStream.h" #include "FloatNode.h" -#include "NoiseNode.h" #include "FractalNoise.h" +#include "NoiseGenerator.h" +#include "NoiseNode.h" +#include "PackStream.h" +#include "TerrainHeightMap.h" +#include TerrainDefinition::TerrainDefinition(DefinitionNode *parent) : DefinitionNode(parent, "terrain", "terrain") { shadow_smoothing = 0.0; diff --git a/src/definition/TerrainHeightMap.cpp b/src/definition/TerrainHeightMap.cpp index 83f0312..30e1db8 100644 --- a/src/definition/TerrainHeightMap.cpp +++ b/src/definition/TerrainHeightMap.cpp @@ -1,7 +1,7 @@ #include "TerrainHeightMap.h" -#include "TerrainDefinition.h" #include "PaintedGridBrush.h" +#include "TerrainDefinition.h" TerrainHeightMap::TerrainHeightMap(TerrainDefinition *terrain) : PaintedGrid(terrain), terrain(terrain) { } diff --git a/src/definition/TextureLayerDefinition.cpp b/src/definition/TextureLayerDefinition.cpp index 7d1af99..6bb5b01 100644 --- a/src/definition/TextureLayerDefinition.cpp +++ b/src/definition/TextureLayerDefinition.cpp @@ -1,15 +1,15 @@ #include "TextureLayerDefinition.h" -#include -#include -#include "Zone.h" -#include "SurfaceMaterial.h" -#include "PackStream.h" -#include "Scenery.h" -#include "TerrainDefinition.h" #include "Color.h" #include "FractalNoise.h" #include "NoiseNode.h" +#include "PackStream.h" +#include "Scenery.h" +#include "SurfaceMaterial.h" +#include "TerrainDefinition.h" +#include "Zone.h" +#include +#include TextureLayerDefinition::TextureLayerDefinition(DefinitionNode *parent, const string &name) : DefinitionNode(parent, name, "texturelayer") { diff --git a/src/definition/TimeManager.cpp b/src/definition/TimeManager.cpp index 5ad2d56..1a83cc0 100644 --- a/src/definition/TimeManager.cpp +++ b/src/definition/TimeManager.cpp @@ -1,10 +1,10 @@ #include "TimeManager.h" -#include "Scenery.h" #include "AtmosphereDefinition.h" -#include "FloatNode.h" -#include "CloudsDefinition.h" #include "CloudLayerDefinition.h" +#include "CloudsDefinition.h" +#include "FloatNode.h" +#include "Scenery.h" #include "WaterDefinition.h" TimeManager::TimeManager() { diff --git a/src/definition/VegetationModelDefinition.cpp b/src/definition/VegetationModelDefinition.cpp index a0a5703..d5be517 100644 --- a/src/definition/VegetationModelDefinition.cpp +++ b/src/definition/VegetationModelDefinition.cpp @@ -1,12 +1,12 @@ #include "VegetationModelDefinition.h" -#include "Maths.h" -#include "VegetationDefinition.h" -#include "RandomGenerator.h" -#include "Matrix4.h" -#include "SurfaceMaterial.h" #include "Color.h" +#include "Maths.h" +#include "Matrix4.h" #include "PackStream.h" +#include "RandomGenerator.h" +#include "SurfaceMaterial.h" +#include "VegetationDefinition.h" VegetationModelDefinition::VegetationModelDefinition(DefinitionNode *parent) : DefinitionNode(parent, "model") { solid_material = new SurfaceMaterial(Color(0.2, 0.15, 0.15)); diff --git a/src/definition/VegetationModelDefinition.h b/src/definition/VegetationModelDefinition.h index 621f508..2b2004f 100644 --- a/src/definition/VegetationModelDefinition.h +++ b/src/definition/VegetationModelDefinition.h @@ -2,11 +2,11 @@ #include "definition_global.h" -#include -#include "DefinitionNode.h" -#include "Sphere.h" #include "CappedCylinder.h" +#include "DefinitionNode.h" #include "Disk.h" +#include "Sphere.h" +#include namespace paysages { namespace definition { diff --git a/src/definition/VegetationPresenceDefinition.cpp b/src/definition/VegetationPresenceDefinition.cpp index da65145..6989e87 100644 --- a/src/definition/VegetationPresenceDefinition.cpp +++ b/src/definition/VegetationPresenceDefinition.cpp @@ -1,14 +1,14 @@ #include "VegetationPresenceDefinition.h" -#include +#include "FloatNode.h" +#include "FractalNoise.h" +#include "NoiseNode.h" #include "Scenery.h" #include "TerrainDefinition.h" +#include "VegetationInstance.h" #include "VegetationLayerDefinition.h" #include "VegetationModelDefinition.h" -#include "VegetationInstance.h" -#include "FloatNode.h" -#include "NoiseNode.h" -#include "FractalNoise.h" +#include VegetationPresenceDefinition::VegetationPresenceDefinition(VegetationLayerDefinition *parent) : DefinitionNode(parent, "presence") { diff --git a/src/definition/WaterDefinition.cpp b/src/definition/WaterDefinition.cpp index f61f9f2..91516eb 100644 --- a/src/definition/WaterDefinition.cpp +++ b/src/definition/WaterDefinition.cpp @@ -1,11 +1,11 @@ #include "WaterDefinition.h" -#include "PackStream.h" -#include "NoiseState.h" -#include "SurfaceMaterial.h" -#include "IntNode.h" -#include "FloatNode.h" #include "ColorNode.h" +#include "FloatNode.h" +#include "IntNode.h" +#include "NoiseState.h" +#include "PackStream.h" +#include "SurfaceMaterial.h" WaterDefinition::WaterDefinition(DefinitionNode *parent) : DefinitionNode(parent, "water", "water") { model = new IntNode(this, "model", -1); diff --git a/src/experiments/bruneton/Main.cpp b/src/experiments/bruneton/Main.cpp index b11a229..3573ea2 100644 --- a/src/experiments/bruneton/Main.cpp +++ b/src/experiments/bruneton/Main.cpp @@ -32,21 +32,21 @@ * Author: Eric Bruneton */ -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include #include #include "tiffio.h" -#include "vec3.h" -#include "mat4.h" #include "Main.h" +#include "mat4.h" +#include "vec3.h" using namespace std; @@ -679,11 +679,11 @@ void idleFunc() { glutPostRedisplay(); } -#include "Texture2D.h" -#include "Texture4D.h" #include "Color.h" #include "Logs.h" #include "PackStream.h" +#include "Texture2D.h" +#include "Texture4D.h" void dumpTextures() { PackStream stream; int x, y, z, w; diff --git a/src/interface/commandline/main.cpp b/src/interface/commandline/main.cpp index 7e6ca74..7a94d90 100644 --- a/src/interface/commandline/main.cpp +++ b/src/interface/commandline/main.cpp @@ -1,10 +1,10 @@ -#include "SoftwareCanvasRenderer.h" -#include "RenderConfig.h" -#include "Scenery.h" #include "AtmosphereDefinition.h" #include "CameraDefinition.h" -#include "TimeManager.h" #include "Logs.h" +#include "RenderConfig.h" +#include "Scenery.h" +#include "SoftwareCanvasRenderer.h" +#include "TimeManager.h" #include diff --git a/src/interface/commandline/render.cpp b/src/interface/commandline/render.cpp index ac54517..79bd047 100644 --- a/src/interface/commandline/render.cpp +++ b/src/interface/commandline/render.cpp @@ -1,5 +1,5 @@ -#include "Thread.h" #include "SoftwareCanvasRenderer.h" +#include "Thread.h" class RenderThread : public Thread { public: diff --git a/src/interface/commandline/tests.cpp b/src/interface/commandline/tests.cpp index cacb990..fe17f26 100644 --- a/src/interface/commandline/tests.cpp +++ b/src/interface/commandline/tests.cpp @@ -1,46 +1,46 @@ -#include "SoftwareCanvasRenderer.h" -#include "TerrainRenderer.h" -#include "Scenery.h" -#include "Maths.h" -#include "CameraDefinition.h" -#include "TerrainDefinition.h" #include "AtmosphereDefinition.h" #include "AtmosphereRenderer.h" #include "AtmosphereResult.h" -#include "TexturesDefinition.h" -#include "GodRaysDefinition.h" -#include "TextureLayerDefinition.h" -#include "WaterDefinition.h" -#include "SurfaceMaterial.h" -#include "FloatNode.h" -#include "SkyRasterizer.h" -#include "CloudsDefinition.h" -#include "LightComponent.h" -#include "LightingManager.h" -#include "LightFilter.h" -#include "GodRaysSampler.h" -#include "Rasterizer.h" -#include "SpaceSegment.h" -#include "OverlayRasterizer.h" -#include "VegetationModelDefinition.h" -#include "VegetationInstance.h" -#include "VegetationRenderer.h" -#include "CloudsRenderer.h" -#include "CloudLayerDefinition.h" -#include "clouds/BaseCloudsModel.h" +#include "CameraDefinition.h" #include "CelestialBodyDefinition.h" -#include "RayCastingResult.h" -#include "OpenGLVegetationImpostor.h" -#include "Texture2D.h" -#include "NoiseNode.h" +#include "CloudLayerDefinition.h" +#include "CloudsDefinition.h" +#include "CloudsRenderer.h" +#include "FloatNode.h" #include "FractalNoise.h" -#include "RandomGenerator.h" +#include "GodRaysDefinition.h" +#include "GodRaysSampler.h" +#include "LightComponent.h" +#include "LightFilter.h" +#include "LightingManager.h" +#include "Maths.h" #include "NoiseFunctionSimplex.h" +#include "NoiseNode.h" +#include "OpenGLVegetationImpostor.h" +#include "OverlayRasterizer.h" +#include "RandomGenerator.h" +#include "Rasterizer.h" +#include "RayCastingResult.h" +#include "Scenery.h" +#include "SkyRasterizer.h" +#include "SoftwareCanvasRenderer.h" +#include "SpaceSegment.h" +#include "SurfaceMaterial.h" +#include "TerrainDefinition.h" +#include "TerrainRenderer.h" +#include "Texture2D.h" +#include "TextureLayerDefinition.h" +#include "TexturesDefinition.h" +#include "VegetationInstance.h" +#include "VegetationModelDefinition.h" +#include "VegetationRenderer.h" +#include "WaterDefinition.h" #include "Zone.h" +#include "clouds/BaseCloudsModel.h" #include -#include #include +#include void startRender(SoftwareCanvasRenderer *renderer, const char *outputpath); @@ -566,7 +566,9 @@ static void testCanvasAliasing() { virtual Color processPixel(int x, int y, double relx, double rely) const override { double d = sqrt(relx * relx + rely * rely); double s = relx * 0.5 + rely; - return (x == y or x / 2 == y or y / 2 == x or (d > 0.8 and d < 0.9) or fabs(s) < 0.1) ? COLOR_BLACK : COLOR_WHITE.scaled(5.0); + return (x == y or x / 2 == y or y / 2 == x or (d > 0.8 and d < 0.9) or fabs(s) < 0.1) + ? COLOR_BLACK + : COLOR_WHITE.scaled(5.0); } }; diff --git a/src/interface/modeler/AtmosphereModeler.cpp b/src/interface/modeler/AtmosphereModeler.cpp index 6dd4a2e..9bd387f 100644 --- a/src/interface/modeler/AtmosphereModeler.cpp +++ b/src/interface/modeler/AtmosphereModeler.cpp @@ -1,10 +1,10 @@ #include "AtmosphereModeler.h" -#include "MainModelerWindow.h" -#include "Scenery.h" #include "AtmosphereDefinition.h" #include "DefinitionNode.h" +#include "MainModelerWindow.h" #include "ModelerCameras.h" +#include "Scenery.h" AtmosphereModeler::AtmosphereModeler(MainModelerWindow *ui) : BaseModelerTool(ui) { addFloatBinding("atmosphere_humidity", "value", "/atmosphere/humidity"); diff --git a/src/interface/modeler/BaseModelerTool.cpp b/src/interface/modeler/BaseModelerTool.cpp index 8273cc1..5e2b2b0 100644 --- a/src/interface/modeler/BaseModelerTool.cpp +++ b/src/interface/modeler/BaseModelerTool.cpp @@ -1,12 +1,12 @@ #include "BaseModelerTool.h" -#include "MainModelerWindow.h" -#include "Scenery.h" -#include "IntNode.h" -#include "IntPropertyBind.h" #include "FloatNode.h" #include "FloatPropertyBind.h" +#include "IntNode.h" +#include "IntPropertyBind.h" #include "Logs.h" +#include "MainModelerWindow.h" +#include "Scenery.h" class BaseModelerTool::pimpl { public: diff --git a/src/interface/modeler/FloatPropertyBind.cpp b/src/interface/modeler/FloatPropertyBind.cpp index 2fda3f7..c0c6df7 100644 --- a/src/interface/modeler/FloatPropertyBind.cpp +++ b/src/interface/modeler/FloatPropertyBind.cpp @@ -1,8 +1,8 @@ #include "FloatPropertyBind.h" -#include "MainModelerWindow.h" #include "FloatNode.h" #include "Logs.h" +#include "MainModelerWindow.h" #include diff --git a/src/interface/modeler/FloatPropertyBind.h b/src/interface/modeler/FloatPropertyBind.h index ca9ae48..c0825b4 100644 --- a/src/interface/modeler/FloatPropertyBind.h +++ b/src/interface/modeler/FloatPropertyBind.h @@ -2,8 +2,8 @@ #include "modeler_global.h" -#include #include "DefinitionWatcher.h" +#include namespace paysages { namespace modeler { diff --git a/src/interface/modeler/IntPropertyBind.cpp b/src/interface/modeler/IntPropertyBind.cpp index 6b71d19..7386dd7 100644 --- a/src/interface/modeler/IntPropertyBind.cpp +++ b/src/interface/modeler/IntPropertyBind.cpp @@ -1,8 +1,8 @@ #include "IntPropertyBind.h" -#include "MainModelerWindow.h" #include "IntNode.h" #include "Logs.h" +#include "MainModelerWindow.h" IntPropertyBind::IntPropertyBind(MainModelerWindow *window, const string &object_name, const string &property_name, IntNode *node) diff --git a/src/interface/modeler/IntPropertyBind.h b/src/interface/modeler/IntPropertyBind.h index dead287..79c9a90 100644 --- a/src/interface/modeler/IntPropertyBind.h +++ b/src/interface/modeler/IntPropertyBind.h @@ -2,8 +2,8 @@ #include "modeler_global.h" -#include #include "DefinitionWatcher.h" +#include namespace paysages { namespace modeler { diff --git a/src/interface/modeler/MainModelerWindow.cpp b/src/interface/modeler/MainModelerWindow.cpp index 64adb6c..513af7b 100644 --- a/src/interface/modeler/MainModelerWindow.cpp +++ b/src/interface/modeler/MainModelerWindow.cpp @@ -1,18 +1,18 @@ #include "MainModelerWindow.h" -#include "Logs.h" -#include "OpenGLView.h" -#include "Scenery.h" -#include "OpenGLRenderer.h" #include "AtmosphereModeler.h" -#include "WaterModeler.h" +#include "Logs.h" #include "ModelerCameras.h" +#include "OpenGLRenderer.h" +#include "OpenGLView.h" +#include "RenderConfig.h" #include "RenderPreviewProvider.h" #include "RenderProcess.h" -#include "RenderConfig.h" +#include "Scenery.h" +#include "WaterModeler.h" -#include #include +#include MainModelerWindow::MainModelerWindow() { QSurfaceFormat new_format = format(); diff --git a/src/interface/modeler/ModelerCameras.cpp b/src/interface/modeler/ModelerCameras.cpp index 911dff4..d97ec91 100644 --- a/src/interface/modeler/ModelerCameras.cpp +++ b/src/interface/modeler/ModelerCameras.cpp @@ -1,12 +1,12 @@ #include "ModelerCameras.h" +#include "AtmosphereDefinition.h" +#include "AtmosphereRenderer.h" +#include "CameraDefinition.h" +#include "FloatNode.h" #include "MainModelerWindow.h" #include "OpenGLRenderer.h" #include "Scenery.h" -#include "CameraDefinition.h" -#include "AtmosphereDefinition.h" -#include "FloatNode.h" -#include "AtmosphereRenderer.h" #include "Timing.h" ModelerCameras::ModelerCameras(MainModelerWindow *parent) diff --git a/src/interface/modeler/ModelerCameras.h b/src/interface/modeler/ModelerCameras.h index 792e8cf..74c09c0 100644 --- a/src/interface/modeler/ModelerCameras.h +++ b/src/interface/modeler/ModelerCameras.h @@ -2,8 +2,8 @@ #include "modeler_global.h" -#include #include "DefinitionWatcher.h" +#include namespace paysages { namespace modeler { diff --git a/src/interface/modeler/OpenGLView.cpp b/src/interface/modeler/OpenGLView.cpp index c7a6f44..3bb8772 100644 --- a/src/interface/modeler/OpenGLView.cpp +++ b/src/interface/modeler/OpenGLView.cpp @@ -1,10 +1,10 @@ #include "OpenGLView.h" -#include -#include #include "MainModelerWindow.h" -#include "OpenGLRenderer.h" #include "ModelerCameras.h" +#include "OpenGLRenderer.h" +#include +#include OpenGLView::OpenGLView(QQuickItem *parent) : QQuickItem(parent) { initialized = false; diff --git a/src/interface/modeler/RenderPreviewProvider.h b/src/interface/modeler/RenderPreviewProvider.h index 99c4d8c..99f8a3a 100644 --- a/src/interface/modeler/RenderPreviewProvider.h +++ b/src/interface/modeler/RenderPreviewProvider.h @@ -2,8 +2,8 @@ #include "modeler_global.h" -#include #include "CanvasLiveClient.h" +#include namespace paysages { namespace modeler { diff --git a/src/interface/modeler/RenderProcess.cpp b/src/interface/modeler/RenderProcess.cpp index 8576864..194b7e6 100644 --- a/src/interface/modeler/RenderProcess.cpp +++ b/src/interface/modeler/RenderProcess.cpp @@ -1,17 +1,17 @@ #include "RenderProcess.h" -#include -#include -#include -#include "MainModelerWindow.h" -#include "SoftwareCanvasRenderer.h" -#include "RenderPreviewProvider.h" -#include "RenderConfig.h" -#include "RenderProgress.h" -#include "Thread.h" #include "Canvas.h" #include "CanvasPreview.h" +#include "MainModelerWindow.h" #include "OpenGLRenderer.h" +#include "RenderConfig.h" +#include "RenderPreviewProvider.h" +#include "RenderProgress.h" +#include "SoftwareCanvasRenderer.h" +#include "Thread.h" +#include +#include +#include class RenderThread : public Thread { public: diff --git a/src/interface/modeler/WaterModeler.cpp b/src/interface/modeler/WaterModeler.cpp index 0903af1..4fe4959 100644 --- a/src/interface/modeler/WaterModeler.cpp +++ b/src/interface/modeler/WaterModeler.cpp @@ -1,13 +1,13 @@ #include "WaterModeler.h" +#include "FloatPropertyBind.h" +#include "IntPropertyBind.h" #include "MainModelerWindow.h" +#include "OpenGLRenderer.h" +#include "OpenGLWater.h" #include "Scenery.h" #include "TerrainDefinition.h" #include "WaterDefinition.h" -#include "FloatPropertyBind.h" -#include "IntPropertyBind.h" -#include "OpenGLRenderer.h" -#include "OpenGLWater.h" WaterModeler::WaterModeler(MainModelerWindow *ui) : BaseModelerTool(ui) { QObject *toggle_water = ui->findQmlObject("camera_toggle_water"); diff --git a/src/interface/modeler/modeler_global.h b/src/interface/modeler/modeler_global.h index 0265d85..28c0017 100644 --- a/src/interface/modeler/modeler_global.h +++ b/src/interface/modeler/modeler_global.h @@ -1,8 +1,8 @@ #pragma once #include "definition_global.h" -#include "software_global.h" #include "opengl_global.h" +#include "software_global.h" namespace paysages { namespace modeler { diff --git a/src/render/opengl/OpenGLRenderer.cpp b/src/render/opengl/OpenGLRenderer.cpp index 17e7c8f..53e82c0 100644 --- a/src/render/opengl/OpenGLRenderer.cpp +++ b/src/render/opengl/OpenGLRenderer.cpp @@ -1,23 +1,23 @@ #include "OpenGLRenderer.h" -#include -#include "Maths.h" -#include "OpenGLFunctions.h" #include "CameraDefinition.h" +#include "CloudsRenderer.h" +#include "Color.h" +#include "GodRaysSampler.h" +#include "LightingManager.h" +#include "Logs.h" +#include "Maths.h" +#include "NoiseFunctionSimplex.h" +#include "OpenGLFunctions.h" #include "OpenGLSharedState.h" #include "OpenGLSkybox.h" -#include "OpenGLWater.h" #include "OpenGLTerrain.h" #include "OpenGLVegetation.h" -#include "CloudsRenderer.h" -#include "VegetationRenderer.h" -#include "Color.h" +#include "OpenGLWater.h" #include "Scenery.h" -#include "LightingManager.h" -#include "GodRaysSampler.h" -#include "Logs.h" #include "Vector3.h" -#include "NoiseFunctionSimplex.h" +#include "VegetationRenderer.h" +#include OpenGLRenderer::OpenGLRenderer(Scenery *scenery) : SoftwareRenderer(scenery) { ready = false; diff --git a/src/render/opengl/OpenGLShaderProgram.cpp b/src/render/opengl/OpenGLShaderProgram.cpp index 541c9cc..7862f55 100644 --- a/src/render/opengl/OpenGLShaderProgram.cpp +++ b/src/render/opengl/OpenGLShaderProgram.cpp @@ -1,7 +1,7 @@ #include "OpenGLShaderProgram.h" -#include -#include +#include "Color.h" +#include "Logs.h" #include "OpenGLFunctions.h" #include "OpenGLRenderer.h" #include "OpenGLSharedState.h" @@ -9,8 +9,8 @@ #include "Texture2D.h" #include "Texture3D.h" #include "Texture4D.h" -#include "Color.h" -#include "Logs.h" +#include +#include OpenGLShaderProgram::OpenGLShaderProgram(const string &name, OpenGLRenderer *renderer) : renderer(renderer), name(name) { diff --git a/src/render/opengl/OpenGLSharedState.h b/src/render/opengl/OpenGLSharedState.h index 65465a9..051421b 100644 --- a/src/render/opengl/OpenGLSharedState.h +++ b/src/render/opengl/OpenGLSharedState.h @@ -2,8 +2,8 @@ #include "opengl_global.h" -#include #include "OpenGLVariable.h" +#include namespace paysages { namespace opengl { diff --git a/src/render/opengl/OpenGLSkybox.cpp b/src/render/opengl/OpenGLSkybox.cpp index 6ef1748..93c15e7 100644 --- a/src/render/opengl/OpenGLSkybox.cpp +++ b/src/render/opengl/OpenGLSkybox.cpp @@ -1,17 +1,17 @@ #include "OpenGLSkybox.h" -#include +#include "AtmosphereDefinition.h" +#include "AtmosphereModelBruneton.h" +#include "AtmosphereRenderer.h" +#include "CelestialBodyDefinition.h" +#include "FloatNode.h" +#include "Logs.h" #include "OpenGLRenderer.h" #include "OpenGLShaderProgram.h" #include "OpenGLSharedState.h" #include "OpenGLVertexArray.h" -#include "CelestialBodyDefinition.h" #include "Scenery.h" -#include "AtmosphereDefinition.h" -#include "AtmosphereRenderer.h" -#include "AtmosphereModelBruneton.h" -#include "FloatNode.h" -#include "Logs.h" +#include static const string path_humidity = "/atmosphere/humidity"; static const string path_sun_phi = "/atmosphere/sun/phi"; diff --git a/src/render/opengl/OpenGLTerrain.cpp b/src/render/opengl/OpenGLTerrain.cpp index 9d1fb3e..ad913aa 100644 --- a/src/render/opengl/OpenGLTerrain.cpp +++ b/src/render/opengl/OpenGLTerrain.cpp @@ -1,15 +1,15 @@ #include "OpenGLTerrain.h" -#include -#include +#include "Mutex.h" #include "OpenGLFunctions.h" #include "OpenGLRenderer.h" #include "OpenGLShaderProgram.h" -#include "ParallelPool.h" -#include "Thread.h" -#include "Mutex.h" #include "OpenGLTerrainChunk.h" +#include "ParallelPool.h" #include "Scenery.h" +#include "Thread.h" +#include +#include class ChunkMaintenanceThreads : public ParallelPool { public: diff --git a/src/render/opengl/OpenGLTerrainChunk.cpp b/src/render/opengl/OpenGLTerrainChunk.cpp index e192e83..883e0fe 100644 --- a/src/render/opengl/OpenGLTerrainChunk.cpp +++ b/src/render/opengl/OpenGLTerrainChunk.cpp @@ -1,20 +1,20 @@ #include "OpenGLTerrainChunk.h" -#include -#include -#include -#include "OpenGLShaderProgram.h" -#include "OpenGLVertexArray.h" -#include "OpenGLSharedState.h" -#include "ColorProfile.h" #include "CameraDefinition.h" +#include "ColorProfile.h" +#include "Logs.h" +#include "Mutex.h" #include "OpenGLRenderer.h" -#include "TerrainRenderer.h" +#include "OpenGLShaderProgram.h" +#include "OpenGLSharedState.h" +#include "OpenGLVertexArray.h" #include "Scenery.h" #include "TerrainDefinition.h" +#include "TerrainRenderer.h" #include "Texture2D.h" -#include "Mutex.h" -#include "Logs.h" +#include +#include +#include OpenGLTerrainChunk::OpenGLTerrainChunk(OpenGLRenderer *renderer, double x, double z, double size, int nbchunks) : _renderer(renderer) { diff --git a/src/render/opengl/OpenGLVariable.cpp b/src/render/opengl/OpenGLVariable.cpp index 42bb33f..2e9672a 100644 --- a/src/render/opengl/OpenGLVariable.cpp +++ b/src/render/opengl/OpenGLVariable.cpp @@ -1,19 +1,19 @@ #include "OpenGLVariable.h" -#include -#include -#include +#include "Color.h" +#include "FractalNoise.h" #include "Logs.h" +#include "Matrix4.h" #include "OpenGLFunctions.h" #include "OpenGLRenderer.h" #include "OpenGLShaderProgram.h" -#include "Vector3.h" -#include "Matrix4.h" -#include "Color.h" #include "Texture2D.h" #include "Texture3D.h" #include "Texture4D.h" -#include "FractalNoise.h" +#include "Vector3.h" +#include +#include +#include typedef enum { TYPE_NONE, diff --git a/src/render/opengl/OpenGLVegetation.cpp b/src/render/opengl/OpenGLVegetation.cpp index 6a3643b..c2b6bbb 100644 --- a/src/render/opengl/OpenGLVegetation.cpp +++ b/src/render/opengl/OpenGLVegetation.cpp @@ -1,11 +1,11 @@ #include "OpenGLVegetation.h" +#include "Mutex.h" #include "OpenGLRenderer.h" #include "OpenGLShaderProgram.h" #include "OpenGLVegetationLayer.h" -#include "Thread.h" -#include "Mutex.h" #include "Scenery.h" +#include "Thread.h" #include "VegetationDefinition.h" #include "VegetationLayerDefinition.h" diff --git a/src/render/opengl/OpenGLVegetationImpostor.cpp b/src/render/opengl/OpenGLVegetationImpostor.cpp index 158eaa0..1b40abb 100644 --- a/src/render/opengl/OpenGLVegetationImpostor.cpp +++ b/src/render/opengl/OpenGLVegetationImpostor.cpp @@ -1,23 +1,23 @@ #include "OpenGLVegetationImpostor.h" -#include +#include "AtmosphereDefinition.h" +#include "CameraDefinition.h" +#include "GodRaysSampler.h" +#include "LightingManager.h" #include "Maths.h" +#include "Matrix4.h" #include "OpenGLShaderProgram.h" #include "OpenGLSharedState.h" -#include "OpenGLVertexArray.h" #include "OpenGLVegetationInstance.h" -#include "Texture2D.h" -#include "SoftwareRenderer.h" -#include "Scenery.h" -#include "AtmosphereDefinition.h" -#include "GodRaysSampler.h" -#include "VegetationRenderer.h" -#include "VegetationInstance.h" +#include "OpenGLVertexArray.h" #include "RayCastingResult.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" #include "SpaceSegment.h" -#include "Matrix4.h" -#include "LightingManager.h" -#include "CameraDefinition.h" +#include "Texture2D.h" +#include "VegetationInstance.h" +#include "VegetationRenderer.h" +#include // Get the rotation matrix for an impostor grid index static inline Matrix4 matrixForIndex(int index) { diff --git a/src/render/opengl/OpenGLVegetationLayer.cpp b/src/render/opengl/OpenGLVegetationLayer.cpp index c9a8a53..a109807 100644 --- a/src/render/opengl/OpenGLVegetationLayer.cpp +++ b/src/render/opengl/OpenGLVegetationLayer.cpp @@ -1,15 +1,15 @@ #include "OpenGLVegetationLayer.h" -#include -#include "Vector3.h" #include "CameraDefinition.h" #include "Mutex.h" #include "OpenGLFunctions.h" #include "OpenGLVegetation.h" -#include "OpenGLVegetationInstance.h" #include "OpenGLVegetationImpostor.h" +#include "OpenGLVegetationInstance.h" +#include "Vector3.h" #include "VegetationLayerDefinition.h" #include "VegetationPresenceDefinition.h" +#include OpenGLVegetationLayer::OpenGLVegetationLayer(OpenGLVegetation *parent, VegetationLayerDefinition *definition, bool own_instances) diff --git a/src/render/opengl/OpenGLVertexArray.cpp b/src/render/opengl/OpenGLVertexArray.cpp index f05dd2c..4ad7769 100644 --- a/src/render/opengl/OpenGLVertexArray.cpp +++ b/src/render/opengl/OpenGLVertexArray.cpp @@ -1,7 +1,7 @@ #include "OpenGLVertexArray.h" -#include "OpenGLFunctions.h" #include "Logs.h" +#include "OpenGLFunctions.h" #include "Vector3.h" OpenGLVertexArray::OpenGLVertexArray(bool has_uv, bool strip) : has_uv(has_uv) { diff --git a/src/render/opengl/OpenGLWater.cpp b/src/render/opengl/OpenGLWater.cpp index cbfa12e..84312f2 100644 --- a/src/render/opengl/OpenGLWater.cpp +++ b/src/render/opengl/OpenGLWater.cpp @@ -1,17 +1,17 @@ #include "OpenGLWater.h" +#include "FloatDiff.h" +#include "FloatNode.h" +#include "IntNode.h" +#include "Logs.h" #include "OpenGLRenderer.h" #include "OpenGLShaderProgram.h" #include "OpenGLSharedState.h" #include "OpenGLVertexArray.h" -#include "WaterRenderer.h" #include "Scenery.h" -#include "WaterDefinition.h" #include "SurfaceMaterial.h" -#include "FloatNode.h" -#include "FloatDiff.h" -#include "IntNode.h" -#include "Logs.h" +#include "WaterDefinition.h" +#include "WaterRenderer.h" static const string path_height = "/terrain/water_height"; static const string path_reflection = "/water/reflection"; diff --git a/src/render/software/AtmosphereModelBruneton.cpp b/src/render/software/AtmosphereModelBruneton.cpp index 7a13507..aeb5f2b 100644 --- a/src/render/software/AtmosphereModelBruneton.cpp +++ b/src/render/software/AtmosphereModelBruneton.cpp @@ -5,27 +5,27 @@ * http://evasion.inrialpes.fr/~Eric.Bruneton/ */ +#include "AtmosphereDefinition.h" +#include "AtmosphereRenderer.h" +#include "AtmosphereResult.h" +#include "CacheFile.h" +#include "CelestialBodyDefinition.h" +#include "FloatNode.h" +#include "LightComponent.h" +#include "LightStatus.h" +#include "Maths.h" +#include "PackStream.h" +#include "ParallelWork.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include "System.h" +#include "Texture2D.h" +#include "Texture4D.h" +#include "WaterRenderer.h" #include #include #include #include -#include "Maths.h" -#include "System.h" -#include "ParallelWork.h" -#include "PackStream.h" -#include "Scenery.h" -#include "AtmosphereDefinition.h" -#include "AtmosphereRenderer.h" -#include "AtmosphereResult.h" -#include "SoftwareRenderer.h" -#include "WaterRenderer.h" -#include "CelestialBodyDefinition.h" -#include "LightComponent.h" -#include "LightStatus.h" -#include "Texture2D.h" -#include "Texture4D.h" -#include "CacheFile.h" -#include "FloatNode.h" #define WORKAROUND_OFFSET 0.1 diff --git a/src/render/software/AtmosphereRenderer.cpp b/src/render/software/AtmosphereRenderer.cpp index 5fc5ecc..c259f19 100644 --- a/src/render/software/AtmosphereRenderer.cpp +++ b/src/render/software/AtmosphereRenderer.cpp @@ -1,18 +1,18 @@ #include "AtmosphereRenderer.h" -#include -#include "SoftwareRenderer.h" #include "AtmosphereDefinition.h" #include "AtmosphereModelBruneton.h" #include "AtmosphereResult.h" +#include "CelestialBodyDefinition.h" +#include "FloatNode.h" #include "GodRaysSampler.h" #include "LightComponent.h" #include "LightStatus.h" -#include "Scenery.h" -#include "NightSky.h" #include "MoonRenderer.h" -#include "CelestialBodyDefinition.h" -#include "FloatNode.h" +#include "NightSky.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include static inline double _getDayFactor(double daytime) { daytime = 1.0 - fabs(0.5 - daytime) / 0.5; diff --git a/src/render/software/BaseCloudLayerRenderer.cpp b/src/render/software/BaseCloudLayerRenderer.cpp index 8499370..2fa991d 100644 --- a/src/render/software/BaseCloudLayerRenderer.cpp +++ b/src/render/software/BaseCloudLayerRenderer.cpp @@ -1,7 +1,7 @@ #include "BaseCloudLayerRenderer.h" -#include "clouds/BaseCloudsModel.h" #include "Vector3.h" +#include "clouds/BaseCloudsModel.h" BaseCloudLayerRenderer::BaseCloudLayerRenderer(SoftwareRenderer *parent) : parent(parent) { setQuality(0.5); diff --git a/src/render/software/Canvas.cpp b/src/render/software/Canvas.cpp index af4cc91..1fd34ca 100644 --- a/src/render/software/Canvas.cpp +++ b/src/render/software/Canvas.cpp @@ -2,9 +2,9 @@ #include +#include "CanvasPictureWriter.h" #include "CanvasPortion.h" #include "CanvasPreview.h" -#include "CanvasPictureWriter.h" #define CUTTER_SIZE 800 diff --git a/src/render/software/CanvasPixelShader.cpp b/src/render/software/CanvasPixelShader.cpp index ee65c60..c4338d4 100644 --- a/src/render/software/CanvasPixelShader.cpp +++ b/src/render/software/CanvasPixelShader.cpp @@ -1,12 +1,12 @@ #include "CanvasPixelShader.h" -#include "Color.h" -#include "SoftwareCanvasRenderer.h" -#include "CanvasPortion.h" -#include "CanvasPixel.h" #include "CanvasFragment.h" +#include "CanvasPixel.h" +#include "CanvasPortion.h" +#include "Color.h" #include "Rasterizer.h" #include "RenderProgress.h" +#include "SoftwareCanvasRenderer.h" CanvasPixelShader::CanvasPixelShader(const SoftwareCanvasRenderer &renderer, CanvasPortion *portion, RenderProgress *progress, int chunk_size, int sub_chunk_size, int chunks_x, diff --git a/src/render/software/CanvasPortion.cpp b/src/render/software/CanvasPortion.cpp index 59ad418..8ebb780 100644 --- a/src/render/software/CanvasPortion.cpp +++ b/src/render/software/CanvasPortion.cpp @@ -6,8 +6,8 @@ #include "CanvasPixel.h" #include "CanvasPreview.h" -#include "PackStream.h" #include "FileSystem.h" +#include "PackStream.h" #include "System.h" #define CHECK_COORDINATES() \ diff --git a/src/render/software/CanvasPreview.cpp b/src/render/software/CanvasPreview.cpp index db516c3..0ef405f 100644 --- a/src/render/software/CanvasPreview.cpp +++ b/src/render/software/CanvasPreview.cpp @@ -1,9 +1,9 @@ #include "CanvasPreview.h" -#include "Color.h" #include "CanvasLiveClient.h" -#include "Mutex.h" +#include "Color.h" #include "ColorProfile.h" +#include "Mutex.h" #include diff --git a/src/render/software/CloudBasicLayerRenderer.cpp b/src/render/software/CloudBasicLayerRenderer.cpp index 2fb852a..b4c9a85 100644 --- a/src/render/software/CloudBasicLayerRenderer.cpp +++ b/src/render/software/CloudBasicLayerRenderer.cpp @@ -1,20 +1,20 @@ #include "CloudBasicLayerRenderer.h" -#include -#include -#include -#include "CloudLayerDefinition.h" -#include "SoftwareRenderer.h" -#include "NoiseGenerator.h" -#include "Curve.h" #include "AtmosphereRenderer.h" #include "AtmosphereResult.h" +#include "CloudLayerDefinition.h" +#include "Curve.h" +#include "FloatNode.h" #include "LightComponent.h" -#include "clouds/BaseCloudsModel.h" -#include "SurfaceMaterial.h" #include "Logs.h" #include "Maths.h" -#include "FloatNode.h" +#include "NoiseGenerator.h" +#include "SoftwareRenderer.h" +#include "SurfaceMaterial.h" +#include "clouds/BaseCloudsModel.h" +#include +#include +#include struct CloudSegment { Vector3 start; diff --git a/src/render/software/CloudsRenderer.cpp b/src/render/software/CloudsRenderer.cpp index a1e7d39..e5aa26e 100644 --- a/src/render/software/CloudsRenderer.cpp +++ b/src/render/software/CloudsRenderer.cpp @@ -1,13 +1,13 @@ #include "CloudsRenderer.h" -#include "SoftwareRenderer.h" -#include "Scenery.h" -#include "CloudsDefinition.h" -#include "CloudLayerDefinition.h" #include "BaseCloudLayerRenderer.h" -#include "CloudBasicLayerRenderer.h" #include "CameraDefinition.h" +#include "CloudBasicLayerRenderer.h" +#include "CloudLayerDefinition.h" +#include "CloudsDefinition.h" #include "Logs.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" #include "clouds/BaseCloudsModel.h" #include "clouds/CloudModelAltoCumulus.h" diff --git a/src/render/software/FluidMediumManager.cpp b/src/render/software/FluidMediumManager.cpp index d2fea02..b2d2f74 100644 --- a/src/render/software/FluidMediumManager.cpp +++ b/src/render/software/FluidMediumManager.cpp @@ -1,8 +1,8 @@ #include "FluidMediumManager.h" -#include "SoftwareRenderer.h" -#include "FluidMediumInterface.h" #include "Color.h" +#include "FluidMediumInterface.h" +#include "SoftwareRenderer.h" FluidMediumManager::FluidMediumManager(SoftwareRenderer *renderer) : renderer(renderer) { } diff --git a/src/render/software/GodRaysSampler.cpp b/src/render/software/GodRaysSampler.cpp index 72f23ce..9acbd54 100644 --- a/src/render/software/GodRaysSampler.cpp +++ b/src/render/software/GodRaysSampler.cpp @@ -1,20 +1,20 @@ #include "GodRaysSampler.h" -#include -#include -#include "GodRaysDefinition.h" #include "AtmosphereDefinition.h" -#include "SoftwareRenderer.h" -#include "Vector3.h" -#include "SpaceSegment.h" -#include "GodRaysResult.h" -#include "LightingManager.h" -#include "FloatNode.h" -#include "LightStatus.h" -#include "Scenery.h" -#include "TerrainDefinition.h" #include "CloudsRenderer.h" +#include "FloatNode.h" +#include "GodRaysDefinition.h" +#include "GodRaysResult.h" #include "Interpolation.h" +#include "LightStatus.h" +#include "LightingManager.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include "SpaceSegment.h" +#include "TerrainDefinition.h" +#include "Vector3.h" +#include +#include GodRaysSampler::GodRaysSampler() { enabled = true; diff --git a/src/render/software/LightStatus.cpp b/src/render/software/LightStatus.cpp index 0aa3f9f..21655bc 100644 --- a/src/render/software/LightStatus.cpp +++ b/src/render/software/LightStatus.cpp @@ -1,8 +1,8 @@ #include "LightStatus.h" -#include "LightingManager.h" -#include "LightComponent.h" #include "Color.h" +#include "LightComponent.h" +#include "LightingManager.h" #include "SurfaceMaterial.h" LightStatus::LightStatus(LightingManager *manager, const Vector3 &location, const Vector3 &eye, bool filtered) { diff --git a/src/render/software/LightingManager.cpp b/src/render/software/LightingManager.cpp index ed74dfb..8724e8d 100644 --- a/src/render/software/LightingManager.cpp +++ b/src/render/software/LightingManager.cpp @@ -1,14 +1,14 @@ #include "LightingManager.h" -#include -#include -#include "LightFilter.h" -#include "LightComponent.h" -#include "LightStatus.h" -#include "LightSource.h" #include "Color.h" -#include "SurfaceMaterial.h" +#include "LightComponent.h" +#include "LightFilter.h" +#include "LightSource.h" +#include "LightStatus.h" #include "Logs.h" +#include "SurfaceMaterial.h" +#include +#include LightingManager::LightingManager() { specularity = true; diff --git a/src/render/software/MoonRenderer.cpp b/src/render/software/MoonRenderer.cpp index c732abe..695e503 100644 --- a/src/render/software/MoonRenderer.cpp +++ b/src/render/software/MoonRenderer.cpp @@ -1,14 +1,14 @@ #include "MoonRenderer.h" -#include #include "CelestialBodyDefinition.h" #include "Color.h" -#include "LightingManager.h" -#include "Geometry.h" -#include "SurfaceMaterial.h" #include "FloatNode.h" #include "FractalNoise.h" +#include "Geometry.h" +#include "LightingManager.h" #include "NoiseNode.h" +#include "SurfaceMaterial.h" +#include class MoonRenderer::pimpl { public: diff --git a/src/render/software/NightSky.cpp b/src/render/software/NightSky.cpp index 92ebefc..db06761 100644 --- a/src/render/software/NightSky.cpp +++ b/src/render/software/NightSky.cpp @@ -1,18 +1,18 @@ #include "NightSky.h" -#include -#include "Color.h" -#include "Vector3.h" -#include "Geometry.h" -#include "SoftwareRenderer.h" -#include "Scenery.h" #include "AtmosphereDefinition.h" #include "AtmosphereRenderer.h" -#include "SurfaceMaterial.h" +#include "CelestialBodyDefinition.h" +#include "Color.h" +#include "FloatNode.h" +#include "Geometry.h" #include "LightComponent.h" #include "LightStatus.h" -#include "CelestialBodyDefinition.h" -#include "FloatNode.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include "SurfaceMaterial.h" +#include "Vector3.h" +#include NightSky::NightSky(SoftwareRenderer *renderer) : renderer(renderer) { } diff --git a/src/render/software/OverlayRasterizer.cpp b/src/render/software/OverlayRasterizer.cpp index efbca3e..5f7a990 100644 --- a/src/render/software/OverlayRasterizer.cpp +++ b/src/render/software/OverlayRasterizer.cpp @@ -1,10 +1,10 @@ #include "OverlayRasterizer.h" -#include -#include "Color.h" -#include "SoftwareCanvasRenderer.h" #include "CameraDefinition.h" #include "CanvasFragment.h" +#include "Color.h" +#include "SoftwareCanvasRenderer.h" +#include OverlayRasterizer::OverlayRasterizer(SoftwareCanvasRenderer *renderer) : Rasterizer(renderer, renderer->getProgressHelper(), 0, COLOR_WHITE) { diff --git a/src/render/software/Rasterizer.cpp b/src/render/software/Rasterizer.cpp index 63c8bdf..0a5b1a6 100644 --- a/src/render/software/Rasterizer.cpp +++ b/src/render/software/Rasterizer.cpp @@ -1,12 +1,12 @@ #include "Rasterizer.h" -#include -#include "SoftwareRenderer.h" #include "CameraDefinition.h" -#include "CanvasPortion.h" #include "CanvasFragment.h" -#include "Vector3.h" +#include "CanvasPortion.h" #include "RenderProgress.h" +#include "SoftwareRenderer.h" +#include "Vector3.h" +#include struct paysages::software::ScanPoint { int x; diff --git a/src/render/software/RenderProgress.cpp b/src/render/software/RenderProgress.cpp index 5552e69..221ec3e 100644 --- a/src/render/software/RenderProgress.cpp +++ b/src/render/software/RenderProgress.cpp @@ -1,8 +1,8 @@ #include "RenderProgress.h" +#include "Logs.h" #include "Mutex.h" #include "Timing.h" -#include "Logs.h" RenderProgress::RenderProgress(int count) { lock = new Mutex(); diff --git a/src/render/software/SkyRasterizer.cpp b/src/render/software/SkyRasterizer.cpp index 0b44912..bfd228f 100644 --- a/src/render/software/SkyRasterizer.cpp +++ b/src/render/software/SkyRasterizer.cpp @@ -1,18 +1,18 @@ #include "SkyRasterizer.h" -#include -#include "Scenery.h" -#include "Maths.h" -#include "Vector3.h" -#include "Color.h" -#include "SoftwareRenderer.h" #include "AtmosphereRenderer.h" #include "AtmosphereResult.h" -#include "CloudsRenderer.h" -#include "Rasterizer.h" #include "CanvasFragment.h" -#include "RenderProgress.h" +#include "CloudsRenderer.h" +#include "Color.h" #include "GodRaysSampler.h" +#include "Maths.h" +#include "Rasterizer.h" +#include "RenderProgress.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include "Vector3.h" +#include SkyRasterizer::SkyRasterizer(SoftwareRenderer *renderer, RenderProgress *progress, unsigned short client_id) : Rasterizer(renderer, progress, client_id, Color(0.7, 0.7, 1.0)) { diff --git a/src/render/software/SoftwareCanvasRenderer.cpp b/src/render/software/SoftwareCanvasRenderer.cpp index cfa0291..6ac5814 100644 --- a/src/render/software/SoftwareCanvasRenderer.cpp +++ b/src/render/software/SoftwareCanvasRenderer.cpp @@ -1,20 +1,20 @@ #include "SoftwareCanvasRenderer.h" -#include "Rasterizer.h" -#include "SoftwareRenderer.h" -#include "Canvas.h" -#include "TerrainRasterizer.h" -#include "WaterRasterizer.h" -#include "SkyRasterizer.h" -#include "VegetationRasterizer.h" #include "CameraDefinition.h" -#include "ParallelWork.h" -#include "CanvasPortion.h" +#include "Canvas.h" #include "CanvasPixelShader.h" -#include "RenderConfig.h" -#include "ColorProfile.h" +#include "CanvasPortion.h" #include "CanvasPreview.h" +#include "ColorProfile.h" +#include "ParallelWork.h" +#include "Rasterizer.h" +#include "RenderConfig.h" #include "RenderProgress.h" +#include "SkyRasterizer.h" +#include "SoftwareRenderer.h" +#include "TerrainRasterizer.h" +#include "VegetationRasterizer.h" +#include "WaterRasterizer.h" SoftwareCanvasRenderer::SoftwareCanvasRenderer(Scenery *scenery) : SoftwareRenderer(scenery) { started = false; diff --git a/src/render/software/SoftwareRenderer.cpp b/src/render/software/SoftwareRenderer.cpp index f812b67..60bc4cb 100644 --- a/src/render/software/SoftwareRenderer.cpp +++ b/src/render/software/SoftwareRenderer.cpp @@ -1,29 +1,29 @@ #include "SoftwareRenderer.h" -#include "CameraDefinition.h" -#include "Scenery.h" -#include "FluidMediumManager.h" -#include "AtmosphereRenderer.h" #include "AtmosphereDefinition.h" +#include "AtmosphereRenderer.h" #include "AtmosphereResult.h" -#include "CloudsRenderer.h" +#include "CameraDefinition.h" #include "CloudsDefinition.h" -#include "TerrainRenderer.h" -#include "TexturesRenderer.h" -#include "VegetationRenderer.h" -#include "WaterRenderer.h" -#include "SkyRasterizer.h" -#include "TerrainRasterizer.h" -#include "WaterRasterizer.h" -#include "NightSky.h" -#include "MoonRenderer.h" +#include "CloudsRenderer.h" +#include "FluidMediumManager.h" +#include "GodRaysResult.h" +#include "GodRaysSampler.h" #include "LightStatus.h" #include "LightingManager.h" -#include "GodRaysSampler.h" -#include "GodRaysResult.h" -#include "System.h" -#include "Thread.h" +#include "MoonRenderer.h" +#include "NightSky.h" #include "RayCastingResult.h" +#include "Scenery.h" +#include "SkyRasterizer.h" +#include "System.h" +#include "TerrainRasterizer.h" +#include "TerrainRenderer.h" +#include "TexturesRenderer.h" +#include "Thread.h" +#include "VegetationRenderer.h" +#include "WaterRasterizer.h" +#include "WaterRenderer.h" SoftwareRenderer::SoftwareRenderer(Scenery *scenery) : scenery(scenery) { render_camera = new CameraDefinition; diff --git a/src/render/software/TerrainRasterizer.cpp b/src/render/software/TerrainRasterizer.cpp index 7ee44c0..d93dace 100644 --- a/src/render/software/TerrainRasterizer.cpp +++ b/src/render/software/TerrainRasterizer.cpp @@ -1,16 +1,16 @@ #include "TerrainRasterizer.h" -#include -#include "SoftwareRenderer.h" #include "BoundingBox.h" #include "CameraDefinition.h" -#include "TerrainRenderer.h" -#include "WaterRenderer.h" -#include "TexturesRenderer.h" -#include "Scenery.h" -#include "CanvasPortion.h" #include "CanvasFragment.h" +#include "CanvasPortion.h" #include "RenderProgress.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include "TerrainRenderer.h" +#include "TexturesRenderer.h" +#include "WaterRenderer.h" +#include TerrainRasterizer::TerrainRasterizer(SoftwareRenderer *renderer, RenderProgress *progress, unsigned short client_id) : Rasterizer(renderer, progress, client_id, Color(1.0, 0.7, 0.7)) { diff --git a/src/render/software/TerrainRayWalker.cpp b/src/render/software/TerrainRayWalker.cpp index 7897f7e..638977b 100644 --- a/src/render/software/TerrainRayWalker.cpp +++ b/src/render/software/TerrainRayWalker.cpp @@ -1,13 +1,13 @@ #include "TerrainRayWalker.h" -#include -#include "SoftwareRenderer.h" -#include "Scenery.h" -#include "TerrainDefinition.h" -#include "TexturesDefinition.h" -#include "TerrainRenderer.h" -#include "TexturesRenderer.h" #include "Matrix4.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include "TerrainDefinition.h" +#include "TerrainRenderer.h" +#include "TexturesDefinition.h" +#include "TexturesRenderer.h" +#include TerrainRayWalker::TerrainRayWalker(SoftwareRenderer *renderer) : renderer(renderer) { setQuality(0.5); diff --git a/src/render/software/TerrainRenderer.cpp b/src/render/software/TerrainRenderer.cpp index af55972..816dbd9 100644 --- a/src/render/software/TerrainRenderer.cpp +++ b/src/render/software/TerrainRenderer.cpp @@ -1,14 +1,14 @@ #include "TerrainRenderer.h" -#include -#include "SoftwareRenderer.h" -#include "Scenery.h" -#include "TerrainDefinition.h" -#include "TexturesRenderer.h" -#include "TexturesDefinition.h" #include "LightComponent.h" -#include "TerrainRayWalker.h" #include "RayCastingResult.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include "TerrainDefinition.h" +#include "TerrainRayWalker.h" +#include "TexturesDefinition.h" +#include "TexturesRenderer.h" +#include TerrainRenderer::TerrainRenderer(SoftwareRenderer *parent) : parent(parent) { walker_ray = new TerrainRayWalker(parent); diff --git a/src/render/software/TerrainRenderer.h b/src/render/software/TerrainRenderer.h index d7e5586..fbba1c8 100644 --- a/src/render/software/TerrainRenderer.h +++ b/src/render/software/TerrainRenderer.h @@ -4,8 +4,8 @@ #include "LightFilter.h" -#include #include "Vector3.h" +#include namespace paysages { namespace software { diff --git a/src/render/software/TexturesRenderer.cpp b/src/render/software/TexturesRenderer.cpp index 8cb00f3..cd11009 100644 --- a/src/render/software/TexturesRenderer.cpp +++ b/src/render/software/TexturesRenderer.cpp @@ -1,17 +1,17 @@ #include "TexturesRenderer.h" -#include -#include +#include "FractalNoise.h" +#include "LightStatus.h" +#include "LightingManager.h" +#include "NoiseGenerator.h" +#include "NoiseNode.h" #include "Scenery.h" #include "SoftwareRenderer.h" #include "TextureLayerDefinition.h" #include "TexturesDefinition.h" #include "Zone.h" -#include "LightingManager.h" -#include "LightStatus.h" -#include "NoiseNode.h" -#include "FractalNoise.h" -#include "NoiseGenerator.h" +#include +#include TexturesRenderer::TexturesRenderer() { setQualityFactor(0.5); diff --git a/src/render/software/VegetationModelRenderer.cpp b/src/render/software/VegetationModelRenderer.cpp index 841c948..701625c 100644 --- a/src/render/software/VegetationModelRenderer.cpp +++ b/src/render/software/VegetationModelRenderer.cpp @@ -1,12 +1,12 @@ #include "VegetationModelRenderer.h" #include "Color.h" -#include "SurfaceMaterial.h" -#include "SpaceSegment.h" -#include "InfiniteRay.h" #include "Disk.h" -#include "SoftwareRenderer.h" +#include "InfiniteRay.h" #include "LightComponent.h" +#include "SoftwareRenderer.h" +#include "SpaceSegment.h" +#include "SurfaceMaterial.h" #include "VegetationModelDefinition.h" #include "VegetationResult.h" diff --git a/src/render/software/VegetationRasterizer.cpp b/src/render/software/VegetationRasterizer.cpp index b2b2ab6..8ab5033 100644 --- a/src/render/software/VegetationRasterizer.cpp +++ b/src/render/software/VegetationRasterizer.cpp @@ -1,14 +1,14 @@ #include "VegetationRasterizer.h" -#include -#include "Scenery.h" #include "CanvasFragment.h" #include "Color.h" -#include "SpaceSegment.h" +#include "RayCastingResult.h" +#include "Scenery.h" #include "SoftwareRenderer.h" +#include "SpaceSegment.h" #include "VegetationDefinition.h" #include "VegetationRenderer.h" -#include "RayCastingResult.h" +#include VegetationRasterizer::VegetationRasterizer(SoftwareRenderer *renderer, RenderProgress *progress, unsigned short client_id) diff --git a/src/render/software/VegetationRenderer.cpp b/src/render/software/VegetationRenderer.cpp index 9fe5095..e74edbe 100644 --- a/src/render/software/VegetationRenderer.cpp +++ b/src/render/software/VegetationRenderer.cpp @@ -1,19 +1,19 @@ #include "VegetationRenderer.h" -#include "VegetationModelRenderer.h" +#include "LightComponent.h" #include "RayCastingResult.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" #include "SpaceGridIterator.h" #include "SpaceSegment.h" -#include "VegetationInstance.h" -#include "SoftwareRenderer.h" -#include "Scenery.h" #include "TerrainRenderer.h" #include "VegetationDefinition.h" -#include "VegetationLayerDefinition.h" -#include "VegetationPresenceDefinition.h" #include "VegetationInstance.h" +#include "VegetationInstance.h" +#include "VegetationLayerDefinition.h" +#include "VegetationModelRenderer.h" +#include "VegetationPresenceDefinition.h" #include "VegetationResult.h" -#include "LightComponent.h" /** * Grid iterator to collect instances of a layer, in small squares. diff --git a/src/render/software/VegetationResult.h b/src/render/software/VegetationResult.h index b078362..256acb2 100644 --- a/src/render/software/VegetationResult.h +++ b/src/render/software/VegetationResult.h @@ -2,8 +2,8 @@ #include "software_global.h" -#include "Vector3.h" #include "SurfaceMaterial.h" +#include "Vector3.h" namespace paysages { namespace software { diff --git a/src/render/software/WaterRasterizer.cpp b/src/render/software/WaterRasterizer.cpp index f8413ed..868cc62 100644 --- a/src/render/software/WaterRasterizer.cpp +++ b/src/render/software/WaterRasterizer.cpp @@ -1,11 +1,11 @@ #include "WaterRasterizer.h" -#include +#include "CanvasFragment.h" +#include "RenderProgress.h" #include "Scenery.h" #include "SoftwareRenderer.h" #include "WaterRenderer.h" -#include "CanvasFragment.h" -#include "RenderProgress.h" +#include WaterRasterizer::WaterRasterizer(SoftwareRenderer *renderer, RenderProgress *progress, unsigned short client_id) : Rasterizer(renderer, progress, client_id, Color(0.7, 0.85, 1.0)) { diff --git a/src/render/software/WaterRenderer.cpp b/src/render/software/WaterRenderer.cpp index 832f8a0..ab29548 100644 --- a/src/render/software/WaterRenderer.cpp +++ b/src/render/software/WaterRenderer.cpp @@ -1,17 +1,17 @@ #include "WaterRenderer.h" -#include +#include "ColorNode.h" +#include "FloatNode.h" +#include "LightComponent.h" +#include "NoiseFunctionSimplex.h" +#include "NoiseGenerator.h" +#include "RayCastingResult.h" +#include "Scenery.h" #include "SoftwareRenderer.h" +#include "SurfaceMaterial.h" #include "TerrainRenderer.h" #include "WaterDefinition.h" -#include "NoiseGenerator.h" -#include "LightComponent.h" -#include "Scenery.h" -#include "SurfaceMaterial.h" -#include "NoiseFunctionSimplex.h" -#include "FloatNode.h" -#include "ColorNode.h" -#include "RayCastingResult.h" +#include WaterRenderer::WaterRenderer(SoftwareRenderer *parent) : parent(parent) { noise = new NoiseFunctionSimplex(); diff --git a/src/render/software/WaterRenderer.h b/src/render/software/WaterRenderer.h index dbb385d..4a261ab 100644 --- a/src/render/software/WaterRenderer.h +++ b/src/render/software/WaterRenderer.h @@ -4,9 +4,9 @@ #include "LightFilter.h" +#include "Color.h" #include "TerrainDefinition.h" #include "Vector3.h" -#include "Color.h" namespace paysages { namespace software { diff --git a/src/render/software/clouds/CloudModelAltoCumulus.cpp b/src/render/software/clouds/CloudModelAltoCumulus.cpp index f8df3e8..3856393 100644 --- a/src/render/software/clouds/CloudModelAltoCumulus.cpp +++ b/src/render/software/clouds/CloudModelAltoCumulus.cpp @@ -1,8 +1,8 @@ #include "CloudModelAltoCumulus.h" +#include "CloudLayerDefinition.h" #include "NoiseGenerator.h" #include "Vector3.h" -#include "CloudLayerDefinition.h" CloudModelAltoCumulus::CloudModelAltoCumulus(CloudLayerDefinition *layer) : BaseCloudsModel(layer) { noise = new NoiseGenerator(); diff --git a/src/render/software/clouds/CloudModelCirrus.cpp b/src/render/software/clouds/CloudModelCirrus.cpp index 1fcdb45..95a754c 100644 --- a/src/render/software/clouds/CloudModelCirrus.cpp +++ b/src/render/software/clouds/CloudModelCirrus.cpp @@ -1,8 +1,8 @@ #include "CloudModelCirrus.h" +#include "CloudLayerDefinition.h" #include "NoiseGenerator.h" #include "Vector3.h" -#include "CloudLayerDefinition.h" CloudModelCirrus::CloudModelCirrus(CloudLayerDefinition *layer) : BaseCloudsModel(layer) { noise = new NoiseGenerator(); diff --git a/src/render/software/clouds/CloudModelCumuloNimbus.cpp b/src/render/software/clouds/CloudModelCumuloNimbus.cpp index dfa0337..c0ee5b1 100644 --- a/src/render/software/clouds/CloudModelCumuloNimbus.cpp +++ b/src/render/software/clouds/CloudModelCumuloNimbus.cpp @@ -1,8 +1,8 @@ #include "CloudModelCumuloNimbus.h" +#include "CloudLayerDefinition.h" #include "NoiseGenerator.h" #include "Vector3.h" -#include "CloudLayerDefinition.h" CloudModelCumuloNimbus::CloudModelCumuloNimbus(CloudLayerDefinition *layer) : BaseCloudsModel(layer) { noise = new NoiseGenerator(); diff --git a/src/render/software/clouds/CloudModelStratoCumulus.cpp b/src/render/software/clouds/CloudModelStratoCumulus.cpp index f2b83a6..009f8ea 100644 --- a/src/render/software/clouds/CloudModelStratoCumulus.cpp +++ b/src/render/software/clouds/CloudModelStratoCumulus.cpp @@ -1,8 +1,8 @@ #include "CloudModelStratoCumulus.h" +#include "CloudLayerDefinition.h" #include "NoiseGenerator.h" #include "Vector3.h" -#include "CloudLayerDefinition.h" CloudModelStratoCumulus::CloudModelStratoCumulus(CloudLayerDefinition *layer) : BaseCloudsModel(layer) { noise = new NoiseGenerator(); diff --git a/src/system/CacheFile.cpp b/src/system/CacheFile.cpp index ca87dc9..613529b 100644 --- a/src/system/CacheFile.cpp +++ b/src/system/CacheFile.cpp @@ -1,7 +1,7 @@ #include "CacheFile.h" -#include #include "DataFile.h" +#include CacheFile::CacheFile(const string &module, const string &ext, const string &tag1, int tag2, int tag3, int tag4, int tag5, int tag6) { diff --git a/src/system/Logs.cpp b/src/system/Logs.cpp index 8eb9aea..1379f0f 100644 --- a/src/system/Logs.cpp +++ b/src/system/Logs.cpp @@ -2,8 +2,8 @@ #include "Timing.h" -#include #include +#include template > class basic_nullbuf : public basic_streambuf { typename traits::int_type overflow(typename traits::int_type c) { diff --git a/src/system/Memory.cpp b/src/system/Memory.cpp index 0e4eb2b..96bf676 100644 --- a/src/system/Memory.cpp +++ b/src/system/Memory.cpp @@ -1,8 +1,8 @@ #include "Memory.h" +#include #include #include -#include void *Memory::naiveArrayInsert(void **array, unsigned long item_size, int item_count, int location) { char **barray = (char **)array; diff --git a/src/system/PackStream.cpp b/src/system/PackStream.cpp index 417d227..c42c332 100644 --- a/src/system/PackStream.cpp +++ b/src/system/PackStream.cpp @@ -1,10 +1,10 @@ #include "PackStream.h" #include "Logs.h" -#include -#include -#include #include +#include +#include +#include class PackStream::pimpl { public: diff --git a/src/system/ParallelWork.cpp b/src/system/ParallelWork.cpp index bdd7483..74bb4d2 100644 --- a/src/system/ParallelWork.cpp +++ b/src/system/ParallelWork.cpp @@ -1,10 +1,10 @@ #include "ParallelWork.h" -#include "Thread.h" -#include "System.h" -#include "Semaphore.h" #include "Mutex.h" #include "ParallelWorker.h" +#include "Semaphore.h" +#include "System.h" +#include "Thread.h" #include /** diff --git a/src/system/System.cpp b/src/system/System.cpp index 7a79d7a..7755c0c 100644 --- a/src/system/System.cpp +++ b/src/system/System.cpp @@ -1,7 +1,7 @@ #include "System.h" -#include #include +#include static int core_count = -1; diff --git a/src/tests/CanvasPortion_Test.cpp b/src/tests/CanvasPortion_Test.cpp index 22687d6..380dd44 100644 --- a/src/tests/CanvasPortion_Test.cpp +++ b/src/tests/CanvasPortion_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "CanvasPortion.h" #include "CanvasFragment.h" +#include "CanvasPortion.h" TEST(CanvasPortion, setSize) { CanvasPortion portion; diff --git a/src/tests/CappedCylinder_Test.cpp b/src/tests/CappedCylinder_Test.cpp index 20411d2..52fc13e 100644 --- a/src/tests/CappedCylinder_Test.cpp +++ b/src/tests/CappedCylinder_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include #include "CappedCylinder.h" +#include TEST(CappedCylinder, findRayIntersection) { CappedCylinder cylinder(VECTOR_DOWN, VECTOR_UP, 1.0, 2.0); diff --git a/src/tests/CelestialBodyDefinition_Test.cpp b/src/tests/CelestialBodyDefinition_Test.cpp index 1a070a9..385c159 100644 --- a/src/tests/CelestialBodyDefinition_Test.cpp +++ b/src/tests/CelestialBodyDefinition_Test.cpp @@ -1,5 +1,5 @@ -#include "BaseTestCase.h" #include "CelestialBodyDefinition.h" +#include "BaseTestCase.h" #include "FloatNode.h" diff --git a/src/tests/ColorNode_Test.cpp b/src/tests/ColorNode_Test.cpp index 5a6f71b..2db8f3d 100644 --- a/src/tests/ColorNode_Test.cpp +++ b/src/tests/ColorNode_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "ColorNode.h" #include "ColorDiff.h" +#include "ColorNode.h" #include "IntDiff.h" #include "PackStream.h" diff --git a/src/tests/DefinitionNode_Test.cpp b/src/tests/DefinitionNode_Test.cpp index 593066e..cb7edfc 100644 --- a/src/tests/DefinitionNode_Test.cpp +++ b/src/tests/DefinitionNode_Test.cpp @@ -1,11 +1,11 @@ #include "BaseTestCase.h" -#include "System.h" #include "DefinitionNode.h" -#include "IntNode.h" -#include "FloatNode.h" -#include "PackStream.h" #include "DefinitionWatcher.h" +#include "FloatNode.h" +#include "IntNode.h" +#include "PackStream.h" +#include "System.h" TEST(DefinitionNode, toString) { DefinitionNode root(NULL, "root"); diff --git a/src/tests/DefinitionWatcher_Test.cpp b/src/tests/DefinitionWatcher_Test.cpp index b033731..d47942b 100644 --- a/src/tests/DefinitionWatcher_Test.cpp +++ b/src/tests/DefinitionWatcher_Test.cpp @@ -1,5 +1,5 @@ -#include "BaseTestCase.h" #include "DefinitionWatcher.h" +#include "BaseTestCase.h" #include "IntNode.h" diff --git a/src/tests/DiffManager_Test.cpp b/src/tests/DiffManager_Test.cpp index f532b1d..03f790c 100644 --- a/src/tests/DiffManager_Test.cpp +++ b/src/tests/DiffManager_Test.cpp @@ -1,11 +1,11 @@ #include "BaseTestCase.h" -#include "TestToolDefinition.h" -#include "DiffManager.h" #include "DefinitionNode.h" #include "DefinitionWatcher.h" +#include "DiffManager.h" #include "FloatDiff.h" #include "FloatNode.h" +#include "TestToolDefinition.h" TEST(DiffManager, undoRedo) { DefinitionNode root(NULL, "root"); diff --git a/src/tests/Disk_Test.cpp b/src/tests/Disk_Test.cpp index 1b8d4ea..57b160b 100644 --- a/src/tests/Disk_Test.cpp +++ b/src/tests/Disk_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "InfiniteRay.h" #include "Disk.h" +#include "InfiniteRay.h" TEST(Disk, checkRayIntersection) { Disk disk(VECTOR_UP, VECTOR_UP, 0.8); diff --git a/src/tests/Euclid_Test.cpp b/src/tests/Euclid_Test.cpp index c8c3fcc..5ac69cc 100644 --- a/src/tests/Euclid_Test.cpp +++ b/src/tests/Euclid_Test.cpp @@ -1,9 +1,9 @@ #include "BaseTestCase.h" -#include -#include "Maths.h" #include "Geometry.h" +#include "Maths.h" #include "Vector3.h" +#include /*static inline int _Vector3_cmp(Vector3 v1, Vector3 v2) { diff --git a/src/tests/FloatNode_Test.cpp b/src/tests/FloatNode_Test.cpp index 0d05998..afc5e9c 100644 --- a/src/tests/FloatNode_Test.cpp +++ b/src/tests/FloatNode_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "FloatNode.h" #include "FloatDiff.h" +#include "FloatNode.h" #include "IntDiff.h" #include "PackStream.h" diff --git a/src/tests/FluidMediumManager_Test.cpp b/src/tests/FluidMediumManager_Test.cpp index 71bb711..dfc41d8 100644 --- a/src/tests/FluidMediumManager_Test.cpp +++ b/src/tests/FluidMediumManager_Test.cpp @@ -1,10 +1,10 @@ #include "BaseTestCase.h" -#include "SpaceSegment.h" +#include "FluidMediumInterface.h" +#include "FluidMediumManager.h" #include "Scenery.h" #include "SoftwareRenderer.h" -#include "FluidMediumManager.h" -#include "FluidMediumInterface.h" +#include "SpaceSegment.h" class FluidMediumManager_Test : public BaseTestCase { protected: diff --git a/src/tests/GodRaysSampler_Test.cpp b/src/tests/GodRaysSampler_Test.cpp index 5fb14b0..8630531 100644 --- a/src/tests/GodRaysSampler_Test.cpp +++ b/src/tests/GodRaysSampler_Test.cpp @@ -1,14 +1,14 @@ -#include "BaseTestCase.h" #include "GodRaysSampler.h" +#include "BaseTestCase.h" -#include +#include "Color.h" +#include "LightComponent.h" +#include "LightFilter.h" +#include "LightSource.h" +#include "LightingManager.h" #include "SpaceSegment.h" #include "Vector3.h" -#include "LightingManager.h" -#include "LightSource.h" -#include "LightFilter.h" -#include "LightComponent.h" -#include "Color.h" +#include TEST(GodRaysSampler, getBounds) { GodRaysSampler sampler; diff --git a/src/tests/InfiniteCylinder_Test.cpp b/src/tests/InfiniteCylinder_Test.cpp index cb24069..2774e84 100644 --- a/src/tests/InfiniteCylinder_Test.cpp +++ b/src/tests/InfiniteCylinder_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "InfiniteRay.h" #include "InfiniteCylinder.h" +#include "InfiniteRay.h" #include TEST(InfiniteCylinder, findRayIntersection) { diff --git a/src/tests/InfinitePlane_Test.cpp b/src/tests/InfinitePlane_Test.cpp index ec9170d..56a4df4 100644 --- a/src/tests/InfinitePlane_Test.cpp +++ b/src/tests/InfinitePlane_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "InfiniteRay.h" #include "InfinitePlane.h" +#include "InfiniteRay.h" TEST(InfinitePlane, checkRayIntersection) { InfinitePlane plane(VECTOR_UP, VECTOR_UP); diff --git a/src/tests/IntNode_Test.cpp b/src/tests/IntNode_Test.cpp index 8237ec9..87f5f7f 100644 --- a/src/tests/IntNode_Test.cpp +++ b/src/tests/IntNode_Test.cpp @@ -1,8 +1,8 @@ #include "BaseTestCase.h" -#include "IntNode.h" -#include "IntDiff.h" #include "FloatDiff.h" +#include "IntDiff.h" +#include "IntNode.h" #include "PackStream.h" TEST(IntNode, toString) { diff --git a/src/tests/Interpolation_Test.cpp b/src/tests/Interpolation_Test.cpp index 782dc62..4e1e89e 100644 --- a/src/tests/Interpolation_Test.cpp +++ b/src/tests/Interpolation_Test.cpp @@ -1,5 +1,5 @@ -#include "BaseTestCase.h" #include "Interpolation.h" +#include "BaseTestCase.h" TEST(Interpolation, trilinear) { double p[8] = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0}; diff --git a/src/tests/Layers_Test.cpp b/src/tests/Layers_Test.cpp index 9401bc3..625491c 100644 --- a/src/tests/Layers_Test.cpp +++ b/src/tests/Layers_Test.cpp @@ -1,11 +1,11 @@ #include "BaseTestCase.h" -#include "System.h" -#include "Layers.h" -#include "PackStream.h" +#include "DefinitionDiff.h" #include "DiffManager.h" #include "IntNode.h" -#include "DefinitionDiff.h" +#include "Layers.h" +#include "PackStream.h" +#include "System.h" static DefinitionNode *_construc1(Layers *, const string &name) { return new DefinitionNode(NULL, name); diff --git a/src/tests/LightingManager_Test.cpp b/src/tests/LightingManager_Test.cpp index da12f12..1f6572d 100644 --- a/src/tests/LightingManager_Test.cpp +++ b/src/tests/LightingManager_Test.cpp @@ -1,8 +1,8 @@ -#include "BaseTestCase.h" #include "LightingManager.h" +#include "BaseTestCase.h" -#include "LightSource.h" #include "LightFilter.h" +#include "LightSource.h" class FakeLightSource : public LightSource { virtual bool getLightsAt(vector &, const Vector3 &) const override { diff --git a/src/tests/Maths_Test.cpp b/src/tests/Maths_Test.cpp index b9db56e..2044b32 100644 --- a/src/tests/Maths_Test.cpp +++ b/src/tests/Maths_Test.cpp @@ -1,5 +1,5 @@ -#include "BaseTestCase.h" #include "Maths.h" +#include "BaseTestCase.h" TEST(Maths, modInRange) { EXPECT_DOUBLE_EQ(0.7, Maths::modInRange(-0.3, 0.0, 1.0)); diff --git a/src/tests/NoiseFunctionSimplex_Test.cpp b/src/tests/NoiseFunctionSimplex_Test.cpp index 5eebb80..812c476 100644 --- a/src/tests/NoiseFunctionSimplex_Test.cpp +++ b/src/tests/NoiseFunctionSimplex_Test.cpp @@ -1,5 +1,5 @@ -#include "BaseTestCase.h" #include "NoiseFunctionSimplex.h" +#include "BaseTestCase.h" #include "RandomGenerator.h" diff --git a/src/tests/OpenGLSkybox_Test.cpp b/src/tests/OpenGLSkybox_Test.cpp index 3d6b91f..ff60e01 100644 --- a/src/tests/OpenGLSkybox_Test.cpp +++ b/src/tests/OpenGLSkybox_Test.cpp @@ -1,9 +1,9 @@ -#include "BaseTestCase.h" #include "OpenGLSkybox.h" +#include "BaseTestCase.h" -#include "Scenery.h" -#include "OpenGLSharedState.h" #include "OpenGLRenderer.h" +#include "OpenGLSharedState.h" +#include "Scenery.h" TEST(OpenGLSkybox, glvariable_atmosphereHumidity) { Scenery scenery; diff --git a/src/tests/OpenGLTerrainChunk_Test.cpp b/src/tests/OpenGLTerrainChunk_Test.cpp index 0bffe12..c4a30cf 100644 --- a/src/tests/OpenGLTerrainChunk_Test.cpp +++ b/src/tests/OpenGLTerrainChunk_Test.cpp @@ -1,11 +1,11 @@ -#include "BaseTestCase.h" #include "OpenGLTerrainChunk.h" +#include "BaseTestCase.h" -#include "Scenery.h" +#include "NoiseNode.h" #include "OpenGLRenderer.h" #include "OpenGLVertexArray.h" +#include "Scenery.h" #include "TerrainDefinition.h" -#include "NoiseNode.h" #include "TestToolNoise.h" #include "Vector3.h" diff --git a/src/tests/OpenGLVariable_Test.cpp b/src/tests/OpenGLVariable_Test.cpp index ed21062..b46bb34 100644 --- a/src/tests/OpenGLVariable_Test.cpp +++ b/src/tests/OpenGLVariable_Test.cpp @@ -1,5 +1,5 @@ -#include "BaseTestCase.h" #include "OpenGLVariable.h" +#include "BaseTestCase.h" #include "NoiseFunctionSimplex.h" diff --git a/src/tests/OpenGLVegetationImpostor_Test.cpp b/src/tests/OpenGLVegetationImpostor_Test.cpp index 2f0b8a2..affa057 100644 --- a/src/tests/OpenGLVegetationImpostor_Test.cpp +++ b/src/tests/OpenGLVegetationImpostor_Test.cpp @@ -1,5 +1,5 @@ -#include "BaseTestCase.h" #include "OpenGLVegetationImpostor.h" +#include "BaseTestCase.h" #include "Vector3.h" diff --git a/src/tests/OpenGLVegetationLayer_Test.cpp b/src/tests/OpenGLVegetationLayer_Test.cpp index 8bf161e..0c0d67f 100644 --- a/src/tests/OpenGLVegetationLayer_Test.cpp +++ b/src/tests/OpenGLVegetationLayer_Test.cpp @@ -1,11 +1,11 @@ -#include "BaseTestCase.h" #include "OpenGLVegetationLayer.h" +#include "BaseTestCase.h" +#include "CameraDefinition.h" +#include "OpenGLVegetationInstance.h" +#include "VegetationInstance.h" #include "VegetationLayerDefinition.h" #include "VegetationModelDefinition.h" -#include "VegetationInstance.h" -#include "OpenGLVegetationInstance.h" -#include "CameraDefinition.h" class FakeLayerRenderer : public OpenGLVegetationLayer { public: diff --git a/src/tests/OpenGLVegetation_Test.cpp b/src/tests/OpenGLVegetation_Test.cpp index a662b13..0e734ed 100644 --- a/src/tests/OpenGLVegetation_Test.cpp +++ b/src/tests/OpenGLVegetation_Test.cpp @@ -1,10 +1,10 @@ -#include "BaseTestCase.h" #include "OpenGLVegetation.h" +#include "BaseTestCase.h" +#include "OpenGLRenderer.h" #include "Scenery.h" #include "VegetationDefinition.h" #include "VegetationLayerDefinition.h" -#include "OpenGLRenderer.h" TEST(OpenGLVegetation, updateLayers) { Scenery scenery; diff --git a/src/tests/OverlayRasterizer_Test.cpp b/src/tests/OverlayRasterizer_Test.cpp index 5a7a040..6be68f4 100644 --- a/src/tests/OverlayRasterizer_Test.cpp +++ b/src/tests/OverlayRasterizer_Test.cpp @@ -1,10 +1,10 @@ -#include "BaseTestCase.h" #include "OverlayRasterizer.h" +#include "BaseTestCase.h" -#include +#include "Color.h" #include "Scenery.h" #include "SoftwareCanvasRenderer.h" -#include "Color.h" +#include typedef struct { int x; diff --git a/src/tests/PackStream_Test.cpp b/src/tests/PackStream_Test.cpp index 2502a17..f954793 100644 --- a/src/tests/PackStream_Test.cpp +++ b/src/tests/PackStream_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "System.h" #include "PackStream.h" +#include "System.h" TEST(PackStream, All) { PackStream *stream; diff --git a/src/tests/Rasterizer_Test.cpp b/src/tests/Rasterizer_Test.cpp index 80fda81..2e3f361 100644 --- a/src/tests/Rasterizer_Test.cpp +++ b/src/tests/Rasterizer_Test.cpp @@ -1,12 +1,12 @@ -#include "BaseTestCase.h" #include "Rasterizer.h" +#include "BaseTestCase.h" -#include "SoftwareRenderer.h" -#include "Scenery.h" -#include "Vector3.h" #include "CameraDefinition.h" -#include "Color.h" #include "CanvasPortion.h" +#include "Color.h" +#include "Scenery.h" +#include "SoftwareRenderer.h" +#include "Vector3.h" class FakeRasterizer : public Rasterizer { public: diff --git a/src/tests/Scenery_Test.cpp b/src/tests/Scenery_Test.cpp index 0fb5246..76b056f 100644 --- a/src/tests/Scenery_Test.cpp +++ b/src/tests/Scenery_Test.cpp @@ -1,11 +1,11 @@ #include "BaseTestCase.h" -#include "System.h" -#include "Scenery.h" -#include "Logs.h" -#include "TerrainDefinition.h" #include "AtmosphereDefinition.h" #include "FloatNode.h" +#include "Logs.h" +#include "Scenery.h" +#include "System.h" +#include "TerrainDefinition.h" TEST(Scenery, saveGlobal) { Scenery scenery1; diff --git a/src/tests/SpaceSegment_Test.cpp b/src/tests/SpaceSegment_Test.cpp index fdd3b1b..b430871 100644 --- a/src/tests/SpaceSegment_Test.cpp +++ b/src/tests/SpaceSegment_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "SpaceSegment.h" #include "SpaceGridIterator.h" +#include "SpaceSegment.h" class CollectGridIterator : public SpaceGridIterator { public: diff --git a/src/tests/TerrainPainting_Test.cpp b/src/tests/TerrainPainting_Test.cpp index 76cb8d0..52c978c 100644 --- a/src/tests/TerrainPainting_Test.cpp +++ b/src/tests/TerrainPainting_Test.cpp @@ -1,13 +1,13 @@ #include "BaseTestCase.h" -#include +#include "FloatNode.h" #include "Maths.h" #include "NoiseNode.h" -#include "TestToolNoise.h" +#include "PaintedGridBrush.h" #include "TerrainDefinition.h" #include "TerrainHeightMap.h" -#include "PaintedGridBrush.h" -#include "FloatNode.h" +#include "TestToolNoise.h" +#include // Noise sin period is defined at 20.0 static constexpr double X_FACTOR = Maths::PI / 10.0; diff --git a/src/tests/TexturesRenderer_Test.cpp b/src/tests/TexturesRenderer_Test.cpp index c385da8..1f6389c 100644 --- a/src/tests/TexturesRenderer_Test.cpp +++ b/src/tests/TexturesRenderer_Test.cpp @@ -1,9 +1,9 @@ -#include "BaseTestCase.h" #include "TexturesRenderer.h" +#include "BaseTestCase.h" -#include "Vector3.h" -#include "TexturesDefinition.h" #include "TextureLayerDefinition.h" +#include "TexturesDefinition.h" +#include "Vector3.h" #include "Zone.h" TEST(TexturesRenderer, getLayersPresence) { diff --git a/src/tests/Vector3_Test.cpp b/src/tests/Vector3_Test.cpp index ee2fe33..5fc7f60 100644 --- a/src/tests/Vector3_Test.cpp +++ b/src/tests/Vector3_Test.cpp @@ -1,5 +1,5 @@ -#include "BaseTestCase.h" #include "Vector3.h" +#include "BaseTestCase.h" TEST(Vector3, midPointTo) { Vector3 v1(1.0, 2.0, 8.0); diff --git a/src/tests/VegetationRasterizer_Test.cpp b/src/tests/VegetationRasterizer_Test.cpp index c2ed959..86d75c5 100644 --- a/src/tests/VegetationRasterizer_Test.cpp +++ b/src/tests/VegetationRasterizer_Test.cpp @@ -1,8 +1,8 @@ -#include "BaseTestCase.h" #include "VegetationRasterizer.h" +#include "BaseTestCase.h" -#include "SoftwareCanvasRenderer.h" #include "Scenery.h" +#include "SoftwareCanvasRenderer.h" #include "VegetationDefinition.h" #include "VegetationLayerDefinition.h" diff --git a/src/tests/Zone_Test.cpp b/src/tests/Zone_Test.cpp index 52e6be0..096e524 100644 --- a/src/tests/Zone_Test.cpp +++ b/src/tests/Zone_Test.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include "Zone.h" #include "Vector3.h" +#include "Zone.h" class Zone_Test : public BaseTestCase { protected: diff --git a/src/tests/main.cpp b/src/tests/main.cpp index 6ec0fd6..b900493 100644 --- a/src/tests/main.cpp +++ b/src/tests/main.cpp @@ -1,7 +1,7 @@ #include "BaseTestCase.h" -#include #include "Logs.h" +#include void noMessageOutput(QtMsgType, const QMessageLogContext &, const QString &) { }