Refactor GUI Engine, Clean Code, and Improve Project Configuration

.gitignore

@@ -8,7 +8,7 @@ obj/
 screenshots/
 src/raylib_module
 src/sfml_module
-.vscode/
+
 
 **/*.dll
 **/*.o
@@ -19,4 +19,6 @@ Game-Pencil-Engine-Editor.depend
 Game-Pencil-Engine-Editor.layout
 Game_Pencil_Engine_IDE.cbp
 Game_Pencil_Engine_IDE.depend
-Game_Pencil_Engine_IDE.layout
+Game_Pencil_Engine_IDE.layout
+GamePencil
+.vscode

.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "name": "Run Game Pencil",
+        "type": "cppdbg",
+        "request": "launch",
+        "program": "${workspaceFolder}/GamePencil",
+        "args": [],
+        "stopAtEntry": false,
+        "cwd": "${workspaceFolder}",
+        "environment": [],
+        "externalConsole": true,
+        "MIMode": "lldb",
+        "setupCommands": [
+          {
+            "description": "Enable pretty-printing for gdb",
+            "text": "-enable-pretty-printing",
+            "ignoreFailures": true
+          }
+        ]
+      }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "type": "shell",
+            "command": "ninja",
+            "args": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": ["$gcc"],
+            "presentation": {
+                "reveal": "always"
+            },
+            "options": {
+                "cwd": "${workspaceFolder}/src/build"
+            }
+        },
+        {
+            "label": "configure",
+            "type": "shell",
+            "command": "meson",
+            "args": [
+                "setup",
+                "--reconfigure",
+                "build"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}/src"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": false
+            },
+            "presentation": {
+                "reveal": "always"
+            }
+        }
+    ]
+}

install_apple_silicon_dependencys.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo "Updating Homebrew..."
+brew update
+
+echo "Installing SDL2 and extensions..."
+brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf meson ninja cmake
+
+echo "Cleaning up unused files..."
+brew cleanup
+
+echo "Dependencies installed successfully!"

src/gpe_editor/gpe_cpp_builder_settings.h → src/gpe_editor/cpp/gpe_cpp_builder_settings.h

@@ -33,7 +33,7 @@ SOFTWARE.
 #ifndef GPE_CPP_COMPILER_RESOURCES_H
 #define GPE_CPP_COMPILER_RESOURCES_H
 
