Optimized the website code

roma160 · Jul 11, 2023 · d44f027 · d44f027
1 parent 0605f05
commit d44f027
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 13 deletions.
diff --git a/emscripten/include/field.h b/emscripten/include/field.h
@@ -62,6 +62,7 @@ class Field {
     bool show_edge_weights = true;
     bool show_only_selected_edges = false;
     bool show_actual_distance = false;
+    bool is_dark_theme_selected;
 
     string debug_message;
 

diff --git a/emscripten/include/main.h b/emscripten/include/main.h
@@ -10,13 +10,17 @@
 #define FIXED_WINDOW_FLAGS ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBackground
 #define FIXED_ALGORITHM_WINDOW_WIDTH 300
 
+#ifdef EMSCRIPTEN_CODE
+#define DELTA_TICKS 25
+#else
 #define DELTA_TICKS 29
+#endif
 
 namespace global {
-    static bool isDarkTheme = true;
+    static bool isDarkTheme;
 
-    void setDarkTheme();
-    void setLightTheme();
+    void setDarkTheme(bool ignore_current = false);
+    void setLightTheme(bool ignore_current = false);
 };
 
 //#define EMSCRIPTEN_CODE
diff --git a/emscripten/main.cpp b/emscripten/main.cpp
@@ -57,8 +57,8 @@ static void MainLoopForEmscripten()     { MainLoopForEmscriptenP(); }
 
 ImVec4 clear_color;
 
-void global::setDarkTheme() {
-    if(global::isDarkTheme) return;
+void global::setDarkTheme(bool ignore_current) {
+    if(!ignore_current && global::isDarkTheme) return;
 
     clear_color = ImVec4(0.45f, 0.55f, 0.60f, .00f);
     ImGui::StyleColorsDark();
@@ -70,8 +70,8 @@ void global::setDarkTheme() {
     global::isDarkTheme = true;
 }
 
-void global::setLightTheme() {
-    if(!global::isDarkTheme) return;
+void global::setLightTheme(bool ignore_current) {
+    if(!ignore_current && !global::isDarkTheme) return;
 
     clear_color = ImVec4(1.f, 1.f, 1.f, 1.f);
 	ImGui::StyleColorsLight();
@@ -216,9 +216,15 @@ int main(int argc, char* argv[])
 
     // Styling the window
     #ifndef EMSCRIPTEN_CODE
-    global::setDarkTheme();
+    if(args_set.count("--light"))
+        global::setLightTheme(true);
+    else
+        global::setDarkTheme(true);
     #else
-    global::setLightTheme();
+    if(args_set.count("--dark"))
+        global::setDarkTheme(true);
+    else
+        global::setLightTheme(true);
     #endif
 
     // GRAPH DATA
@@ -233,7 +239,7 @@ int main(int argc, char* argv[])
     #endif
 
     // Main loop
-#ifdef __EMSCRIPTEN__
+#ifdef EMSCRIPTEN_CODE
     emscripten_log(EM_LOG_CONSOLE, "The main loop definition begin!");
 #endif
 

diff --git a/emscripten/src/field.cpp b/emscripten/src/field.cpp
@@ -42,7 +42,9 @@ void Field::FGraph::clear_annotations() {
 }
 
 
-Field::Field(float cell_size, Vec2 bounds): cell_size(cell_size), bounds(bounds), graphs() {}
+Field::Field(float cell_size, Vec2 bounds): 
+    cell_size(cell_size), bounds(bounds), graphs(),
+    is_dark_theme_selected(global::isDarkTheme) {}
 
 pair<int, int> Field::get_field_index(const Vec2& point) const {
     return {
@@ -301,7 +303,6 @@ void Field::display_window(){
         ImGui::SameLine();
         ImGui::Checkbox("Bounds", &bound_forces);
 
-        static bool is_dark_theme_selected = global::isDarkTheme;
         ImGui::SameLine();
         if(ImGui::Checkbox("Use dark theme", &is_dark_theme_selected)) {
             if (is_dark_theme_selected) {

diff --git a/svelte/src/lib/index.html b/svelte/src/lib/index.html
@@ -11,6 +11,7 @@
 			#canvas {
 				left: 0;
 				top: 0;
+				width: 100%;
 			}
 
 			html, body {

diff --git a/svelte/src/lib/main.js b/svelte/src/lib/main.js
diff --git a/svelte/src/lib/main.wasm b/svelte/src/lib/main.wasm