diff --git a/FocusTerra/.vs/FocusTerra/v16/.suo b/FocusTerra/.vs/FocusTerra/v16/.suo
index f03bebdeae496a4b4859748f0a6c2243c96c4ff9..1b30abe893aaea4d500a2e449c0fb0fcba54d636 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/2497ca4debdda90c/SLIM_BLOCKCHAIN_HANDLER.ipch b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/2497ca4debdda90c/SLIM_BLOCKCHAIN_HANDLER.ipch
index a6468645ed556230bf06c722f85748be1966ff3c..a93d743b7369e2557791f7b0afd35031df7312f3 100644
Binary files a/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/2497ca4debdda90c/SLIM_BLOCKCHAIN_HANDLER.ipch and b/FocusTerra/.vs/FocusTerra/v16/ipch/AutoPCH/2497ca4debdda90c/SLIM_BLOCKCHAIN_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 02f8ebbc872e119deea06dd1d791f84a6732f160..8ada777082351ffad88fa99b86af11f1ca854e7d 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 9465b1071627190bc13e0cf01e8ba8687cf67fa1..d41adaff1fe9c6f669384e626c93ed6da46b7610 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 6f8f790cb16fd0e6ba716da79fc623ef10292b66..43d951ce78d864501005bbaaee65054c88167714 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 6eb02c5fba460a01d3a49d6be9574e14b54d36a1..6a1b721e7a5e6bb413ec495b9df8b73c56bbe0ee 100644
--- a/FocusTerra/FocusTerra/x64/Release/FocusTerra.log
+++ b/FocusTerra/FocusTerra/x64/Release/FocusTerra.log
@@ -1,6 +1,4 @@
- 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
+ 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(244,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(249,6): warning C4312: 'type cast': conversion from 'GLuint' to 'void *' of greater size
@@ -28,9 +26,8 @@ C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(43
]
C:\Users\engel\VS_Projects\FocusTerra\framebuffer-testing\src\gui_handler.cpp(436,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(118): warning C4715: 'SDL_main': not all control paths return a value
- 9 of 2324 functions ( 0.4%) were compiled, the rest were copied from previous compilation.
- 2 functions were new in current compilation
- 54 functions had inline decision re-evaluated but remain unchanged
+ 1 of 2324 functions (<0.1%) were compiled, the rest were copied from previous compilation.
+ 0 functions were new in current compilation
+ 21 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 75b7394b9f86c396b1bd663991e659bd19bfaa51..cda3a3259fd23a2882c28272c2466003fb268a36 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 27b0664a54fe7c89973b6348d4e613f7be64641b..2b712400209502b14331500c52e65a496df0922a 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 e6ad2436211ae948c5350df2ae3d4c98dc338fa7..a5df1ca6f793ac5db3ee5d6aac0a44708ae24056 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 14bcdab0f5036b0f9dc74c7832d5bdf3e9638af8..2cd31494dadf74d19db32eb70f85c6443501b23f 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/gui_handler.obj b/FocusTerra/FocusTerra/x64/Release/gui_handler.obj
index 3d1c04662b8946396aa81742ca47430914b411af..376d4cc94ae0aabf810137ffe1e758a47f024141 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 6dd85adcd5f35fc8a406c29b4ea3e3778f00376a..e5560a91082134764376596ffa00a78e79bef5d3 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 3eeee3a82ed46b945ea2107868a855c51cffab75..38992a548ac667f01f534e1c7a418c062c060b77 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 9994f4cb33e4a8a8c07d3d0f58cddd648dad758b..f7d21c95bf0f9f6f75699d383b895f19ad78252b 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 59ef9e06354f4d4bc8554ec9fbccbf2339a9d8c7..b93d934905188979ecf991502d37dd02a6329490 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 3478507640f5773ef14312dbe3d442f3e83abb08..0a9eb548ac6d7e7af7fa3828e4415dd94aad4b9a 100644
Binary files a/FocusTerra/x64/Release/FocusTerra.pdb and b/FocusTerra/x64/Release/FocusTerra.pdb differ
diff --git a/include/slim_blockchain_handler.hpp b/include/slim_blockchain_handler.hpp
index 90dedcde4e648fa909cfd39032ce6b5f9d702a76..72bcf8442ea1942d257bd71bc319be8b3b585b3f 100644
--- a/include/slim_blockchain_handler.hpp
+++ b/include/slim_blockchain_handler.hpp
@@ -53,7 +53,7 @@ public:
/*Load structure textures*/
load_damping_texture_(tb, filename_ssh, &texture_ssh_);
- load_damping_texture_(tb, filename_fzp, &texture_fzp_);
+ load_damping_texture_(tb, filename_fzp, &texture_fresnel_);
}
void update(Toolbox& tb);
@@ -92,7 +92,7 @@ private:
GLuint fbo_static_ = 0;
/*Structure textures*/
GLuint texture_ssh_ = 0;
- GLuint texture_fzp_ = 0;
+ GLuint texture_fresnel_ = 0;
/*Drawlists*/
std::vector<glm::ivec4> drawlist_static_;
std::vector<glm::ivec4> drawlist_dynamic_;
diff --git a/src/slim_blockchain_handler.cpp b/src/slim_blockchain_handler.cpp
index 45283639c1103c3dfa6fd8a9f49e8e0c7cc07856..e8dd7019cec2fac8ae836c026bccbbdd918de181 100644
--- a/src/slim_blockchain_handler.cpp
+++ b/src/slim_blockchain_handler.cpp
@@ -307,7 +307,7 @@ void SlimBlockchainHandler::queue_ssh_(Toolbox& tb) {
}
void SlimBlockchainHandler::queue_fresnel_(Toolbox& tb) {
- queued_texture_ = texture_ssh_;
+ queued_texture_ = texture_fresnel_;
}
void SlimBlockchainHandler::xywhs_to_vertices_(const Toolbox& tb, const std::vector<bool>& duplicates, const std::vector<glm::ivec4>& xywhs, std::vector<float>& vertices) const {