diff --git a/grafika_projekt/Debug/grafika_projekt.ilk b/grafika_projekt/Debug/grafika_projekt.ilk index 33e3b66..94ad16a 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.tlog/CL.write.1.tlog b/grafika_projekt/Debug/grafika_projekt.tlog/CL.write.1.tlog index 9b31983..8991ce3 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 2ea581e..85bb645 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 826dd0d..a7ff61f 100644 Binary files a/grafika_projekt/Debug/main.obj and b/grafika_projekt/Debug/main.obj differ diff --git a/grafika_projekt/Debug/main.obj.enc b/grafika_projekt/Debug/main.obj.enc new file mode 100644 index 0000000..f034b68 Binary files /dev/null and b/grafika_projekt/Debug/main.obj.enc differ diff --git a/grafika_projekt/Debug/vc142.idb b/grafika_projekt/Debug/vc142.idb index eedc400..68f838c 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 6777003..e502af6 100644 Binary files a/grafika_projekt/Debug/vc142.pdb and b/grafika_projekt/Debug/vc142.pdb differ diff --git a/grafika_projekt/models/skybox/back.jpg b/grafika_projekt/models/skybox/New folder/back - Copy.jpg similarity index 100% rename from grafika_projekt/models/skybox/back.jpg rename to grafika_projekt/models/skybox/New folder/back - Copy.jpg diff --git a/grafika_projekt/models/skybox/New folder/back.jpg b/grafika_projekt/models/skybox/New folder/back.jpg new file mode 100644 index 0000000..470a679 Binary files /dev/null and b/grafika_projekt/models/skybox/New folder/back.jpg differ diff --git a/grafika_projekt/models/skybox/bottom.jpg b/grafika_projekt/models/skybox/New folder/bottom - Copy.jpg similarity index 100% rename from grafika_projekt/models/skybox/bottom.jpg rename to grafika_projekt/models/skybox/New folder/bottom - Copy.jpg diff --git a/grafika_projekt/models/skybox/New folder/bottom.jpg b/grafika_projekt/models/skybox/New folder/bottom.jpg new file mode 100644 index 0000000..893f394 Binary files /dev/null and b/grafika_projekt/models/skybox/New folder/bottom.jpg differ diff --git a/grafika_projekt/models/skybox/front.jpg b/grafika_projekt/models/skybox/New folder/front - Copy.jpg similarity index 100% rename from grafika_projekt/models/skybox/front.jpg rename to grafika_projekt/models/skybox/New folder/front - Copy.jpg diff --git a/grafika_projekt/models/skybox/New folder/front.jpg b/grafika_projekt/models/skybox/New folder/front.jpg new file mode 100644 index 0000000..4e17b77 Binary files /dev/null and b/grafika_projekt/models/skybox/New folder/front.jpg differ diff --git a/grafika_projekt/models/skybox/left.jpg b/grafika_projekt/models/skybox/New folder/left - Copy.jpg similarity index 100% rename from grafika_projekt/models/skybox/left.jpg rename to grafika_projekt/models/skybox/New folder/left - Copy.jpg diff --git a/grafika_projekt/models/skybox/New folder/left.jpg b/grafika_projekt/models/skybox/New folder/left.jpg new file mode 100644 index 0000000..5750b91 Binary files /dev/null and b/grafika_projekt/models/skybox/New folder/left.jpg differ diff --git a/grafika_projekt/models/skybox/right.jpg b/grafika_projekt/models/skybox/New folder/right - Copy.jpg similarity index 100% rename from grafika_projekt/models/skybox/right.jpg rename to grafika_projekt/models/skybox/New folder/right - Copy.jpg diff --git a/grafika_projekt/models/skybox/New folder/right.jpg b/grafika_projekt/models/skybox/New folder/right.jpg new file mode 100644 index 0000000..8963037 Binary files /dev/null and b/grafika_projekt/models/skybox/New folder/right.jpg differ diff --git a/grafika_projekt/models/skybox/top.jpg b/grafika_projekt/models/skybox/New folder/top - Copy.jpg similarity index 100% rename from grafika_projekt/models/skybox/top.jpg rename to grafika_projekt/models/skybox/New folder/top - Copy.jpg diff --git a/grafika_projekt/models/skybox/New folder/top.jpg b/grafika_projekt/models/skybox/New folder/top.jpg new file mode 100644 index 0000000..4db3c2a Binary files /dev/null and b/grafika_projekt/models/skybox/New folder/top.jpg differ diff --git a/grafika_projekt/models/skybox/New folder/top1.jpg b/grafika_projekt/models/skybox/New folder/top1.jpg new file mode 100644 index 0000000..3bbf706 Binary files /dev/null and b/grafika_projekt/models/skybox/New folder/top1.jpg differ diff --git a/grafika_projekt/models/skybox/back1.jpg b/grafika_projekt/models/skybox/back1.jpg new file mode 100644 index 0000000..5ed7593 Binary files /dev/null and b/grafika_projekt/models/skybox/back1.jpg differ diff --git a/grafika_projekt/models/skybox/bottom1.jpg b/grafika_projekt/models/skybox/bottom1.jpg new file mode 100644 index 0000000..f4b5702 Binary files /dev/null and b/grafika_projekt/models/skybox/bottom1.jpg differ diff --git a/grafika_projekt/models/skybox/front1.jpg b/grafika_projekt/models/skybox/front1.jpg new file mode 100644 index 0000000..f0a2adf Binary files /dev/null and b/grafika_projekt/models/skybox/front1.jpg differ diff --git a/grafika_projekt/models/skybox/left1.jpg b/grafika_projekt/models/skybox/left1.jpg new file mode 100644 index 0000000..ef889f4 Binary files /dev/null and b/grafika_projekt/models/skybox/left1.jpg differ diff --git a/grafika_projekt/models/skybox/right1.jpg b/grafika_projekt/models/skybox/right1.jpg new file mode 100644 index 0000000..3b3dea6 Binary files /dev/null and b/grafika_projekt/models/skybox/right1.jpg differ diff --git a/grafika_projekt/models/skybox/top1.jpg b/grafika_projekt/models/skybox/top1.jpg new file mode 100644 index 0000000..3bbf706 Binary files /dev/null and b/grafika_projekt/models/skybox/top1.jpg differ diff --git a/grafika_projekt/src/main.cpp b/grafika_projekt/src/main.cpp index 4ea2f2d..bd5a649 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/right.jpg", - "models/skybox/left.jpg", - "models/skybox/top.jpg", - "models/skybox/bottom.jpg", - "models/skybox/front.jpg", - "models/skybox/back.jpg" + "models/skybox/right1.jpg", + "models/skybox/left1.jpg", + "models/skybox/top1.jpg", + "models/skybox/bottom1.jpg", + "models/skybox/front1.jpg", + "models/skybox/back1.jpg" }; float skyboxVertices[] = { @@ -156,16 +156,17 @@ unsigned int loadCubemap() int width, height, nrChannels; for (unsigned int i = 0; i < 6; i++) { - unsigned char* data = stbi_load(skyboxTextures[i].c_str(), &width, &height, &nrChannels, 0); + unsigned char* data = stbi_load(skyboxTextures[i].c_str(), &width, &height, &nrChannels, STBI_rgb_alpha); if (data) { glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, - 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, data + 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data ); stbi_image_free(data); } else { + std::cout << stbi_failure_reason() << std::endl; std::cout << "Cubemap tex failed to load at path: " << skyboxTextures[i] << std::endl; stbi_image_free(data); }