X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FDirectInput.hpp;h=7d7cd5129e4eab36d6af5b1bfc15017c0f2c5d37;hb=HEAD;hp=d4a2e96d110b4b0c740a69048f648f540589a7c6;hpb=ccd6e7001572808400b9cb9bc91f9bedcf28a1ad;p=blank.git

diff --git a/src/ui/DirectInput.hpp b/src/ui/DirectInput.hpp
index d4a2e96..7d7cd51 100644
--- a/src/ui/DirectInput.hpp
+++ b/src/ui/DirectInput.hpp
@@ -4,8 +4,6 @@
 #include "PlayerController.hpp"
 
 #include "../app/IntervalTimer.hpp"
-#include "../world/EntityCollision.hpp"
-#include "../world/WorldCollision.hpp"
 
 
 namespace blank {
@@ -20,43 +18,25 @@ class DirectInput
 public:
 	DirectInput(World &, Player &, WorldManipulator &);
 
-	const WorldCollision &BlockFocus() const noexcept { return aim_world; }
-	const EntityCollision &EntityFocus() const noexcept { return aim_entity; }
+	void Update(Entity &, float dt) override;
 
-	void Update(int dt);
-
-	void SetMovement(const glm::vec3 &) override;
-	void TurnHead(float pitch, float yaw) override;
 	void StartPrimaryAction() override;
 	void StopPrimaryAction() override;
 	void StartSecondaryAction() override;
 	void StopSecondaryAction() override;
 	void StartTertiaryAction() override;
 	void StopTertiaryAction() override;
-	void SelectInventory(int) override;
 
 private:
-	void UpdatePlayer();
-
 	void PickBlock();
 	void PlaceBlock();
 	void RemoveBlock();
 
 private:
-	World &world;
-	Player &player;
 	WorldManipulator &manip;
 
-	WorldCollision aim_world;
-	EntityCollision aim_entity;
-
-	glm::vec3 move_dir;
-	float pitch;
-	float yaw;
-	bool dirty;
-
-	IntervalTimer place_timer;
-	IntervalTimer remove_timer;
+	FineTimer place_timer;
+	FineTimer remove_timer;
 
 };