mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 03:29:44 -06:00
General code cleanup
This commit is contained in:
@@ -80,7 +80,6 @@ public:
|
||||
void setLightness(float lightness) override;
|
||||
void setColorSpace(unsigned int colorspace) override;
|
||||
|
||||
|
||||
void enableBloom(bool enable) override;
|
||||
void enableHistogram(bool enable) override;
|
||||
|
||||
|
||||
@@ -71,17 +71,17 @@ public:
|
||||
void updateHDRAndFiltering();
|
||||
void updateFXAA();
|
||||
void updateDownscaledVolume();
|
||||
|
||||
|
||||
void setResolution(glm::ivec2 res) override;
|
||||
void setHDRExposure(float hdrExposure) override;
|
||||
void setGamma(float gamma) override;
|
||||
void setHue(float hue) override;
|
||||
void setValue(float value) override;
|
||||
void setSaturation(float sat) override;
|
||||
|
||||
|
||||
void enableFXAA(bool enable) override;
|
||||
void setDisableHDR(bool disable) override;
|
||||
|
||||
|
||||
void update() override;
|
||||
void performRaycasterTasks(const std::vector<RaycasterTask>& tasks);
|
||||
void performDeferredTasks(const std::vector<DeferredcasterTask>& tasks);
|
||||
@@ -114,7 +114,7 @@ private:
|
||||
void updateDownscaleTextures();
|
||||
void updateExitVolumeTextures();
|
||||
void writeDownscaledVolume();
|
||||
|
||||
|
||||
std::map<VolumeRaycaster*, RaycastData> _raycastData;
|
||||
RaycasterProgObjMap _exitPrograms;
|
||||
RaycasterProgObjMap _raycastPrograms;
|
||||
@@ -131,7 +131,7 @@ private:
|
||||
UniformCache(hdrFeedingTexture, blackoutFactor, hdrExposure, gamma,
|
||||
Hue, Saturation, Value) _hdrUniformCache;
|
||||
UniformCache(renderedTexture, inverseScreenSize) _fxaaUniformCache;
|
||||
UniformCache(downscaledRenderedVolume, downscaledRenderedVolumeDepth)
|
||||
UniformCache(downscaledRenderedVolume, downscaledRenderedVolumeDepth)
|
||||
_writeDownscaledVolumeUniformCache;
|
||||
|
||||
GLint _defaultFBO;
|
||||
@@ -158,7 +158,7 @@ private:
|
||||
GLuint hdrFilteringFramebuffer;
|
||||
GLuint hdrFilteringTexture;
|
||||
} _hdrBuffers;
|
||||
|
||||
|
||||
struct {
|
||||
GLuint fxaaFramebuffer;
|
||||
GLuint fxaaTexture;
|
||||
@@ -176,18 +176,18 @@ private:
|
||||
bool _dirtyDeferredcastData;
|
||||
bool _dirtyRaycastData;
|
||||
bool _dirtyResolution;
|
||||
|
||||
|
||||
glm::ivec2 _resolution = glm::ivec2(0);
|
||||
int _nAaSamples;
|
||||
bool _enableFXAA = true;
|
||||
bool _disableHDR = false;
|
||||
|
||||
|
||||
float _hdrExposure = 3.7f;
|
||||
float _gamma = 0.95f;
|
||||
float _hue = 1.f;
|
||||
float _saturation = 1.f;
|
||||
float _value = 1.f;
|
||||
|
||||
|
||||
ghoul::Dictionary _rendererData;
|
||||
};
|
||||
|
||||
|
||||
@@ -211,7 +211,7 @@ private:
|
||||
properties::BoolProperty _disableMasterRendering;
|
||||
|
||||
properties::FloatProperty _globalBlackOutFactor;
|
||||
|
||||
|
||||
properties::BoolProperty _enableFXAA;
|
||||
|
||||
properties::BoolProperty _disableHDRPipeline;
|
||||
@@ -221,13 +221,13 @@ private:
|
||||
properties::FloatProperty _hue;
|
||||
properties::FloatProperty _saturation;
|
||||
properties::FloatProperty _value;
|
||||
|
||||
|
||||
properties::FloatProperty _horizFieldOfView;
|
||||
|
||||
properties::Vec3Property _globalRotation;
|
||||
properties::Vec3Property _screenSpaceRotation;
|
||||
properties::Vec3Property _masterRotation;
|
||||
|
||||
|
||||
uint64_t _frameNumber = 0;
|
||||
unsigned int _latestScreenshotNumber = 0;
|
||||
|
||||
|
||||
@@ -139,7 +139,7 @@ public:
|
||||
|
||||
private:
|
||||
/**
|
||||
* Maximum number of integration steps to be executed by the volume integrator.
|
||||
* Maximum number of integration steps to be executed by the volume integrator.
|
||||
*/
|
||||
int _rayCastMaxSteps = 1000;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user