diff --git a/FocusTerra/.vs/FocusTerra/v16/.suo b/FocusTerra/.vs/FocusTerra/v16/.suo index aa5cecd9e6f6ce1a392bad3b11f6a2af55f0dc7a..3489c81fe04b612d75f54456394c65fa0769554c 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 76bed84d7822e7e23aa2de29bf48d773099925a8..8979c6cec174f998c1df1e79e1e598b7c9a4ff84 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 ae42a8f61ab418295c0b9ce73f14364d78ae63f5..45c9dbddeb154eb37e49c57a4e7f4b02f00a2e71 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 62770be5f2138ec70e356d62a89642d744321741..51e9b1f9193e97a275ae9341657d0933d6495bc8 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 8b33a5fbc4abf4a96880915fa94712339385d08e..05c176514a5f67b654334cc2edea6db727082ecb 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 c310c1adc46a2ab34fc629a305b1151bcd633c7f..dfa10286514cab3dbbcfe5f5efa8bf78c659be19 100644 --- a/FocusTerra/FocusTerra/x64/Release/FocusTerra.log +++ b/FocusTerra/FocusTerra/x64/Release/FocusTerra.log @@ -1,98 +1,7 @@ - pattern_handler.cpp - slim_blockchain_handler.cpp -C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(165,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(181,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(187,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(202,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(208,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(278,16): 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(279,59): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data -C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(279,56): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data -C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(299,16): 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(300,59): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data -C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(300,56): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data -C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\slim_blockchain_handler.cpp(315,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(316,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(324,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(325,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(326,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(327,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(329,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(330,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(334,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(335,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(339,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(340,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(344,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(345,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(349,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(350,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(354,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(355,47): warning C4244: 'argument': conversion from 'double' to '_Ty', possible loss of data - with - [ - _Ty=float - ] + toolbox.cpp Generating code -C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\main_testing.cpp(130): warning C4715: 'SDL_main': not all control paths return a value - 5 of 2339 functions ( 0.2%) were compiled, the rest were copied from previous compilation. + 1 of 2278 functions (<0.1%) were compiled, the rest were copied from previous compilation. 0 functions were new in current compilation - 35 functions had inline decision re-evaluated but remain unchanged + 23 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 87ffdf7c78ee260c62a374e5c1d81c89b916e722..0099fe13715c8c401c36b9245c7936515a534dce 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 ff860e246e7e91c199ef6575a13627e569284352..76977e99edd782f5488d54a0b3850369f384e84b 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 109a4f75c45746ca9938c5e0dabaf35c669c89da..a2fd8c2d8905c71d5b87daa355a952eeb613dfa7 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 a298b2dba7575ce63cfa02450e4c1b7e8fa94544..b6afb2aee6d62704e1c72d0d185fcc71d6ebeb85 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 4efcae4204c2809529f5c39754af2106edfb3360..55b47a6c8a76a0a6cade84a6de3fcb5c6a928483 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 28dc5695117926740c769885bd77c2a96b8f8720..e18e9a1e8acf26d1f6ff73b57cdc2de9011ce746 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/toolbox.obj b/FocusTerra/FocusTerra/x64/Release/toolbox.obj index 7909f69a293ea08d45bf5c8c12cc15a05a3e8514..4a5d03df540a210a7b5c94f407b8d7f30bfcaa2c 100644 Binary files a/FocusTerra/FocusTerra/x64/Release/toolbox.obj and b/FocusTerra/FocusTerra/x64/Release/toolbox.obj differ diff --git a/FocusTerra/FocusTerra/x64/Release/vc142.pdb b/FocusTerra/FocusTerra/x64/Release/vc142.pdb index aeb691eb2befe7d585d8623ee27280b82eefe5eb..b3f17e2840c27ac91956503f7a1e636f64055cf6 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 96f86bf5786964b159e64e0e2719620c7be2dd22..a280e3c32baf2c2ff315c155f5b61e2699265a82 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 de558f5c46d81788207430128b67d8d3c73a9caa..f5926c24955e45e990f787b84ef42f96fb2eb2d7 100644 Binary files a/FocusTerra/x64/Release/FocusTerra.pdb and b/FocusTerra/x64/Release/FocusTerra.pdb differ diff --git a/src/toolbox.cpp b/src/toolbox.cpp index 36a8bc44cef2e11ef86c76a70407f6e93de54f09..761b588b56d15195d6b663c759db5181b4137b61 100644 --- a/src/toolbox.cpp +++ b/src/toolbox.cpp @@ -34,7 +34,8 @@ Toolbox::Toolbox(const int screen_w, const int screen_h, //screen resolution texture_path(texturepath), resource_path(resource_path), time(0.f), - dt(0.016f) + //dt(0.016f) + dt(0.007477f) { infra.init("Waves Window Title", screen_w, screen_h); //mailbox.reserve(50);