diff --git a/grafika_projekt/Debug/Render_Utils.obj b/grafika_projekt/Debug/Render_Utils.obj index 557debc..59dc190 100644 Binary files a/grafika_projekt/Debug/Render_Utils.obj and b/grafika_projekt/Debug/Render_Utils.obj differ diff --git a/grafika_projekt/Debug/Texture.obj b/grafika_projekt/Debug/Texture.obj index 978531c..9c71a3c 100644 Binary files a/grafika_projekt/Debug/Texture.obj and b/grafika_projekt/Debug/Texture.obj differ diff --git a/grafika_projekt/src/main.cpp b/grafika_projekt/src/main.cpp index 2d17857..4e3dc6c 100644 --- a/grafika_projekt/src/main.cpp +++ b/grafika_projekt/src/main.cpp @@ -21,7 +21,7 @@ unsigned int cubemapTexture, skyboxVAO; float old_x, old_y = -1; glm::vec3 cursorDiff; -glm::vec3 lightDir = glm::normalize(glm::vec3(1.0f, -0.9f, -1.0f)); +glm::vec3 lightDir = glm::normalize(glm::vec3(0.0f, 0.0f, 1.0f)); glm::vec3 cameraPos = glm::vec3(0, 0, 5); glm::vec3 cameraDir; // Wektor "do przodu" kamery glm::vec3 cameraSide; // Wektor "w bok" kamery @@ -214,7 +214,7 @@ void renderScene() glDrawArrays(GL_TRIANGLES, 0, 36); glBindVertexArray(0); - glm::mat4 submarineInitialTransformation = glm::translate(glm::vec3(-1, 0, -0.5)) * glm::rotate(glm::radians(180.0f), glm::vec3(0, 1, 0)) * glm::scale(glm::vec3(0.25f)); + glm::mat4 submarineInitialTransformation = glm::translate(glm::vec3(0, -0.5, -0.4)) * glm::rotate(glm::radians(180.0f), glm::vec3(0, 1, 0)) * glm::scale(glm::vec3(0.25f)); glm::mat4 submarineModelMatrix = glm::translate(cameraPos + cameraDir) * glm::mat4_cast(glm::inverse(rotation)) * submarineInitialTransformation; //drawObjectColor(fishContext, fishModelMatrix, glm::vec3(0.6f)); drawObjectTexture(submarineContext, submarineModelMatrix, textureSubmarine); diff --git a/grafika_projekt/x64/Debug/Render_Utils.obj b/grafika_projekt/x64/Debug/Render_Utils.obj new file mode 100644 index 0000000..f7294e4 Binary files /dev/null and b/grafika_projekt/x64/Debug/Render_Utils.obj differ diff --git a/grafika_projekt/x64/Debug/Texture.obj b/grafika_projekt/x64/Debug/Texture.obj new file mode 100644 index 0000000..3616187 Binary files /dev/null and b/grafika_projekt/x64/Debug/Texture.obj differ