Added file dialog, saving, loading, new maze

Author: arceryz

Examples/normal_maze.json

@@ -0,0 +1,23 @@
+{
+	"mazeName": "Unnamed Maze",
+	"junctions": [
+		[ "E1", 26500, 47, 20, 0, 0, 1, 1 ],
+		[ "N1", 6334, 40, 13, 0, 0, 1, 1 ],
+		[ "S1", 15724, 32, 13, 0, 0, 1, 1 ],
+		[ "S1", 19169, 40, 27, 0, 0, 1, 1 ],
+		[ "W1", 18467, 32, 20, 0, 0, 1, 1 ],
+		[ "H", 41, 40, 20, 0, 0, 1, 1 ]
+	],
+	"tunnels": [
+		[ 6334, 15724 ],
+		[ 41, 6334 ],
+		[ 41, 26500 ],
+		[ 41, 18467 ],
+		[ 41, 19169 ],
+		[ 15724, 18467 ]
+	],
+	"tags": [
+		[ 32, 13, [ "supply_lift" ]],
+		[ 40, 20, [ "home_base" ]]
+	]
+}

Examples/test.json

@@ -1,29 +1,26 @@
 {
 	"mazeName": "Test Maze",
 	"junctions": [
-		[ "A", 11478, 38, 27, 0, 0, 1, 1 ],
-		[ "B", 26500, 47, 15, 0, 0, 1, 1 ],
-		[ "C", 6334, 38, 15, 0, 0, 1, 1 ],
-		[ "D", 15724, 47, 27, 0, 0, 1, 1 ],
-		[ "E", 19169, 47, 21, 0, 0, 3, 2 ],
+		[ "G", 41, 38, 21, 0, 0, 1, 1 ],
 		[ "F", 18467, 29, 21, -1, -1, 1, 1 ],
-		[ "G", 41, 38, 21, 0, 0, 1, 1 ]
+		[ "E", 19169, 47, 21, 0, 0, 3, 2 ],
+		[ "D", 15724, 47, 27, 0, 0, 1, 1 ],
+		[ "C", 6334, 38, 15, 0, 0, 1, 1 ],
+		[ "B", 26500, 47, 15, 0, 0, 1, 1 ],
+		[ "A", 11478, 38, 27, 0, 0, 1, 1 ]
 	],
 	"tunnels": [
-		[ 11478, 15724 ],
+		[ 41, 18467 ],
+		[ 41, 6334 ],
+		[ 41, 11478 ],
 		[ 6334, 26500 ],
-		[ 15724, 19169 ],
 		[ 19169, 26500 ],
-		[ 41, 11478 ],
-		[ 41, 6334 ],
-		[ 41, 18467 ]
+		[ 15724, 19169 ],
+		[ 11478, 15724 ]
 	],
 	"tags": [
-		[ 33, 21, [ "moreitems" ]],
+		[ 29, 21, [ "foodsupply1", "outpost2", "largeplatform" ]],
 		[ 38, 15, [ "spawn", "outpost1", "supplycrate" ]],
-		[ 29, 21, [ "foodsupply1", "outpost2", "largeplatform" ]]
+		[ 33, 21, [ "moreitems" ]]
 	]
-}
-
-
-
+}

README.md

@@ -12,10 +12,10 @@ Core features:
 - [x] Edge placement
 - [x] Tagging of any grid cell with strings
 - [x] JSON export/import function
-- [ ] File management/Export UI
-- [ ] Sector partitioning. Junction naming and coloring by sector.
+- [x] File dialog/Export UI
 
 Extra: 
+- [ ] Sector partitioning. Junction naming and coloring by sector.
 - [ ] Advanced junction moving features
 - [ ] Tag managing and coloring
 - [ ] Interactive maze generation

Source/arclib.h

@@ -9,6 +9,9 @@
 #include <raylib.h>
 #include <raygui.h>
 #include <raymath.h>
