From 23d3c82c4fa5436405d1f754ab0308adf035d447 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 10 Apr 2021 11:31:30 +0200 Subject: [PATCH] Cleaned up :: from the new pseudocodes. --- 22_sdl_application.txt | 16 ++++++++-------- 24_sdl_main_scene.txt | 18 +++++++----------- 25_sdl_input_app.txt | 10 +++++----- 26_sdl_button.txt | 10 +++++----- 27_sdl_button_app.txt | 20 ++++++++++---------- 5 files changed, 35 insertions(+), 39 deletions(-) diff --git a/22_sdl_application.txt b/22_sdl_application.txt index a662d98..f4312e8 100644 --- a/22_sdl_application.txt +++ b/22_sdl_application.txt @@ -88,7 +88,7 @@ csinálni, mert akkor befagy az adott tab. Ne felehjtsétek el, hogy a statikus változót is definiálni kell a .cpp fájlban! -így: Application* Application::_instance = nullptr; +így: Application* _instance = nullptr; Szükség lessz az std::chrono könyvtárra! (Elég a .cpp-fájlban is beincludeolni.) Így: #include @@ -125,7 +125,7 @@ Akkor az Application osztály UML diagramja: ------------------------------------------------------------------------------------------ -void Application::event(const SDL_Event ¤t_event): +void event(const SDL_Event ¤t_event): switch (current_event.type): case SDL_QUIT: running = false @@ -135,19 +135,19 @@ void Application::event(const SDL_Event ¤t_event): ------------------------------------------------------------------------------------------ -void Application::update(float delta): +void update(float delta): scene->update(delta) ------------------------------------------------------------------------------------------ -void Application::render(): +void render(): scene->render() Renderer::get_singleton()->present() ------------------------------------------------------------------------------------------ -void Application::main_loop(): +void main_loop(): std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now() SDL_Event current_event @@ -176,7 +176,7 @@ void Application::main_loop(): ------------------------------------------------------------------------------------------ -Application::Application(): +Application(): running = true target_fps = 60 @@ -185,12 +185,12 @@ Application::Application(): ------------------------------------------------------------------------------------------ -Application::~Application(): +~Application(): _instance = nullptr ------------------------------------------------------------------------------------------ -Application* Application::get_singleton(): +Application* get_singleton(): return _instance ------------------------------------------------------------------------------------------ diff --git a/24_sdl_main_scene.txt b/24_sdl_main_scene.txt index 543993d..0cfda33 100644 --- a/24_sdl_main_scene.txt +++ b/24_sdl_main_scene.txt @@ -18,18 +18,14 @@ |---------------------------------------------------------------------------------------| -#include "main_scene.h" -#include "renderer.h" +void event(const SDL_Event &ev): + return +void update(float delta): + return -void MainScene::event(const SDL_Event &ev): - - -void MainScene::update(float delta): - - -void MainScene::render(): +void render(): Renderer::get_singleton()->clear() _camera->viewport.x += _dir @@ -44,7 +40,7 @@ void MainScene::render(): _sprite->draw() -MainScene::MainScene(): +MainScene(): _camera = new Camera() _image = new Image("ti.bmp") _texture = new Texture(_image) @@ -56,7 +52,7 @@ MainScene::MainScene(): _dir = 1 -MainScene::~MainScene(): +~MainScene(): _texture->free() _image->free() diff --git a/25_sdl_input_app.txt b/25_sdl_input_app.txt index dec0ec1..9214d1e 100644 --- a/25_sdl_input_app.txt +++ b/25_sdl_input_app.txt @@ -29,7 +29,7 @@ #include -void MainScene::event(const SDL_Event &ev): +void event(const SDL_Event &ev): switch (ev.type): case SDL_WINDOWEVENT:: switch (ev.window.event): @@ -76,7 +76,7 @@ void MainScene::event(const SDL_Event &ev): -void MainScene::update(float delta): +void update(float delta): if (_up): _sprite->set_y(_sprite->get_y() - 50 * delta) @@ -94,7 +94,7 @@ void MainScene::update(float delta): -void MainScene::render(): +void render(): Renderer::get_singleton()->clear() _camera->bind() @@ -102,7 +102,7 @@ void MainScene::render(): Renderer::get_singleton()->draw_sprite(_sprite) -MainScene::MainScene(): +MainScene(): _camera = new Camera() _image = new Image("ti.bmp") _texture = new Texture(_image) @@ -114,7 +114,7 @@ MainScene::MainScene(): _right = false -MainScene::~MainScene(): +~MainScene(): _texture->free() _image->free() diff --git a/26_sdl_button.txt b/26_sdl_button.txt index 2b6d46c..9769219 100644 --- a/26_sdl_button.txt +++ b/26_sdl_button.txt @@ -92,7 +92,7 @@ Ez az include kelleni fog: #include ------------------------------------------------------------------------------------------ -void Button::event(const SDL_Event &ev): +void event(const SDL_Event &ev): if (state == BUTTON_STATE_OFF): return @@ -136,12 +136,12 @@ void Button::event(const SDL_Event &ev): ------------------------------------------------------------------------------------------ -void Button::update(float delta): +void update(float delta): return ------------------------------------------------------------------------------------------ -void Button::render(): +void render(): if (state == BUTTON_STATE_UP): if (up): up->set_transform(transform) @@ -164,7 +164,7 @@ void Button::render(): ------------------------------------------------------------------------------------------ -Button::Button(): +Button(): state = BUTTON_STATE_UP up = nullptr @@ -174,7 +174,7 @@ Button::Button(): ------------------------------------------------------------------------------------------ -Button::~Button(): +~Button(): return ------------------------------------------------------------------------------------------ diff --git a/27_sdl_button_app.txt b/27_sdl_button_app.txt index 7d563ec..eeaeeb3 100644 --- a/27_sdl_button_app.txt +++ b/27_sdl_button_app.txt @@ -34,16 +34,16 @@ public: #include -void MainScene::event(const SDL_Event &ev): +void event(const SDL_Event &ev): b1->event(ev); b2->event(ev); b3->event(ev); -void MainScene::update(float delta): +void update(float delta): -void MainScene::render(): +void render(): Renderer::get_singleton()->clear(); _camera->bind(); @@ -53,20 +53,20 @@ void MainScene::render(): b3->render(); -void MainScene::on_first_button_clicked(): +void on_first_button_clicked(): printf("Click!\n"); -void MainScene::on_first_button_clicked_member(void* cls): +void on_first_button_clicked_member(void* cls): if (cls): reinterpret_cast(cls)->member_print(); -void MainScene::member_print(): +void member_print(): printf("Click Member!\n"); -MainScene::MainScene(): +MainScene(): _camera = new Camera(); _image = new Image("ti.bmp"); _texture = new Texture(_image); @@ -76,7 +76,7 @@ MainScene::MainScene(): b1->up = new Sprite(_texture); b1->down = new Sprite(_texture, Color(100, 100, 100)); b1->hover = new Sprite(_texture, Color(200, 200, 200)); - b1->on_click = MainScene::on_first_button_clicked; + b1->on_click = on_first_button_clicked; b2 = new Button(); b2->transform = Rect2(0, 110, 100, 100); @@ -89,10 +89,10 @@ MainScene::MainScene(): b3->down = new Sprite(_texture, Color(100, 100, 100)); b3->hover = new Sprite(_texture, Color(200, 200, 200)); b3->cls = this; - b3->on_click_member = MainScene::on_first_button_clicked_member; + b3->on_click_member = on_first_button_clicked_member; -MainScene::~MainScene(): +~MainScene(): _texture->free(); _image->free();