diff --git a/Release/grk-cw9.exe b/Release/grk-cw9.exe index dc5db0d..fb746f8 100644 Binary files a/Release/grk-cw9.exe and b/Release/grk-cw9.exe differ diff --git a/Release/grk-cw9.pdb b/Release/grk-cw9.pdb index c2ba710..f815fdd 100644 Binary files a/Release/grk-cw9.pdb and b/Release/grk-cw9.pdb differ diff --git a/cw 9/Release/Box.obj b/cw 9/Release/Box.obj index 3c08665..f793e60 100644 Binary files a/cw 9/Release/Box.obj and b/cw 9/Release/Box.obj differ diff --git a/cw 9/Release/Camera.obj b/cw 9/Release/Camera.obj index b3254b8..57a55ae 100644 Binary files a/cw 9/Release/Camera.obj and b/cw 9/Release/Camera.obj differ diff --git a/cw 9/Release/Render_Utils.obj b/cw 9/Release/Render_Utils.obj index 9a759ba..74b4445 100644 Binary files a/cw 9/Release/Render_Utils.obj and b/cw 9/Release/Render_Utils.obj differ diff --git a/cw 9/Release/SOIL.obj b/cw 9/Release/SOIL.obj index 500fbb4..7a7ec09 100644 Binary files a/cw 9/Release/SOIL.obj and b/cw 9/Release/SOIL.obj differ diff --git a/cw 9/Release/Shader_Loader.obj b/cw 9/Release/Shader_Loader.obj index 14e7ed0..1dd6f01 100644 Binary files a/cw 9/Release/Shader_Loader.obj and b/cw 9/Release/Shader_Loader.obj differ diff --git a/cw 9/Release/Texture.obj b/cw 9/Release/Texture.obj index ca17d0e..e2c7c06 100644 Binary files a/cw 9/Release/Texture.obj and b/cw 9/Release/Texture.obj differ diff --git a/cw 9/Release/TriangleSoup.obj b/cw 9/Release/TriangleSoup.obj index 5d74cc7..f9573c8 100644 Binary files a/cw 9/Release/TriangleSoup.obj and b/cw 9/Release/TriangleSoup.obj differ diff --git a/cw 9/Release/grk-cw9.exe.recipe b/cw 9/Release/grk-cw9.exe.recipe index f8307c7..1b4d63d 100644 --- a/cw 9/Release/grk-cw9.exe.recipe +++ b/cw 9/Release/grk-cw9.exe.recipe @@ -2,7 +2,7 @@ - C:\Users\jedrz\Desktop\gr\GRK_Project\Release\grk-cw9.exe + C:\Users\jedrz\Desktop\projekt final\GRK_Project\Release\grk-cw9.exe diff --git a/cw 9/Release/grk-cw9.iobj b/cw 9/Release/grk-cw9.iobj index 0500cee..cff619c 100644 Binary files a/cw 9/Release/grk-cw9.iobj and b/cw 9/Release/grk-cw9.iobj differ diff --git a/cw 9/Release/grk-cw9.ipdb b/cw 9/Release/grk-cw9.ipdb index 2cb6a17..472201c 100644 Binary files a/cw 9/Release/grk-cw9.ipdb and b/cw 9/Release/grk-cw9.ipdb differ diff --git a/cw 9/Release/grk-cw9.log b/cw 9/Release/grk-cw9.log index 8237617..a280ce0 100644 --- a/cw 9/Release/grk-cw9.log +++ b/cw 9/Release/grk-cw9.log @@ -1,86 +1,86 @@  main.cpp C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra -C:\Users\jedrz\Desktop\gr\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY” -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(342,30): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(370,17): warning C4101: "data": lokalna zmienna, do której nie istnieje odwołanie -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(395,38): warning C4305: "=": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(424,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(641,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(649,73): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(649,66): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(664,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(682,98): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY” +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(342,30): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(372,17): warning C4101: "data": lokalna zmienna, do której nie istnieje odwołanie +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(397,38): warning C4305: "=": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(426,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(644,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(657,73): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(657,66): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(669,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(687,98): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(685,68): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(690,68): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(730,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(744,99): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(735,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(749,99): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(747,69): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(752,69): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(792,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(806,99): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(797,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(811,99): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(809,69): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(814,69): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(933,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(934,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(935,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(938,31): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(939,25): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(993,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(994,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(995,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(998,31): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(999,23): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1101,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1115,108): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(938,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(939,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(940,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(943,31): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(944,25): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(998,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(999,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1000,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1003,31): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1004,23): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1106,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1120,108): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1128,85): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1154,73): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1158,81): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1159,93): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1160,83): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1161,83): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1257,108): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1133,85): warning C4305: "argument": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1159,73): warning C4305: "argument": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1163,81): warning C4305: "argument": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1164,93): warning C4305: "argument": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1165,83): warning C4305: "argument": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1166,83): warning C4305: "argument": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1264,108): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1597,21): warning C4305: "-=": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\gr\GRK_Project\cw 9\src\ex_9_1.hpp(1599,21): warning C4305: "+=": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1610,21): warning C4305: "-=": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\projekt final\GRK_Project\cw 9\src\ex_9_1.hpp(1612,21): warning C4305: "+=": obcięcie z "double" do "float" Trwa generowanie kodu - 102 of 727 functions (14.0%) were compiled, the rest were copied from previous compilation. - 1 functions were new in current compilation - 11 functions had inline decision re-evaluated but remain unchanged + 99 of 727 functions (13.6%) were compiled, the rest were copied from previous compilation. + 0 functions were new in current compilation + 24 functions had inline decision re-evaluated but remain unchanged Zakończono generowanie kodu - grk-cw9.vcxproj -> C:\Users\jedrz\Desktop\gr\GRK_Project\Release\grk-cw9.exe + grk-cw9.vcxproj -> C:\Users\jedrz\Desktop\projekt final\GRK_Project\Release\grk-cw9.exe diff --git a/cw 9/Release/grk-cw9.tlog/CL.command.1.tlog b/cw 9/Release/grk-cw9.tlog/CL.command.1.tlog index 10adfe6..6def638 100644 Binary files a/cw 9/Release/grk-cw9.tlog/CL.command.1.tlog and b/cw 9/Release/grk-cw9.tlog/CL.command.1.tlog differ diff --git a/cw 9/Release/grk-cw9.tlog/CL.read.1.tlog b/cw 9/Release/grk-cw9.tlog/CL.read.1.tlog index 5c51887..6a3d25f 100644 Binary files a/cw 9/Release/grk-cw9.tlog/CL.read.1.tlog and b/cw 9/Release/grk-cw9.tlog/CL.read.1.tlog differ diff --git a/cw 9/Release/grk-cw9.tlog/CL.write.1.tlog b/cw 9/Release/grk-cw9.tlog/CL.write.1.tlog index e83447c..1be7ee5 100644 Binary files a/cw 9/Release/grk-cw9.tlog/CL.write.1.tlog and b/cw 9/Release/grk-cw9.tlog/CL.write.1.tlog differ diff --git a/cw 9/Release/grk-cw9.tlog/grk-cw9.lastbuildstate b/cw 9/Release/grk-cw9.tlog/grk-cw9.lastbuildstate index 813d57c..a1d8533 100644 --- a/cw 9/Release/grk-cw9.tlog/grk-cw9.lastbuildstate +++ b/cw 9/Release/grk-cw9.tlog/grk-cw9.lastbuildstate @@ -1,2 +1,2 @@ PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0: -Release|Win32|C:\Users\jedrz\Desktop\gr\GRK_Project\| +Release|Win32|C:\Users\jedrz\Desktop\projekt final\GRK_Project\| diff --git a/cw 9/Release/grk-cw9.tlog/link.command.1.tlog b/cw 9/Release/grk-cw9.tlog/link.command.1.tlog index b60aac9..254c6d3 100644 Binary files a/cw 9/Release/grk-cw9.tlog/link.command.1.tlog and b/cw 9/Release/grk-cw9.tlog/link.command.1.tlog differ diff --git a/cw 9/Release/grk-cw9.tlog/link.read.1.tlog b/cw 9/Release/grk-cw9.tlog/link.read.1.tlog index 2590c58..be9d211 100644 Binary files a/cw 9/Release/grk-cw9.tlog/link.read.1.tlog and b/cw 9/Release/grk-cw9.tlog/link.read.1.tlog differ diff --git a/cw 9/Release/grk-cw9.tlog/link.write.1.tlog b/cw 9/Release/grk-cw9.tlog/link.write.1.tlog index 5b984a5..cf56783 100644 Binary files a/cw 9/Release/grk-cw9.tlog/link.write.1.tlog and b/cw 9/Release/grk-cw9.tlog/link.write.1.tlog differ diff --git a/cw 9/Release/image_DXT.obj b/cw 9/Release/image_DXT.obj index f95387c..bdbe064 100644 Binary files a/cw 9/Release/image_DXT.obj and b/cw 9/Release/image_DXT.obj differ diff --git a/cw 9/Release/image_helper.obj b/cw 9/Release/image_helper.obj index 672a21f..20e00ff 100644 Binary files a/cw 9/Release/image_helper.obj and b/cw 9/Release/image_helper.obj differ diff --git a/cw 9/Release/main.obj b/cw 9/Release/main.obj index b9cc504..d3a483a 100644 Binary files a/cw 9/Release/main.obj and b/cw 9/Release/main.obj differ diff --git a/cw 9/Release/stb_image_aug.obj b/cw 9/Release/stb_image_aug.obj index 0892275..156d318 100644 Binary files a/cw 9/Release/stb_image_aug.obj and b/cw 9/Release/stb_image_aug.obj differ diff --git a/cw 9/src/ex_9_1.hpp b/cw 9/src/ex_9_1.hpp index e57f252..adae256 100644 --- a/cw 9/src/ex_9_1.hpp +++ b/cw 9/src/ex_9_1.hpp @@ -360,6 +360,8 @@ float deltaTime = 0.f; void bubbleManager(); void bubbleManagerInRoom(); +bool bubble = false; + unsigned int loadSkybox(std::vector faces1) { unsigned int textureID; @@ -637,6 +639,7 @@ void drawBubbleColor(Core::RenderContext context, glm::mat4 modelMatrix, glm::ve glUseProgram(0); } + void drawBubble(glm::mat4 transformSphere) { float time = glfwGetTime(); glUseProgram(programBubble); @@ -645,7 +648,12 @@ void drawBubble(glm::mat4 transformSphere) { glm::mat4 viewProjectionMatrix = perspectiveMatrix * cameraMatrix; glm::mat4 transformation = viewProjectionMatrix * transformSphere; glm::mat3 bubbleSkyboxViewMatrix = glm::mat3(perspectiveMatrix * glm::mat4(glm::mat3(cameraMatrix))); - glUniformMatrix4fv(glGetUniformLocation(programBubble, "transformation"), 1, GL_FALSE, (float*)&transformation); + if (bubble == false) { + glUniformMatrix4fv(glGetUniformLocation(programBubble, "transformation"), 1, GL_FALSE, (float*)&transformSphere); + } + else { + glUniformMatrix4fv(glGetUniformLocation(programBubble, "transformation"), 1, GL_FALSE, (float*)&transformation); + } glUniform3f(glGetUniformLocation(programBubble, "iResolution"), WIDTH, HEIGHT, 1.0); glUniform1f(glGetUniformLocation(programBubble, "time"), time); @@ -993,7 +1001,7 @@ void bubbleMovementInRoom(int i) { float bubbleWobbling = 0.0005; - float bubbleUp = 0.05; + float bubbleUp = 0.02; //printf(xDir ? "true\n" : "false\n"); //printf(zDir ? "true\n" : "false\n"); @@ -1107,13 +1115,13 @@ void renderScene(GLFWwindow* window) renderShadowapLamp(); //space lamp - /*glUseProgram(programSun); + glUseProgram(programSun); glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix(); glm::mat4 transformation = viewProjectionMatrix * glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)); glUniformMatrix4fv(glGetUniformLocation(programSun, "transformation"), 1, GL_FALSE, (float*)&transformation); glUniform3f(glGetUniformLocation(programSun, "color"), sunColor.x / 2, sunColor.y / 2, sunColor.z / 2); glUniform1f(glGetUniformLocation(programSun, "exposition"), exposition); - Core::DrawContext(sphereContext);*/ + Core::DrawContext(sphereContext); drawSkybox(models::cubeContext, createPerspectiveMatrix() * glm::mat4(glm::mat3(createCameraMatrix())), skyboxTexture); glUseProgram(program); glm::mat4 transform(1.0f); @@ -1212,10 +1220,12 @@ void renderScene(GLFWwindow* window) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, depthMap3); Core::DrawContext(models::testContext);*/ + bubbleManagerInRoom(); bubbleManager(); + glUseProgram(0); glfwSwapBuffers(window); } @@ -1564,6 +1574,12 @@ void processInput(GLFWwindow* window) texture::screen = Core::LoadTexture("textures/visual.png"); PlaySound(TEXT("sound/ocean.wav"), NULL, SND_ASYNC|SND_LOOP); } + if (glfwGetKey(window, GLFW_KEY_N) == GLFW_PRESS) { + bubble = false; + } + if (glfwGetKey(window, GLFW_KEY_M) == GLFW_PRESS) { + bubble = true; + } if (glfwGetKey(window, GLFW_KEY_B) == GLFW_PRESS) { for (int i = 0; i < bubblenumber; i++) diff --git a/cw 9/textures/bubbleSkybox/back.jpg b/cw 9/textures/bubbleSkybox/back.jpg index b2fc1b0..87dcb6d 100644 Binary files a/cw 9/textures/bubbleSkybox/back.jpg and b/cw 9/textures/bubbleSkybox/back.jpg differ diff --git a/cw 9/textures/bubbleSkybox/front.jpg b/cw 9/textures/bubbleSkybox/front.jpg index 87dcb6d..b2fc1b0 100644 Binary files a/cw 9/textures/bubbleSkybox/front.jpg and b/cw 9/textures/bubbleSkybox/front.jpg differ