Minor code cleanup.

include/App/EditorApp.hpp

@@ -86,21 +86,21 @@ public:
 #pragma endregion
 
 #pragma region Map Data
-    Level* loaded_level;
-    Tileset* loaded_tileset;
-    JGL::Texture* loaded_tilesheet;
+    Level* loaded_level = nullptr;
+    Tileset* loaded_tileset = nullptr;
+    JGL::Texture* loaded_tilesheet = nullptr;
 #pragma endregion
     EditorCamera camera;
-
-
-    JUI::Window * CreateAppInfoDialogWindow(JUI::Widget *parent);
-
-
     Preferences preferences;
 
 
     int focus_layer_index = 0;
 
+    JUI::Window * CreateAppInfoDialogWindow(JUI::Widget *parent);
+
+
+
+
     Layer* GetLayer(int index)
     {
         return loaded_level->layers[index];
@@ -160,46 +160,7 @@ public:
     /// @note Placeholder until FileDialogs are added.
     void SaveCurrentLevel() const;
     void LoadLevel(const std::filesystem::path& level_meta_path);
-    void CreateTestLevel() {
-        loaded_level = new Level();
-        loaded_level->name = "TestLevel";
-        loaded_level->author = "dawsh";
-        loaded_level->cols = 64;
-        loaded_level->rows = 64;
-        loaded_level->tileset_path = "tileset.json";
-        auto layer = new Layer();
-        layer->name = "Layer 1";
-        layer->cols = 64;
-        layer->rows = 64;
-        layer->cell_height = 16;
-        layer->cell_width = 16;
-        layer->binary_path = "layers/1.bin";
-        layer->InitGrid();
-        layer->Save();
-        loaded_level->layers.push_back(layer);
-        loaded_tileset = new Tileset();
-        loaded_tileset->name = "MegaCommando";
-        loaded_tileset->author = "dawsh";
-        loaded_tileset->tex_height = 1280;
-        loaded_tileset->tex_width = 1024;
-        loaded_tileset->tile_width = 16;
-        loaded_tileset->tile_height = 16;
-        loaded_tileset->tile_spacing = 0;
-        loaded_tileset->cols = 80;
-        loaded_tileset->rows = 60;
-        loaded_tileset->file_path = "tileset.json";
-        loaded_tileset->texture_path = "assets/megacommando.png";
-        loaded_tilesheet = new JGL::Texture("assets/megacommando.png");
-
-        write_file_contents("tileset.json", json::deparse(loaded_tileset->Serialize()));
-
-        //layer_view->UpdateComponents(loaded_level);
-
-        data_ready = true;
-
-        SaveCurrentLevel();
-
-    }
+    void CreateTestLevel();
 
 
     void SizeCellIndicatorToTilesetSize();

include/App/Preferences.hpp

@@ -15,7 +15,7 @@ struct RecentCameraState
 	json::value Serialize() const
 	{
 		json::object json;
-		json["tx"] = translation.x;
+		json["tx"] = json::number(translation.x);
 		json["ty"] = translation.y;
 		json["rot"] = rotation;
 		json["scale"] = scale;
@@ -33,10 +33,12 @@ struct RecentCameraState
 
 class Preferences {
 public:
-
+#pragma region Member Variables
 	RecentCameraState recent_camera_state;
+#pragma endregion
+public:
 
-	explicit Preferences() : recent_camera_state()
+	Preferences() : recent_camera_state()
 	{
 
 	}
@@ -61,10 +63,4 @@ public:
 	}
 
 public:
-    Color4 GridColor() const;
-
-    bool ShowBackgroundGrid() const;
-    bool ShowForegroundGrid() const;
-
-    bool AutoSave() const;
 };