+#include <vector>
+#include <string>
+using namespace std;
 
 struct ArcGlobal {
     Camera2D camera;
@@ -40,6 +43,7 @@ bool PositionGizmo(Vector2 &position, Vector2 &anchor, bool &grabbed, float size
 Color LerpColor(Color from, Color to, float factor);
 Color ColorFromNormalized3(float arr[3]);
 void ColorToFloat3(Color col, float arr[3]);
+void StringsToPointers(vector<string> &vec, const char **pointers, int n);
 
 #endif
 
@@ -195,6 +199,12 @@ void ColorToFloat3(Color col, float arr[3])
     arr[1] = ((float)col.g)/255.0;
     arr[2] = ((float)col.b)/255.0;
 }
+void StringsToPointers(vector<string> &vec, const char **pointers, int n)
+{
+    for (int i = 0; i < vec.size() && i < n; i++) {
+        pointers[i] = vec[i].c_str();
+    }
+}
 
 #undef ARCLIB_IMPLEMENTATION
 #endif

Source/editor.h

@@ -1,11 +1,13 @@
 #ifndef MAZE_GUI_H
 #define MAZE_GUI_H
 
-#include "arclib.h"
-#include "maze.h"
-#include "imgui.h"
+#include <imgui.h>
 #include <string>
 #include <vector>
+#include "arclib.h"
+#include "maze.h"
+#include "file_dialog.h"
+
 
 #define KEY_SELECT IsMouseButtonPressed(MOUSE_LEFT_BUTTON)
 #define KEY_REMOVE IsMouseButtonPressed(MOUSE_RIGHT_BUTTON)
@@ -18,10 +20,15 @@
 using namespace std;
 namespace Gui = ImGui;
 
+// TODO: Clean up this class with states.
+// TODO: Split file loading from Maze class to editor.
+
 // This class is basically the entire editor.
 class MazeEditor {
 public:
-    Maze &maze;
+    Maze maze;
+    FileDialog fileDialog;
+    fs::path filePath = "";
 
     float tileSize = 16.0f;
     int fontSize = 20;
@@ -60,6 +67,7 @@ class MazeEditor {
     vector<string> tagsList;
     bool mazeHasFocus = false;
     bool editingCorners = false;
+    bool loadOnFile = false;
 
     bool showLabels = true;
     bool showJunctions = true;
@@ -69,14 +77,16 @@ class MazeEditor {
     bool showIdMap = false;
     bool showTags = true;
 
-    MazeEditor(Maze &targetMaze): maze(targetMaze)
+    MazeEditor()
     {
         raylibFont = GetFontDefault();
         CenterHome();
         ColorToFloat3(junctionColor, junctionColorArr);
         ColorToFloat3(gridColor, gridColorArr);
         ColorToFloat3(clearColor, clearColorArr);
         ColorToFloat3(tunnelColor, tunnelColorArr);
+        strcpy(mazeNameBuf, maze.name.c_str());
+        LoadMaze("Examples/test.json");
     }
 
     //
@@ -228,6 +238,35 @@ class MazeEditor {
             arcGlobal.camera.offset.y = GetScreenHeight() / 2;
         }
     }
+    void SaveMaze(fs::path path)
+    {
+        if (maze.ExportJson(path)) {
+            filePath = path;
+            cout << "Saved " << filePath << endl;
+        } else {
+            cout << "Invalid file " << filePath << endl;
+        }
+    }
+    void LoadMaze(fs::path path)
+    {
+        if (maze.ImportJson(path)) {
+            filePath = path;
+            cout << "Loaded " << filePath << endl;
+        } else {
+            cout << "Invalid file " << filePath << endl;
+        }
+    }
+    void NewMaze()
+    {
+        maze = Maze();
+        filePath = "";
+        cout << "New Maze" << endl;
+    }
+    bool HasValidFile()
+    {
+        ifstream stream(filePath);
+        return stream.good();
+    }
 
     //
     // Drawing methods.
@@ -257,7 +296,6 @@ class MazeEditor {
         if (showLabels) DrawJunctionLabels();
         DrawFPS(5, GetScreenHeight() - 15);
 
-
         Gui::SetNextWindowPos(ImVec2(0, 20), ImGuiCond_Once);
         Gui::SetNextWindowSize(ImVec2(350, 300), ImGuiCond_Once);
         Gui::Begin("Control Panel");
@@ -266,6 +304,13 @@ class MazeEditor {
         DrawGuiEditorSettings();
         DrawGuiMazeSettings();
         DrawGuiInspector();
+        if (fileDialog.Update()) {
+            if (loadOnFile) {
+                LoadMaze(fileDialog.targetPath);
+            } else {
+                SaveMaze(fileDialog.targetPath);
+            }
+        }
         Gui::PopItemWidth();
         Gui::End();
     }
@@ -441,6 +486,7 @@ class MazeEditor {
     {
         if (Gui::TreeNode("Maze")) {
             Gui::InputText("Maze Name", mazeNameBuf, IM_ARRAYSIZE(mazeNameBuf));
+            maze.name = string(mazeNameBuf);
 
             Gui::Text("View Toggles");
             if (Gui::BeginTable("Split", 3)) {
@@ -475,7 +521,7 @@ class MazeEditor {
                 Gui::InputText("Junction Name", nameBuf, IM_ARRAYSIZE(nameBuf));
             // The two buttons.
             if (hasSelectedCoord) {
-                Gui::Text(TextFormat("Tag Position (%d, %d)", selectedCoord.x, selectedCoord.y));
+                Gui::Text("Tag Position (%d, %d)", selectedCoord.x, selectedCoord.y);
                 Gui::InputText("Tag", tagBuf, IM_ARRAYSIZE(tagBuf));
                 Gui::SameLine();
                 if (Gui::Button("Add")) {
@@ -503,18 +549,41 @@ class MazeEditor {
         // The top bar.
          if (Gui::BeginMainMenuBar()) {
             if (Gui::BeginMenu("File")) {
-                if (Gui::MenuItem("New")) {}
-                if (Gui::MenuItem("Save", "Ctrl+S")) {}
-                if (Gui::MenuItem("Load")) {}
+                if (Gui::MenuItem("New")) {
+                    NewMaze();
+                }
+                if (Gui::MenuItem("Save", "")) {
+                    if (HasValidFile())
+                        SaveMaze(filePath);
+                    else {
+                        fileDialog.Open();
+                        loadOnFile = false;
+                    }
+                }
+                if (Gui::MenuItem("Save As", "")) {
+                    fileDialog.Open();
+                    loadOnFile = false;
+                }
+                if (Gui::MenuItem("Load")) {
+                    fileDialog.Open();
+                    loadOnFile = true;
+                }
                 Gui::EndMenu();
             }
             Gui::PushStyleColor(ImGuiCol_Text, ImVec4(0.3, 0.3, 0.3, 1));    
             Gui::Text(statusBarText.c_str());
             Gui::PopStyleColor();
             Gui::EndMainMenuBar();
         }
+
+        int w = GetScreenWidth();
+        Gui::SetNextWindowPos(ImVec2(w-400, 19));
+        Gui::SetNextWindowSize(ImVec2(400, 0));
+        Gui::Begin("Info bar", NULL, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoBackground);
+        Gui::TextWrapped("%s", filePath.string().c_str());
+        Gui::End();
     }
-    
+
     //
     // Utility methods.
     //