diff --git a/FocusTerra/.vs/FocusTerra/v16/.suo b/FocusTerra/.vs/FocusTerra/v16/.suo
index 982880b33a59c2a5015601d68012309c11844423..ddedc0d7b6eb74e02167d7f5b1142fcf1539c746 100644
Binary files a/FocusTerra/.vs/FocusTerra/v16/.suo and b/FocusTerra/.vs/FocusTerra/v16/.suo differ
diff --git a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/3b7f66ca6222ba83/GUI_HANDLER.ipch b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/3b7f66ca6222ba83/GUI_HANDLER.ipch
index 0c7dee8fe7ead3dc223e4d22826614de77c4cb06..dc6d38ad1a650973579cbb47a7bde15fe3d9bd65 100644
Binary files a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/3b7f66ca6222ba83/GUI_HANDLER.ipch and b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/3b7f66ca6222ba83/GUI_HANDLER.ipch differ
diff --git a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/42bf0e3704eff1eb/TIMEOUT_HANDLER.ipch b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/42bf0e3704eff1eb/TIMEOUT_HANDLER.ipch
index 45e216c76a07be9ad9fe09c93b95015fb70824ba..aafabd66b34a80c38d76be10bb154035dbc5fa41 100644
Binary files a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/42bf0e3704eff1eb/TIMEOUT_HANDLER.ipch and b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/42bf0e3704eff1eb/TIMEOUT_HANDLER.ipch differ
diff --git a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/814970c2f16523d/WAVE_HANDLER.ipch b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/814970c2f16523d/WAVE_HANDLER.ipch
index 45c9dbddeb154eb37e49c57a4e7f4b02f00a2e71..ee67d02df0ba3a6ad2c2e7c4ce49fe83d21a3306 100644
Binary files a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/814970c2f16523d/WAVE_HANDLER.ipch and b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/814970c2f16523d/WAVE_HANDLER.ipch differ
diff --git a/FocusTerra/FocusTerra/x64/Release/FocusTerra.iobj b/FocusTerra/FocusTerra/x64/Release/FocusTerra.iobj
index 18fd96c4c123592fd8709a3cd214daa993d53448..152f59a67f41b79035481485a85f76f36beae71e 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/FocusTerra.iobj and b/FocusTerra/FocusTerra/x64/Release/FocusTerra.iobj differ
diff --git a/FocusTerra/FocusTerra/x64/Release/FocusTerra.ipdb b/FocusTerra/FocusTerra/x64/Release/FocusTerra.ipdb
index e1418957b8fc4e9fdbbd3eccf5f350bcc44a4ef1..0072ae9a33f477e5d567189ee35ec73627cdb310 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/FocusTerra.ipdb and b/FocusTerra/FocusTerra/x64/Release/FocusTerra.ipdb differ
diff --git a/FocusTerra/FocusTerra/x64/Release/FocusTerra.log b/FocusTerra/FocusTerra/x64/Release/FocusTerra.log
index 7afd6aa8fc0a1a0ccfcbbdcc3914e9b6c1730b57..a58d610460b2d3cdbab2fe3d58214d28e80cbf73 100644
--- a/FocusTerra/FocusTerra/x64/Release/FocusTerra.log
+++ b/FocusTerra/FocusTerra/x64/Release/FocusTerra.log
@@ -1,173 +1,15 @@
- drawer.cpp
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\include\glm\detail\type_quat.inl(115,15): warning C4244: 'initializing': conversion from 'int' to 'float', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\include\glm\detail\type_quat.inl(117,15): warning C4244: '=': conversion from 'int' to 'float', possible loss of data
- drawing_handler.cpp
+ main_testing.cpp
C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\include\drawing_handler.hpp(29,21): warning C4305: 'initializing': truncation from 'double' to 'float'
- main_testing.cpp
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\include\drawing_handler.hpp(29,21): warning C4305: 'initializing': truncation from 'double' to 'float'
- event_logger.cpp
- gui_handler.cpp
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(157,60): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(246,60): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(251,6): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(256,6): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(264,6): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(269,6): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(275,6): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(280,6): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(309,5): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(317,5): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(331,5): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(339,5): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(353,5): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(361,5): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(435,28): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(440,51): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(450,28): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(453,51): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data
- input_handler.cpp
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\input_handler.cpp(35,71): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data
- pattern_handler.cpp
- slim_blockchain_handler.cpp
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(131,40): warning C4267: 'argument': conversion from 'size_t' to 'GLint', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(147,40): warning C4267: 'argument': conversion from 'size_t' to 'GLint', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(153,40): warning C4267: 'argument': conversion from 'size_t' to 'GLint', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(168,40): warning C4267: 'argument': conversion from 'size_t' to 'GLint', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(174,40): warning C4267: 'argument': conversion from 'size_t' to 'GLint', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(200,17): warning C4244: 'initializing': conversion from 'const int' to 'float', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(201,18): warning C4244: 'initializing': conversion from 'const int' to 'float', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(209,11): warning C4244: 'initializing': conversion from 'int' to 'float', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(210,11): warning C4244: 'initializing': conversion from 'const T' to 'float', possible loss of data
- with
- [
- T=glm::i32
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(211,11): warning C4244: 'initializing': conversion from 'T' to 'float', possible loss of data
- with
- [
- T=glm::i32
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(212,11): warning C4244: 'initializing': conversion from 'const T' to 'float', possible loss of data
- with
- [
- T=glm::i32
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(214,42): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(215,43): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(219,46): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(220,47): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(224,46): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(225,43): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(229,42): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(230,43): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(234,46): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(235,47): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(239,42): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(240,47): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data
- with
- [
- _Ty=float
- ]
timeout_handler.cpp
C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\timeout_handler.cpp(29,99): warning C4244: '=': conversion from '_Rep' to 'int', possible loss of data
with
[
_Rep=__int64
]
- toolbox.cpp
- wave_handler.cpp
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(221,37): warning C4267: '=': conversion from 'size_t' to 'GLuint', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(288,36): warning C4267: 'argument': conversion from 'size_t' to 'const _Ty', possible loss of data
- with
- [
- _Ty=GLuint
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(289,50): warning C4267: 'argument': conversion from 'size_t' to '_Ty', possible loss of data
- with
- [
- _Ty=GLuint
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(290,46): warning C4267: 'argument': conversion from 'size_t' to '_Ty', possible loss of data
- with
- [
- _Ty=GLuint
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(291,36): warning C4267: 'argument': conversion from 'size_t' to 'const _Ty', possible loss of data
- with
- [
- _Ty=GLuint
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(292,40): warning C4267: 'argument': conversion from 'size_t' to '_Ty', possible loss of data
- with
- [
- _Ty=GLuint
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(293,50): warning C4267: 'argument': conversion from 'size_t' to '_Ty', possible loss of data
- with
- [
- _Ty=GLuint
- ]
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(296,37): warning C4267: '=': conversion from 'size_t' to 'GLuint', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(499,102): warning C4267: 'argument': conversion from 'size_t' to 'GLsizei', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(528,41): warning C4267: '=': conversion from 'size_t' to 'GLuint', possible loss of data
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(557,37): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\wave_handler.cpp(558,37): warning C4305: 'argument': truncation from 'double' to 'float'
Generating code
C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\main_testing.cpp(132): warning C4715: 'SDL_main': not all control paths return a value
- 39 of 2290 functions ( 1.7%) were compiled, the rest were copied from previous compilation.
- 12 functions were new in current compilation
- 20 functions had inline decision re-evaluated but remain unchanged
+ 2 of 2290 functions (<0.1%) were compiled, the rest were copied from previous compilation.
+ 0 functions were new in current compilation
+ 22 functions had inline decision re-evaluated but remain unchanged
Finished generating code
FocusTerra.vcxproj -> C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\FocusTerra\x64\Release\FocusTerra.exe
diff --git a/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.command.1.tlog b/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.command.1.tlog
index 38791e16462f6c7d88bded1ef7a6f3f0ff976997..e81e6e3d62b05029daf00e372208ee8e59e02a36 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.command.1.tlog and b/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.command.1.tlog differ
diff --git a/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.read.1.tlog b/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.read.1.tlog
index f3e9081f43cee9153a127a9cda41feb802bfba59..102411226956c3884ea075f87359b352c57aa5fb 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.read.1.tlog and b/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.read.1.tlog differ
diff --git a/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.write.1.tlog b/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.write.1.tlog
index b3e63c65190549910a95e463a4fdb10f094dc004..d887f377e8d5899baa1fff0af5aac58a927849a6 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.write.1.tlog and b/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/CL.write.1.tlog differ
diff --git a/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/link.read.1.tlog b/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/link.read.1.tlog
index f8b8f564cb75ef58dbf73875026312b70a184ca2..641f00edd717f413050b5b6bc0d6930fe8d0d496 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/link.read.1.tlog and b/FocusTerra/FocusTerra/x64/Release/FocusTerra.tlog/link.read.1.tlog differ
diff --git a/FocusTerra/FocusTerra/x64/Release/main_testing.obj b/FocusTerra/FocusTerra/x64/Release/main_testing.obj
index 3d7802fb815860f76afd4a21ff6c9562d15af154..f30779d4373e526949457ba352d6d2d6dc9fcaa4 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/main_testing.obj and b/FocusTerra/FocusTerra/x64/Release/main_testing.obj differ
diff --git a/FocusTerra/FocusTerra/x64/Release/timeout_handler.obj b/FocusTerra/FocusTerra/x64/Release/timeout_handler.obj
index 173cd64b524bb02e11713e9e5e5e6599c6b55881..2e28d445979b0d1b034e39db99d1e5b50b4f66d5 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/timeout_handler.obj and b/FocusTerra/FocusTerra/x64/Release/timeout_handler.obj differ
diff --git a/FocusTerra/FocusTerra/x64/Release/vc142.pdb b/FocusTerra/FocusTerra/x64/Release/vc142.pdb
index 8c2b050875a173dde58d6640911466093610b582..d12e5c68c605b154e16c35f11181a13438569d9d 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/vc142.pdb and b/FocusTerra/FocusTerra/x64/Release/vc142.pdb differ
diff --git a/FocusTerra/x64/Release/FocusTerra.exe b/FocusTerra/x64/Release/FocusTerra.exe
index 2f1d7255e2c43db6ea0ee4c938038df2c060989f..6265b08c65f0eeb32446514bf6679aed1c565922 100644
Binary files a/FocusTerra/x64/Release/FocusTerra.exe and b/FocusTerra/x64/Release/FocusTerra.exe differ
diff --git a/FocusTerra/x64/Release/FocusTerra.pdb b/FocusTerra/x64/Release/FocusTerra.pdb
index f52ce758026083ae465c134540b91692196023ac..10e28aa6e8b9ad05c78b9c33d0da222160e3dfdc 100644
Binary files a/FocusTerra/x64/Release/FocusTerra.pdb and b/FocusTerra/x64/Release/FocusTerra.pdb differ
diff --git a/include/gui_handler.hpp b/include/gui_handler.hpp
index 3d89a5df1c90d41e57c0a30f2564b4e84dfcf6ea..7db1449384d039ee953792b830840fe1b0a1f47b 100644
--- a/include/gui_handler.hpp
+++ b/include/gui_handler.hpp
@@ -20,6 +20,7 @@ public:
private:
bool isInGuiWindow_(const Pevent&) const;
void draw_gui_(Toolbox& tb);
+ void draw_gui_ft_(Toolbox& tb);
void draw_old_gui_(Toolbox& tb);
void load_button_textures_(const std::string path);
void load_image_to_texture_(const std::string file, GLuint& texture);
diff --git a/src/gui_handler.cpp b/src/gui_handler.cpp
index a8ca0e5930218ce44f403e9aacb0f2fd12db4493..3eed801ec80202f567755c85b169e66a4628c572 100644
--- a/src/gui_handler.cpp
+++ b/src/gui_handler.cpp
@@ -456,6 +456,10 @@ void GuiHandler::draw_gui_(Toolbox& tb) {
ImGui::End();
}
+void GuiHandler::draw_gui_ft_(Toolbox& tb) {
+
+}
+
void GuiHandler::draw_old_gui_(Toolbox& tb){
/*Set Window Position and Size and start the Window*/
ImGui::Begin("Controller", nullptr, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);