diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h index 14fd53eb3a..fc3b9c61d9 100644 --- a/include/openspace/rendering/renderable.h +++ b/include/openspace/rendering/renderable.h @@ -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; diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h index 3041507935..725bfcbfa7 100644 --- a/include/openspace/rendering/renderengine.h +++ b/include/openspace/rendering/renderengine.h @@ -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 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); diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h index 5c94ab72ba..31dec8b3dd 100644 --- a/include/openspace/scene/scene.h +++ b/include/openspace/scene/scene.h @@ -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 */ diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h index c656271aac..b028462909 100644 --- a/include/openspace/scene/scenegraphnode.h +++ b/include/openspace/scene/scenegraphnode.h @@ -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); diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index 6ecfd1a46d..cd891e87eb 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -226,8 +226,7 @@ bool RenderableGalaxy::initialize() { _pointsProgram = renderEngine.buildRenderProgram("Galaxy points", "${MODULE_GALAXY}/shaders/points.vs", "${MODULE_GALAXY}/shaders/points.fs", - ghoul::Dictionary(), - RenderEngine::RenderProgramType::Post); + ghoul::Dictionary()); _pointsProgram->setIgnoreUniformLocationError(ghoul::opengl::ProgramObject::IgnoreError::Yes); @@ -331,7 +330,7 @@ float RenderableGalaxy::safeLength(const glm::vec3& vector) { return glm::length(vector / maxComponent) * maxComponent; } -void RenderableGalaxy::postRender(const RenderData& data) { +/*void RenderableGalaxy::postRender(const RenderData& data) { _raycaster->setStepSize(_pointStepSize); @@ -362,6 +361,6 @@ void RenderableGalaxy::postRender(const RenderData& data) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); OsEng.ref().renderEngine().postRaycast(*_pointsProgram); -} +}*/ } diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h index 1281c158e9..fc104b36e4 100644 --- a/modules/galaxy/rendering/renderablegalaxy.h +++ b/modules/galaxy/rendering/renderablegalaxy.h @@ -45,7 +45,6 @@ public: bool deinitialize() override; bool isReady() const override; void render(const RenderData& data, RendererTasks& tasks) override; - void postRender(const RenderData& data) override; void update(const UpdateData& data) override; private: diff --git a/src/rendering/abufferrenderer.cpp b/src/rendering/abufferrenderer.cpp index 1d4fc632c1..2cc1c2025e 100644 --- a/src/rendering/abufferrenderer.cpp +++ b/src/rendering/abufferrenderer.cpp @@ -50,7 +50,6 @@ namespace { const std::string _loggerCat = "ABufferRenderer"; const std::string BoundsFragmentShaderPath = "${SHADERS}/abuffer/boundsabuffer.frag"; const std::string RenderFragmentShaderPath = "${SHADERS}/abuffer/renderabuffer.frag"; - const std::string PostRenderFragmentShaderPath = "${SHADERS}/abuffer/postrenderabuffer.frag"; const int MaxRaycasters = 32; const int MaxLayers = 32; const int MaxAverageLayers = 8; @@ -322,8 +321,6 @@ void ABufferRenderer::render(float blackoutFactor, bool doPerformanceMeasurement _resolveProgram->deactivate(); - _scene->postRender(data); - _mainColorTextureUnit = nullptr; _mainDepthTextureUnit = nullptr; } @@ -562,7 +559,6 @@ void ABufferRenderer::updateRendererData() { ghoul::Dictionary dict; dict.setValue("fragmentRendererPath", std::string(RenderFragmentShaderPath)); - dict.setValue("postFragmentRendererPath", std::string(PostRenderFragmentShaderPath)); dict.setValue("maxLayers", MaxLayers); dict.setValue("maxTotalFragments", MaxLayers * _resolution.x * _resolution.y); diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp index 7b1dd34a93..63041636f3 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -47,7 +47,6 @@ namespace { const std::string ExitFragmentShaderPath = "${SHADERS}/framebuffer/exitframebuffer.frag"; const std::string RaycastFragmentShaderPath = "${SHADERS}/framebuffer/raycastframebuffer.frag"; const std::string RenderFragmentShaderPath = "${SHADERS}/framebuffer/renderframebuffer.frag"; - const std::string PostRenderFragmentShaderPath = "${SHADERS}/framebuffer/postrenderframebuffer.frag"; } namespace openspace { @@ -467,7 +466,6 @@ void FramebufferRenderer::setNAaSamples(int nAaSamples) { void FramebufferRenderer::updateRendererData() { ghoul::Dictionary dict; dict.setValue("fragmentRendererPath", std::string(RenderFragmentShaderPath)); - dict.setValue("postFragmentRendererPath", std::string(PostRenderFragmentShaderPath)); _rendererData = dict; diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index 3313c432ef..58826b0b0d 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -134,8 +134,6 @@ void Renderable::render(const RenderData& data, RendererTasks&) { void Renderable::render(const RenderData& data) {} -void Renderable::postRender(const RenderData& data) {} - void Renderable::setPscUniforms( ghoul::opengl::ProgramObject& program, const Camera& camera, diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 06c164efa5..d6bf478772 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -99,7 +99,6 @@ namespace { std::chrono::seconds ScreenLogTimeToLive(15); const std::string DefaultRenderingMethod = "ABuffer"; const std::string RenderFsPath = "${SHADERS}/render.frag"; - const std::string PostRenderFsPath = "${SHADERS}/postrender.frag"; } @@ -592,8 +591,7 @@ std::unique_ptr RenderEngine::buildRenderProgram( std::string name, std::string vsPath, std::string fsPath, - const ghoul::Dictionary& data, - RenderEngine::RenderProgramType type) { + const ghoul::Dictionary& data) { ghoul::Dictionary dict = data; @@ -604,16 +602,10 @@ std::unique_ptr RenderEngine::buildRenderProgram( // instead of a void main() setting glFragColor, glFragDepth, etc. dict.setValue("fragmentPath", fsPath); - if (type == RenderEngine::RenderProgramType::Post) { - dict.setValue("resolveData", _resolveData); - } - - std::string path = (type == RenderEngine::RenderProgramType::Post) ? PostRenderFsPath : RenderFsPath; - std::unique_ptr program = ghoul::opengl::ProgramObject::Build( name, vsPath, - path, + RenderFsPath, dict); if (program) { @@ -630,27 +622,20 @@ std::unique_ptr RenderEngine::buildRenderProgram( std::string vsPath, std::string fsPath, std::string csPath, - const ghoul::Dictionary& data, - RenderEngine::RenderProgramType type) { + const ghoul::Dictionary& data) { ghoul::Dictionary dict = data; dict.setValue("rendererData", _rendererData); - if (type == RenderEngine::RenderProgramType::Post) { - dict.setValue("resolveData", _resolveData); - } - // parameterize the main fragment shader program with specific contents. // fsPath should point to a shader file defining a Fragment getFragment() function // instead of a void main() setting glFragColor, glFragDepth, etc. dict.setValue("fragmentPath", fsPath); - std::string path = (type == RenderEngine::RenderProgramType::Post) ? PostRenderFsPath : RenderFsPath; - std::unique_ptr program = ghoul::opengl::ProgramObject::Build( name, vsPath, - path, + RenderFsPath, csPath, dict); diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp index bbb48d2e5d..7b0185b8a6 100644 --- a/src/scene/scene.cpp +++ b/src/scene/scene.cpp @@ -164,12 +164,6 @@ void Scene::render(const RenderData& data, RendererTasks& tasks) { } } -void Scene::postRender(const RenderData& data) { - for (SceneGraphNode* node : _graph.nodes()) { - node->postRender(data); - } -} - void Scene::scheduleLoadSceneFile(const std::string& sceneDescriptionFilePath) { _sceneGraphToLoad = sceneDescriptionFilePath; } diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index f02af89741..c7d58b84ea 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -357,18 +357,6 @@ void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) { // child->render(newData); } -void SceneGraphNode::postRender(const RenderData& data) { - const psc thisPosition = psc::CreatePowerScaledCoordinate(_worldPositionCached.x, _worldPositionCached.y, _worldPositionCached.z); - RenderData newData = { data.camera, thisPosition, data.doPerformanceMeasurement, data.renderBinMask, _worldPositionCached}; - - //_performanceRecord.renderTime = 0; - if (_renderableVisible && _renderable->isVisible() && _renderable->isReady() && _renderable->isEnabled()) { - _renderable->postRender(newData); - } -} - - - // not used anymore @AA //void SceneGraphNode::addNode(SceneGraphNode* child)