glm backwards compatibility

[blank.git] / src / ui / PlayerController.hpp

diff --git a/src/ui/PlayerController.hpp b/src/ui/PlayerController.hpp
index 22454133bd3c6971bec4f7ff9f3d65786653df13..69a15e9846ef7e7b42bd72f9b281682184eb015a 100644 (file)
--- a/src/ui/PlayerController.hpp
+++ b/src/ui/PlayerController.hpp
@@ -1,8 +1,7 @@
 #ifndef BLANK_UI_PLAYERCONTROLLER_HPP_
 #define BLANK_UI_PLAYERCONTROLLER_HPP_
 
-#include <glm/glm.hpp>
-
+#include "../graphics/glm.hpp"
 #include "../world/EntityCollision.hpp"
 #include "../world/EntityController.hpp"
 #include "../world/WorldCollision.hpp"
@@ -18,6 +17,7 @@ class PlayerController
 
 public:
        PlayerController(World &, Player &);
+       ~PlayerController();
 
        World &GetWorld() noexcept { return world; }
        const World &GetWorld() const noexcept { return world; }
@@ -34,8 +34,6 @@ public:
        void SetMovement(const glm::vec3 &) noexcept;
        const glm::vec3 &GetMovement() const noexcept { return move_dir; }
 
-       glm::vec3 ControlForce(const EntityState &) const override;
-
        /// turn the controlled entity's head by given pitch and yaw deltas
        void TurnHead(float pitch, float yaw) noexcept;