-#include "gpe_basic_resource_page.h"
+#include "../resources/basic/gpe_basic_resource_page.h"
 
 class cppCompilerManager
 {

src/gpe_editor/gpe_editor.h → src/gpe_editor/editor/gpe_editor.h

@@ -34,16 +34,16 @@ SOFTWARE.
 #ifndef GPE_EDITOR_H
 #define GPE_EDITOR_H
 
-#include "../pawgui/pawgui.h"
-#include "../pawgui/pawgui_resource_dropdown.h"
-#include "../pawgui/pawgui_dock_system.h"
+#include "../pawgui/pawgui/pawgui.h"
+#include "../pawgui/resource_dropdown/pawgui_resource_dropdown.h"
+#include "../pawgui/dock_system/pawgui_dock_system.h"
 
 #include "gpe_editor_constants.h"
-#include "gpe_editor_globals.h"
+#include "../editor/gpe_editor_globals.h"
 #include "gpe_editor_project.h"
 #include "gpe_editor_project_helper.h"
-#include "gpe_log_manager.h"
-#include "gpe_resource_tree.h"
+#include "../log/gpe_log_manager.h"
+#include "../resources/gpe/gpe_resource_tree.h"
 
 extern std::string GPE_BUILD_NAMES[ gpe::system_os_max ];
 

src/gpe_editor/gpe_editor_aboutpage.h → src/gpe_editor/editor/gpe_editor_aboutpage.h

@@ -34,7 +34,7 @@ SOFTWARE.
 #ifndef GPE_ABOUT_PAGE_RESOURCES_H
 #define GPE_ABOUT_PAGE_RESOURCES_H
 
-#include "gpe_basic_resource_page.h"
+#include "../resources/basic/gpe_basic_resource_page.h"
 
 class gamePencilAboutPageResource: public pawgui::general_resource
 {

src/gpe_editor/gpe_editor_globals.cpp → src/gpe_editor/editor/gpe_editor_globals.cpp

@@ -32,7 +32,7 @@ SOFTWARE.
 */
 
 #include "gpe_editor_constants.h"
-#include "gpe_editor_globals.h"
+#include "../editor/gpe_editor_globals.h"
 
 int release_current_mode = release_type_alpha;
 bool release_is_lts_version = false;

src/gpe_editor/gpe_editor_globals.h → src/gpe_editor/editor/gpe_editor_globals.h

@@ -34,8 +34,8 @@ SOFTWARE.
 #ifndef gpe_editor_globals_h
 #define gpe_editor_globals_h
 
-#include "../pawgui/pawgui_theme_controller.h"
-#include "../pawgui/pawgui_dock_system.h"
+#include "../../pawgui/theme_controller/pawgui_theme_controller.h"
+#include "../../pawgui/dock_system/pawgui_dock_system.h"
 #include "gpe_editor_splash_page.h"
 
 extern int release_current_mode;

src/gpe_editor/gpe_editor_project.cpp → src/gpe_editor/editor/gpe_editor_project.cpp

@@ -32,8 +32,8 @@ SOFTWARE.
 */
 
 #include "gpe_editor_project.h"
-#include "gpe_project_resources.h"
-#include "project_properties.h"
+#include "../project/gpe_project_resources.h"
+#include "../project/project_properties.h"
 
 GPE_ProjectFolder * current_project = nullptr;
 

src/gpe_editor/gpe_editor_project.h → src/gpe_editor/editor/gpe_editor_project.h

@@ -34,15 +34,15 @@ SOFTWARE.
 #ifndef gpe_editor_project_h
 #define gpe_editor_project_h
 
-#include "../pawgui/pawgui.h"
-#include "../pawgui/pawgui_resource_dropdown.h"
-#include "../pawgui/pawgui_general_resource.h"
+#include "../pawgui/pawgui/pawgui.h"
+#include "../pawgui/resource_dropdown/pawgui_resource_dropdown.h"
+#include "../pawgui/general_resource/pawgui_general_resource.h"
 
 #include "gpe_editor_constants.h"
-#include "gpe_editor_globals.h"
-#include "gpe_log_manager.h"
+#include "../editor/gpe_editor_globals.h"
+#include "../log/gpe_log_manager.h"
 #include "gpe_editor_project_helper.h"
-#include "gpe_resource_tree.h"
+#include "../resources/gpe/gpe_resource_tree.h"
 
 class GPE_ProjectFolder
 {
@@ -163,7 +163,7 @@ class GPE_ProjectFolder
     bool save_project_settings();
     bool save_project_as(std::string projectFilenew_name);
     void set_project_language( std::string newProjectLanguage);
-    void set_project_language_id( int projectLanguageId );
+    void set_project_language_id( int projectLanguageId );
     void start_state();
 };
 

src/gpe_editor/gpe_editor_project_helper.h → src/gpe_editor/editor/gpe_editor_project_helper.h

@@ -39,9 +39,9 @@ SOFTWARE.
 #include "../gpe/gpe_file_system.h"
 #include "../gpe/gpe_globals.h"
 #include "../gpe/gpe.h"
-#include "../pawgui/pawgui_popups.h"
+#include "../pawgui/popups/pawgui_popups.h"
 #include "gpe_editor_constants.h"
-#include "gpe_editor_globals.h"
+#include "../editor/gpe_editor_globals.h"
 
 void setup_project_directory(std::string newProjectDir);
 std::string setup_cpp_folder(std::string buildDirectory, int buildType, int buildBits = 32, bool inDebugMode = false );

src/gpe_editor/gpe_editor_settings.h → src/gpe_editor/editor/gpe_editor_settings.h

@@ -34,7 +34,7 @@ SOFTWARE.
 #ifndef GPE_EDITOR_SETTINGS_RESOURCES_H
 #define GPE_EDITOR_SETTINGS_RESOURCES_H
 
-#include "gpe_basic_resource_page.h"
+#include "../resources/basic/gpe_basic_resource_page.h"
 #include "gpe_editor.h"
 
 const int GPE_EXTERNAL_EDITOR_MAX = 4;

src/gpe_editor/gpe_editor_splash_page.h → src/gpe_editor/editor/gpe_editor_splash_page.h

@@ -35,7 +35,7 @@ SOFTWARE.
 
 #include <string>
 #include "../gpe/gpe.h"
-#include "../pawgui/pawgui.h"
+#include "../pawgui/pawgui/pawgui.h"
 
 class gpe_splash_page
 {

src/gpe_editor/gpe_editor_start_page.h → src/gpe_editor/editor/gpe_editor_start_page.h

@@ -33,7 +33,8 @@ SOFTWARE.
 #ifndef GPE_START_PAGE_H
 #define GPE_START_PAGE_H
 
-#include "gpe_basic_resource_page.h"
+#include "../resources/basic/gpe_basic_resource_page.h"
+
 #include "gpe_editor.h"
 #include "gpe_editor_aboutpage.h"
 

src/gpe_editor/gpe_editor_state.cpp → src/gpe_editor/editor/gpe_editor_state.cpp

@@ -32,17 +32,18 @@ SOFTWARE.
 */
 
 #include "gpe_editor_state.h"
+#include "../extra/gpe_extra_tools.h"
 
 gpe_editor_state::gpe_editor_state(std::string s_name)
-{
-    if( (int)s_name.size() > 0)
-    {
-        state_name = s_name;
+{
+    if( (int)s_name.size() > 0)
+    {
+        state_name = s_name;
     }
-    else
-    {
+    else
+    {
         state_name = "gpe_editor";
-    }
+    }
 }
 
 gpe_editor_state::~gpe_editor_state()
@@ -202,11 +203,11 @@ void gpe_editor_state::clean_up()
 {
 
 }
-
-void gpe_editor_state::end_state()
-{
-
-}
+
+void gpe_editor_state::end_state()
+{
+
+}
 
 void gpe_editor_state::process_view_mode()
 {
@@ -273,9 +274,9 @@ void gpe_editor_state::render()
     gpe::error_log->log_ms_action("editor_gui_main->render_foreground_engine()",eTicks - sTicks,10 );
 
 }
-
-void gpe_editor_state::start_state()
-{
+
+void gpe_editor_state::start_state()
+{
     main_editor_log->log_general_line("Starting Game Pencil Engine Version "+ stg_ex::float_to_string( gpe::version_number_total )+"...");
 
     if( main_gpe_splash_page != nullptr )
@@ -682,8 +683,8 @@ bool init_gpe_editor( int argc, char* args[] )
 
     gpe::game_runtime->loading_data = false;
     gpe_editor_state * newEditor = new gpe_editor_state( "gpe_editor");
-    gpe::game_runtime->state_add( newEditor );
-    gpe::game_runtime->state_set( newEditor->get_state_name() );
+    gpe::game_runtime->state_add( newEditor );
+    gpe::game_runtime->state_set( newEditor->get_state_name() );
 
     //Opens projects based on args[0] being the application name.
     if( argc > 1)
@@ -721,43 +722,43 @@ bool init_gpe_editor( int argc, char* args[] )
 bool quit_gpe_editor()
 {
     if( pawgui::main_tab_resource_bar!=nullptr)
-    {
+    {
         gpe::error_log->report("Closing all tabs....");
         pawgui::main_tab_resource_bar->close_all_tabs();
     }
     if( main_editor_settings!=nullptr)
-    {
+    {
         gpe::error_log->report("Deleting _settings....");
         main_editor_settings->save_resource();
         delete main_editor_settings;
         main_editor_settings = nullptr;
     }
     if( main_about_page!=nullptr)
-    {
+    {
         gpe::error_log->report("Deleting about page....");
         delete main_about_page;
         main_about_page = nullptr;
     }
     if( main_START_PAGE!=nullptr)
-    {
+    {
         gpe::error_log->report("Deleting start page....");
         delete main_START_PAGE;
         main_START_PAGE = nullptr;
     }
     if( main_EXTRA_TOOLS!=nullptr)
-    {
+    {
         gpe::error_log->report("Deleting extra tools....");
         delete main_EXTRA_TOOLS;
         main_EXTRA_TOOLS = nullptr;
     }
     if( pawgui::main_context_menu!=nullptr)
-    {
+    {
         gpe::error_log->report("Deleting context menu....");
         delete pawgui::main_context_menu;
         pawgui::main_context_menu = nullptr;
     }
     if( main_TOOLBAR_RECENT_PROJECTS!=nullptr)
-    {
+    {
         gpe::error_log->report("Deleting toolbar recent projects....");
         delete main_TOOLBAR_RECENT_PROJECTS;
         main_TOOLBAR_RECENT_PROJECTS = nullptr;
@@ -771,7 +772,7 @@ bool quit_gpe_editor()
     }
 
     if( editor_gui_main!=nullptr)
-    {
+    {
         gpe::error_log->report("Deleting gui....");
         editor_gui_main->save_settings();
         delete editor_gui_main;