mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 08:58:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Copied changes from old HDR branch to new one.

Browse Source
This commit is contained in:
Jonathas Costa
2019-01-10 14:17:29 -05:00
parent ebf55f3029
commit 88ad250c85
20 changed files with 1158 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,12 @@ public:
void setHDRExposure(float hdrExposure) override;
void setHDRBackground(float hdrBackground) override;
void setGamma(float gamma) override;
void setMaxWhite(float maxWhite) override;
void setToneMapOperator(int tmOp) override;
void setBloomThreMin(float minV) override;
void setBloomThreMax(float maxV) override;
void setBloomOrigFactor(float origFactor) override;
void setBloomNewFactor(float newFactor) override;
float hdrBackground() const override;
int nAaSamples() const override;
@@ -135,7 +141,13 @@ private:
float _hdrExposure = 0.4f;
float _hdrBackground = 2.8f;
float _gamma = 2.2f;
float _maxWhite = 1.f;
float _blackoutFactor;
float _bloomThresholdMin = 0.0;
float _bloomThresholdMax = 1.0;
float _bloomOrigFactor = 1.0;
float _bloomNewFactor = 1.0;
int _toneMapOperator = 0;
std::vector<double> _mSAAPattern;

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

@@ -76,7 +76,9 @@ public:
void updateResolution();
void updateRaycastData();
void updateDeferredcastData();
void updateHDRData();
void updateHDRAndFiltering();
void updateAveLum();
void updateBloomConfig();
void updateMSAASamplingPattern();
void setResolution(glm::ivec2 res) override;
@@ -84,6 +86,12 @@ public:
void setHDRExposure(float hdrExposure) override;
void setHDRBackground(float hdrBackground) override;
void setGamma(float gamma) override;
void setMaxWhite(float maxWhite) override;
void setToneMapOperator(int tmOp) override;
void setBloomThreMin(float minV) override;
void setBloomThreMax(float maxV) override;
void setBloomOrigFactor(float origFactor) override;
void setBloomNewFactor(float newFactor) override;
float hdrBackground() const override;
int nAaSamples() const override;
@@ -105,6 +113,11 @@ public:
virtual void deferredcastersChanged(Deferredcaster& deferredcaster,
DeferredcasterListener::IsAttached isAttached) override;
private:
float computeBufferAveLuminance();
float computeBufferAveLuminanceGPU();
void applyBloomFilter();
private:
std::map<VolumeRaycaster*, RaycastData> _raycastData;
RaycasterProgObjMap _exitPrograms;
@@ -113,14 +126,26 @@ private:
std::map<Deferredcaster*, DeferredcastData> _deferredcastData;
DeferredcasterProgObjMap _deferredcastPrograms;
std::unique_ptr<ghoul::opengl::ProgramObject> _hdrBackGroundProgram;
std::unique_ptr<ghoul::opengl::ProgramObject> _hdrFilteringProgram;
std::unique_ptr<ghoul::opengl::ProgramObject> _aveLumProgram;
std::unique_ptr<ghoul::opengl::ProgramObject> _bloomProgram;
std::unique_ptr<ghoul::opengl::ProgramObject> _bloomResolveProgram;
std::unique_ptr<ghoul::opengl::ProgramObject> _resolveProgram;
UniformCache(mainColorTexture, blackoutFactor, nAaSamples) _uniformCache;
UniformCache(deferredResultsTexture, blackoutFactor, backgroundConstant,
backgroundExposure, gamma, toneMapOperator, aveLum, maxWhite)
_hdrUniformCache;
UniformCache(renderedImage, bloomImage, bloomThresholdMin, bloomThresholdMax,
bloomOrigFactor, bloomNewFactor) _bloomUniformCache;
GLuint _screenQuad;
GLuint _vertexPositionBuffer;
GLuint _mainColorTexture;
GLuint _mainFilterTexture;
GLuint _mainPositionTexture;
GLuint _mainNormalTexture;
GLuint _mainDepthTexture;
@@ -128,8 +153,14 @@ private:
GLuint _mainFramebuffer;
GLuint _exitDepthTexture;
GLuint _exitFramebuffer;
GLuint _deferredFramebuffer;
GLuint _deferredColorTexture;
GLuint _hdrFilteringFramebuffer;
GLuint _hdrFilteringTexture;
GLuint _bloomFilterFBO[3];
GLuint _bloomTexture[3];
GLuint _computeAveLumFBO;
GLuint _computeAveLumTexture;
bool _dirtyDeferredcastData;
bool _dirtyRaycastData;
@@ -141,6 +172,12 @@ private:
float _hdrExposure = 0.4f;
float _hdrBackground = 2.8f;
float _gamma = 2.2f;
float _maxWhite = 1.0f;
float _bloomThresholdMin = 0.0;
float _bloomThresholdMax = 1.0;
float _bloomOrigFactor = 1.0;
float _bloomNewFactor = 1.0;
int _toneMapOperator = 0;
std::vector<double> _mSAAPattern;

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

@@ -64,6 +64,20 @@ public:
Invalid
};
enum class ToneMapOperators {
EXPONENTIAL = 0,
LINEAR,
SIMPLE_REINHARD,
LUM_BASED_REINHARD,
WHITE_PRESERVING,
ROM_BIN_DA_HOUSE,
FILMIC,
UNCHARTED,
COSTA,
ADAPTIVE,
GLOBAL
};
RenderEngine();
~RenderEngine();
@@ -193,6 +207,12 @@ private:
properties::FloatProperty _hdrExposure;
properties::FloatProperty _hdrBackground;
properties::FloatProperty _gamma;
properties::FloatProperty _maxWhite;
properties::FloatProperty _bloomThreshouldMin;
properties::FloatProperty _bloomThreshouldMax;
properties::FloatProperty _bloomOrigColorFactor;
properties::FloatProperty _bloomNewColorFactor;
properties::OptionProperty _toneMapOperator;
uint64_t _frameNumber = 0;

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

@@ -53,6 +53,12 @@ public:
virtual void setHDRExposure(float hdrExposure) = 0;
virtual void setHDRBackground(float hdrBackground) = 0;
virtual void setGamma(float gamma) = 0;
virtual void setMaxWhite(float maxWhite) = 0;
virtual void setToneMapOperator(int tmOp) = 0;
virtual void setBloomThreMin(float minV) = 0;
virtual void setBloomThreMax(float maxV) = 0;
virtual void setBloomOrigFactor(float origFactor) = 0;
virtual void setBloomNewFactor(float newFactor) = 0;
virtual float hdrBackground() const = 0;
virtual int nAaSamples() const = 0;