diff --git a/grafika_projekt/Debug/grafika_projekt.ilk b/grafika_projekt/Debug/grafika_projekt.ilk index 94ad16a..06c6d8c 100644 Binary files a/grafika_projekt/Debug/grafika_projekt.ilk and b/grafika_projekt/Debug/grafika_projekt.ilk differ diff --git a/grafika_projekt/Debug/grafika_projekt.log b/grafika_projekt/Debug/grafika_projekt.log index 18e41ec..ed55311 100644 --- a/grafika_projekt/Debug/grafika_projekt.log +++ b/grafika_projekt/Debug/grafika_projekt.log @@ -1 +1,4 @@ - grafika_projekt.vcxproj -> J:\source\repos\grafika_projekt\Debug\grafika_projekt.exe + main.cpp +J:\source\repos\grafika_projekt\grafika_projekt\src\main.cpp(108,10): warning C4244: '=': conversion from 'int' to 'float', possible loss of data +J:\source\repos\grafika_projekt\grafika_projekt\src\main.cpp(109,10): warning C4244: '=': conversion from 'int' to 'float', possible loss of data + grafika_projekt.vcxproj -> J:\source\repos\grafika_projekt\Debug\grafika_projekt.exe diff --git a/grafika_projekt/Debug/grafika_projekt.tlog/CL.write.1.tlog b/grafika_projekt/Debug/grafika_projekt.tlog/CL.write.1.tlog index 8991ce3..9b31983 100644 Binary files a/grafika_projekt/Debug/grafika_projekt.tlog/CL.write.1.tlog and b/grafika_projekt/Debug/grafika_projekt.tlog/CL.write.1.tlog differ diff --git a/grafika_projekt/Debug/grafika_projekt.tlog/link.read.1.tlog b/grafika_projekt/Debug/grafika_projekt.tlog/link.read.1.tlog index 85bb645..df6a1f1 100644 Binary files a/grafika_projekt/Debug/grafika_projekt.tlog/link.read.1.tlog and b/grafika_projekt/Debug/grafika_projekt.tlog/link.read.1.tlog differ diff --git a/grafika_projekt/Debug/main.obj b/grafika_projekt/Debug/main.obj index a7ff61f..f5bcf89 100644 Binary files a/grafika_projekt/Debug/main.obj and b/grafika_projekt/Debug/main.obj differ diff --git a/grafika_projekt/Debug/vc142.idb b/grafika_projekt/Debug/vc142.idb index 68f838c..4652371 100644 Binary files a/grafika_projekt/Debug/vc142.idb and b/grafika_projekt/Debug/vc142.idb differ diff --git a/grafika_projekt/Debug/vc142.pdb b/grafika_projekt/Debug/vc142.pdb index e502af6..46b9dca 100644 Binary files a/grafika_projekt/Debug/vc142.pdb and b/grafika_projekt/Debug/vc142.pdb differ diff --git a/grafika_projekt/models/skybox/New folder/back - Copy.jpg b/grafika_projekt/models/skybox/New folder/back - Copy.jpg deleted file mode 100644 index 470a679..0000000 Binary files a/grafika_projekt/models/skybox/New folder/back - Copy.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/back.jpg b/grafika_projekt/models/skybox/New folder/back.jpg deleted file mode 100644 index 470a679..0000000 Binary files a/grafika_projekt/models/skybox/New folder/back.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/bottom - Copy.jpg b/grafika_projekt/models/skybox/New folder/bottom - Copy.jpg deleted file mode 100644 index 893f394..0000000 Binary files a/grafika_projekt/models/skybox/New folder/bottom - Copy.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/bottom.jpg b/grafika_projekt/models/skybox/New folder/bottom.jpg deleted file mode 100644 index 893f394..0000000 Binary files a/grafika_projekt/models/skybox/New folder/bottom.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/front - Copy.jpg b/grafika_projekt/models/skybox/New folder/front - Copy.jpg deleted file mode 100644 index 4e17b77..0000000 Binary files a/grafika_projekt/models/skybox/New folder/front - Copy.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/front.jpg b/grafika_projekt/models/skybox/New folder/front.jpg deleted file mode 100644 index 4e17b77..0000000 Binary files a/grafika_projekt/models/skybox/New folder/front.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/left - Copy.jpg b/grafika_projekt/models/skybox/New folder/left - Copy.jpg deleted file mode 100644 index 5750b91..0000000 Binary files a/grafika_projekt/models/skybox/New folder/left - Copy.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/left.jpg b/grafika_projekt/models/skybox/New folder/left.jpg deleted file mode 100644 index 5750b91..0000000 Binary files a/grafika_projekt/models/skybox/New folder/left.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/right - Copy.jpg b/grafika_projekt/models/skybox/New folder/right - Copy.jpg deleted file mode 100644 index 8963037..0000000 Binary files a/grafika_projekt/models/skybox/New folder/right - Copy.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/right.jpg b/grafika_projekt/models/skybox/New folder/right.jpg deleted file mode 100644 index 8963037..0000000 Binary files a/grafika_projekt/models/skybox/New folder/right.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/top - Copy.jpg b/grafika_projekt/models/skybox/New folder/top - Copy.jpg deleted file mode 100644 index 4db3c2a..0000000 Binary files a/grafika_projekt/models/skybox/New folder/top - Copy.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/New folder/top.jpg b/grafika_projekt/models/skybox/New folder/top.jpg deleted file mode 100644 index 4db3c2a..0000000 Binary files a/grafika_projekt/models/skybox/New folder/top.jpg and /dev/null differ diff --git a/grafika_projekt/models/skybox/back1.jpg b/grafika_projekt/models/skybox/back.jpg similarity index 100% rename from grafika_projekt/models/skybox/back1.jpg rename to grafika_projekt/models/skybox/back.jpg diff --git a/grafika_projekt/models/skybox/bottom1.jpg b/grafika_projekt/models/skybox/bottom.jpg similarity index 100% rename from grafika_projekt/models/skybox/bottom1.jpg rename to grafika_projekt/models/skybox/bottom.jpg diff --git a/grafika_projekt/models/skybox/front1.jpg b/grafika_projekt/models/skybox/front.jpg similarity index 100% rename from grafika_projekt/models/skybox/front1.jpg rename to grafika_projekt/models/skybox/front.jpg diff --git a/grafika_projekt/models/skybox/left1.jpg b/grafika_projekt/models/skybox/left.jpg similarity index 100% rename from grafika_projekt/models/skybox/left1.jpg rename to grafika_projekt/models/skybox/left.jpg diff --git a/grafika_projekt/models/skybox/right1.jpg b/grafika_projekt/models/skybox/right.jpg similarity index 100% rename from grafika_projekt/models/skybox/right1.jpg rename to grafika_projekt/models/skybox/right.jpg diff --git a/grafika_projekt/models/skybox/New folder/top1.jpg b/grafika_projekt/models/skybox/top.jpg similarity index 100% rename from grafika_projekt/models/skybox/New folder/top1.jpg rename to grafika_projekt/models/skybox/top.jpg diff --git a/grafika_projekt/models/skybox/top1.jpg b/grafika_projekt/models/skybox/top1.jpg deleted file mode 100644 index 3bbf706..0000000 Binary files a/grafika_projekt/models/skybox/top1.jpg and /dev/null differ diff --git a/grafika_projekt/src/main.cpp b/grafika_projekt/src/main.cpp index bd5a649..d6b129a 100644 --- a/grafika_projekt/src/main.cpp +++ b/grafika_projekt/src/main.cpp @@ -30,12 +30,12 @@ glm::mat4 cameraMatrix, perspectiveMatrix; Core::Shader_Loader shaderLoader; std::string skyboxTextures[6] = { - "models/skybox/right1.jpg", - "models/skybox/left1.jpg", - "models/skybox/top1.jpg", - "models/skybox/bottom1.jpg", - "models/skybox/front1.jpg", - "models/skybox/back1.jpg" + "models/skybox/right.jpg", + "models/skybox/left.jpg", + "models/skybox/top.jpg", + "models/skybox/bottom.jpg", + "models/skybox/front.jpg", + "models/skybox/back.jpg" }; float skyboxVertices[] = {