Refactor: Make current_scene_update a base render method
Should be no functional changes.
This commit is contained in:
committed by
Sergey Sharybin
parent
0193c5029b
commit
964b83aa8b
@@ -1078,7 +1078,7 @@ static void do_render_engine(Render *re)
|
||||
/* now use renderdata and camera to set viewplane */
|
||||
RE_SetCamera(re, camera);
|
||||
|
||||
re->current_scene_update_cb(re->suh, re->scene);
|
||||
re->current_scene_update(re->scene);
|
||||
RE_engine_render(re, false);
|
||||
|
||||
/* when border render, check if we have to insert it in black */
|
||||
@@ -1188,7 +1188,7 @@ static void do_render_compositor_scenes(Render *re)
|
||||
|
||||
if (changed_scene) {
|
||||
/* If rendered another scene, switch back to the current scene with compositing nodes. */
|
||||
re->current_scene_update_cb(re->suh, re->scene);
|
||||
re->current_scene_update(re->scene);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -41,6 +41,13 @@ Render::~Render()
|
||||
render_result_free(pushedresult);
|
||||
}
|
||||
|
||||
void Render::current_scene_update(struct Scene *scene)
|
||||
{
|
||||
if (current_scene_update_cb) {
|
||||
current_scene_update_cb(suh, scene);
|
||||
}
|
||||
}
|
||||
|
||||
void Render::stats_draw(RenderStats *render_stats)
|
||||
{
|
||||
if (stats_draw_cb) {
|
||||
|
||||
@@ -49,6 +49,8 @@ struct BaseRender {
|
||||
const char *view_name) = 0;
|
||||
virtual void compositor_free() = 0;
|
||||
|
||||
virtual void current_scene_update(struct Scene *scene) = 0;
|
||||
|
||||
virtual void stats_draw(RenderStats *render_stats) = 0;
|
||||
virtual void progress(float progress) = 0;
|
||||
|
||||
@@ -97,6 +99,8 @@ struct ViewRender : public BaseRender {
|
||||
}
|
||||
void compositor_free() override {}
|
||||
|
||||
void current_scene_update(struct Scene * /*scene*/) override {}
|
||||
|
||||
void stats_draw(RenderStats * /*render_stats*/) override {}
|
||||
void progress(const float /*progress*/) override {}
|
||||
|
||||
@@ -134,6 +138,8 @@ struct Render : public BaseRender {
|
||||
const char *view_name) override;
|
||||
void compositor_free() override;
|
||||
|
||||
void current_scene_update(struct Scene *scene) override;
|
||||
|
||||
void stats_draw(RenderStats *render_stats) override;
|
||||
void progress(float progress) override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user