From 39dde35229ea0c8922fbfea7940a83f085788f51 Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Mon, 17 Apr 2023 22:04:44 +0200
Subject: [PATCH] more

---
 src/app.rs  | 39 ---------------------------------------
 src/main.rs | 36 +++++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 42 deletions(-)
 delete mode 100644 src/app.rs

diff --git a/src/app.rs b/src/app.rs
deleted file mode 100644
index 446ce34..0000000
--- a/src/app.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use crate::{
-    command::CmdVec,
-    debug::{self, DebugState},
-    game::GameState,
-    res::Res,
-};
-use egui_sfml::SfEgui;
-/// Application level state (includes game and ui state, etc.)
-pub(crate) struct App {
-    pub(crate) game: GameState,
-    pub(crate) res: Res,
-    pub(crate) sf_egui: SfEgui,
-    pub(crate) debug: DebugState,
-    /// Integer scale for rendering the game
-    pub(crate) scale: u8,
-    pub(crate) cmdvec: CmdVec,
-}
-impl App {
-    pub(crate) fn new() -> anyhow::Result<Self> {
-        loop {}
-    }
-    pub(crate) fn do_game_loop(&mut self) {
-        self.do_rendering();
-    }
-    fn do_rendering(&mut self) {
-        self.sf_egui
-            .do_frame(|ctx| {
-                debug::do_debug_ui(
-                    ctx,
-                    &mut self.debug,
-                    &mut self.game,
-                    &mut self.res,
-                    &mut self.scale,
-                    &mut self.cmdvec,
-                );
-            })
-            .unwrap();
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index d7d43d2..158add0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,9 @@
-mod app;
+use command::CmdVec;
+use debug::DebugState;
+use egui_sfml::SfEgui;
+use game::GameState;
+use res::Res;
+
 mod command;
 mod debug;
 mod game;
@@ -8,9 +13,34 @@ mod res;
 mod texture_atlas;
 mod tiles;
 mod world;
-use app::App;
+
+pub(crate) struct App {
+    pub(crate) game: GameState,
+    pub(crate) res: Res,
+    pub(crate) sf_egui: SfEgui,
+    pub(crate) debug: DebugState,
+    /// Integer scale for rendering the game
+    pub(crate) scale: u8,
+    pub(crate) cmdvec: CmdVec,
+}
+impl App {
+    pub(crate) fn new() -> anyhow::Result<Self> {
+        loop {}
+    }
+}
 
 fn main() {
     let mut app = App::new().unwrap();
-    app.do_game_loop();
+    app.sf_egui
+        .do_frame(|ctx| {
+            debug::do_debug_ui(
+                ctx,
+                &mut app.debug,
+                &mut app.game,
+                &mut app.res,
+                &mut app.scale,
+                &mut app.cmdvec,
+            );
+        })
+        .unwrap();
 }