diff --git a/Step 3/cmake-build-release/.ninja_deps b/Step 3/cmake-build-release/.ninja_deps index 79cb1d7..6b05635 100644 Binary files a/Step 3/cmake-build-release/.ninja_deps and b/Step 3/cmake-build-release/.ninja_deps differ diff --git a/Step 3/cmake-build-release/.ninja_log b/Step 3/cmake-build-release/.ninja_log index 1b26a03..15fb571 100644 --- a/Step 3/cmake-build-release/.ninja_log +++ b/Step 3/cmake-build-release/.ninja_log @@ -24,3 +24,13 @@ 3 2080 1668323537012791771 CMakeFiles/Step_3.dir/src/graphics/gl/shader.cpp.o 2553d57dba16057b 2 3101 1668323538032821145 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 641dce3f86933e2e 2 1369 1668323498931695025 CMakeFiles/Step_3.dir/src/engine/util/parser.cpp.o 1007c86c207ac940 +1 1102 1668324071584170088 CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o 330ad35a6abf06c3 +1 1373 1668324071856177907 CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o ce988de97a5cb51d +1374 1444 1668324071924179862 Step_3 f055ce2b85635598 +1 1083 1668324105033131597 CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o 330ad35a6abf06c3 +1083 1160 1668324105109133783 Step_3 f055ce2b85635598 +1 1080 1668324205980033050 CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o 330ad35a6abf06c3 +1 1310 1668324206208039601 CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o ce988de97a5cb51d +1310 1378 1668324206276041556 Step_3 f055ce2b85635598 +1 1298 1668324222400504969 CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o ce988de97a5cb51d +1298 1369 1668324222472507037 Step_3 f055ce2b85635598 diff --git a/Step 3/cmake-build-release/2022-11-13 2:18:28.png b/Step 3/cmake-build-release/2022-11-13 2:18:28.png new file mode 100644 index 0000000..76b3c54 Binary files /dev/null and b/Step 3/cmake-build-release/2022-11-13 2:18:28.png differ diff --git a/Step 3/cmake-build-release/2022-11-13 2:21:16.png b/Step 3/cmake-build-release/2022-11-13 2:21:16.png new file mode 100644 index 0000000..76b3c54 Binary files /dev/null and b/Step 3/cmake-build-release/2022-11-13 2:21:16.png differ diff --git a/Step 3/cmake-build-release/2022-11-13 2:21:57.png b/Step 3/cmake-build-release/2022-11-13 2:21:57.png new file mode 100644 index 0000000..76b3c54 Binary files /dev/null and b/Step 3/cmake-build-release/2022-11-13 2:21:57.png differ diff --git a/Step 3/cmake-build-release/2022-11-13 2:23:33.png b/Step 3/cmake-build-release/2022-11-13 2:23:33.png new file mode 100644 index 0000000..76b3c54 Binary files /dev/null and b/Step 3/cmake-build-release/2022-11-13 2:23:33.png differ diff --git a/Step 3/cmake-build-release/2022-11-13 2:23:56.png b/Step 3/cmake-build-release/2022-11-13 2:23:56.png new file mode 100644 index 0000000..76b3c54 Binary files /dev/null and b/Step 3/cmake-build-release/2022-11-13 2:23:56.png differ diff --git a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o index 83a8af5..9a4d347 100644 Binary files a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o and b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o differ diff --git a/Step 3/cmake-build-release/Step_3 b/Step 3/cmake-build-release/Step_3 index 01785b1..46e8c55 100755 Binary files a/Step 3/cmake-build-release/Step_3 and b/Step 3/cmake-build-release/Step_3 differ diff --git a/Step 3/cmake-build-release/Testing/Temporary/LastTest.log b/Step 3/cmake-build-release/Testing/Temporary/LastTest.log index 5dd1d6c..44696f6 100644 --- a/Step 3/cmake-build-release/Testing/Temporary/LastTest.log +++ b/Step 3/cmake-build-release/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Nov 13 02:14 EST +Start testing: Nov 13 02:23 EST ---------------------------------------------------------- -End testing: Nov 13 02:14 EST +End testing: Nov 13 02:23 EST diff --git a/Step 3/src/graphics/gl/gl.cpp b/Step 3/src/graphics/gl/gl.cpp index ad91bd3..db6e469 100644 --- a/Step 3/src/graphics/gl/gl.cpp +++ b/Step 3/src/graphics/gl/gl.cpp @@ -122,6 +122,7 @@ VAO::VAO(const std::vector& triangles): VaoID(createVAO()) // enable the attributes, prevents us from having to do this later. glEnableVertexAttribArray(0); glEnableVertexAttribArray(1); + glEnableVertexAttribArray(2); // convert vertex data std::vector verts; std::vector uvs; diff --git a/Step 3/src/graphics/graphics.cpp b/Step 3/src/graphics/graphics.cpp index c8257be..d58c62b 100644 --- a/Step 3/src/graphics/graphics.cpp +++ b/Step 3/src/graphics/graphics.cpp @@ -529,7 +529,6 @@ namespace Raytracing { }); if (debug){ - // TODO: temp install GLM to test which function is broken. auto projection = m_camera.project(); if (m_window.isMouseGrabbed()) { yaw += (float) Input::getMouseDelta().x * (1000.0f / ImGui::GetIO().Framerate / 1000.0f) * 3;