misc

Author: koppi

src/gui.cpp

@@ -270,26 +270,103 @@ void gui_draw(Synth *synth, SDL_Window *window, SDL_GLContext gl_context,
 
     // ADSR Envelope
     if (ImGui::CollapsingHeader("ADSR Envelope", ImGuiTreeNodeFlags_DefaultOpen)) {
-        // Single column layout - Attack, Decay, Sustain, Release stacked vertically
+        // 4x1 layout with envelope visualization
+        ImGui::Columns(5, "adsr_columns", true); // 4 parameters + 1 for envelope visualization
+        
+        // Attack column
         ImGui::Text("Attack");
         if (ImGui::SliderFloat("##adsrattack", &synth->adsr.attack, 0.001f, 5.0f, "%.3f s", 0)) {
             synth_set_param(synth, "adsr.attack", synth->adsr.attack);
         }
+        ImGui::NextColumn();
 
+        // Decay column
         ImGui::Text("Decay");
         if (ImGui::SliderFloat("##adsrdecay", &synth->adsr.decay, 0.001f, 5.0f, "%.3f s", 0)) {
             synth_set_param(synth, "adsr.decay", synth->adsr.decay);
         }
+        ImGui::NextColumn();
 
+        // Sustain column
         ImGui::Text("Sustain");
         if (ImGui::SliderFloat("##adsrsustain", &synth->adsr.sustain, 0.0f, 1.0f, "%.2f", 0)) {
             synth_set_param(synth, "adsr.sustain", synth->adsr.sustain);
         }
+        ImGui::NextColumn();
 
+        // Release column
         ImGui::Text("Release");
         if (ImGui::SliderFloat("##adsrrelease", &synth->adsr.release, 0.001f, 10.0f, "%.3f s", 0)) {
             synth_set_param(synth, "adsr.release", synth->adsr.release);
         }
+        ImGui::NextColumn();
+        
+        // Envelope visualization column
+        ImGui::Text("Envelope");
+        ImDrawList* draw_list = ImGui::GetWindowDrawList();
+        ImVec2 canvas_pos = ImGui::GetCursorScreenPos();
+        ImVec2 canvas_size = ImVec2(120, 80); // Fixed size for envelope display
+        
+        // Draw background
+        ImVec2 bg_end = ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y);
+        draw_list->AddRectFilled(canvas_pos, bg_end, IM_COL32(20, 25, 35, 255));
+        draw_list->AddRect(canvas_pos, bg_end, IM_COL32(100, 100, 120, 255));
+        
+        // Calculate envelope curve points
+        const int num_points = 100;
+        float total_time = synth->adsr.attack + synth->adsr.decay + synth->adsr.release + 1.0f; // Add 1 second for sustain phase
+        float max_time = fmaxf(total_time, 2.0f); // At least 2 seconds for display
+        
+        // Calculate envelope points and clip to canvas bounds
+        ImVec2 points[num_points];
+        int valid_points = 0;
+        
+        for (int i = 0; i < num_points; i++) {
+            float t = (float)i / (float)(num_points - 1) * max_time;
+            float amplitude = 0.0f;
+            
+            if (t < synth->adsr.attack) {
+                // Attack phase: linear ramp from 0 to 1
+                amplitude = t / synth->adsr.attack;
+            } else if (t < synth->adsr.attack + synth->adsr.decay) {
+                // Decay phase: exponential decay from 1 to sustain
+                float decay_progress = (t - synth->adsr.attack) / synth->adsr.decay;
+                amplitude = 1.0f - (1.0f - synth->adsr.sustain) * decay_progress;
+            } else if (t < synth->adsr.attack + synth->adsr.decay + 1.0f) {
+                // Sustain phase: constant
+                amplitude = synth->adsr.sustain;
+            } else {
+                // Release phase: exponential decay from sustain to 0
+                float release_progress = (t - synth->adsr.attack - synth->adsr.decay - 1.0f) / synth->adsr.release;
+                amplitude = synth->adsr.sustain * (1.0f - release_progress);
+            }
+            
+            // Calculate screen position and clip to canvas bounds
+            float x = canvas_pos.x + (float)i / (float)(num_points - 1) * canvas_size.x;
+            float y = canvas_pos.y + canvas_size.y - amplitude * canvas_size.y;
+            
+            // Clamp coordinates to canvas bounds
+            x = fmaxf(canvas_pos.x, fminf(x, canvas_pos.x + canvas_size.x));
+            y = fmaxf(canvas_pos.y, fminf(y, canvas_pos.y + canvas_size.y));
+            
+            points[i] = ImVec2(x, y);
+            valid_points++;
+        }
+        
+        // Draw clipped polyline using the calculated points
+        if (valid_points > 1) {
+            draw_list->AddPolyline(points, valid_points, IM_COL32(100, 255, 100, 255), 0, 2.0f);
+        }
+        
+        // Draw phase labels
+        draw_list->AddText(ImVec2(canvas_pos.x + 2, canvas_pos.y + 2), IM_COL32(180, 180, 200, 255), "A");
+        draw_list->AddText(ImVec2(canvas_pos.x + canvas_size.x / 4 + 2, canvas_pos.y + canvas_size.y - 15), IM_COL32(180, 180, 200, 255), "D");
+        draw_list->AddText(ImVec2(canvas_pos.x + canvas_size.x / 2 + 2, canvas_pos.y + canvas_size.y - 15), IM_COL32(180, 180, 200, 255), "S");
+        draw_list->AddText(ImVec2(canvas_pos.x + 3 * canvas_size.x / 4 + 2, canvas_pos.y + canvas_size.y - 15), IM_COL32(180, 180, 200, 255), "R");
+        
+        ImGui::Dummy(canvas_size); // Reserve space for the drawing
+        
+        ImGui::Columns(1, "", false);
 
         // Preset buttons
         ImGui::Separator();