diff --git a/.vs/grk-cw/FileContentIndex/1bff35ff-85ca-47ca-87a5-b28a8a92ae27.vsidx b/.vs/grk-cw/FileContentIndex/1bff35ff-85ca-47ca-87a5-b28a8a92ae27.vsidx new file mode 100644 index 0000000..9218755 Binary files /dev/null and b/.vs/grk-cw/FileContentIndex/1bff35ff-85ca-47ca-87a5-b28a8a92ae27.vsidx differ diff --git a/.vs/grk-cw/FileContentIndex/b2ba638c-b4ea-4fc0-b3d6-e80dbd89d44d.vsidx b/.vs/grk-cw/FileContentIndex/b2ba638c-b4ea-4fc0-b3d6-e80dbd89d44d.vsidx new file mode 100644 index 0000000..36266b9 Binary files /dev/null and b/.vs/grk-cw/FileContentIndex/b2ba638c-b4ea-4fc0-b3d6-e80dbd89d44d.vsidx differ diff --git a/.vs/grk-cw/FileContentIndex/d0eb5b1b-9450-4970-9752-940d24f2fa4d.vsidx b/.vs/grk-cw/FileContentIndex/d0eb5b1b-9450-4970-9752-940d24f2fa4d.vsidx new file mode 100644 index 0000000..09d4aa7 Binary files /dev/null and b/.vs/grk-cw/FileContentIndex/d0eb5b1b-9450-4970-9752-940d24f2fa4d.vsidx differ diff --git a/.vs/grk-cw/v17/.suo b/.vs/grk-cw/v17/.suo index 4de972a..ab400a3 100644 Binary files a/.vs/grk-cw/v17/.suo and b/.vs/grk-cw/v17/.suo differ diff --git a/.vs/grk-cw/v17/Browse.VC.db b/.vs/grk-cw/v17/Browse.VC.db index 283d7e9..ab3fec1 100644 Binary files a/.vs/grk-cw/v17/Browse.VC.db and b/.vs/grk-cw/v17/Browse.VC.db differ diff --git a/.vs/grk-cw/v17/fileList.bin b/.vs/grk-cw/v17/fileList.bin index 78bebb3..514a882 100644 Binary files a/.vs/grk-cw/v17/fileList.bin and b/.vs/grk-cw/v17/fileList.bin differ diff --git a/.vs/grk-cw/v17/ipch/AutoPCH/37e31236656f7d5e/TEXTUREENUM.ipch b/.vs/grk-cw/v17/ipch/AutoPCH/37e31236656f7d5e/TEXTUREENUM.ipch new file mode 100644 index 0000000..1b23629 Binary files /dev/null and b/.vs/grk-cw/v17/ipch/AutoPCH/37e31236656f7d5e/TEXTUREENUM.ipch differ diff --git a/.vs/grk-cw/v17/ipch/AutoPCH/704221a64b86fdff/MAIN.ipch b/.vs/grk-cw/v17/ipch/AutoPCH/704221a64b86fdff/MAIN.ipch new file mode 100644 index 0000000..ec2b76e Binary files /dev/null and b/.vs/grk-cw/v17/ipch/AutoPCH/704221a64b86fdff/MAIN.ipch differ diff --git a/.vs/grk-cw/v17/ipch/AutoPCH/abb251e4ccb41e84/TEXTUREENUM.ipch b/.vs/grk-cw/v17/ipch/AutoPCH/abb251e4ccb41e84/TEXTUREENUM.ipch new file mode 100644 index 0000000..dcfbe12 Binary files /dev/null and b/.vs/grk-cw/v17/ipch/AutoPCH/abb251e4ccb41e84/TEXTUREENUM.ipch differ diff --git a/.vs/grk-cw/v17/ipch/AutoPCH/b323cd3ac7b67633/TEXTURE.ipch b/.vs/grk-cw/v17/ipch/AutoPCH/b323cd3ac7b67633/TEXTURE.ipch new file mode 100644 index 0000000..12aa459 Binary files /dev/null and b/.vs/grk-cw/v17/ipch/AutoPCH/b323cd3ac7b67633/TEXTURE.ipch differ diff --git a/.vs/grk-cw/v17/ipch/AutoPCH/f56fff213fb796c0/RENDER_UTILS.ipch b/.vs/grk-cw/v17/ipch/AutoPCH/f56fff213fb796c0/RENDER_UTILS.ipch new file mode 100644 index 0000000..f06d0b0 Binary files /dev/null and b/.vs/grk-cw/v17/ipch/AutoPCH/f56fff213fb796c0/RENDER_UTILS.ipch differ diff --git a/Debug/Box.obj b/Debug/Box.obj index b01ccdb..72b7d5c 100644 Binary files a/Debug/Box.obj and b/Debug/Box.obj differ diff --git a/Debug/Camera.obj b/Debug/Camera.obj index 375b74f..711646b 100644 Binary files a/Debug/Camera.obj and b/Debug/Camera.obj differ diff --git a/Debug/Render_Utils.obj b/Debug/Render_Utils.obj index 54388c4..7b0c56b 100644 Binary files a/Debug/Render_Utils.obj and b/Debug/Render_Utils.obj differ diff --git a/Debug/SOIL.obj b/Debug/SOIL.obj index ea3e99b..6491a40 100644 Binary files a/Debug/SOIL.obj and b/Debug/SOIL.obj differ diff --git a/Debug/Shader_Loader.obj b/Debug/Shader_Loader.obj index 595db89..5c170af 100644 Binary files a/Debug/Shader_Loader.obj and b/Debug/Shader_Loader.obj differ diff --git a/Debug/Texture.obj b/Debug/Texture.obj index 77c22f7..72f8930 100644 Binary files a/Debug/Texture.obj and b/Debug/Texture.obj differ diff --git a/Debug/grk-cw9.exe b/Debug/grk-cw9.exe index 1c854a4..834dbb5 100644 Binary files a/Debug/grk-cw9.exe and b/Debug/grk-cw9.exe differ diff --git a/Debug/grk-cw9.exe.recipe b/Debug/grk-cw9.exe.recipe index c3e9eef..af8aa97 100644 --- a/Debug/grk-cw9.exe.recipe +++ b/Debug/grk-cw9.exe.recipe @@ -2,7 +2,7 @@ - C:\Users\BBB\OneDrive\Pulpit\git\Debug\grk-cw9.exe + D:\git\grk\GRK-2023\Debug\grk-cw9.exe diff --git a/Debug/grk-cw9.log b/Debug/grk-cw9.log index 389be16..9b5c5af 100644 --- a/Debug/grk-cw9.log +++ b/Debug/grk-cw9.log @@ -1,66 +1,41 @@ - Box.cpp - Camera.cpp - main.cpp + main.cpp C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition -C:\Users\BBB\OneDrive\Pulpit\git\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY' -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(74,30): warning C4305: 'initializing': truncation from 'double' to 'float' -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(88,38): warning C4305: '=': truncation from 'double' to 'float' -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(111,16): warning C4305: 'initializing': truncation from 'double' to 'float' -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(159,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(176,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(183,108): warning C4305: 'argument': truncation from 'double' to 'T' +D:\git\grk\GRK-2023\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(75,30): warning C4305: 'initializing': truncation from 'double' to 'float' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(89,38): warning C4305: '=': truncation from 'double' to 'float' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(112,16): warning C4305: 'initializing': truncation from 'double' to 'float' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(173,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data +D:\git\grk\GRK-2023\src\ex_9_1.hpp(186,59): warning C4305: 'argument': truncation from 'double' to 'T' with [ T=float ] -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(191,87): warning C4305: 'argument': truncation from 'double' to 'T' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(189,59): warning C4305: 'argument': truncation from 'double' to 'T' with [ T=float ] -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(191,223): warning C4305: 'argument': truncation from 'double' to 'float' -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(194,59): warning C4305: 'argument': truncation from 'double' to 'T' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(233,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data +D:\git\grk\GRK-2023\src\ex_9_1.hpp(240,108): warning C4305: 'argument': truncation from 'double' to 'T' with [ T=float ] -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(195,37): warning C4305: 'argument': truncation from 'double' to 'float' -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(227,2): warning C4305: 'argument': truncation from 'double' to 'float' -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(330,21): warning C4305: '-=': truncation from 'double' to 'float' -C:\Users\BBB\OneDrive\Pulpit\git\src\ex_9_1.hpp(332,21): warning C4305: '+=': truncation from 'double' to 'float' - Render_Utils.cpp - Shader_Loader.cpp - Texture.cpp - Generating Code... - image_DXT.c -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\image_DXT.c(92,9): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. - image_helper.c -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\image_helper.c(325,17): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\image_helper.c(366,13): warning C4244: '=': conversion from 'double' to 'float', possible loss of data -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\image_helper.c(373,20): warning C4244: '=': conversion from 'float' to 'int', possible loss of data -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\image_helper.c(415,13): warning C4244: '=': conversion from 'double' to 'float', possible loss of data -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\image_helper.c(422,20): warning C4244: '=': conversion from 'float' to 'int', possible loss of data - SOIL.c -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\SOIL.c(1719,36): warning C4018: '<=': signed/unsigned mismatch -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\SOIL.c(1729,19): warning C4018: '<': signed/unsigned mismatch -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\SOIL.c(1841,6): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. - stb_image_aug.c -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(177,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(251,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(303,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(1557,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(2394,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(2709,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(2995,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(3209,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(3548,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stb_image_aug.c(3644,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stbi_DDS_aug_c.h(362,19): warning C4018: '>': signed/unsigned mismatch -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stbi_DDS_aug_c.h(366,19): warning C4018: '>': signed/unsigned mismatch -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stbi_DDS_aug_c.h(390,19): warning C4018: '<': signed/unsigned mismatch -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stbi_DDS_aug_c.h(427,19): warning C4018: '<': signed/unsigned mismatch -C:\Users\BBB\OneDrive\Pulpit\git\src\SOIL\stbi_DDS_aug_c.h(498,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. - Generating Code... +D:\git\grk\GRK-2023\src\ex_9_1.hpp(249,59): warning C4305: 'argument': truncation from 'double' to 'T' + with + [ + T=float + ] +D:\git\grk\GRK-2023\src\ex_9_1.hpp(252,6): warning C4305: 'argument': truncation from 'double' to 'float' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(255,59): warning C4305: 'argument': truncation from 'double' to 'T' + with + [ + T=float + ] +D:\git\grk\GRK-2023\src\ex_9_1.hpp(258,6): warning C4305: 'argument': truncation from 'double' to 'float' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(290,2): warning C4305: 'argument': truncation from 'double' to 'float' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(404,21): warning C4305: '-=': truncation from 'double' to 'float' +D:\git\grk\GRK-2023\src\ex_9_1.hpp(406,21): warning C4305: '+=': truncation from 'double' to 'float' Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library - grk-cw9.vcxproj -> C:\Users\BBB\OneDrive\Pulpit\git\Debug\grk-cw9.exe + grk-cw9.vcxproj -> D:\git\grk\GRK-2023\Debug\grk-cw9.exe diff --git a/Debug/grk-cw9.pdb b/Debug/grk-cw9.pdb index 4938590..4404f06 100644 Binary files a/Debug/grk-cw9.pdb and b/Debug/grk-cw9.pdb differ diff --git a/Debug/grk-cw9.tlog/CL.command.1.tlog b/Debug/grk-cw9.tlog/CL.command.1.tlog index 56bdd37..4b02544 100644 Binary files a/Debug/grk-cw9.tlog/CL.command.1.tlog and b/Debug/grk-cw9.tlog/CL.command.1.tlog differ diff --git a/Debug/grk-cw9.tlog/CL.read.1.tlog b/Debug/grk-cw9.tlog/CL.read.1.tlog index b098af0..f76e166 100644 Binary files a/Debug/grk-cw9.tlog/CL.read.1.tlog and b/Debug/grk-cw9.tlog/CL.read.1.tlog differ diff --git a/Debug/grk-cw9.tlog/CL.write.1.tlog b/Debug/grk-cw9.tlog/CL.write.1.tlog index 02af0e8..e3c0f7a 100644 Binary files a/Debug/grk-cw9.tlog/CL.write.1.tlog and b/Debug/grk-cw9.tlog/CL.write.1.tlog differ diff --git a/Debug/grk-cw9.tlog/grk-cw9.lastbuildstate b/Debug/grk-cw9.tlog/grk-cw9.lastbuildstate index ffc56ea..286c057 100644 --- a/Debug/grk-cw9.tlog/grk-cw9.lastbuildstate +++ b/Debug/grk-cw9.tlog/grk-cw9.lastbuildstate @@ -1,2 +1,2 @@ PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.32.31326:TargetPlatformVersion=10.0.19041.0: -Debug|Win32|C:\Users\BBB\OneDrive\Pulpit\git\| +Debug|Win32|D:\git\grk\GRK-2023\| diff --git a/Debug/grk-cw9.tlog/link.command.1.tlog b/Debug/grk-cw9.tlog/link.command.1.tlog index cc1f90a..193a923 100644 Binary files a/Debug/grk-cw9.tlog/link.command.1.tlog and b/Debug/grk-cw9.tlog/link.command.1.tlog differ diff --git a/Debug/grk-cw9.tlog/link.read.1.tlog b/Debug/grk-cw9.tlog/link.read.1.tlog index 8e81b1e..4f4a99b 100644 Binary files a/Debug/grk-cw9.tlog/link.read.1.tlog and b/Debug/grk-cw9.tlog/link.read.1.tlog differ diff --git a/Debug/grk-cw9.tlog/link.write.1.tlog b/Debug/grk-cw9.tlog/link.write.1.tlog index cca283c..5cddcd5 100644 Binary files a/Debug/grk-cw9.tlog/link.write.1.tlog and b/Debug/grk-cw9.tlog/link.write.1.tlog differ diff --git a/Debug/grk-cw9.vcxproj.FileListAbsolute.txt b/Debug/grk-cw9.vcxproj.FileListAbsolute.txt index f85e689..173689c 100644 --- a/Debug/grk-cw9.vcxproj.FileListAbsolute.txt +++ b/Debug/grk-cw9.vcxproj.FileListAbsolute.txt @@ -1 +1 @@ -C:\Users\BBB\OneDrive\Pulpit\git\Debug\grk-cw9.exe +D:\git\grk\GRK-2023\Debug\grk-cw9.exe diff --git a/Debug/image_DXT.obj b/Debug/image_DXT.obj index 3f0bd41..cd9cb5f 100644 Binary files a/Debug/image_DXT.obj and b/Debug/image_DXT.obj differ diff --git a/Debug/image_helper.obj b/Debug/image_helper.obj index 1943d83..3deb64c 100644 Binary files a/Debug/image_helper.obj and b/Debug/image_helper.obj differ diff --git a/Debug/main.obj b/Debug/main.obj index c0a12b5..7fd3f18 100644 Binary files a/Debug/main.obj and b/Debug/main.obj differ diff --git a/Debug/stb_image_aug.obj b/Debug/stb_image_aug.obj index 48500a6..9e88d2a 100644 Binary files a/Debug/stb_image_aug.obj and b/Debug/stb_image_aug.obj differ diff --git a/Debug/vc143.idb b/Debug/vc143.idb index a06ff20..fb93b83 100644 Binary files a/Debug/vc143.idb and b/Debug/vc143.idb differ diff --git a/Debug/vc143.pdb b/Debug/vc143.pdb index 203a7b0..735e02a 100644 Binary files a/Debug/vc143.pdb and b/Debug/vc143.pdb differ