s464869/GRK_Project
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

skybox... zrobiłem ile mogłem

Browse Source
This commit is contained in:
XsedoX 2023-02-12 22:27:27 +01:00
parent a5e49e770b
commit acd60b813a
29 changed files with 59 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Debug/grk-cw9.exe
View File

Binary file not shown.

BIN
Debug/grk-cw9.pdb
View File

Binary file not shown.

BIN
cw 9/Debug/Box.obj
View File

Binary file not shown.

BIN
cw 9/Debug/Camera.obj
View File

Binary file not shown.

BIN
cw 9/Debug/Render_Utils.obj
View File

Binary file not shown.

BIN
cw 9/Debug/SOIL.obj
View File

Binary file not shown.

BIN
cw 9/Debug/Shader_Loader.obj
View File

Binary file not shown.

BIN
cw 9/Debug/Texture.obj
View File

Binary file not shown.

2
cw 9/Debug/grk-cw9.exe.recipe
View File

@ -2,7 +2,7 @@
<Project> <Project>
<ProjectOutputs> <ProjectOutputs>
<ProjectOutput> <ProjectOutput>
<FullPath>C:\Users\walcz\Desktop\ksdma\GRK_Project\Debug\grk-cw9.exe</FullPath> <FullPath>C:\Users\sjule\source\repos\GRK_Project\Debug\grk-cw9.exe</FullPath>
</ProjectOutput> </ProjectOutput>
</ProjectOutputs> </ProjectOutputs>
<ContentFiles /> <ContentFiles />

161
cw 9/Debug/grk-cw9.log
View File

@ -1,146 +1,83 @@
 Box.cpp  main.cpp
Camera.cpp C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
Collision_System.cpp C:\Users\sjule\source\repos\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123,1): message : see previous definition of 'APIENTRY'
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(337,30): warning C4305: 'initializing': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(375,17): warning C4101: 'data': unreferenced local variable
main.cpp C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(400,38): warning C4305: '=': truncation from 'double' to 'float'
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(429,16): warning C4305: 'initializing': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(642,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(650,73): warning C4244: 'argument': conversion from 'int' to 'GLfloat', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(650,66): warning C4244: 'argument': conversion from 'int' to 'GLfloat', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(662,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(680,98): warning C4305: 'argument': truncation from 'double' to 'T'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: 'return': conversion from 'int' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(337,30): warning C4305: 'initializing': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(375,17): warning C4101: 'data': unreferenced local variable
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(400,38): warning C4305: '=': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(429,16): warning C4305: 'initializing': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(642,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(650,73): warning C4244: 'argument': conversion from 'int' to 'GLfloat', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(650,66): warning C4244: 'argument': conversion from 'int' to 'GLfloat', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(665,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(683,98): warning C4305: 'argument': truncation from 'double' to 'T'
with with
[ [
T=float T=float
] ]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(686,68): warning C4305: 'argument': truncation from 'double' to 'T' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(683,68): warning C4305: 'argument': truncation from 'double' to 'T'
with with
[ [
T=float T=float
] ]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(731,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(728,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(745,99): warning C4305: 'argument': truncation from 'double' to 'T' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(742,99): warning C4305: 'argument': truncation from 'double' to 'T'
with with
[ [
T=float T=float
] ]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(748,69): warning C4305: 'argument': truncation from 'double' to 'T' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(745,69): warning C4305: 'argument': truncation from 'double' to 'T'
with with
[ [
T=float T=float
] ]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(793,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(790,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(807,99): warning C4305: 'argument': truncation from 'double' to 'T' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(804,99): warning C4305: 'argument': truncation from 'double' to 'T'
with with
[ [
T=float T=float
] ]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(810,69): warning C4305: 'argument': truncation from 'double' to 'T' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(807,69): warning C4305: 'argument': truncation from 'double' to 'T'
with with
[ [
T=float T=float
] ]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(934,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(931,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(935,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(932,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(936,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(933,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(939,31): warning C4305: 'initializing': truncation from 'double' to 'float' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(936,31): warning C4305: 'initializing': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(940,25): warning C4305: 'initializing': truncation from 'double' to 'float' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(937,25): warning C4305: 'initializing': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(994,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(991,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(995,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(992,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(996,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(993,8): warning C4244: 'initializing': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(999,31): warning C4305: 'initializing': truncation from 'double' to 'float' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(996,31): warning C4305: 'initializing': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1000,23): warning C4305: 'initializing': truncation from 'double' to 'float' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(997,23): warning C4305: 'initializing': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1102,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1099,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1116,108): warning C4305: 'argument': truncation from 'double' to 'T' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1122,87): warning C4305: 'argument': truncation from 'double' to 'T'
with with
[ [
T=float T=float
] ]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1125,87): warning C4305: 'argument': truncation from 'double' to 'T' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1122,223): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1151,73): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1155,81): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1156,93): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1157,83): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1158,83): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1254,108): warning C4305: 'argument': truncation from 'double' to 'T'
with with
[ [
T=float T=float
] ]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1125,223): warning C4305: 'argument': truncation from 'double' to 'float' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1592,21): warning C4305: '-=': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1154,73): warning C4305: 'argument': truncation from 'double' to 'float' C:\Users\sjule\source\repos\GRK_Project\cw 9\src\ex_9_1.hpp(1594,21): warning C4305: '+=': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1158,81): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1159,93): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1160,83): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1161,83): warning C4305: 'argument': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1257,108): warning C4305: 'argument': truncation from 'double' to 'T'
with
[
T=float
]
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1595,21): warning C4305: '-=': truncation from 'double' to 'float'
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\ex_9_1.hpp(1597,21): warning C4305: '+=': truncation from 'double' to 'float'
Render_Utils.cpp
Shader_Loader.cpp
Texture.cpp
TriangleSoup.cpp
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(284,10): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(285,10): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(288,15): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(289,15): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(412,12): 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\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(421,3): warning C4996: 'sscanf': This function or variable may be unsafe. Consider using sscanf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(445,3): warning C4996: 'sscanf': This function or variable may be unsafe. Consider using sscanf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(448,14): warning C4996: 'sscanf': This function or variable may be unsafe. Consider using sscanf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(462,14): warning C4996: 'sscanf': This function or variable may be unsafe. Consider using sscanf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(474,14): warning C4996: 'sscanf': This function or variable may be unsafe. Consider using sscanf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\TriangleSoup.cpp(487,14): warning C4996: 'sscanf': This function or variable may be unsafe. Consider using sscanf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
Generating Code...
image_DXT.c
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\image_helper.c(325,22): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\image_helper.c(366,13): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\image_helper.c(373,20): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\image_helper.c(415,13): warning C4244: '=': conversion from 'double' to 'float', possible loss of data
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\image_helper.c(422,20): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
SOIL.c
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\SOIL.c(1719,36): warning C4018: '<=': signed/unsigned mismatch
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\SOIL.c(1729,19): warning C4018: '<': signed/unsigned mismatch
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\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\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\stbi_DDS_aug_c.h(362,19): warning C4018: '>': signed/unsigned mismatch
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\stbi_DDS_aug_c.h(366,19): warning C4018: '>': signed/unsigned mismatch
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\stbi_DDS_aug_c.h(390,19): warning C4018: '<': signed/unsigned mismatch
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\src\SOIL\stbi_DDS_aug_c.h(427,19): warning C4018: '<': signed/unsigned mismatch
C:\Users\walcz\Desktop\ksdma\GRK_Project\cw 9\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...
Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification 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 LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
grk-cw9.vcxproj -> C:\Users\walcz\Desktop\ksdma\GRK_Project\Debug\grk-cw9.exe grk-cw9.vcxproj -> C:\Users\sjule\source\repos\GRK_Project\Debug\grk-cw9.exe

BIN
cw 9/Debug/grk-cw9.tlog/CL.command.1.tlog
View File

Binary file not shown.

BIN
cw 9/Debug/grk-cw9.tlog/CL.read.1.tlog
View File

Binary file not shown.

BIN
cw 9/Debug/grk-cw9.tlog/CL.write.1.tlog
View File

Binary file not shown.

4
cw 9/Debug/grk-cw9.tlog/grk-cw9.lastbuildstate
View File

@ -1,2 +1,2 @@
PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.30.30705:TargetPlatformVersion=10.0.19041.0: PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.34.31933:TargetPlatformVersion=10.0.22621.0:
Debug|Win32|C:\Users\walcz\Desktop\ksdma\GRK_Project\| Debug|Win32|C:\Users\sjule\source\repos\GRK_Project\|

BIN
cw 9/Debug/grk-cw9.tlog/link.read.1.tlog
View File

Binary file not shown.

BIN
cw 9/Debug/grk-cw9.tlog/link.write.1.tlog
View File

Binary file not shown.

BIN
cw 9/Debug/image_DXT.obj
View File

Binary file not shown.

BIN
cw 9/Debug/image_helper.obj
View File

Binary file not shown.

BIN
cw 9/Debug/main.obj
View File

Binary file not shown.

BIN
cw 9/Debug/stb_image_aug.obj
View File

Binary file not shown.

8
cw 9/shaders/shader_bubble.frag
View File

@ -1,8 +1,5 @@
#version 430 core #version 430 core
uniform vec3 iResolution; uniform vec3 iResolution;
//uniform vec3 cameraPos;
//uniform vec3 cameraDir;
uniform mat3 camMat;
uniform sampler2D iChannel1; uniform sampler2D iChannel1;
uniform samplerCube iChannel0; uniform samplerCube iChannel0;
uniform float time; uniform float time;
@ -236,7 +233,6 @@ void main()
// camera movement // camera movement
//vec3 ro, ta; //vec3 ro, ta;
//doCamera( ro, ta, iTime, m ); //doCamera( ro, ta, iTime, m );
//mat3 camMat = calcLookAtMatrix( cameraPos, cameraDir, 0.0 );
float dh = (0.666 / iResolution.y); float dh = (0.666 / iResolution.y);
const float rads = TWO_PI / float(AA_SAMPLES); const float rads = TWO_PI / float(AA_SAMPLES);
@ -252,8 +248,8 @@ void main()
for (int samp = 0; samp < AA_SAMPLES; samp++) { for (int samp = 0; samp < AA_SAMPLES; samp++) {
vec2 dxy = dh * vec2(cos(float(samp) * rads), sin(float(samp) * rads)); vec2 dxy = dh * vec2(cos(float(samp) * rads), sin(float(samp) * rads));
vec3 rd = normalize(camMat * vec3(p.xy + dxy, 1.5)); // 1.5 is the lens length vec3 rd = normalize(vec3(p.xy + dxy, 0.2)); // 1.5 is the lens length
vec3 pos = bubblePosition.xyz; vec3 pos = vec3(-bubblePosition.z, -bubblePosition.y, bubblePosition.x);
bool hit = false; bool hit = false;
for (int j = 0; j < ITERATIONS; j++) { for (int j = 0; j < ITERATIONS; j++) {
float t = DIST_SCALE * sdf(pos); float t = DIST_SCALE * sdf(pos);

2
cw 9/shaders/shader_bubble.vert
View File

@ -14,6 +14,6 @@ void main()
{ {
bubblePosition = transformation * vec4(vertexPosition, 1.0); bubblePosition = transformation * vec4(vertexPosition, 1.0);
//vec3 bubbling = sdf(bubblePosition2.xyz); //vec3 bubbling = sdf(bubblePosition2.xyz);
gl_Position = bubblePosition; gl_Position = transformation * vec4(vertexPosition, 1.0);
//gl_Position = vec4(vertexPosition, 1.0); //gl_Position = vec4(vertexPosition, 1.0);
} }

11
cw 9/src/ex_9_1.hpp
View File

@ -645,13 +645,10 @@ void drawBubble(glm::mat4 transformSphere) {
glm::mat4 perspectiveMatrix = createPerspectiveMatrix(); glm::mat4 perspectiveMatrix = createPerspectiveMatrix();
glm::mat4 viewProjectionMatrix = perspectiveMatrix * cameraMatrix; glm::mat4 viewProjectionMatrix = perspectiveMatrix * cameraMatrix;
glm::mat4 transformation = viewProjectionMatrix * transformSphere; glm::mat4 transformation = viewProjectionMatrix * transformSphere;
glm::mat4 bubbleSkyboxViewMatrix = glm::mat3(perspectiveMatrix * glm::mat4(glm::mat3(cameraMatrix))); glm::mat3 bubbleSkyboxViewMatrix = glm::mat3(perspectiveMatrix * glm::mat4(glm::mat3(cameraMatrix)));
glUniformMatrix4fv(glGetUniformLocation(programBubble, "transformation"), 1, GL_FALSE, (float*)&transformSphere); glUniformMatrix4fv(glGetUniformLocation(programBubble, "transformation"), 1, GL_FALSE, (float*)&transformation);
glUniform3f(glGetUniformLocation(programBubble, "iResolution"), WIDTH, HEIGHT, 1.0); glUniform3f(glGetUniformLocation(programBubble, "iResolution"), WIDTH, HEIGHT, 1.0);
glUniform1f(glGetUniformLocation(programBubble, "time"), time); glUniform1f(glGetUniformLocation(programBubble, "time"), time);
//glUniform3f(glGetUniformLocation(programBubble, "cameraPos"), cameraPos.x, cameraPos.y, cameraPos.z);
//glUniform3f(glGetUniformLocation(programBubble, "cameraDir"), cameraDir.x, cameraDir.y, cameraDir.z);
glUniformMatrix3fv(glGetUniformLocation(programBubble, "camMat"), 1, GL_FALSE, (float*)&glm::mat3(bubbleSkyboxViewMatrix));
Core::SetActiveTexture(bubbleTexture0, "iChannel0", programBubble, 1); Core::SetActiveTexture(bubbleTexture0, "iChannel0", programBubble, 1);
glBindTexture(GL_TEXTURE_CUBE_MAP, bubbleTexture0); glBindTexture(GL_TEXTURE_CUBE_MAP, bubbleTexture0);
@ -1111,13 +1108,13 @@ void renderScene(GLFWwindow* window)
renderShadowapLamp(); renderShadowapLamp();
//space lamp //space lamp
glUseProgram(programSun); /*glUseProgram(programSun);
glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix(); glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix();
glm::mat4 transformation = viewProjectionMatrix * glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)); glm::mat4 transformation = viewProjectionMatrix * glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1));
glUniformMatrix4fv(glGetUniformLocation(programSun, "transformation"), 1, GL_FALSE, (float*)&transformation); glUniformMatrix4fv(glGetUniformLocation(programSun, "transformation"), 1, GL_FALSE, (float*)&transformation);
glUniform3f(glGetUniformLocation(programSun, "color"), sunColor.x / 2, sunColor.y / 2, sunColor.z / 2); glUniform3f(glGetUniformLocation(programSun, "color"), sunColor.x / 2, sunColor.y / 2, sunColor.z / 2);
glUniform1f(glGetUniformLocation(programSun, "exposition"), exposition); glUniform1f(glGetUniformLocation(programSun, "exposition"), exposition);
Core::DrawContext(sphereContext); Core::DrawContext(sphereContext);*/
drawSkybox(models::cubeContext, createPerspectiveMatrix() * glm::mat4(glm::mat3(createCameraMatrix())), skyboxTexture); drawSkybox(models::cubeContext, createPerspectiveMatrix() * glm::mat4(glm::mat3(createCameraMatrix())), skyboxTexture);
glUseProgram(program); glUseProgram(program);
glm::mat4 transform(1.0f); glm::mat4 transform(1.0f);

BIN
cw 9/textures/bubbleSkybox/back.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
cw 9/textures/bubbleSkybox/bottom.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
cw 9/textures/bubbleSkybox/front.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 88 KiB

BIN
cw 9/textures/bubbleSkybox/left.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 57 KiB

BIN
cw 9/textures/bubbleSkybox/right.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 68 KiB

BIN
cw 9/textures/bubbleSkybox/top.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 21 KiB