simplify ray/chunk intersection test

[blank.git] / src / app / Application.hpp

diff --git a/src/app/Application.hpp b/src/app/Application.hpp
index a8e0f2d00f3fdafda8df72d5533e4f86cbfe7c3c..359599ef73750de04c0ee3de16c489690114a005 100644 (file)
--- a/src/app/Application.hpp
+++ b/src/app/Application.hpp
@@ -1,40 +1,34 @@
 #ifndef BLANK_APP_APPLICATION_HPP_
 #define BLANK_APP_APPLICATION_HPP_
 
-#include "Assets.hpp"
-#include "FrameCounter.hpp"
-#include "init.hpp"
-#include "RandomWalk.hpp"
-#include "../graphics/Viewport.hpp"
-#include "../ui/Interface.hpp"
-#include "../world/World.hpp"
-
 #include <SDL.h>
+#include <stack>
 
 
 namespace blank {
 
-class Application {
+class Environment;
+class HeadlessEnvironment;
+class State;
+class Window;
 
-public:
-       struct Config {
-               bool vsync = true;
-               bool doublebuf = true;
-               int multisampling = 1;
+class HeadlessApplication {
 
-               Interface::Config interface = Interface::Config();
-               World::Config world = World::Config();
-       };
+public:
+       explicit HeadlessApplication(HeadlessEnvironment &);
+       ~HeadlessApplication();
 
-       explicit Application(const Config &);
+       void PushState(State *);
+       State *PopState();
+       State *SwitchState(State *);
+       State &GetState();
+       void CommitStates();
+       bool HasState() const noexcept;
 
-       Application(const Application &) = delete;
-       Application &operator =(const Application &) = delete;
-
-       /// run until user quits
+       /// run until out of states
        void Run();
        /// evaluate a single frame of dt milliseconds
-       void Loop(int dt);
+       virtual void Loop(int dt);
 
        /// run for n frames
        void RunN(size_t n);
@@ -45,26 +39,40 @@ public:
 
        /// process all events in SDL's queue
        void HandleEvents();
-       void Handle(const SDL_WindowEvent &);
+       void Handle(const SDL_Event &);
        /// integrate to the next step with dt milliseconds passed
        void Update(int dt);
-       /// push the current state to display
-       void Render();
-
-       static Entity &MakeTestEntity(World &);
 
 private:
-       Init init;
-       Viewport viewport;
-       Assets assets;
-       FrameCounter counter;
+       HeadlessEnvironment &env;
+       std::stack<State *> states;
 
-       World world;
-       Interface interface;
+};
 
-       RandomWalk test_controller;
 
-       bool running;
+class Application
+: public HeadlessApplication {
+
+public:
+       explicit Application(Environment &);
+       ~Application();
+
+       Application(const Application &) = delete;
+       Application &operator =(const Application &) = delete;
+
+       void Loop(int dt) override;
+
+       /// process all events in SDL's queue
+       void HandleEvents();
+       void Handle(const SDL_Event &);
+       void Handle(const SDL_WindowEvent &);
+       /// integrate to the next step with dt milliseconds passed
+       void Update(int dt);
+       /// push the current state to display
+       void Render();
+
+private:
+       Environment &env;
 
 };