aboutsummaryrefslogtreecommitdiff
path: root/src/drone_controller.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/drone_controller.hh')
-rw-r--r--src/drone_controller.hh37
1 files changed, 1 insertions, 36 deletions
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