diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-28 18:54:31 +0000 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-28 18:54:31 +0000 |
commit | 9fff9d2a0d0a6af5e35697bde5203f429f73a854 (patch) | |
tree | 4cc82769c743182cf59c75b2a13f66822e6738ed /application | |
parent | Input stack and logical split of camera controller (diff) | |
download | ilt-9fff9d2a0d0a6af5e35697bde5203f429f73a854.tar.bz2 ilt-9fff9d2a0d0a6af5e35697bde5203f429f73a854.tar.xz ilt-9fff9d2a0d0a6af5e35697bde5203f429f73a854.zip |
Monkey has outlived his usefullness, bye monkey
Diffstat (limited to 'application')
-rw-r--r-- | application/main.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/application/main.cpp b/application/main.cpp index 0685d5e..b2c2a5e 100644 --- a/application/main.cpp +++ b/application/main.cpp @@ -4,19 +4,14 @@ #include "manualCameraController.h" #include <SDL2/SDL.h> #include <chrono> -#include <cmath> #include <collection.hpp> -#include <game/physical.h> #include <game/world.h> #include <game/worldobject.h> #include <gfx/camera_controller.h> #include <gfx/gl/camera.h> #include <gfx/gl/shader.h> -#include <gfx/gl/transform.h> #include <gfx/renderable.h> -#include <glm/glm.hpp> #include <memory> -#include <numbers> #include <special_members.hpp> #include <vector> #include <worker.h> @@ -24,22 +19,6 @@ static const int DISPLAY_WIDTH = 800; static const int DISPLAY_HEIGHT = 600; -class Monkey : public WorldObject, public Physical { -public: - Monkey() : Physical {{0.0, 0.5, 1.0}, "res/monkey3.obj", "res/bricks.jpg"} { } - - void - tick(TickDuration elapsed) override - { - counter += 0.000625F * elapsed.count(); - location.GetRot().y = std::numbers::pi_v<double> + sin(counter); - location.GetRot().z = 0.3 * cos(counter * 10); - } - -private: - float counter {}; -}; - class SDL_Application : public InputHandler, public std::enable_shared_from_this<SDL_Application> { public: SDL_Application() @@ -82,7 +61,6 @@ public: Worker w; - world.create<Monkey>(); world.create<Terrain>(); Shader shader; |