mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-10 15:28:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into atm.

Browse Source
This commit is contained in:
Jonathas Costa
2017-08-16 12:00:28 -04:00
parent f95411b1cc 904ea5b447
commit 2d0da72a50
702 changed files with 6580 additions and 6798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ public:
void preRaycast(const RaycasterTask& raycasterTask);
void postRaycast(const RaycasterTask& raycasterTask);
void update();
void update() override;
void render(float blackoutFactor, bool doPerformanceMeasurements) override;
/**

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

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -87,7 +87,6 @@ public:
virtual void deferredcastersChanged(Deferredcaster& deferredcaster, ghoul::Boolean isAttached) override;
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;

1
include/openspace/rendering/raycasterlistener.h
View File

@@ -31,6 +31,7 @@ class VolumeRaycaster;
class RaycasterListener {
public:
virtual ~RaycasterListener() = default;
virtual void raycastersChanged(VolumeRaycaster& raycaster, bool attached) = 0;
};

4
include/openspace/rendering/renderable.h
View File

@@ -64,8 +64,8 @@ public:
Renderable(const ghoul::Dictionary& dictionary);
virtual ~Renderable();
virtual bool initialize() = 0;
virtual bool deinitialize() = 0;
virtual void initialize();
virtual void deinitialize();
virtual bool isReady() const = 0;
bool isEnabled() const;

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

@@ -47,6 +47,8 @@ class Scene;
class Renderer {
public:
virtual ~Renderer() = default;
virtual void initialize() = 0;
virtual void deinitialize() = 0;