mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 01:39:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Version with no NVidia hdr (removed now), transparency back to previous and LDR to HDR in Colors. Fix compilation for testing. (JCC: Add back changes before clean up).

Browse Source
This commit is contained in:
Jonathas Costa
2019-06-19 20:14:34 -04:00
parent 26e55cab90
commit 5fc11c9df2
13 changed files with 125 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/abufferrenderer.h
-2
View File
@@ -63,7 +63,6 @@ public:
void setResolution(glm::ivec2 res) override;
void setNAaSamples(int nAaSamples) override;
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;
@@ -84,7 +83,6 @@ public:
void enableBloom(bool enable) override;
void enableHistogram(bool enable) override;
float hdrBackground() const override;
int nAaSamples() const override;
const std::vector<double>& mSSAPattern() const override;
include/openspace/rendering/framebufferrenderer.h
+13 -14
View File
@@ -26,6 +26,7 @@
#define __OPENSPACE_CORE___FRAMEBUFFERRENDERER___H__
#include <openspace/rendering/renderer.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/rendering/raycasterlistener.h>
#include <openspace/rendering/deferredcasterlistener.h>
@@ -86,7 +87,6 @@ public:
void setResolution(glm::ivec2 res) override;
void setNAaSamples(int nAaSamples) override;
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;
@@ -106,7 +106,6 @@ public:
void enableBloom(bool enable) override;
void enableHistogram(bool enable) override;
float hdrBackground() const override;
int nAaSamples() const override;
const std::vector<double>& mSSAPattern() const override;
@@ -153,16 +152,14 @@ private:
std::unique_ptr<ghoul::opengl::ProgramObject> _resolveProgram;
UniformCache(mainColorTexture, blackoutFactor, nAaSamples) _uniformCache;
UniformCache(deferredResultsTexture, blackoutFactor, backgroundConstant,
hdrExposure, gamma, toneMapOperator, aveLum, maxWhite,
Hue, Saturation, Value, Lightness, colorSpace)
_hdrUniformCache;
UniformCache(deferredResultsTexture, blackoutFactor, hdrExposure, gamma,
toneMapOperator, aveLum, maxWhite, Hue, Saturation, Value,
Lightness, colorSpace) _hdrUniformCache;
UniformCache(renderedImage, bloomImage, bloomThresholdMin, bloomThresholdMax,
bloomOrigFactor, bloomNewFactor) _bloomUniformCache;
bloomOrigFactor, bloomNewFactor) _bloomUniformCache;
UniformCache(renderedImage, maxWhite, imageWidth,
imageHeight) _histoUniformCache;
UniformCache(renderedImage, maxWhite, imageWidth, imageHeight) _histoUniformCache;
UniformCache(hdrSampler, key, Ywhite, sat) _tmoUniformCache;
@@ -202,9 +199,8 @@ private:
glm::ivec2 _resolution = glm::ivec2(0);
int _nAaSamples;
float _hdrExposure = 0.4f;
float _hdrBackground = 2.8f;
float _gamma = 2.2f;
float _hdrExposure = 1.68f;
float _gamma = 0.86f;
float _maxWhite = 1.0f;
bool _bloomEnabled = false;
float _bloomThresholdMin = 0.0;
@@ -218,15 +214,18 @@ private:
float _tmoYwhite = 1e6f;
float _tmoSaturation = 1.0f;
float _hue = 1.f;
float _saturation = 1.f;
float _saturation = 1.45f;
float _value = 1.f;
float _lightness = 1.f;
float _lightness = 1.1f;
unsigned int _colorSpace = 1;
std::vector<double> _mSAAPattern;
std::vector<float> _histoPoints;
ghoul::Dictionary _rendererData;
// Capture Default OpenSpace GL State
RenderEngine::GLDefaultState _osDefaultGLState;
};
} // namespace openspace
include/openspace/rendering/renderengine.h
+25 -1
View File
@@ -33,6 +33,8 @@
#include <openspace/properties/scalar/floatproperty.h>
#include <openspace/properties/triggerproperty.h>
#include <ghoul/opengl/ghoul_gl.h>
namespace ghoul {
class Dictionary;
class SharedMemory;
@@ -87,6 +89,23 @@ public:
HSL
};
struct GLDefaultState {
GLboolean blendEnabled;
GLboolean blend0Enabled;
GLboolean blend1Enabled;
GLboolean blend2Enabled;
GLboolean blend3Enabled;
GLboolean cullFaceEnabled;
GLboolean depthTestEnabled;
GLint defaultFBO;
GLenum blendEquationRGB;
GLenum blendEquationAlpha;
GLenum blendDestAlpha;
GLenum blendDestRGB;
GLenum blendSrcAlpha;
GLenum blendSrcRGB;
};
RenderEngine();
~RenderEngine();
@@ -169,6 +188,10 @@ public:
*/
static scripting::LuaLibrary luaLibrary();
const RenderEngine::GLDefaultState& glDefaultState() const;
void setGLDefaultState(RenderEngine::GLDefaultState glDS);
// Temporary fade functionality
void startFading(int direction, float fadeDuration);
@@ -188,6 +211,8 @@ private:
Camera* _camera = nullptr;
Scene* _scene = nullptr;
GLDefaultState _glDefaultState;
properties::BoolProperty _doPerformanceMeasurements;
std::unique_ptr<Renderer> _renderer;
@@ -224,7 +249,6 @@ private:
properties::PropertyOwner _tmoOwner;
properties::FloatProperty _hdrExposure;
properties::FloatProperty _hdrBackground;
properties::FloatProperty _maxWhite;
properties::OptionProperty _toneMapOperator;
properties::FloatProperty _tmoKey;
include/openspace/rendering/renderer.h
-2
View File
@@ -51,7 +51,6 @@ public:
virtual void setResolution(glm::ivec2 res) = 0;
virtual void setNAaSamples(int nAaSamples) = 0;
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;
@@ -71,7 +70,6 @@ public:
virtual void enableBloom(bool enable) = 0;
virtual void enableHistogram(bool enable) = 0;
virtual float hdrBackground() const = 0;
virtual int nAaSamples() const = 0;
virtual const std::vector<double>& mSSAPattern() const = 0;