launch xvfb on travis

[blank.git] / src / world / EntityController.hpp

diff --git a/src/world/EntityController.hpp b/src/world/EntityController.hpp
index 526a3222fa4d985fc53094ab7e2c649376dfdd2e..2724c5e9c8278e67858d3da5d384a24fa26c3796 100644 (file)
--- a/src/world/EntityController.hpp
+++ b/src/world/EntityController.hpp
@@ -1,11 +1,6 @@
 #ifndef BLANK_WORLD_ENTITYCONTROLLER_HPP_
 #define BLANK_WORLD_ENTITYCONTROLLER_HPP_
 
-#include "EntityState.hpp"
-
-#include <glm/glm.hpp>
-
-
 namespace blank {
 
 class Entity;
@@ -16,26 +11,6 @@ struct EntityController {
 
        virtual void Update(Entity &, float dt) = 0;
 
-       virtual glm::vec3 ControlForce(const Entity &, const EntityState &) const = 0;
-
-
-       /// try to add as much of add to out so it doesn't exceed max
-       /// returns true if it's maxed out
-       static bool MaxOutForce(
-               glm::vec3 &out,
-               const glm::vec3 &add,
-               float max
-       ) noexcept;
-       /// give a force that makes state's velocity converge with given target velocity
-       /// over 1/n seconds
-       static inline glm::vec3 TargetVelocity(
-               const glm::vec3 &target,
-               const EntityState &state,
-               float n
-       ) noexcept {
-               return (target - state.velocity) * n;
-       }
-
 };
 
 }