graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Fixed top-down render preview

Browse source
This commit is contained in:
Michaël Lemaire 2013-12-15 14:50:43 +01:00
parent a814a530de
commit 02bf40c3c6
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,21 +5,7 @@
#include "Scenery.h" #include "Scenery.h"
#include "TerrainRenderer.h" #include "TerrainRenderer.h"
#include "WaterRenderer.h" #include "WaterRenderer.h"
#include "CloudsRenderer.h"
/*static Vector3 _getCameraLocation(Renderer*, Vector3 location)
{
return v3Add(location, v3Scale(VECTOR_UP, 50.0));
}
static AtmosphereResult _applyAerialPerspective(Renderer*, Vector3, Color base)
{
AtmosphereResult result;
atmosphereInitResult(&result);
result.base = base;
result.final = base;
atmosphereUpdateResult(&result);
return result;
}*/
SceneryTopDownPreviewRenderer::SceneryTopDownPreviewRenderer(Scenery* scenery): SceneryTopDownPreviewRenderer::SceneryTopDownPreviewRenderer(Scenery* scenery):
scenery(scenery) scenery(scenery)
@ -39,7 +25,6 @@ void SceneryTopDownPreviewRenderer::bindEvent(BasePreview* preview)
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);
preview->configScrolling(-1000.0, 1000.0, 0.0, -1000.0, 1000.0, 0.0); preview->configScrolling(-1000.0, 1000.0, 0.0, -1000.0, 1000.0, 0.0);
} }
void SceneryTopDownPreviewRenderer::updateEvent() void SceneryTopDownPreviewRenderer::updateEvent()
@ -52,10 +37,6 @@ void SceneryTopDownPreviewRenderer::updateEvent()
} }
prepare(); prepare();
/*getCameraLocation = _getCameraLocation;
lightingManagerDisableSpecularity(lighting);
atmosphere->applyAerialPerspective = _applyAerialPerspective;*/
} }
Color SceneryTopDownPreviewRenderer::getColor2D(double x, double y, double scaling) Color SceneryTopDownPreviewRenderer::getColor2D(double x, double y, double scaling)
@ -84,3 +65,20 @@ void SceneryTopDownPreviewRenderer::toggleChangeEvent(const std::string &key, bo
} }
} }
Vector3 SceneryTopDownPreviewRenderer::getCameraLocation(const Vector3 &target)
{
return target.add(VECTOR_UP.scale(50.0));
}
Color SceneryTopDownPreviewRenderer::applyMediumTraversal(Vector3 location, Color color)
{
if (clouds_enabled)
{
return getCloudsRenderer()->getColor(getCameraLocation(location), location, color);
}
else
{
return color;
}
}

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

@ -17,8 +17,12 @@ protected:
virtual void bindEvent(BasePreview* preview) override; virtual void bindEvent(BasePreview* preview) override;
virtual void updateEvent() override; virtual void updateEvent() override;
virtual Color getColor2D(double x, double y, double scaling) override; virtual Color getColor2D(double x, double y, double scaling) override;
virtual void toggleChangeEvent(const std::string &key, bool value) override; virtual void toggleChangeEvent(const std::string &key, bool value) override;
virtual Vector3 getCameraLocation(const Vector3 &target) override;
virtual Color applyMediumTraversal(Vector3 location, Color color) override;
private: private:
Scenery* scenery; Scenery* scenery;
bool clouds_enabled; bool clouds_enabled;