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

Remove unused postRender method for scene graph nodes and renderables

Browse Source
This commit is contained in:
Emil Axelsson
2016-12-14 14:14:53 +01:00
parent dbb599a5fa
commit ad3921fda5
12 changed files with 9 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,6 @@ public:
virtual void render(const RenderData& data);
virtual void render(const RenderData& data, RendererTasks& rendererTask);
virtual void postRender(const RenderData& data);
virtual void update(const UpdateData& data);
RenderBin renderBin() const;

11
include/openspace/rendering/renderengine.h
View File

@@ -68,11 +68,6 @@ public:
Invalid
};
enum class RenderProgramType {
Default = 0,
Post
};
enum class FrametimeType {
DtTimeAvg = 0,
FPS,
@@ -135,16 +130,14 @@ public:
std::string name,
std::string vsPath,
std::string fsPath,
const ghoul::Dictionary& dictionary = ghoul::Dictionary(),
RenderEngine::RenderProgramType type = RenderEngine::RenderProgramType::Default);
const ghoul::Dictionary& dictionary = ghoul::Dictionary());
std::unique_ptr<ghoul::opengl::ProgramObject> buildRenderProgram(
std::string name,
std::string vsPath,
std::string fsPath,
std::string csPath,
const ghoul::Dictionary& dictionary = ghoul::Dictionary(),
RenderEngine::RenderProgramType type = RenderEngine::RenderProgramType::Default);
const ghoul::Dictionary& dictionary = ghoul::Dictionary());
std::string progressToStr(int size, double t);

5
include/openspace/scene/scene.h
View File

@@ -85,11 +85,6 @@ public:
*/
void render(const RenderData& data, RendererTasks& tasks);
/*
* Post-Render visible SceneGraphNodes using the provided camera
*/
void postRender(const RenderData& data);
/*
* Returns the root SceneGraphNode
*/

1
include/openspace/scene/scenegraphnode.h
View File

@@ -72,7 +72,6 @@ public:
void update(const UpdateData& data);
void evaluate(const Camera* camera, const psc& parentPosition = psc());
void render(const RenderData& data, RendererTasks& tasks);
void postRender(const RenderData& data);
void updateCamera(Camera* camera) const;
//void addNode(SceneGraphNode* child);