From bb0da810d945d98b25390c65ab3f34e695914fd6 Mon Sep 17 00:00:00 2001
From: ccolin
Date: Sat, 2 Jan 2021 01:16:06 +0100
Subject: move Drone and Waypoint declarations to their own files

---
 src/drone_controller.hh | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

(limited to 'src/drone_controller.hh')

diff --git a/src/drone_controller.hh b/src/drone_controller.hh
index 93930a1..08dac42 100644
--- a/src/drone_controller.hh
+++ b/src/drone_controller.hh
@@ -1,47 +1,12 @@
 #ifndef DRONE_CONTROLLER_HH
 #define DRONE_CONTROLLER_HH
 
-#include "opengl_mesh.hh"
+#include "drone.hh"
 
 #include <QJsonObject>
-#include <QVector3D>
 #include <QTimer>
 
 
-template <typename T>
-static T lerp(T a, T b, double factor) {
-	return a + (factor * (b - a));
-}
-
-
-struct Waypoint {
-	int frame;
-	QVector3D pos;
-
-	Waypoint(unsigned frame, QVector3D pos);
-	Waypoint(const QJsonObject &json);
-};
-
-
-class Drone {
-	static OpenGLMesh *mesh;
-	static bool mesh_initialized;
-
-	QVector<Waypoint> waypoints;
-	int mesh_id;
-	QVector3D pos;
-	int id;
-
-public:
-	Drone(int id);
-	Drone(const QJsonObject &json);
-	const QVector<Waypoint> getWaypoints() const;
-	void setTo(int frame);
-	QVector3D getPos() const;
-	int getId() const;
-};
-
-
 class DroneController : public QObject {
 	Q_OBJECT
 
-- 
cgit v1.2.3-70-g09d2