mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 12:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed HDR controls for multiple atm's.

Browse Source
This commit is contained in:
Jonathas Costa
2017-07-11 14:52:59 -04:00
parent 18d8612a8a
commit 39b90863d6
11 changed files with 107 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/rendering/abufferrenderer.h
View File

@@ -71,6 +71,10 @@ public:
void setResolution(glm::ivec2 res) override;
void setNAaSamples(const int nAaSamples) override;
void setHDRExposure(const float hdrExposure) override;
void setHDRBackground(const float hdrBackground) override;
void setGamma(const float gamma) override;
float hdrBackground() const override;
void preRaycast(const RaycasterTask& raycasterTask);
void postRaycast(const RaycasterTask& raycasterTask);
@@ -132,6 +136,8 @@ private:
int _nAaSamples;
float _hdrExposure;
float _hdrBackground;
float _gamma;
float _blackoutFactor;
ghoul::Dictionary _rendererData;

6
include/openspace/rendering/framebufferrenderer.h
View File

@@ -73,6 +73,10 @@ public:
void setResolution(glm::ivec2 res) override;
void setNAaSamples(const int nAaSamples) override;
void setHDRExposure(const float hdrExposure) override;
void setHDRBackground(const float hdrBackground) override;
void setGamma(const float gamma) override;
float hdrBackground() const override;
void update() override;
void render(float blackoutFactor, bool doPerformanceMeasurements) override;
@@ -122,6 +126,8 @@ private:
glm::vec2 _resolution;
int _nAaSamples;
float _hdrExposure;
float _hdrBackground;
float _gamma;
ghoul::Dictionary _rendererData;
};

3
include/openspace/rendering/renderengine.h
View File

@@ -222,6 +222,9 @@ private:
int _fadeDirection;
properties::IntProperty _nAaSamples;
properties::FloatProperty _hdrExposure;
properties::FloatProperty _hdrBackground;
properties::FloatProperty _gamma;
uint64_t _frameNumber;
std::vector<ghoul::opengl::ProgramObject*> _programs;

3
include/openspace/rendering/renderer.h
View File

@@ -60,7 +60,10 @@ public:
virtual void setResolution(glm::ivec2 res) = 0;
virtual void setNAaSamples(const int nAaSamples) = 0;
virtual void setHDRExposure(const float hdrExposure) = 0;
virtual void setHDRBackground(const float hdrBackground) = 0;
virtual void setGamma(const float gamma) = 0;
virtual float hdrBackground() const = 0;
/**
* Set raycasting uniforms on the program object, and setup raycasting.