diff --git a/FocusTerra/.vs/FocusTerra/v16/.suo b/FocusTerra/.vs/FocusTerra/v16/.suo
index 8979d1cfaf7bb7632652d1f20a7e6801289f3d3c..46e39ad8d28c71f412529a481f6a6531f2429383 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 a66889b368289d0688d1cf6e52f9c70134c3e551..61a6ff0b134564b14fb6e5e813b2267e796d870a 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/814970c2f16523d/WAVE_HANDLER.ipch b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/814970c2f16523d/WAVE_HANDLER.ipch
index 08a9a66aba44c509c35fa50a6ebbc7b6b6c2aac9..8d8d61b917320675cf6f25a0622da05f88e10496 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/.vs/FocusTerra/v16/ipch/AutoPCH/cb00a5d01c33728d/MAIN_TESTING.ipch b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/cb00a5d01c33728d/MAIN_TESTING.ipch
index 7bc0088d92ca451bf4133de79dcda8f47c7050bc..7c7f42da1be3b995e359ca8097cd28759e093161 100644
Binary files a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/cb00a5d01c33728d/MAIN_TESTING.ipch and b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/cb00a5d01c33728d/MAIN_TESTING.ipch differ
diff --git a/FocusTerra/FocusTerra/x64/Release/FocusTerra.iobj b/FocusTerra/FocusTerra/x64/Release/FocusTerra.iobj
index cb86c802e5880d76fb2622818e1ceeb92c7a8830..08898783432dbdda6e93dbe0c0d7be5ebcf2762e 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 aede8e996af70ebd0c2dfd4865e7cd477293272b..561271c0b00d2d46822546a1e2f8bb3f50b17256 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 1002db4b0ffb35249412935dc10ae4baa801a5d5..360233f30f4ae34f1a4be2e3b6aeda72a6f9f526 100644
--- a/FocusTerra/FocusTerra/x64/Release/FocusTerra.log
+++ b/FocusTerra/FocusTerra/x64/Release/FocusTerra.log
@@ -1,9 +1,32 @@
- 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'
+ gui_handler.cpp
+C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(149,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(236,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(241,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(246,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(254,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(259,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(265,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(270,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(299,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(306,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(319,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(326,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(394,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(399,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(405,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(408,51): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data
Generating code
-C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\main_testing.cpp(112): warning C4715: 'SDL_main': not all control paths return a value
- 2 of 2265 functions (<0.1%) were compiled, the rest were copied from previous compilation.
+C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\main_testing.cpp(117): warning C4715: 'SDL_main': not all control paths return a value
+ 6 of 2265 functions ( 0.3%) 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
+ 30 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 b02328f0fbd2db90677505a78a48a3a50f5cc412..2c8c4762bae0462fb1627ce159a50ebefb563b12 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 1f5685ed15f9fd67707305698e30ba79e76a8c62..3efa8616f1720c1e563e23a28c839ae092e2d810 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 3076d04db522dd2f6f79131222ce565cc54eefde..a5353ff6320780a22ee572bff7589b986122752c 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/gui_handler.obj b/FocusTerra/FocusTerra/x64/Release/gui_handler.obj
index ba29ec41f59c49e14e13322f45747e5276fa2afc..661317b3b88abf8051b009b7dd9b5b1d976baca2 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/gui_handler.obj and b/FocusTerra/FocusTerra/x64/Release/gui_handler.obj differ
diff --git a/FocusTerra/FocusTerra/x64/Release/main_testing.obj b/FocusTerra/FocusTerra/x64/Release/main_testing.obj
index 5a375b740b560447499e78f8e1ca254a02b4fbac..9a9f0ecf4a8eae6961954e67871dd22397ddf374 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/slim_blockchain_handler.obj b/FocusTerra/FocusTerra/x64/Release/slim_blockchain_handler.obj
index 5836f332049c4850c21c10384533584c1cd60271..067d4067265d23f9c780e66d183395245ee4f0fe 100644
Binary files a/FocusTerra/FocusTerra/x64/Release/slim_blockchain_handler.obj and b/FocusTerra/FocusTerra/x64/Release/slim_blockchain_handler.obj differ
diff --git a/FocusTerra/FocusTerra/x64/Release/vc142.pdb b/FocusTerra/FocusTerra/x64/Release/vc142.pdb
index 50823abb24ad25b5fe58b3c7481ae02647e365e5..0de4d61b815690b938f2cedbf6a9c21734fa0f11 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 c5cf77c7008bc940fa611b5347dfc404759a9370..a4f6268f1ce6292f86729cd9923764c6817aca47 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 bb316024e92650c063d50105131d189af14cd6f6..a27bdb7486d998c73b466897f067e5861d5ad8aa 100644
Binary files a/FocusTerra/x64/Release/FocusTerra.pdb and b/FocusTerra/x64/Release/FocusTerra.pdb differ
diff --git a/src/gui_handler.cpp b/src/gui_handler.cpp
index 54e683a4ee47d9ffe16a3d60c8385552ab831f89..dbdf5e21d9abea8c0498d2579165f370e75950ee 100644
--- a/src/gui_handler.cpp
+++ b/src/gui_handler.cpp
@@ -131,12 +131,14 @@ void GuiHandler::update(Toolbox& tb) {
}
/*If the controlling finger is not currently touching, reset*/
+ /*Uncomment on a touchscreen*/
+ /*
if (fingerID_ != -42) {
if (std::find(tb.current_touchIDs.begin(), tb.current_touchIDs.end(), fingerID_) == tb.current_touchIDs.end()) {
fingerID_ = -42;
}
}
-
+ */
/*Draw GUI*/
/*Draw controller window*/
diff --git a/src/main_testing.cpp b/src/main_testing.cpp
index 320798ad600189a5a3957cae9cc4c27db700e2bd..8001b1ca09483dbb0ba28e74d314b050cfcd8cf3 100644
--- a/src/main_testing.cpp
+++ b/src/main_testing.cpp
@@ -17,7 +17,13 @@
//#define WIDTH 3840
//#define HEIGHT 2160
+/*Path to resources*/
+
int main(int argc, char** argv) {
+ std::string top_path = "C:\\Users\\engel\\VS_Projects\\FocusTerra\\framebuffer-testing\\";
+ std::string rsc_path = top_path + "resource\\";
+ std::string img_path = rsc_path + "images\\";
+ std::string shd_path = top_path + "shaders\\";
int tex_offscreen_left = 0;
int tex_offscreen_right = 450;
int tex_offscreen_bottom = 450;
@@ -25,15 +31,14 @@ int main(int argc, char** argv) {
int texwidth = WIDTH + tex_offscreen_left + tex_offscreen_right;
int texheight = HEIGHT + tex_offscreen_bottom + tex_offscreen_top;
- Toolbox tb(WIDTH, HEIGHT, texwidth, texheight, tex_offscreen_left, tex_offscreen_right, tex_offscreen_bottom, tex_offscreen_top, "C:\\Users\\engel\\VS_Projects\\FocusTerra\\framebuffer-testing\\shaders\\");
+ Toolbox tb(WIDTH, HEIGHT, texwidth, texheight, tex_offscreen_left, tex_offscreen_right, tex_offscreen_bottom, tex_offscreen_top, shd_path);
WaveHandler waves(tb);
- //waves.initialize("C:\\Users\\engel\\VS_Projects\\FocusTerra\\framebuffer-testing\\resource\\damp_smooth_smalldelta", "C:\\Users\\engel\\VS_Projects\\FocusTerra\\framebuffer-testing\\resource\\ft_palette");
- waves.initialize("C:\\Users\\engel\\VS_Projects\\FocusTerra\\framebuffer-testing\\resource\\damp_exp", "C:\\Users\\engel\\VS_Projects\\FocusTerra\\framebuffer-testing\\resource\\ft_palette");
+ waves.initialize(rsc_path + "damp_exp", rsc_path + "ft_palette");
waves.generate_and_transfer_textures(tb);
InputHandler ioHandler;
GuiHandler guiHandler(0.15f);
- guiHandler.init(tb, "C:\\Users\\engel\\VS_Projects\\FocusTerra\\framebuffer-testing\\resource\\images\\");
+ guiHandler.init(tb, img_path);
SlimBlockchainHandler bch(tb, MSTATE::PLACE);
DrawingHandler drah(tb);