develop by skmp · Pull Request #2 · nilware-io/orgasm

skmp · 2026-03-27T09:11:57Z

No description provided.

… update GraphBuilder to handle parsed arguments

…or nodes

- Created IEditorPane interface in editor_pane.h to unify editor pane functionality. - Updated Editor1Pane and Editor2Pane to implement IEditorPane, ensuring consistent method signatures for loading, drawing, and state checks. - Added TabState struct to manage editor pane instances, providing convenience accessors for loaded state and file paths. - Enhanced Editor2Pane to inherit from IEditorPane, aligning it with the new architecture.

…Pane

…Assembler

- docs/instructions.md: Guide covering build system, architectural layers, instrument anatomy, audio callback patterns, and codebase conventions - docs/names.md: Naming philosophy and guidelines for the project - README.md: Link new docs from the Instructions section

Copilot

Pull request overview

This PR modernizes the attoflow editor by replacing the legacy monolithic editor with a layered Editor2 architecture built around GraphBuilder (observer-driven model) and a reusable VisualEditor canvas interaction layer, plus extensive accompanying documentation.

Changes:

Introduces GraphBuilder + editor observer interfaces and migrates the editor UI to FlowEditorWindow + Editor2Pane + VisualEditor.
Adds a dedicated nets view (NetsEditor) and shared selection state across panes/tabs.
Embeds Liberation Mono for ImGui and adds a large documentation suite describing architecture, style, patterns, and format rules.

Reviewed changes

Copilot reviewed 42 out of 45 changed files in this pull request and generated 11 comments.

Show a summary per file

File	Description
src/legacy/editor1.h	Adds legacy Editor1 pane header in `legacy/` for compatibility/transition.
src/attoflow/window.h	New top-level window class API (tabs, build/run, child process mgmt).
src/attoflow/visual_editor.h	New reusable canvas interaction base class (pan/zoom/hover/drag/wire ops).
src/attoflow/visual_editor.cpp	Implements canvas drawing + interactions (selection, dragging, wire drag/grab).
src/attoflow/tooltip_renderer.h	Declares tooltip render helpers for pins/nodes/wires.
src/attoflow/tooltip_renderer.cpp	Implements tooltip content for pins, node body, and wire info.
src/attoflow/tab.h	Defines per-tab state to hold `GraphBuilder`, shared editor state, and pane instance.
src/attoflow/sdl_imgui_window.h	Switches to embedded Liberation Mono font and DPI-aware font rebuilding.
src/attoflow/node_renderer.h	Declares rendering + hit-testing primitives and hover item types.
src/attoflow/nets_editor.h	Adds a nets-focused editor pane built on `VisualEditor`.
src/attoflow/nets_editor.cpp	Implements nets layout/rendering + hover highlighting in a baseline-style view.
src/attoflow/main.cpp	Updates entry include to use the new `window.h` entry point.
src/attoflow/fonts/LICENSE-LiberationFonts	Adds font license for Liberation fonts.
src/attoflow/editor_style.h	Adds centralized editor style constants (`Editor2Style`, global `S`).
src/attoflow/editor_style.cpp	Defines default values for `Editor2Style` and instantiates global `S`.
src/attoflow/editor_pane.h	Introduces `IEditorPane` interface for pluggable panes per tab.
src/attoflow/editor2.h	Declares Editor2 pane, per-item editor impls, and wire connection hooks.
src/attoflow/editor2.cpp	Implements Editor2 rendering, hover, wire rebuild, connect/disconnect/delete logic.
src/attoflow/editor.h	Removes the legacy monolithic editor window/header.
src/attoflow/atto_editor_shared_state.h	Adds shared selection state used across panes.
src/atto/node_types.h	Adds `NodeTypeID::Error` descriptor entry.
src/atto/graph_editor_interfaces.h	Adds editor observer interfaces (`IGraphEditor`, `INodeEditor`, etc.).
src/atto/graph_builder.h	Adds the GraphBuilder model (entries/pins/sentinels, batching, observer hooks).
src/atto/args.h	Adds `split_args` API and clarifies legacy wrapper comment.
src/atto/args.cpp	Implements `split_args` tokenizer/splitting logic for arg strings.
scenes/klavier/main.atto	Updates shadow expr nodes to encode return types inline (folding `->` nodes).
docs/thinking.md	New design/philosophy write-up for major project decisions.
docs/style.md	New comprehensive code + visual style guide.
docs/patterns.md	New catalog of recurring design patterns used throughout the codebase.
docs/names.md	New naming philosophy and naming history document.
docs/differential.md	New document on incremental/differential concepts across the system.
docs/coding.md	New C++ coding conventions and repository practices guide.
docs/changelog.md	New project evolution and milestone changelog.
docs/attolang.md	Updates language spec sections (inline args, bang semantics, file format details).
docs/architecture.md	New high-level architecture overview and subsystem breakdown.
README.md	Adds pointers to the new documentation suite.
CMakeLists.txt	Adds `graph_builder.cpp` to core library and generates embedded font header for editor build.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-27T09:19:57Z

