CLEANUP

Author: Raais

Makefile.emscripten

@@ -26,8 +26,8 @@ SOURCES += $(FMT_DIR)/src/format.cc
 SOURCES += $(wildcard $(SRC_DIR)/utils/*.cpp)
 SOURCES += $(wildcard $(SRC_DIR)/sources/*.cpp)
 
-SOURCES += $(SRC_DIR)/backend_sdl_emscripten.cpp
-SOURCES += $(SRC_DIR)/main.cpp
+SOURCES += $(SRC_DIR)/main_sdl_emscripten.cpp
+SOURCES += $(SRC_DIR)/main_window.cpp
 
 ##---------------------------------------------------------------------
 
@@ -54,7 +54,7 @@ CPPFLAGS += -DIMGUI_DISABLE_FILE_FUNCTIONS
 
 CPPFLAGS += -DPROJECT_VERSION_STRING="\"$(VERSION)\""
 CPPFLAGS += -DGIT_SHA1="\"$(HASH)\""
-CPPFLAGS += -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends -I$(IMGUI_DIR)/misc/cpp -I$(FMT_DIR)/include -I$(SRC_DIR)/sources
+CPPFLAGS += -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends -I$(IMGUI_DIR)/misc/cpp -I$(FMT_DIR)/include -I$(SRC_DIR)/sources -I$(SRC_DIR)/utils
 CPPFLAGS += -Wall -Wformat -Os $(EMS)
 LDFLAGS += --shell-file shell.html $(EMS)
 

Makefile.unix.old

@@ -1,3 +1,3 @@
 1
 2
-2
+3

VERSION

@@ -8,13 +8,15 @@ file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sources/*.h ${CMAKE_CURREN
 add_executable(${TARGET} WIN32 MACOSX_BUNDLE
     ${SOURCES}
     ${HEADERS}
-    backend_glfw_opengl3.cpp
-    main.cpp
+    main_glfw_opengl3.cpp
+    main_window.cpp
 )
 
 message(STATUS "IMGUI_INCLUDE_DIRS: ${IMGUI_INCLUDE_DIRS}")
 message(STATUS "FMT_INCLUDE_DIRS: ${FMT_INCLUDE_DIRS}")
 
+target_include_directories(${TARGET} PRIVATE SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/sources)
+target_include_directories(${TARGET} PRIVATE SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/utils)
 target_include_directories(${TARGET} PRIVATE SYSTEM ${IMGUI_INCLUDE_DIRS})
 target_include_directories(${TARGET} PRIVATE SYSTEM ${FMT_INCLUDE_DIRS})
 target_include_directories(${TARGET} PRIVATE SYSTEM ${GLFW_INCLUDE_DIR})

src/CMakeLists.txt

@@ -1,9 +1,16 @@
+#include <GLFW/glfw3.h>
 #include "imgui.h"
 #include "imgui_impl_glfw.h"
 #include "imgui_impl_opengl3.h"
 
-#include "includes.h"
-#include "main.h"
+#include "main_window.h"
+
+#ifndef PROJECT_VERSION_STRING
+#define PROJECT_VERSION_STRING "0.0.0"
+#endif
+#ifndef GIT_SHA1
+#define GIT_SHA1 "0000000"
+#endif
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1900) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
 #pragma comment(lib, "legacy_stdio_definitions")
@@ -30,9 +37,8 @@ int main(int argc, char *argv[])
         }
     }
 
-    State state;
-    state.gui.bw.objects.reserve(2048);
-    state.rng.seed(time(NULL));
+    ImStudio::GUI gui;
+    gui.bw.objects.reserve(2048);
 
     glfwSetErrorCallback(glfw_error_callback);
     if (!glfwInit())
@@ -75,14 +81,14 @@ int main(int argc, char *argv[])
     ImGui_ImplGlfw_InitForOpenGL(glwindow, true);
     ImGui_ImplOpenGL3_Init(glsl_version);
 
-    while ((!glfwWindowShouldClose(glwindow)) && (state.gui.state))
+    while ((!glfwWindowShouldClose(glwindow)) && (gui.state))
     {
         glfwPollEvents();
         ImGui_ImplOpenGL3_NewFrame();
         ImGui_ImplGlfw_NewFrame();
         ImGui::NewFrame();
 
-        MainWindowGUI(state);
+        MainWindowGUI(gui);
 
         ImGui::Render();
         int display_w, display_h;

src/includes.h

@@ -6,8 +6,7 @@
 #include <SDL.h>
 #include <SDL_opengles2.h>
 
-#include "includes.h"
-#include "main.h"
+#include "main_window.h"
 
 SDL_Window *g_Window = NULL;
 SDL_GLContext g_GLContext = NULL;
@@ -16,9 +15,8 @@ static void main_loop(void *);
 
 int main(int, char **)
 {
-    State state;
-    state.gui.bw.objects.reserve(2048);
-    state.rng.seed(time(NULL));
+    ImStudio::GUI gui;
+    gui.bw.objects.reserve(2048);
 
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) != 0)
     {
@@ -58,7 +56,7 @@ int main(int, char **)
     ImGui_ImplOpenGL3_Init(glsl_version);
 
     /////////////////////////////////////////////////////////
-    emscripten_set_main_loop_arg(main_loop, &state, 0, true);
+    emscripten_set_main_loop_arg(main_loop, &gui, 0, true);
     /////////////////////////////////////////////////////////
 }
 
@@ -74,8 +72,8 @@ static void main_loop(void *arg)
     ImGui::NewFrame();
 
     ImGuiIO &io = ImGui::GetIO();
-    State &state = *(State *)arg;
-    MainWindowGUI(state);
+    ImStudio::GUI &gui = *(ImStudio::GUI *)arg;
+    MainWindowGUI(gui);
 
     ImGui::Render();
     SDL_GL_MakeCurrent(g_Window, g_GLContext);

src/main.h

@@ -1,4 +1,4 @@
-#include "main.h"
+#include "main_window.h"
 
 void MainWindowStyle()
 {
@@ -57,19 +57,15 @@ void MainWindowStyle()
 
 }
 
-void MainWindowGUI(State & state)
+void MainWindowGUI(ImStudio::GUI & gui_r)
 {
 
     //////////////////////////////////
-    ImStudio::GUI &gui = state.gui;
-    std::mt19937 &rng = state.rng;
+    ImStudio::GUI &gui = gui_r;
     ImGuiIO &io = ImGui::GetIO();
 
     static int w_w = io.DisplaySize.x;
     static int w_h = io.DisplaySize.y;
-
-    std::uniform_int_distribution<int>
-        gen(999, 9999);
     //////////////////////////////////
 
     ImGui::SetNextWindowPos(ImVec2(0, 0));
@@ -98,7 +94,7 @@ void MainWindowGUI(State & state)
                 // create-viewport
                 gui.vp_P = ImVec2(gui.sb_S.x, gui.mb_S.y);
                 gui.vp_S = ImVec2(gui.pt_P.x - gui.sb_S.x, w_h - gui.mb_S.y);
-                if (gui.viewport) gui.ShowViewport(gen(rng));
+                if (gui.viewport) gui.ShowViewport();
 
             }
         }
@@ -129,7 +125,7 @@ void MainWindowGUI(State & state)
         // create-viewport
         gui.vp_P = ImVec2(gui.sb_S.x, gui.mb_S.y);
         gui.vp_S = ImVec2(gui.pt_P.x - gui.sb_S.x, w_h - gui.mb_S.y);
-        if (gui.viewport) gui.ShowViewport(gen(rng));
+        if (gui.viewport) gui.ShowViewport();
     }
 
     { // create-children

src/backend_glfw_opengl3.cpp renamed to src/main_glfw_opengl3.cpp

@@ -0,0 +1,8 @@
+#pragma once
+
+#include "ims_object.h"
+#include "ims_buffer.h"
+#include "ims_gui.h"
+
+void MainWindowStyle();
+void MainWindowGUI(ImStudio::GUI & gui);

src/backend_sdl_emscripten.cpp renamed to src/main_sdl_emscripten.cpp

@@ -1,8 +1,6 @@
-#include "../includes.h"
-#include "buffer.h"
-#include "object.h"
+#include "ims_buffer.h"
 
-void ImStudio::BufferWindow::drawall(int *select, int gen_rand)
+void ImStudio::BufferWindow::drawall(int *select)
 {
     if (state)
     {
@@ -33,7 +31,7 @@ void ImStudio::BufferWindow::drawall(int *select, int gen_rand)
                 {
                     if (o.type != "child")
                     {
-                        o.draw(select, gen_rand, staticlayout);
+                        o.draw(select, staticlayout);
                     }
                     else
                     {
@@ -43,7 +41,7 @@ void ImStudio::BufferWindow::drawall(int *select, int gen_rand)
                             o.child.init  = true;
                         }
 
-                        o.child.drawall(select, gen_rand, staticlayout);
+                        o.child.drawall(select, staticlayout);
                     }
                 }
             }