graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Coding style

Browse source
This commit is contained in:
Michaël Lemaire 2016-01-12 19:50:56 +01:00
parent bf42b2bab8
commit ba4433dfdd
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/definition/TexturesDefinition.h
View file

@ -16,11 +16,7 @@ class DEFINITIONSHARED_EXPORT TexturesDefinition : public Layers {
return (TextureLayerDefinition *)getLayer(position); return (TextureLayerDefinition *)getLayer(position);
} }
typedef enum { typedef enum { TEXTURES_PRESET_FULL, TEXTURES_PRESET_IRELAND, TEXTURES_PRESET_ALPS } TexturesPreset;
TEXTURES_PRESET_FULL,
TEXTURES_PRESET_IRELAND,
TEXTURES_PRESET_ALPS
} TexturesPreset;
void applyPreset(TexturesPreset preset, RandomGenerator &random = RandomGeneratorDefault); void applyPreset(TexturesPreset preset, RandomGenerator &random = RandomGeneratorDefault);
double getMaximalDisplacement(); double getMaximalDisplacement();

3
src/render/opengl/OpenGLTerrainChunk.cpp
View file

@ -99,7 +99,8 @@ bool OpenGLTerrainChunk::maintain() {
double x = _startx + factor * to_double(i); double x = _startx + factor * to_double(i);
double z = _startz + factor * to_double(j); double z = _startz + factor * to_double(j);
Color color = _renderer->getTerrainRenderer()->getFinalColor(x, z, 0.001); Color color = _renderer->getTerrainRenderer()->getFinalColor(x, z, 0.001);
new_image->setPixel(i, j, Color(color.r * 0.2, color.g * 0.2, color.b * 0.2).normalized().to32BitRGBA()); new_image->setPixel(i, j,
Color(color.r * 0.2, color.g * 0.2, color.b * 0.2).normalized().to32BitRGBA());
} }
} }

3
src/render/software/AtmosphereModelBruneton.h
View file

@ -13,7 +13,8 @@ class SOFTWARESHARED_EXPORT AtmosphereModelBruneton : public LightSource {
AtmosphereModelBruneton(SoftwareRenderer *parent); AtmosphereModelBruneton(SoftwareRenderer *parent);
virtual ~AtmosphereModelBruneton(); virtual ~AtmosphereModelBruneton();
AtmosphereResult getSkyColor(Vector3 eye, const Vector3 &direction, const Vector3 &sun_position, const Color &base) const; AtmosphereResult getSkyColor(Vector3 eye, const Vector3 &direction, const Vector3 &sun_position,
const Color &base) const;
AtmosphereResult applyAerialPerspective(Vector3 location, const Color &base) const; AtmosphereResult applyAerialPerspective(Vector3 location, const Color &base) const;
virtual bool getLightsAt(vector<LightComponent> &result, const Vector3 &location) const override; virtual bool getLightsAt(vector<LightComponent> &result, const Vector3 &location) const override;