]> git.localhorst.tv Git - blank.git/blobdiff - src/app/runtime.cpp
fix normal in intersection ray/box intersection
[blank.git] / src / app / runtime.cpp
index 30b15aeb4b0d105b713255fbba892837481d45a7..72a51da2b6eef53e7e376e3d60693bc472b28dde 100644 (file)
@@ -1,11 +1,10 @@
 #include "Application.hpp"
 #include "Environment.hpp"
-#include "PreloadState.hpp"
 #include "Runtime.hpp"
 #include "WorldState.hpp"
 
 #include "init.hpp"
-#include "../world/WorldSave.hpp"
+#include "../io/WorldSave.hpp"
 
 #include <cctype>
 #include <cstdlib>
@@ -50,7 +49,8 @@ Environment::Environment(Window &win, const string &asset_path)
 , window(win)
 , assets(asset_path)
 , counter() {
-
+       viewport.Clear();
+       window.Flip();
 }
 
 
@@ -236,17 +236,14 @@ int Runtime::Execute() {
        if (save.Exists()) {
                save.Read(config.world);
        } else {
-               save.Create(config.world);
+               save.Write(config.world);
        }
 
        Application app(env);
 
-       WorldState world_state(env, config.interface, config.world);
+       WorldState world_state(env, config.interface, config.world, save);
        app.PushState(&world_state);
 
-       PreloadState preloader(env, world_state.GetWorld().Loader());
-       app.PushState(&preloader);
-
        switch (mode) {
                default:
                case NORMAL: