graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Refactored atmosphere previews

Browse source
This commit is contained in:
Michaël Lemaire 2013-11-20 11:27:21 +01:00 committed by Michael Lemaire
parent ee78af05d5
commit ee094d9b18
3 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/interface/desktop/formatmosphere.cpp
View file

@ -14,27 +14,6 @@
static AtmosphereDefinition* _definition; static AtmosphereDefinition* _definition;
/**************** Previews ****************/
class PreviewSkyRenderer:public AtmosphereColorPreviewRenderer
{
public:
PreviewSkyRenderer(double heading):
AtmosphereColorPreviewRenderer(heading)
{
}
void bindEvent(BasePreview* preview) override
{
preview->configHdrToneMapping(true);
preview->configScaling(0.5, 5.0, 0.5, 2.5);
}
void updateEvent() override
{
getScenery()->setAtmosphere(_definition);
prepare();
}
};
/**************** Form ****************/ /**************** Form ****************/
FormAtmosphere::FormAtmosphere(QWidget *parent): FormAtmosphere::FormAtmosphere(QWidget *parent):
BaseForm(parent) BaseForm(parent)
@ -48,12 +27,12 @@ FormAtmosphere::FormAtmosphere(QWidget *parent):
_definition = new AtmosphereDefinition(NULL); _definition = new AtmosphereDefinition(NULL);
previewWest = new BasePreview(this); previewWest = new BasePreview(this);
previewWestRenderer = new PreviewSkyRenderer(M_PI / 2.0); previewWestRenderer = new AtmosphereColorPreviewRenderer(_definition, M_PI / 2.0);
previewWest->setRenderer(previewWestRenderer); previewWest->setRenderer(previewWestRenderer);
addPreview(previewWest, QString(tr("West preview"))); addPreview(previewWest, QString(tr("West preview")));
previewEast = new BasePreview(this); previewEast = new BasePreview(this);
previewEastRenderer = new PreviewSkyRenderer(-M_PI / 2.0); previewEastRenderer = new AtmosphereColorPreviewRenderer(_definition, -M_PI / 2.0);
previewEast->setRenderer(previewEastRenderer); previewEast->setRenderer(previewEastRenderer);
addPreview(previewEast, QString(tr("East preview"))); addPreview(previewEast, QString(tr("East preview")));

16
src/render/preview/AtmosphereColorPreviewRenderer.cpp
View file

@ -6,6 +6,7 @@
#include "tools/lighting.h" #include "tools/lighting.h"
#include "SurfaceMaterial.h" #include "SurfaceMaterial.h"
#include "Scenery.h" #include "Scenery.h"
#include "BasePreview.h"
/* /*
* Atmosphere previews. * Atmosphere previews.
@ -146,12 +147,23 @@ static inline int _checkHit(Vector3 eye, Vector3 direction, Vector3* hit, Vector
return _checkHitGround(eye, direction, hit); return _checkHitGround(eye, direction, hit);
} }
AtmosphereColorPreviewRenderer::AtmosphereColorPreviewRenderer(double heading): AtmosphereColorPreviewRenderer::AtmosphereColorPreviewRenderer(AtmosphereDefinition* definition, double heading):
heading(heading) definition(definition), heading(heading)
{ {
getScenery()->getCamera()->setLocation(Vector3(0.0, 7.0, 0.0)); getScenery()->getCamera()->setLocation(Vector3(0.0, 7.0, 0.0));
} }
void AtmosphereColorPreviewRenderer::bindEvent(BasePreview* preview)
{
preview->configHdrToneMapping(true);
preview->configScaling(0.5, 5.0, 0.5, 2.5);
}
void AtmosphereColorPreviewRenderer::updateEvent()
{
getScenery()->setAtmosphere(definition);
prepare();
}
Color AtmosphereColorPreviewRenderer::getColor2D(double x, double y, double) Color AtmosphereColorPreviewRenderer::getColor2D(double x, double y, double)
{ {
Vector3 eye = {0.0, 7.0, 0.0}; Vector3 eye = {0.0, 7.0, 0.0};

7
src/render/preview/AtmosphereColorPreviewRenderer.h
View file

@ -9,11 +9,14 @@ namespace preview {
class AtmosphereColorPreviewRenderer:public Base2dPreviewRenderer class AtmosphereColorPreviewRenderer:public Base2dPreviewRenderer
{ {
public: public:
AtmosphereColorPreviewRenderer(double heading); AtmosphereColorPreviewRenderer(AtmosphereDefinition* definition, double heading);
void bindEvent(BasePreview* preview) override;
void updateEvent() override;
virtual Color getColor2D(double x, double y, double scaling) override; virtual Color getColor2D(double x, double y, double scaling) override;
protected: private:
AtmosphereDefinition* definition;
double heading; double heading;
}; };