Requested changes for merging. Part IV.

This commit is contained in:
Jonathas Costa
2018-04-20 19:56:17 -04:00
parent 908ade3215
commit cd95ebb213
2 changed files with 40 additions and 52 deletions
@@ -54,6 +54,15 @@ class Scene;
class FramebufferRenderer : public Renderer, public RaycasterListener,
public DeferredcasterListener
{
public:
typedef std::map<
VolumeRaycaster*,
std::unique_ptr<ghoul::opengl::ProgramObject>
> RaycasterProgObjMap;
typedef std::map<
Deferredcaster*,
std::unique_ptr<ghoul::opengl::ProgramObject>
> DeferredcasterProgObjMap;
public:
FramebufferRenderer();
virtual ~FramebufferRenderer();
@@ -97,21 +106,12 @@ public:
private:
std::map<VolumeRaycaster*, RaycastData> _raycastData;
std::map<
VolumeRaycaster*, std::unique_ptr<ghoul::opengl::ProgramObject>
> _exitPrograms;
std::map<
VolumeRaycaster*, std::unique_ptr<ghoul::opengl::ProgramObject>
> _raycastPrograms;
std::map<
VolumeRaycaster*, std::unique_ptr<ghoul::opengl::ProgramObject>
> _insideRaycastPrograms;
RaycasterProgObjMap _exitPrograms;
RaycasterProgObjMap _raycastPrograms;
RaycasterProgObjMap _insideRaycastPrograms;
std::map<Deferredcaster*, DeferredcastData> _deferredcastData;
std::map<
Deferredcaster*,
std::unique_ptr<ghoul::opengl::ProgramObject>
> _deferredcastPrograms;
DeferredcasterProgObjMap _deferredcastPrograms;
std::unique_ptr<ghoul::opengl::ProgramObject> _hdrBackGroundProgram;
std::unique_ptr<ghoul::opengl::ProgramObject> _resolveProgram;