Cleaned up <class>:: from the new pseudocodes.

This commit is contained in:
Relintai 2021-04-10 11:31:30 +02:00
parent ec0b8c240a
commit 23d3c82c4f
5 changed files with 35 additions and 39 deletions

View File

@ -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 <chrono>
@ -125,7 +125,7 @@ Akkor az Application osztály UML diagramja:
------------------------------------------------------------------------------------------
void Application::event(const SDL_Event &current_event):
void event(const SDL_Event &current_event):
switch (current_event.type):
case SDL_QUIT:
running = false
@ -135,19 +135,19 @@ void Application::event(const SDL_Event &current_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
------------------------------------------------------------------------------------------

View File

@ -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()

View File

@ -29,7 +29,7 @@
#include <SDL.h>
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()

View File

@ -92,7 +92,7 @@ Ez az include kelleni fog: #include <functional>
------------------------------------------------------------------------------------------
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
------------------------------------------------------------------------------------------

View File

@ -34,16 +34,16 @@ public:
#include <stdio.h>
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<MainScene*>(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();