Scaling issue fix

Author: Sekqies

devlog.md

@@ -1,22 +0,0 @@
-The complex function plotter is done!
-
-A little bit of personal lore here: I made another complex function plotter four years ago, when I was still in highschool. It was clunky, but worked fine enough. Still, I felt it missed some things, which led me to work on this project. 
-Now, I have accomplished all things I have set out to do. Bugfixes aside, I believe I can put this project to rest now.
-
-First, I worked on making the high precision plots reactive. They take a while to render, so having them shut down the main thread while the user waits on a blank screen isn't very fun. Now, each thread updates the canvas for every pixel they render. This allows the user to see the progress being made!
-Also, some reconfigurations were needed in the web version, since the browser needs special permissions to run Web Workers (the equivalent to threads for browsers)
-
-Then, some quality of life changes: I added an amortization factor so the graph takes longer to converge to white (and black), and fixed a parsing mistake one of my beta testers caught. 
-
-Finally, documentation and benchmarking! I could always tell this tool was _fast_, but never _how fast_. I took upon myself to benchmark my own tool, and some other project's (since they are opensource, I can manually modify the code to do so). The result were great: this project outperforms everything else by a factor of 50.
-
-And that's it for now folks! 
-
-Attached, our high precision plotting in real time!
-
-**Commits**
-[9dd1515](https://url.jam06452.uk/3yqc6h): Async image generation
-[4266aaa](https://url.jam06452.uk/c71kuv): Add threading for web version
-[ded05c1](https://url.jam06452.uk/gvwf7p): Update documentation and perform benchmarking
-[2e32e99](https://url.jam06452.uk/zgmyyg): Fixed issue where expressions with negations would be evaluated incorrectly
-[2e10128](https://url.jam06452.uk/1rzb8g3): Fixed issue where moving the screen would cause the high precision plot to shift as well.

src/graphics/ui.cpp

@@ -440,7 +440,11 @@ void render_and_update(FunctionState& state, ViewState& view_state, unsigned int
             ImGui::EndPopup();
         }
     }
+    ImVec2 main_pos = ImGui::GetWindowPos();
+    ImVec2 main_size = ImGui::GetWindowSize();
+    ImVec2 side_spawn_pos = ImVec2(main_pos.x + main_size.x + 15.0f, main_pos.y);
     if (view_state.is_high_precision) {
+        ImGui::SetNextWindowPos(side_spawn_pos, ImGuiCond_Appearing);
         ImGui::Begin("High Precision Render", &view_state.is_high_precision, ImGuiWindowFlags_AlwaysAutoResize);
         if (view_state.hp_texture != 0) {
             ImGui::Text("Resolution: %dx%d", view_state.hp_width, view_state.hp_height);
@@ -468,10 +472,12 @@ void render_and_update(FunctionState& state, ViewState& view_state, unsigned int
         else {
             ImGui::Text("Initializing...");
         }
+        side_spawn_pos.y += ImGui::GetWindowSize().y + 15.0f;
         ImGui::End(); 
     }
     if (view_state.is_3d) {
-        ImGui::Begin("3D Settings");
+        ImGui::SetNextWindowPos(side_spawn_pos, ImGuiCond_Appearing);
+        ImGui::Begin("3D Settings",nullptr, ImGuiWindowFlags_AlwaysAutoResize);
         ImGui::Text("Height = ");
         if (ImGui::IsItemHovered()) ImGui::SetTooltip("Height function. 'z' evaluates on the output of f(z). Defaults to mag(z).");
         ImGui::SameLine();
@@ -491,7 +497,7 @@ void render_and_update(FunctionState& state, ViewState& view_state, unsigned int
             state.needs_height_reparse = true;
         }
         ImGui::Spacing();
-        if (UI::CollapsingHeader("Camera Settings"), nullptr, ImGuiWindowFlags_AlwaysAutoResize) {
+        if (UI::CollapsingHeader("Camera Settings")) {
             ImGui::Text("Camera Mode:");
             ImGui::SameLine();
 

src/graphics/ui_init.cpp

@@ -11,24 +11,35 @@
 
 
 void init_imgui(GLFWwindow* window) {
-	IMGUI_CHECKVERSION();
-	ImGui::CreateContext();
-	ImGuiIO& io = ImGui::GetIO();
-	io.FontGlobalScale = 2.0f;
-	io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
-	io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
-	io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
-	ImGui_ImplGlfw_InitForOpenGL(window, true);
+    IMGUI_CHECKVERSION();
+    ImGui::CreateContext();
+    ImGuiIO& io = ImGui::GetIO();
+    float xscale = 1.0f;
+    float yscale = 1.0f;
+
 #ifdef __EMSCRIPTEN__
+    xscale = emscripten_get_device_pixel_ratio();
+#else
+    glfwGetWindowContentScale(window, &xscale, &yscale);
+#endif
+    io.FontGlobalScale = xscale; 
 
-	emscripten_browser_clipboard::paste([](std::string&& paste_data, void* callback_data) {
-		clip_content = std::move(paste_data);
-		just_pasted = true;
-		}, nullptr); 
-	
-	ImGui_ImplOpenGL3_Init("#version 300 es");
+    //ImGui::GetStyle().ScaleAllSizes(xscale); 
+
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
+    io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+    ImGui_ImplGlfw_InitForOpenGL(window, true);
+
+#ifdef __EMSCRIPTEN__
+    emscripten_browser_clipboard::paste([](std::string&& paste_data, void* callback_data) {
+        clip_content = std::move(paste_data);
+        just_pasted = true;
+        }, nullptr); 
+    
+    ImGui_ImplOpenGL3_Init("#version 300 es");
 #else
-	ImGui_ImplOpenGL3_Init();
+    ImGui_ImplOpenGL3_Init();
 #endif
 }
 

src/index.html

@@ -77,11 +77,6 @@ <h2>Loading...</h2>
         if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
         console.error(text);
       },
-      setCanvasSize: function(width, height, noRepaint) {
-    const dpr = window.devicePixelRatio || 1;
-    this.canvas.width = width * dpr;
-    this.canvas.height = height * dpr;
-  },
       onRuntimeInitialized: function() {
         document.getElementById('loading-overlay').style.display = 'none';
         canvas.focus();

src/shaders/embedded_shaders.h

@@ -356,6 +356,8 @@ uniform float time;
 uniform bool show_grid;
 uniform bool warp_grid;
 
+const float gamma_correction_constant = 0.65;
+
 #define END_UNIFORM_DECLARATIONS HERE
 
 #define FUNCTION_DEFINITIONS HERE
@@ -681,13 +683,13 @@ void main(){
     vec2 z = convert_coordinates(gl_FragCoord.xy,u_resolution,u_range) + shift;
     
     #define INTERPRETER_ASSIGNEMENT HERE
-    vec2 func_value = run_stack(operator_stack,constant_stack,z);
-    func_value = clamp(func)shdr" R"shdr(_value, -1e38, 1e38);
+    vec2 func_value = run_stack(operator_stack)shdr" R"shdr(,constant_stack,z);
+    func_value = clamp(func_value, -1e38, 1e38);
     #define END_INTERPRETER_ASSIGNEMENT HERE
     
     #define INJECTION_POINT HERE
     
-    vec3 hsl = domain_color(func_value,0.5);
+    vec3 hsl = domain_color(func_value,gamma_correction_constant);
 
     if(show_grid){
         vec2 target = z;

src/shaders/plotter.frag

@@ -40,6 +40,8 @@ uniform float time;
 uniform bool show_grid;
 uniform bool warp_grid;
 
+const float gamma_correction_constant = 0.65;
+
 #define END_UNIFORM_DECLARATIONS HERE
 
 #define FUNCTION_DEFINITIONS HERE
@@ -371,7 +373,7 @@ void main(){
 
     #define INJECTION_POINT HERE
 
-    vec3 hsl = domain_color(func_value,0.5);
+    vec3 hsl = domain_color(func_value,gamma_correction_constant);
 
     if(show_grid){
         vec2 target = z;