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

change interfaces from pointer to reference

Browse Source
This commit is contained in:
Emil Axelsson
2016-03-23 14:00:40 +01:00
parent c5aba19d52
commit 80fe89dbc8
28 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ public:
* Responsible for calling renderEngine::setRenderData
*/
virtual void updateRendererData() override;
virtual void raycastersChanged(VolumeRaycaster* entity, bool attached) override;
virtual void raycastersChanged(VolumeRaycaster& raycaster, bool attached) override;
private:
void clear();

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

@@ -78,7 +78,7 @@ public:
*/
virtual void updateRendererData() override;
virtual void raycastersChanged(VolumeRaycaster* entity, bool attached) override;
virtual void raycastersChanged(VolumeRaycaster& raycaster, bool attached) override;
private:
std::map<VolumeRaycaster*, RaycastData> _raycastData;

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

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

10
include/openspace/rendering/raycastermanager.h
View File

@@ -36,13 +36,13 @@ class RaycasterManager {
public:
RaycasterManager();
~RaycasterManager();
void attachRaycaster(VolumeRaycaster* raycaster);
void detachRaycaster(VolumeRaycaster* raycaster);
bool isAttached(VolumeRaycaster* raycaster);
void attachRaycaster(VolumeRaycaster& raycaster);
void detachRaycaster(VolumeRaycaster& raycaster);
bool isAttached(VolumeRaycaster& raycaster);
const std::vector<VolumeRaycaster*>& raycasters();
void addListener(RaycasterListener* listener);
void removeListener(RaycasterListener* listener);
void addListener(RaycasterListener& listener);
void removeListener(RaycasterListener& listener);
private:
std::vector<VolumeRaycaster*> _raycasters;
std::vector<RaycasterListener*> _listeners;

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

@@ -81,7 +81,7 @@ public:
void onEnabledChange(std::function<void(bool)> callback);
static void setPscUniforms(ghoul::opengl::ProgramObject* program, const Camera* camera, const PowerScaledCoordinate& position);
static void setPscUniforms(ghoul::opengl::ProgramObject& program, const Camera& camera, const PowerScaledCoordinate& position);
private:
properties::BoolProperty _enabled;

8
include/openspace/rendering/volumeraycaster.h
View File

@@ -51,24 +51,24 @@ public:
/**
* Render the volume's entry points (front face of the bounding geometry)
*/
virtual void renderEntryPoints(const RenderData& data, ghoul::opengl::ProgramObject* program) = 0;
virtual void renderEntryPoints(const RenderData& data, ghoul::opengl::ProgramObject& program) = 0;
/**
* Render the volume's exit points (back face of the bounding geometry)
*/
virtual void renderExitPoints(const RenderData& data, ghoul::opengl::ProgramObject* program) = 0;
virtual void renderExitPoints(const RenderData& data, ghoul::opengl::ProgramObject& program) = 0;
/**
* Prepare the volume for the ABuffer's resolve step.
* Make sure textures are up to date, bind them to texture units, set program uniforms etc.
*/
virtual void preRaycast(const RaycastData& data, ghoul::opengl::ProgramObject* program) {};
virtual void preRaycast(const RaycastData& data, ghoul::opengl::ProgramObject& program) {};
/**
* Clean up for the volume after the ABuffer's resolve step.
* Make sure texture units are deinitialized, etc.
*/
virtual void postRaycast(const RaycastData& data, ghoul::opengl::ProgramObject* program) {};
virtual void postRaycast(const RaycastData& data, ghoul::opengl::ProgramObject& program) {};
/**
* Return a path the file to use as vertex shader