+// Find which visual input pin of dst_node receives this net entry, using VisualPinMap
+static int find_dest_input_pin(const VisualPinMap& vpm, const BuilderEntryPtr& net_entry) {
+    for (int i = 0; i < (int)vpm.inputs.size(); i++) {
+        auto& pin = vpm.inputs[i];
+        if (!pin.arg) continue;


This helper appears unused in this TU, which can trip -Werror=unused-function builds. Either remove it or use it for destination pin lookup.

Copilot · 2026-03-27T09:19:58Z

+        ImVec2 label_sz = ImGui::CalcTextSize(net_id.c_str());
+        float label_w = label_sz.x * canvas_zoom_ * 0.8f / ImGui::GetFontSize() * ImGui::GetFontSize();
+        // Simpler: just use a fixed estimate
+        float label_half = (label_sz.x * zoom * 0.8f + 6.0f) * 0.5f;
+        float label_cx = label_x + label_half;


label_w / label_cx are computed but never used, which can trigger unused-variable warnings. Either remove them or use them in the label-gap computation.

Copilot · 2026-03-27T09:19:58Z

+    // Remove from net's destinations if this is a dest pin
+    auto node = pin->node();
+    auto& dests = net->destinations();
+    dests.erase(std::remove_if(dests.begin(), dests.end(),
+        [&](auto& w) { return w.lock() == node; }), dests.end());


This removal always treats the pin as a destination (destinations() entry). If the disconnected pin is an output/source pin, you need to clear net->source() instead; otherwise the net is left with a stale source. Use the pos parameter (or equivalent) to branch.

Suggested change

// Remove from net's destinations if this is a dest pin

auto node = pin->node();

auto& dests = net->destinations();

dests.erase(std::remove_if(dests.begin(), dests.end(),

[&](auto& w) { return w.lock() == node; }), dests.end());

// Update net endpoints based on pin position

auto node = pin->node();

if (pos == PortPosition2::Output) {

// Disconnecting a source/output pin: clear the net's source

net->source({});

} else {

// Disconnecting a destination/input pin: remove from destinations

auto& dests = net->destinations();

dests.erase(std::remove_if(dests.begin(), dests.end(),

[&](auto& w) { return w.lock() == node; }), dests.end());

}

Copilot · 2026-03-27T09:19:58Z

+                    // Remove this node from the net's destinations
+                    auto node = pin->node();
+                    auto& dests = net->destinations();
+                    dests.erase(std::remove_if(dests.begin(), dests.end(),
+                        [&](auto& w) { return w.lock() == node; }), dests.end());
+


This code always removes the pin’s node from net->destinations(). Deleting/disconnecting an output/source pin should clear net->source() instead (and keep the net consistent), otherwise the net retains a stale source.

Suggested change

// Remove this node from the net's destinations

auto node = pin->node();

auto& dests = net->destinations();

dests.erase(std::remove_if(dests.begin(), dests.end(),

[&](auto& w) { return w.lock() == node; }), dests.end());

auto node = pin->node();

auto& dests = net->destinations();

auto& src = net->source();

// If this node is the net's source, clear the source; otherwise, remove it from destinations

if (src.lock() == node) {

src.reset();

} else {

dests.erase(std::remove_if(dests.begin(), dests.end(),

[&](auto& w) { return w.lock() == node; }), dests.end());

}

Copilot · 2026-03-27T09:19:59Z

+
+// ─── Wire rebuilding ───
+
+void Editor2Pane::rebuild_wires(ImVec2 canvas_origin) {


rebuild_wires() always clears and rebuilds cached_wires_ even though the class tracks wires_dirty_. Consider early-returning when !wires_dirty_ (and only setting dirty via observer callbacks / on_nodes_moved) to avoid rebuilding wires every frame.

Suggested change

void Editor2Pane::rebuild_wires(ImVec2 canvas_origin) {

void Editor2Pane::rebuild_wires(ImVec2 canvas_origin) {

if (!wires_dirty_)

return;

Copilot · 2026-03-27T09:19:59Z

+            paren_depth--;
+            if (paren_depth < 0)
+                return std::string("Mismatched ')' at position " + std::to_string(i));
+            current += c;


split_args builds error strings using std::string("...") around an expression that starts with a string literal plus std::to_string(...). This is invalid C++ (const char* + std::string) and will not compile. Build the message with std::string("...") + std::to_string(...) (and similarly for the "Unclosed" cases).

Copilot · 2026-03-27T09:19:59Z

+            brace_depth--;
+            if (brace_depth < 0)
+                return std::string("Mismatched '}' at position " + std::to_string(i));
+            current += c;


This error return uses std::string("...") around a const char* + std::string expression, which is invalid C++. Build the message as std::string("...") + std::to_string(i) (or similar).

Copilot · 2026-03-27T09:20:00Z

+    if (paren_depth > 0)
+        return std::string("Unclosed '(' — " + std::to_string(paren_depth) + " level(s) deep");
+    if (brace_depth > 0)
+        return std::string("Unclosed '{' — " + std::to_string(brace_depth) + " level(s) deep");


These Unclosed error returns use the same invalid const char* + std::string concatenation pattern and won’t compile. Construct the string via std::string(...) + ... (or ostringstream).

Copilot · 2026-03-27T09:20:00Z

+    // Re-add to net's destinations
+    auto net = grab_undo_.old_entry ? grab_undo_.old_entry->as_net() : nullptr;
+    if (net) {
+        net->destinations().push_back(pin->node());


do_reconnect_pin always pushes pin->node() into net->destinations(). If the pin being reconnected is an output/source pin, the correct restore action is to set net->source() back to the node, not add it as a destination.

Suggested change

// Re-add to net's destinations

auto net = grab_undo_.old_entry ? grab_undo_.old_entry->as_net() : nullptr;

if (net) {

net->destinations().push_back(pin->node());

// Re-add to net's destinations, but avoid adding the source node as a destination

auto net = grab_undo_.old_entry ? grab_undo_.old_entry->as_net() : nullptr;

if (net) {

auto node = pin->node();

if (node) {

auto src = net->source().lock();

if (!src || src != node) {

net->destinations().push_back(node);

}

}

Copilot · 2026-03-27T09:20:00Z

+            int source_pin = 0;
+
+            if (auto net = entry->as_net()) {
+                if (net->is_the_unconnected()) continue;
+                auto src_ptr = net->source().lock();


source_pin is initialized to 0, but output index 0 is a valid value. Using if (source_pin == 0) as a “not found” check is ambiguous; initialize to -1 and check source_pin < 0 instead.

Podcast

skmp added 30 commits March 25, 2026 22:38

first steps for graphbuilder

a937964

argument parsing changes: add split_args and parse_args_v2 functions,…

b1dea6f

… update GraphBuilder to handle parsed arguments

Initials steps for graphbuilder

9ff34c6

more graphbuilder work

4772975

Cleanups

12d455c

more graphbuilder work

022c4a4

work on nets and nodes

d0c9eb1

args2 to graphbuilder

2e7b6c5

more net work

28bcd4c

Editor2Pane!

a7a7e00

Folding

925b808

attolang.md update

099e443

towards editor2

bf4d01f

not perfect, but progress is progress

fb3d96d

towards lambda link rendering

4120050

lambda grab rendering

3d66499

Cleanup node_types2.h

25cd373

node drawing: add side-bang and lambda grab only for flow nodes

1855ab5

better output mappings

db492f7

better imports

21a2eab

Add special handling for label and error nodes in editor rendering

d2482e2

Add initial value support to decl_var input ports

fe361ca

editor2: pin hovers

a2a0654

editor2: move styles out

7a73090

editor2: PinMapping

3d7904a

optionals are indeed optionals now

0522f0f

Split input_ports_optional

1768a5c

hover on + pin.

789589e

optionally scaled tooltips

f4fb025

Increase default font size a bit

596bbcf

skmp added 20 commits March 26, 2026 22:19

Extract tooltip rendering functionality and style management for edit…

0f5ca5c

…or nodes

editor->window.cpp/h

f296f08

Remove / #if LEGACY_EDITOR editor1

9de4f08

shift/alt + scroll = x/y pan

a53d8a5

further decoulping refactors

7dd3656

move editor1 to legacy folder

722a591

nets_editor concept

5838b34

Add scroll pan speed to Editor2Style and update canvas panning logic

84dc2da

fix: shorten node ids

2aaa7f4

in atto:0 import remove unconnected nets and replace with $unconnected

27617c5

implement wire connection functionality in Editor2Pane and VisualEditor

5702ccf

Add functionality to delete hovered items in VisualEditor and Editor2…

f7bb2b7

…Pane

Merge branch 'rewrite'

80bbd17

1Merge branch 'skmp/rewrite'

12b9747

Merge branch 'skmp/wirring-and-networking'

ec9f709

Add documentation

f33a0be

Merge branch 'skmp/docs' into develop

073fe5b

Add comprehensive instructions and naming guidelines for the Organic …

6bb8d6c

…Assembler

Copilot AI review requested due to automatic review settings March 27, 2026 09:11

skmp changed the title ~~Develop~~ develop Mar 27, 2026

Copilot started reviewing on behalf of skmp March 27, 2026 09:12 View session

Copilot AI reviewed Mar 27, 2026

View reviewed changes

skmp added 4 commits March 27, 2026 11:59

Add introductory documentation for the Organic Assembler

26f9eef

Add introductory podcast and notes for the Organic Assembler

04bd88e

Merge pull request #3 from nilware-io/podcast

b7d0d56

Podcast

Add podcast file for "Growing Instruments with the Organic Assembler"

7f97ed6

skmp merged commit 67f6b15 into main Mar 27, 2026
0 of 2 checks passed

skmp deleted the develop branch March 27, 2026 15:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

develop#2

develop#2
skmp merged 96 commits intomainfrom
develop

skmp commented Mar 27, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants


		// ─── Wire rebuilding ───

		void Editor2Pane::rebuild_wires(ImVec2 canvas_origin) {

Conversation

skmp commented Mar 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants