diff --git a/.vs/grk-cw/FileContentIndex/0b80078f-ed71-4bd4-8bf2-4b1145db45ad.vsidx b/.vs/grk-cw/FileContentIndex/0b80078f-ed71-4bd4-8bf2-4b1145db45ad.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/grk-cw/FileContentIndex/0b80078f-ed71-4bd4-8bf2-4b1145db45ad.vsidx differ diff --git a/.vs/grk-cw/FileContentIndex/0e8677ab-46b0-4129-a2fc-a5b717d51fba.vsidx b/.vs/grk-cw/FileContentIndex/0e8677ab-46b0-4129-a2fc-a5b717d51fba.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/grk-cw/FileContentIndex/0e8677ab-46b0-4129-a2fc-a5b717d51fba.vsidx differ diff --git a/.vs/grk-cw/FileContentIndex/15e9ce87-230b-4a84-95ad-cdeafa209f4d.vsidx b/.vs/grk-cw/FileContentIndex/15e9ce87-230b-4a84-95ad-cdeafa209f4d.vsidx deleted file mode 100644 index 7964ea6..0000000 Binary files a/.vs/grk-cw/FileContentIndex/15e9ce87-230b-4a84-95ad-cdeafa209f4d.vsidx and /dev/null differ diff --git a/.vs/grk-cw/FileContentIndex/179d5a97-c2c5-4211-a087-97a2b01d1035.vsidx b/.vs/grk-cw/FileContentIndex/179d5a97-c2c5-4211-a087-97a2b01d1035.vsidx deleted file mode 100644 index 4511b7a..0000000 Binary files a/.vs/grk-cw/FileContentIndex/179d5a97-c2c5-4211-a087-97a2b01d1035.vsidx and /dev/null differ diff --git a/.vs/grk-cw/FileContentIndex/341ee49f-d3dd-4604-bac0-993c51420f7d.vsidx b/.vs/grk-cw/FileContentIndex/341ee49f-d3dd-4604-bac0-993c51420f7d.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/grk-cw/FileContentIndex/341ee49f-d3dd-4604-bac0-993c51420f7d.vsidx differ diff --git a/.vs/grk-cw/FileContentIndex/48ab3ccd-013a-44f4-a7af-94e4e0b01859.vsidx b/.vs/grk-cw/FileContentIndex/48ab3ccd-013a-44f4-a7af-94e4e0b01859.vsidx deleted file mode 100644 index 932aa59..0000000 Binary files a/.vs/grk-cw/FileContentIndex/48ab3ccd-013a-44f4-a7af-94e4e0b01859.vsidx and /dev/null differ diff --git a/.vs/grk-cw/FileContentIndex/4cc91dc2-a77e-4590-858f-7ef269c844f2.vsidx b/.vs/grk-cw/FileContentIndex/4cc91dc2-a77e-4590-858f-7ef269c844f2.vsidx new file mode 100644 index 0000000..c50fdfb Binary files /dev/null and b/.vs/grk-cw/FileContentIndex/4cc91dc2-a77e-4590-858f-7ef269c844f2.vsidx differ diff --git a/.vs/grk-cw/FileContentIndex/6bc42686-bf88-440c-b0df-c8bced25c55f.vsidx b/.vs/grk-cw/FileContentIndex/6bc42686-bf88-440c-b0df-c8bced25c55f.vsidx deleted file mode 100644 index d4f5b86..0000000 Binary files a/.vs/grk-cw/FileContentIndex/6bc42686-bf88-440c-b0df-c8bced25c55f.vsidx and /dev/null differ diff --git a/.vs/grk-cw/FileContentIndex/d6db2aac-2ed3-4c7f-8c9d-301e89155c42.vsidx b/.vs/grk-cw/FileContentIndex/d6db2aac-2ed3-4c7f-8c9d-301e89155c42.vsidx deleted file mode 100644 index 85d272c..0000000 Binary files a/.vs/grk-cw/FileContentIndex/d6db2aac-2ed3-4c7f-8c9d-301e89155c42.vsidx and /dev/null differ diff --git a/.vs/grk-cw/FileContentIndex/e60a0a6c-14d3-4bd3-a7c5-2dd8b0bf2af8.vsidx b/.vs/grk-cw/FileContentIndex/e60a0a6c-14d3-4bd3-a7c5-2dd8b0bf2af8.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/grk-cw/FileContentIndex/e60a0a6c-14d3-4bd3-a7c5-2dd8b0bf2af8.vsidx differ diff --git a/.vs/grk-cw/v17/.suo b/.vs/grk-cw/v17/.suo index 071db83..965cde0 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 7114cdb..19c4478 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/DocumentLayout.json b/.vs/grk-cw/v17/DocumentLayout.json index 4fe2476..32575e3 100644 --- a/.vs/grk-cw/v17/DocumentLayout.json +++ b/.vs/grk-cw/v17/DocumentLayout.json @@ -1,7 +1,24 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\maksg\\Documents\\clone\\Grafika_2024\\", - "Documents": [], + "WorkspaceRootPath": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310}|projekt_grk\\grk-cw7.vcxproj|D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_5_1_tex_copy.vert||{8B382828-6202-11D1-8870-0000F87579D2}", + "RelativeMoniker": "D:0:0:{F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310}|projekt_grk\\grk-cw7.vcxproj|solutionrelative:projekt_grk\\shaders\\shader_5_1_tex_copy.vert||{8B382828-6202-11D1-8870-0000F87579D2}" + }, + { + "AbsoluteMoniker": "D:0:0:{F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310}|projekt_grk\\grk-cw7.vcxproj|D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_5_1_tex_copy.frag||{8B382828-6202-11D1-8870-0000F87579D2}", + "RelativeMoniker": "D:0:0:{F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310}|projekt_grk\\grk-cw7.vcxproj|solutionrelative:projekt_grk\\shaders\\shader_5_1_tex_copy.frag||{8B382828-6202-11D1-8870-0000F87579D2}" + }, + { + "AbsoluteMoniker": "D:0:0:{F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310}|projekt_grk\\grk-cw7.vcxproj|D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\src\\ex_7_1.hpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310}|projekt_grk\\grk-cw7.vcxproj|solutionrelative:projekt_grk\\src\\ex_7_1.hpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310}|projekt_grk\\grk-cw7.vcxproj|D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_pbr.frag||{8B382828-6202-11D1-8870-0000F87579D2}", + "RelativeMoniker": "D:0:0:{F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310}|projekt_grk\\grk-cw7.vcxproj|solutionrelative:projekt_grk\\shaders\\shader_pbr.frag||{8B382828-6202-11D1-8870-0000F87579D2}" + } + ], "DocumentGroupContainers": [ { "Orientation": 0, @@ -9,11 +26,63 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": -1, + "SelectedChildIndex": 1, "Children": [ { "$type": "Bookmark", "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "shader_5_1_tex_copy.vert", + "DocumentMoniker": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_5_1_tex_copy.vert", + "RelativeDocumentMoniker": "projekt_grk\\shaders\\shader_5_1_tex_copy.vert", + "ToolTip": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_5_1_tex_copy.vert", + "RelativeToolTip": "projekt_grk\\shaders\\shader_5_1_tex_copy.vert", + "ViewState": "AQIAAAkAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", + "WhenOpened": "2024-03-01T18:58:34.685Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "shader_5_1_tex_copy.frag", + "DocumentMoniker": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_5_1_tex_copy.frag", + "RelativeDocumentMoniker": "projekt_grk\\shaders\\shader_5_1_tex_copy.frag", + "ToolTip": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_5_1_tex_copy.frag", + "RelativeToolTip": "projekt_grk\\shaders\\shader_5_1_tex_copy.frag", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", + "WhenOpened": "2024-03-01T18:58:31.038Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "shader_pbr.frag", + "DocumentMoniker": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_pbr.frag", + "RelativeDocumentMoniker": "projekt_grk\\shaders\\shader_pbr.frag", + "ToolTip": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\shaders\\shader_pbr.frag", + "RelativeToolTip": "projekt_grk\\shaders\\shader_pbr.frag", + "ViewState": "AQIAABgAAAAAAAAAAAAowC0AAAAfAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|", + "WhenOpened": "2024-03-01T18:45:46.425Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "ex_7_1.hpp", + "DocumentMoniker": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\src\\ex_7_1.hpp", + "RelativeDocumentMoniker": "projekt_grk\\src\\ex_7_1.hpp", + "ToolTip": "D:\\STUDIA_sem5\\GRK_FINAL_PULL\\Grafika_2024\\projekt_grk\\src\\ex_7_1.hpp", + "RelativeToolTip": "projekt_grk\\src\\ex_7_1.hpp", + "ViewState": "AQIAAC4BAAAAAAAAAAAgwEMBAAAXAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", + "WhenOpened": "2024-03-01T18:40:57.457Z", + "EditorCaption": "" } ] } diff --git a/.vs/grk-cw/v17/fileList.bin b/.vs/grk-cw/v17/fileList.bin index a83e5e9..9bc2e4b 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/28f33419c888e8e5/MAIN.ipch b/.vs/grk-cw/v17/ipch/AutoPCH/28f33419c888e8e5/MAIN.ipch new file mode 100644 index 0000000..516ef08 Binary files /dev/null and b/.vs/grk-cw/v17/ipch/AutoPCH/28f33419c888e8e5/MAIN.ipch differ diff --git a/Debug/projekt_grk.exe b/Debug/projekt_grk.exe index 08b4a84..9f5afce 100644 Binary files a/Debug/projekt_grk.exe and b/Debug/projekt_grk.exe differ diff --git a/Debug/projekt_grk.pdb b/Debug/projekt_grk.pdb index 62f192b..a365985 100644 Binary files a/Debug/projekt_grk.pdb and b/Debug/projekt_grk.pdb differ diff --git a/projekt_grk/Debug/Box.obj b/projekt_grk/Debug/Box.obj index bbefb43..5501213 100644 Binary files a/projekt_grk/Debug/Box.obj and b/projekt_grk/Debug/Box.obj differ diff --git a/projekt_grk/Debug/Camera.obj b/projekt_grk/Debug/Camera.obj index 6d38ed7..cfe6e21 100644 Binary files a/projekt_grk/Debug/Camera.obj and b/projekt_grk/Debug/Camera.obj differ diff --git a/projekt_grk/Debug/Render_Utils.obj b/projekt_grk/Debug/Render_Utils.obj index 5a98a68..46ba743 100644 Binary files a/projekt_grk/Debug/Render_Utils.obj and b/projekt_grk/Debug/Render_Utils.obj differ diff --git a/projekt_grk/Debug/SOIL.obj b/projekt_grk/Debug/SOIL.obj index 41c600e..2711df2 100644 Binary files a/projekt_grk/Debug/SOIL.obj and b/projekt_grk/Debug/SOIL.obj differ diff --git a/projekt_grk/Debug/Shader_Loader.obj b/projekt_grk/Debug/Shader_Loader.obj index c7d6f2b..cfa8a71 100644 Binary files a/projekt_grk/Debug/Shader_Loader.obj and b/projekt_grk/Debug/Shader_Loader.obj differ diff --git a/projekt_grk/Debug/Texture.obj b/projekt_grk/Debug/Texture.obj index 394eee7..77c7681 100644 Binary files a/projekt_grk/Debug/Texture.obj and b/projekt_grk/Debug/Texture.obj differ diff --git a/projekt_grk/Debug/grk-cw7.log b/projekt_grk/Debug/grk-cw7.log index 512cc74..81bd360 100644 --- a/projekt_grk/Debug/grk-cw7.log +++ b/projekt_grk/Debug/grk-cw7.log @@ -1,4 +1,25 @@ C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\Microsoft.CppBuild.targets(531,5): warning MSB8028: Katalog pośredni (Debug\) zawiera pliki udostępnione z innego projektu (grk-cw3.vcxproj, grk-cw4.vcxproj, grk-cw5.vcxproj, grk-cw6.vcxproj, grk-cw7.vcxproj). Może to spowodować niepoprawne zachowanie podczas oczyszczania i ponownej kompilacji. + main.cpp +C:\Program Files (x86)\Windows Kits\10\Include\10.0.22000.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra + (kompilowanie pliku źródłowego „src/main.cpp”) + D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123,1): + zobacz poprzednią definicję „APIENTRY” + +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\ex_7_1.hpp(162,10): warning C4305: "inicjowanie": obcięcie z "double" do "float" + (kompilowanie pliku źródłowego „src/main.cpp”) + +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\ex_7_1.hpp(293,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych + (kompilowanie pliku źródłowego „src/main.cpp”) + +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\ex_7_1.hpp(474,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych + (kompilowanie pliku źródłowego „src/main.cpp”) + +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\ex_7_1.hpp(704,25): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych + (kompilowanie pliku źródłowego „src/main.cpp”) + +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\ex_7_1.hpp(744,34): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych + (kompilowanie pliku źródłowego „src/main.cpp”) + Box.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO” LINK : warning LNK4098: domyślna biblioteka „MSVCRT” powoduje konflikt z innymi bibliotekami; użyj opcji /NODEFAULTLIB:biblioteka - grk-cw7.vcxproj -> C:\Users\maksg\Documents\clone\Grafika_2024\Debug\projekt_grk.exe + grk-cw7.vcxproj -> D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\Debug\projekt_grk.exe diff --git a/projekt_grk/Debug/image_DXT.obj b/projekt_grk/Debug/image_DXT.obj index edf2a2c..1013eb4 100644 Binary files a/projekt_grk/Debug/image_DXT.obj and b/projekt_grk/Debug/image_DXT.obj differ diff --git a/projekt_grk/Debug/image_helper.obj b/projekt_grk/Debug/image_helper.obj index cd40c5c..2feb95c 100644 Binary files a/projekt_grk/Debug/image_helper.obj and b/projekt_grk/Debug/image_helper.obj differ diff --git a/projekt_grk/Debug/main.obj b/projekt_grk/Debug/main.obj index 50826bf..f09319d 100644 Binary files a/projekt_grk/Debug/main.obj and b/projekt_grk/Debug/main.obj differ diff --git a/projekt_grk/Debug/projekt_grk.exe.recipe b/projekt_grk/Debug/projekt_grk.exe.recipe index eee05a6..1a329bb 100644 --- a/projekt_grk/Debug/projekt_grk.exe.recipe +++ b/projekt_grk/Debug/projekt_grk.exe.recipe @@ -2,7 +2,7 @@ - C:\Users\maksg\Documents\clone\Grafika_2024\Debug\projekt_grk.exe + D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\Debug\projekt_grk.exe diff --git a/projekt_grk/Debug/projekt_grk.tlog/CL.command.1.tlog b/projekt_grk/Debug/projekt_grk.tlog/CL.command.1.tlog index 139c9c6..6a0e683 100644 Binary files a/projekt_grk/Debug/projekt_grk.tlog/CL.command.1.tlog and b/projekt_grk/Debug/projekt_grk.tlog/CL.command.1.tlog differ diff --git a/projekt_grk/Debug/projekt_grk.tlog/CL.read.1.tlog b/projekt_grk/Debug/projekt_grk.tlog/CL.read.1.tlog index 99917e8..569a823 100644 Binary files a/projekt_grk/Debug/projekt_grk.tlog/CL.read.1.tlog and b/projekt_grk/Debug/projekt_grk.tlog/CL.read.1.tlog differ diff --git a/projekt_grk/Debug/projekt_grk.tlog/CL.write.1.tlog b/projekt_grk/Debug/projekt_grk.tlog/CL.write.1.tlog index bf9e00f..885317b 100644 Binary files a/projekt_grk/Debug/projekt_grk.tlog/CL.write.1.tlog and b/projekt_grk/Debug/projekt_grk.tlog/CL.write.1.tlog differ diff --git a/projekt_grk/Debug/projekt_grk.tlog/Cl.items.tlog b/projekt_grk/Debug/projekt_grk.tlog/Cl.items.tlog index 7997dec..fbc0e01 100644 --- a/projekt_grk/Debug/projekt_grk.tlog/Cl.items.tlog +++ b/projekt_grk/Debug/projekt_grk.tlog/Cl.items.tlog @@ -1,10 +1,10 @@ -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\Box.cpp;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\Box.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\Camera.cpp;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\Camera.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\main.cpp;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\main.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\Render_Utils.cpp;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\Render_Utils.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\Shader_Loader.cpp;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\Shader_Loader.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\SOIL\image_DXT.c;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\image_DXT.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\SOIL\image_helper.c;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\image_helper.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\SOIL\SOIL.c;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\SOIL.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\SOIL\stb_image_aug.c;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\stb_image_aug.obj -C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\src\Texture.cpp;C:\Users\maksg\Documents\clone\Grafika_2024\projekt_grk\Debug\Texture.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\Box.cpp;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\Box.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\Camera.cpp;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\Camera.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\main.cpp;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\main.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\Render_Utils.cpp;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\Render_Utils.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\Shader_Loader.cpp;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\Shader_Loader.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\SOIL\image_DXT.c;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\image_DXT.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\SOIL\image_helper.c;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\image_helper.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\SOIL\SOIL.c;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\SOIL.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\SOIL\stb_image_aug.c;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\stb_image_aug.obj +D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\src\Texture.cpp;D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\projekt_grk\Debug\Texture.obj diff --git a/projekt_grk/Debug/projekt_grk.tlog/link.command.1.tlog b/projekt_grk/Debug/projekt_grk.tlog/link.command.1.tlog index 4f08f13..2cd7e14 100644 Binary files a/projekt_grk/Debug/projekt_grk.tlog/link.command.1.tlog and b/projekt_grk/Debug/projekt_grk.tlog/link.command.1.tlog differ diff --git a/projekt_grk/Debug/projekt_grk.tlog/link.read.1.tlog b/projekt_grk/Debug/projekt_grk.tlog/link.read.1.tlog index f931c9e..8f27f40 100644 Binary files a/projekt_grk/Debug/projekt_grk.tlog/link.read.1.tlog and b/projekt_grk/Debug/projekt_grk.tlog/link.read.1.tlog differ diff --git a/projekt_grk/Debug/projekt_grk.tlog/link.secondary.1.tlog b/projekt_grk/Debug/projekt_grk.tlog/link.secondary.1.tlog index e79cee4..c71f11f 100644 --- a/projekt_grk/Debug/projekt_grk.tlog/link.secondary.1.tlog +++ b/projekt_grk/Debug/projekt_grk.tlog/link.secondary.1.tlog @@ -1 +1 @@ -^C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\BOX.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\CAMERA.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\IMAGE_DXT.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\IMAGE_HELPER.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\MAIN.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\RENDER_UTILS.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\SHADER_LOADER.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\SOIL.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\STB_IMAGE_AUG.OBJ|C:\USERS\MAKSG\DOCUMENTS\CLONE\GRAFIKA_2024\PROJEKT_GRK\DEBUG\TEXTURE.OBJ +^D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\BOX.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\CAMERA.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\IMAGE_DXT.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\IMAGE_HELPER.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\MAIN.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\RENDER_UTILS.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\SHADER_LOADER.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\SOIL.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\STB_IMAGE_AUG.OBJ|D:\STUDIA_SEM5\GRK_FINAL_PULL\GRAFIKA_2024\PROJEKT_GRK\DEBUG\TEXTURE.OBJ diff --git a/projekt_grk/Debug/projekt_grk.tlog/link.write.1.tlog b/projekt_grk/Debug/projekt_grk.tlog/link.write.1.tlog index d62f6ea..4ec6a61 100644 Binary files a/projekt_grk/Debug/projekt_grk.tlog/link.write.1.tlog and b/projekt_grk/Debug/projekt_grk.tlog/link.write.1.tlog differ diff --git a/projekt_grk/Debug/projekt_grk.tlog/projekt_grk.lastbuildstate b/projekt_grk/Debug/projekt_grk.tlog/projekt_grk.lastbuildstate index 2cc5d26..517f362 100644 --- a/projekt_grk/Debug/projekt_grk.tlog/projekt_grk.lastbuildstate +++ b/projekt_grk/Debug/projekt_grk.tlog/projekt_grk.lastbuildstate @@ -1,2 +1,2 @@ -PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.39.33519:TargetPlatformVersion=10.0.22621.0: -Debug|Win32|C:\Users\maksg\Documents\clone\Grafika_2024\| +PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.39.33519:TargetPlatformVersion=10.0.22000.0: +Debug|Win32|D:\STUDIA_sem5\GRK_FINAL_PULL\Grafika_2024\| diff --git a/projekt_grk/Debug/stb_image_aug.obj b/projekt_grk/Debug/stb_image_aug.obj index de47c28..b962b87 100644 Binary files a/projekt_grk/Debug/stb_image_aug.obj and b/projekt_grk/Debug/stb_image_aug.obj differ diff --git a/projekt_grk/Debug/vc143.idb b/projekt_grk/Debug/vc143.idb index 31dd9fc..d170f8d 100644 Binary files a/projekt_grk/Debug/vc143.idb and b/projekt_grk/Debug/vc143.idb differ diff --git a/projekt_grk/Debug/vc143.pdb b/projekt_grk/Debug/vc143.pdb index 0a8acbf..9783960 100644 Binary files a/projekt_grk/Debug/vc143.pdb and b/projekt_grk/Debug/vc143.pdb differ diff --git a/projekt_grk/grk-cw7.vcxproj b/projekt_grk/grk-cw7.vcxproj index d16830f..634260d 100644 --- a/projekt_grk/grk-cw7.vcxproj +++ b/projekt_grk/grk-cw7.vcxproj @@ -58,7 +58,7 @@ {F2FC2E8F-CBA6-49D7-8B73-4BFBCB64D310} Win32Proj grk-cw7 - 10.0.22621.0 + 10.0.22000.0 projekt_grk diff --git a/projekt_grk/shaders/shader_pbr.frag b/projekt_grk/shaders/shader_pbr.frag index d5a3d51..2e9d12b 100644 --- a/projekt_grk/shaders/shader_pbr.frag +++ b/projekt_grk/shaders/shader_pbr.frag @@ -1,7 +1,6 @@ #version 430 core const float DIFFUSE_INTENSITY = 0.6; -const float MAX_RENDER_DISTANCE = 16.0; float surfaceRoughness; float metalnessValue; @@ -64,10 +63,6 @@ void main() { vec3 diffuseReflectance = vec3(1.0) - fresnelTerm; vec3 BRDF = diffuseReflectance * (textureColor / 3.1458493) + specular; - if (distanceToCamera > MAX_RENDER_DISTANCE) { - discard; - } - float diffuse = max(0.0001, dot(normal, lightDir)); fragmentColor = vec4(BRDF * (DIFFUSE_INTENSITY + diffuse) * 1.5, 1.0); diff --git a/projekt_grk/src/ex_7_1.hpp b/projekt_grk/src/ex_7_1.hpp index e65367c..9a479db 100644 --- a/projekt_grk/src/ex_7_1.hpp +++ b/projekt_grk/src/ex_7_1.hpp @@ -97,8 +97,8 @@ float zCordinatesOfCoin[maxSize] = { float xCordinatesOfCollectedCoin[maxSize] = {}; float zCordinatesOfCollectedCoin[maxSize] = {}; -float angleSpeed = 0.005f; -float moveSpeed = 0.0035f; +float angleSpeed = 0.01f; +float moveSpeed = 0.009f; struct Planet { glm::vec3 currentPos; @@ -436,78 +436,6 @@ void drawSpaceShip(Core::RenderContext& context, glm::mat4 modelMatrix, GLuint t } -void renderPlanet(float time, float orbitRadius, float orbitRotationSpeed, float selfRotationSpeed, float scale, GLuint planetTexture, GLuint normalTexture) { - glm::mat4 planetTransform = glm::rotate(glm::mat4(1.0f), time * orbitRotationSpeed, glm::vec3(0, 1, 0)) // orbitowanie dooko<6B>a s<>oca - * glm::translate(glm::vec3(orbitRadius, 0, 0)) // translacja na odp. odleg<65>o<6F> - * glm::rotate(glm::mat4(1.0f), time * selfRotationSpeed, glm::vec3(0, 1, 0)) //obr<62>t planety wok<6F> w<>asnej osi - * glm::scale(glm::vec3(scale)); //skalowanie planety - - drawObjectTexture(sphereContext, planetTransform, planetTexture, normalTexture); -} - -void renderPlanets() { - float time = 0; - //float time = glfwGetTime(); - - float mercuryOrbitRadius = 1.3f; - float venusOrbitRadius = 2.0f; - float earthOrbitRadius = 5.0f; - float moonOrbitRadius = 0.8f; - float marsOrbitRadius = 8.0f; - float jupiterOrbitRadius = 10.0f; - float saturnOrbitRadius = 11.0f; - float uranusOrbitRadius = 12.5f; - float neptuneOrbitRadius = 13.0f; - - // im mniejsze tym szybciej - float mercuryRotationSpeed = 1.0f / 10; - float venusRotationSpeed = 1.0f / 7; - float earthRotationSpeed = 1.0f / 6; - float moonRotationSpeed = 1.0f / 2; - float marsRotationSpeed = 1.0f / 5; - float jupiterRotationSpeed = 1.0f / 8.5; - float saturnRotationSpeed = 1.0f / 5; - float uranusRotationSpeed = 1.0f / 9; - float neptuneRotationSpeed = 1.0f / 10; - - float mercurySelfRotationSpeed = 1.0f; - float venusSelfRotationSpeed = 1.0f; - float earthSelfRotationSpeed = 1.0f; - float moonSelfRotationSpeed = 1.0f / 2; - float marsSelfRotationSpeed = 1.0f; - float jupiterSelfRotationSpeed = 1.0f; - float saturnSelfRotationSpeed = 1.0f; - float uranusSelfRotationSpeed = 1.0f / 2; - float neptuneSelfRotationSpeed = 1.0f; - - float mercuryScale = 0.11f; - float venusScale = 0.14f; - float earthScale = 0.3f; - float moonScale = 0.055f; - float marsScale = 0.2f; - float jupiterScale = 0.7f; - float saturnScale = 0.5f; - float uranusScale = 0.3f; - float neptuneScale = 0.32f; - - renderPlanet(time, mercuryOrbitRadius, mercuryRotationSpeed, mercurySelfRotationSpeed, mercuryScale, texture::mercury, texture::mercuryNormal); - renderPlanet(time, venusOrbitRadius, venusRotationSpeed, venusSelfRotationSpeed, venusScale, texture::venus, texture::venusNormal); - renderPlanet(time, earthOrbitRadius, earthRotationSpeed, earthSelfRotationSpeed, earthScale, texture::earth, texture::earthNormal); - - //earths moon, musi by<62> inaczej renderowany bo on nie orbituje wok<6F> s<>oca tylko ziemi. P<>niej to mo<6D>na jako<6B> lepiej rozwi<77>za<7A>. - drawObjectTexture(sphereContext, - glm::eulerAngleY(time * earthRotationSpeed) * glm::translate(glm::vec3(earthOrbitRadius, 0, 0)) * glm::eulerAngleY(time * moonRotationSpeed) * glm::translate(glm::vec3(moonOrbitRadius, 0, 0)) * glm::scale(glm::vec3(moonScale)), - texture::moon, - texture::asteroidNormal); - - renderPlanet(time, marsOrbitRadius, marsRotationSpeed, marsSelfRotationSpeed, marsScale, texture::mars, texture::marsNormal); - renderPlanet(time, jupiterOrbitRadius, jupiterRotationSpeed, jupiterSelfRotationSpeed, jupiterScale, texture::jupiter, texture::jupiterNormal); - renderPlanet(time, saturnOrbitRadius, saturnRotationSpeed, saturnSelfRotationSpeed, saturnScale, texture::saturn, texture::saturnNormal); - renderPlanet(time, uranusOrbitRadius, uranusRotationSpeed, uranusSelfRotationSpeed, uranusScale, texture::uranus, texture::uranusNormal); - renderPlanet(time, neptuneOrbitRadius, neptuneRotationSpeed, neptuneSelfRotationSpeed, neptuneScale, texture::neptune, texture::neptuneNormal); - -} - void initializePlanets() { planets.push_back(Planet{ glm::vec3(2.0f, 0, 0), glm::vec3(0.11f), 1 / 59.0f, 1.0f / 2, 2.0f, texture::mercury, texture::mercuryNormal }); planets.push_back(Planet{ glm::vec3(3.5f, 0, 0), glm::vec3(0.29f), 1 / 243.0f, 1.0f / 5, 3.5f, texture::venus, texture::venusNormal }); @@ -561,7 +489,7 @@ void renderScene(GLFWwindow* window) for (auto& planet : planets) { - glm::mat4 modelMatrix = glm::rotate(glm::mat4(1.0f), 5*time * planet.orbitSpeed, glm::vec3(0, 1, 0)) // orbitowanie dookoa soca + glm::mat4 modelMatrix = glm::rotate(glm::mat4(1.0f), time * planet.orbitSpeed, glm::vec3(0, 1, 0)) // orbitowanie dookoa soca * glm::translate(glm::vec3(planet.orbitRadius, 0, 0)) // translacja na odp. odlego * glm::rotate(glm::mat4(1.0f), time * planet.rotationSpeed, glm::vec3(0, 1, 0)) //obrt planety wok wasnej osi * glm::scale(glm::vec3(planet.modelScale)); //skalowanie planety @@ -744,8 +672,6 @@ void processInput(GLFWwindow* window) glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f))); glm::vec3 spaceshipUp = glm::vec3(0.f, 1.f, 0.f); - //float angleSpeed = 0.005f; - //float moveSpeed = 0.0025f; if (glfwGetKey(window, GLFW_KEY_ESCAPE) == GLFW_PRESS) { glfwSetWindowShouldClose(window, true); }