graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Fixed top-down preview and opengl renderer

Browse source
This commit is contained in:
Michaël Lemaire 2013-12-15 15:18:11 +01:00
parent 1685efcfbe
commit bd29ee97cf
4 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/render/opengl/OpenGLRenderer.cpp
View file

@ -59,6 +59,11 @@ void OpenGLRenderer::paint()
} }
double OpenGLRenderer::getPrecision(const Vector3 &)
{
return 0.0000001;
}
Color OpenGLRenderer::applyMediumTraversal(Vector3, Color color) Color OpenGLRenderer::applyMediumTraversal(Vector3, Color color)
{ {
return color; return color;

1
src/render/opengl/OpenGLRenderer.h
View file

@ -21,6 +21,7 @@ public:
void resize(int width, int height); void resize(int width, int height);
void paint(); void paint();
virtual double getPrecision(const Vector3 &location) override;
virtual Color applyMediumTraversal(Vector3 location, Color color) override; virtual Color applyMediumTraversal(Vector3 location, Color color) override;
}; };

12
src/render/preview/SceneryTopDownPreviewRenderer.cpp
View file

@ -6,6 +6,7 @@
#include "TerrainRenderer.h" #include "TerrainRenderer.h"
#include "WaterRenderer.h" #include "WaterRenderer.h"
#include "CloudsRenderer.h" #include "CloudsRenderer.h"
#include "LightingManager.h"
SceneryTopDownPreviewRenderer::SceneryTopDownPreviewRenderer(Scenery* scenery): SceneryTopDownPreviewRenderer::SceneryTopDownPreviewRenderer(Scenery* scenery):
scenery(scenery) scenery(scenery)
@ -21,6 +22,7 @@ void SceneryTopDownPreviewRenderer::bindEvent(BasePreview* preview)
// TODO Translation // TODO Translation
preview->addOsd("geolocation"); preview->addOsd("geolocation");
preview->addToggle("clouds", "Clouds", false); preview->addToggle("clouds", "Clouds", false);
preview->addToggle("specularity", "Light reflection", false);
preview->configHdrToneMapping(true); preview->configHdrToneMapping(true);
preview->configScaling(0.5, 200.0, 3.0, 50.0); preview->configScaling(0.5, 200.0, 3.0, 50.0);
@ -35,6 +37,7 @@ void SceneryTopDownPreviewRenderer::updateEvent()
{ {
getScenery()->getClouds()->clear(); getScenery()->getClouds()->clear();
} }
getLightingManager()->setSpecularity(specularity_enabled);
prepare(); prepare();
} }
@ -63,6 +66,15 @@ void SceneryTopDownPreviewRenderer::toggleChangeEvent(const std::string &key, bo
{ {
clouds_enabled = value; clouds_enabled = value;
} }
else if (key == "specularity")
{
specularity_enabled = value;
}
}
double SceneryTopDownPreviewRenderer::getPrecision(const Vector3 &)
{
return 0.0000001;
} }
Vector3 SceneryTopDownPreviewRenderer::getCameraLocation(const Vector3 &target) Vector3 SceneryTopDownPreviewRenderer::getCameraLocation(const Vector3 &target)

2
src/render/preview/SceneryTopDownPreviewRenderer.h
View file

@ -20,12 +20,14 @@ protected:
virtual void toggleChangeEvent(const std::string &key, bool value) override; virtual void toggleChangeEvent(const std::string &key, bool value) override;
virtual double getPrecision(const Vector3 &location) override;
virtual Vector3 getCameraLocation(const Vector3 &target) override; virtual Vector3 getCameraLocation(const Vector3 &target) override;
virtual Color applyMediumTraversal(Vector3 location, Color color) override; virtual Color applyMediumTraversal(Vector3 location, Color color) override;
private: private:
Scenery* scenery; Scenery* scenery;
bool clouds_enabled; bool clouds_enabled;
bool specularity_enabled;
CloudsDefinition* no_clouds; CloudsDefinition* no_clouds;
}; };