From d6e2dbdc02273cfaaa175eb6c29296ea2f094b26 Mon Sep 17 00:00:00 2001
From: Filip Vincze <vincze.filip@gmail.com>
Date: Tue, 3 Dec 2024 20:59:13 +0100
Subject: [PATCH] remove print from presenter
---
src/presenter.cpp | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/presenter.cpp b/src/presenter.cpp
index 5474944..41b286d 100644
--- a/src/presenter.cpp
+++ b/src/presenter.cpp
@@ -7,8 +7,6 @@
#include <osi/index.hpp>
#include <iostream>
#include <fstream>
-#include <glm/gtx/string_cast.hpp>
-#include <gfx/ui/handlers.hpp>
namespace mak {
@@ -69,8 +67,6 @@ void Presenter::initialize()
init_scene4(ui_camera);
init_3d_ui(object_camera);
- print_tree(*ui_system()->uis(), std::cout);
-
ui_system()->set_current_scene("scene1");
@@ -95,8 +91,6 @@ void Presenter::initialize()
//gfx::light_system()->insert_shadow_caster(dir_light, test_box);
// print_tree(*gfx::root(), std::cout);
// print_tree(*mak::root(), std::cout);
- std::cout << glm::to_string(gfx::camera_system()->active_camera()->bottom_left_absolute()) << std::endl;
- std::cout << glm::to_string(gfx::camera_system()->active_camera()->top_right_absolute()) << std::endl;
}
void Presenter::init_scene1(Camera* camera) {
@@ -112,11 +106,11 @@ void Presenter::init_scene1(Camera* camera) {
auto* slider = ui_system()->insert_element<Slider>("slider", scene1, scene1_default_layer, vec2i{20.0f, 200.0f}, VERTICAL);
auto* h_slider = ui_system()->insert_element<Slider>("h_slider", scene1, scene1_default_layer, vec2i{200.0f, 20.0f}, HORIZONTAL);
auto* progress_bar = ui_system()->insert_element<ProgressBar>("progress_bar", scene1, scene1_default_layer, vec2i{200.0f, 20.0f}, 0.4f);
- Button* button1 = ui_generators()->create_ui_button("ui_elem1", vec2i{100, 50}, scene1, scene1_layer1, "button1");
+ Button* button1 = ui_generators()->create_ui_button("ui_elem1", vec2i{100, 50}, nullptr, scene1, scene1_layer1, "button1");
button1->register_handler(buffer_handler);
button1->get_transform()->set_anchor(0.7f, 0.2f, 0.1f, 0.1f);
button1->request_fonts_to_load("OpenSans", 48U, false, false);
- Button* button2 = ui_generators()->create_ui_button("ui_elem2", vec2i{100,100}, scene1, scene1_default_layer, "button2");
+ Button* button2 = ui_generators()->create_ui_button("ui_elem2", vec2i{100,100}, nullptr, scene1, scene1_default_layer, "button2");
button2->request_fonts_to_load("OpenSans", 48U, false, false);
auto* list_box = ui_system()->insert_element<ListBox>("list_box", scene1, scene1_default_layer, vec2i(100, 300), vec2i(100, 30));
@@ -242,11 +236,11 @@ void Presenter::init_scene4(Camera* camera)
ui_system()->assign_camera_to_scene(scene4, camera, false);
auto* scene4_default_layer = ui_system()->get_default_scene_layer(scene4);
- Button* button3 = ui_generators()->create_ui_button("ui_elem3", vec2i{100, 50}, scene4, scene4_default_layer, "button3");
- Button* button4 = ui_generators()->create_ui_button("ui_elem4", vec2i{100, 50}, scene4, scene4_default_layer, "button4");
- Button* button5 = ui_generators()->create_ui_button("ui_elem5", vec2i{100, 50}, scene4, scene4_default_layer, "button5");
- Button* button6 = ui_generators()->create_ui_button("ui_elem6", vec2i{100, 50}, scene4, scene4_default_layer, "button6");
- Button* button7 = ui_generators()->create_ui_button("ui_elem7", vec2i{100, 50}, scene4, scene4_default_layer, "button7");
+ Button* button3 = ui_generators()->create_ui_button("ui_elem3", vec2i{100, 50}, nullptr, scene4, scene4_default_layer, "button3");
+ Button* button4 = ui_generators()->create_ui_button("ui_elem4", vec2i{100, 50}, nullptr, scene4, scene4_default_layer, "button4");
+ Button* button5 = ui_generators()->create_ui_button("ui_elem5", vec2i{100, 50}, nullptr, scene4, scene4_default_layer, "button5");
+ Button* button6 = ui_generators()->create_ui_button("ui_elem6", vec2i{100, 50}, nullptr, scene4, scene4_default_layer, "button6");
+ Button* button7 = ui_generators()->create_ui_button("ui_elem7", vec2i{100, 50}, nullptr, scene4, scene4_default_layer, "button7");
button3->get_transform()->set_anchor(0.001f, 0.001f, 1.f, .8f);
button4->get_transform()->set_anchor(1.f, .8f, 0.001f, 0.001f);
button5->get_transform()->set_anchor(0.001f, .8f, 1.f, 0.001f);
--
GitLab