diff --git a/examples/cloud.cpp b/examples/cloud.cpp index 99d7475b..ba7c352f 100644 --- a/examples/cloud.cpp +++ b/examples/cloud.cpp @@ -532,7 +532,7 @@ struct cloud_app slice_mesh.load(builder.vertices, builder.indices); } - void render() override + void present() override { update_slice_mesh(); diff --git a/examples/deferred.cpp b/examples/deferred.cpp index 6de9f66a..6ad89138 100644 --- a/examples/deferred.cpp +++ b/examples/deferred.cpp @@ -32,7 +32,7 @@ struct deferred_app void on_mouse_wheel(int delta) override; void update() override; - void render() override; + void present() override; gfx::deferred_renderer renderer; @@ -324,7 +324,7 @@ void deferred_app::on_mouse_wheel(int delta) void deferred_app::update() {} -void deferred_app::render() +void deferred_app::present() { float const time = clock.count(); diff --git a/examples/fire.cpp b/examples/fire.cpp index 1d18ed04..88d08ce1 100644 --- a/examples/fire.cpp +++ b/examples/fire.cpp @@ -306,7 +306,7 @@ struct fire_app time += clock.restart().count(); } - void render() override + void present() override { gl::ClearColor(0.f, 0.f, 0.f, 1.f); gl::Clear(gl::COLOR_BUFFER_BIT | gl::DEPTH_BUFFER_BIT); diff --git a/examples/grass.cpp b/examples/grass.cpp index f2bec255..2293d322 100644 --- a/examples/grass.cpp +++ b/examples/grass.cpp @@ -523,7 +523,7 @@ struct grass_app } } - void render() override + void present() override { gl::ClearColor(0.8f, 0.8f, 1.f, 1.f); gl::Clear(gl::COLOR_BUFFER_BIT | gl::DEPTH_BUFFER_BIT); diff --git a/examples/gravity.cpp b/examples/gravity.cpp index a7b67534..abf0e1df 100644 --- a/examples/gravity.cpp +++ b/examples/gravity.cpp @@ -262,7 +262,7 @@ struct myapp : app::app } } - void render() override + void present() override { gl::Clear(gl::COLOR_BUFFER_BIT); diff --git a/examples/physics.cpp b/examples/physics.cpp index f9ddb714..82d9baf2 100644 --- a/examples/physics.cpp +++ b/examples/physics.cpp @@ -87,7 +87,7 @@ struct physics_demo_app void on_mouse_wheel(int delta) override; void update() override; - void render() override; + void present() override; geom::point screen_to_world(geom::point const & p) const; geom::point world_to_screen(geom::point const & p) const; @@ -804,7 +804,7 @@ void physics_demo_app::update() } } -void physics_demo_app::render() +void physics_demo_app::present() { gl::Viewport(0, 0, width(), height()); diff --git a/examples/shadow.cpp b/examples/shadow.cpp index 24b18639..3e620a44 100644 --- a/examples/shadow.cpp +++ b/examples/shadow.cpp @@ -519,7 +519,7 @@ struct shadow_app void on_key_down(SDL_Keycode key) override; - void render() override; + void present() override; }; shadow_app::shadow_app() @@ -733,7 +733,7 @@ void shadow_app::on_key_down(SDL_Keycode key) paused = !paused; } -void shadow_app::render() +void shadow_app::present() { if (!paused) time += clock.restart().count() / 4.f; diff --git a/examples/tree.cpp b/examples/tree.cpp index cc4679ac..f32c7fcd 100644 --- a/examples/tree.cpp +++ b/examples/tree.cpp @@ -367,7 +367,7 @@ struct tree_app void on_key_down(SDL_Keycode key) override; - void render() override; + void present() override; }; struct vertex @@ -511,7 +511,7 @@ void tree_app::on_key_down(SDL_Keycode key) } } -void tree_app::render() +void tree_app::present() { gl::ClearColor(0.7f, 0.7f, 1.f, 1.f); gl::Clear(gl::COLOR_BUFFER_BIT | gl::DEPTH_BUFFER_BIT); diff --git a/libs/app/include/psemek/app/app.hpp b/libs/app/include/psemek/app/app.hpp index 49c1ce69..31ff77f3 100644 --- a/libs/app/include/psemek/app/app.hpp +++ b/libs/app/include/psemek/app/app.hpp @@ -24,7 +24,7 @@ namespace psemek::app void on_resize(int width, int height) override; - void render() override; + void present() override; void poll_events(); void run(); diff --git a/libs/app/include/psemek/app/scene.hpp b/libs/app/include/psemek/app/scene.hpp index cf8fc62b..7f848d9b 100644 --- a/libs/app/include/psemek/app/scene.hpp +++ b/libs/app/include/psemek/app/scene.hpp @@ -34,7 +34,7 @@ namespace psemek::app virtual void on_key_up(SDL_Keycode /* key */) {} virtual void update() {} - virtual void render() {} + virtual void present() {} }; inline scene::~scene() = default; diff --git a/libs/app/source/app.cpp b/libs/app/source/app.cpp index 5f93e604..9b6e6f8c 100644 --- a/libs/app/source/app.cpp +++ b/libs/app/source/app.cpp @@ -190,7 +190,7 @@ namespace psemek::app } } - void app::render() + void app::present() { gl::ClearColor(0.7f, 0.7f, 1.f, 1.f); gl::Clear(gl::COLOR_BUFFER_BIT); @@ -217,7 +217,7 @@ namespace psemek::app } if (!running()) break; handler->update(); - handler->render(); + handler->present(); SDL_GL_SwapWindow(impl().window); }