mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 20:09:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed pointer from renderer.

Browse Source
This commit is contained in:
Jonathas Costa
2017-12-21 11:11:50 -05:00
parent 3ea918b818
commit 73354e87d8
6 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/abufferrenderer.h
+3 -3
View File
@@ -76,7 +76,7 @@ public:
float hdrBackground() const override;
int nAaSamples() const override;
const double * mSSAPattern() const override;
std::vector<double> mSSAPattern() const override;
using Renderer::preRaycast;
void preRaycast(const RaycasterTask& raycasterTask);
@@ -100,7 +100,7 @@ private:
void updateResolveDictionary();
void updateMSAASamplingPattern();
void saveTextureToMemory(const GLenum color_buffer_attachment,
const int width, const int height, double ** memory) const;
const int width, const int height, std::vector<double> & memory) const;
Camera* _camera;
Scene* _scene;
@@ -148,7 +148,7 @@ private:
float _gamma;
float _blackoutFactor;
double * _mSAAPattern;
std::vector<double> _mSAAPattern;
ghoul::Dictionary _rendererData;
};
include/openspace/rendering/deferredcaster.h
+4 -4
View File
@@ -46,11 +46,11 @@ public:
*/
virtual ~Deferredcaster() {};
virtual void preRaycast(const RenderData& renderData,
const DeferredcastData& deferredData, ghoul::opengl::ProgramObject& program) {};
virtual void preRaycast(const RenderData& /*renderData*/,
const DeferredcastData& /*deferredData*/, ghoul::opengl::ProgramObject& /*program*/) {};
virtual void postRaycast(const RenderData & renderData,
const DeferredcastData& deferredData, ghoul::opengl::ProgramObject& program) {};
virtual void postRaycast(const RenderData & /*renderData*/,
const DeferredcastData& /*deferredData*/, ghoul::opengl::ProgramObject& /*program*/) {};
virtual std::string deferredcastPath() const = 0;
include/openspace/rendering/framebufferrenderer.h
+4 -2
View File
@@ -76,7 +76,8 @@ public:
float hdrBackground() const override;
int nAaSamples() const override;
const double * mSSAPattern() const override;
/*const double * mSSAPattern() const override;*/
std::vector<double> mSSAPattern() const override;
void update() override;
void render(float blackoutFactor, bool doPerformanceMeasurements) override;
@@ -134,7 +135,8 @@ private:
float _hdrBackground;
float _gamma;
double * _mSAAPattern;
//double * _mSAAPattern;
std::vector<double> _mSAAPattern;
ghoul::Dictionary _rendererData;
};
include/openspace/rendering/renderer.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
virtual float hdrBackground() const = 0;
virtual int nAaSamples() const = 0;
virtual const double * mSSAPattern() const = 0;
virtual std::vector<double> mSSAPattern() const = 0;
/**
* Set raycasting uniforms on the program object, and setup raycasting.