diff --git a/src/entities/player.h b/src/entities/player.h deleted file mode 100644 index ea5424d..0000000 --- a/src/entities/player.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include -#include "collision_entity.h" - -namespace entities -{ - class Player : public CollisionEntity - { - public: - Player(const models::TexturedModel& model, const glm::vec3& position, const glm::vec3& rotation, float scale, - const collision::Box& bounding_box) - : CollisionEntity(model, position, rotation, scale, bounding_box) - {} - - void Update() - { - position.x += 0.11f; - MoveCollisionBox(); - } - - void OnCollide(const ::collision::Collision& collision) override - { - std::cout << "Player got HIT" << std::endl; - } - }; - - class Player2 : public CollisionEntity - { - public: - Player2(const models::TexturedModel& model, const glm::vec3& position, const glm::vec3& rotation, float scale, - const collision::Box& bounding_box) - : CollisionEntity(model, position, rotation, scale, bounding_box) - {} - - void Update() { position.x -= 0.01f; MoveCollisionBox(); } - - void OnCollide(const ::collision::Collision& collision) override - { - std::cout << "Player2 got HIT" << std::endl; - } - }; -} diff --git a/src/main.cpp b/src/main.cpp index a2b49ce..7644b13 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -49,14 +49,9 @@ int main(void) current_scene = new scene::Startup_Scene(); - - - glfwSetKeyCallback(window, [](GLFWwindow* window, int key, int scancode, int action, int mods) { current_scene->onKey(window, key, scancode, action, mods); - if (key == GLFW_KEY_ESCAPE) - glfwSetWindowShouldClose(window, true); }); bool window_open = true; @@ -90,7 +85,6 @@ int main(void) // Clean up -> preventing memory leaks!!! std::cout << "ending..." << std::endl; - delete current_scene; glfwTerminate(); return 0; } diff --git a/src/scenes/scene.cpp b/src/scenes/scene.cpp deleted file mode 100644 index 7183938..0000000 --- a/src/scenes/scene.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "scene.h" - -namespace scene -{ - -} - diff --git a/wk2_fps.vcxproj b/wk2_fps.vcxproj index 9b55093..0842a3d 100644 --- a/wk2_fps.vcxproj +++ b/wk2_fps.vcxproj @@ -21,7 +21,6 @@ - @@ -45,7 +44,6 @@ - diff --git a/wk2_fps.vcxproj.filters b/wk2_fps.vcxproj.filters index 695a96e..583aaf9 100644 --- a/wk2_fps.vcxproj.filters +++ b/wk2_fps.vcxproj.filters @@ -48,9 +48,6 @@ Source Files - - Source Files - Source Files @@ -125,8 +122,5 @@ Header Files - - Header Files - \ No newline at end of file