diff --git a/.github/workflows/ui-smoke.yml b/.github/workflows/ui-smoke.yml index bb7ef5fed..0dc7e03a5 100644 --- a/.github/workflows/ui-smoke.yml +++ b/.github/workflows/ui-smoke.yml @@ -87,6 +87,8 @@ jobs: run: python tests/pages_v54_wire_fx_context_smoke.py - name: Verify V55 accepted WIRE paint and fader depth run: python tests/pages_v55_context_wire_fader_smoke.py + - name: Verify V58 quiet folded MAIN, graphite default OUT and selected-only WIRE + run: python tests/pages_wire_v57_selected_main_dot_impact_smoke.py - name: Verify original metallic asset and standalone synchronization run: python tests/fader_asset_test.py - name: Validate recessed Button 180 + embedded Inter font contract @@ -297,6 +299,8 @@ jobs: name: arsonmix-gui-baseline-smoke path: | pages-wire-main-1680.png + pages-wire-v57-selected-1680.png + pages-wire-v58-collapsed-1680.png pages-v51-portrait-meter-1680.png pages-v53-fx-rail-1366.png pages-v53-fx-rail-1378.png diff --git a/site/preview-v2/assets/mixer-wire-dots.css b/site/preview-v2/assets/mixer-wire-dots.css index 598c6c9ee..87b591ca5 100644 --- a/site/preview-v2/assets/mixer-wire-dots.css +++ b/site/preview-v2/assets/mixer-wire-dots.css @@ -916,10 +916,10 @@ box-shadow:inset 0 1px 2px #061017!important;opacity:1!important; } -/* V55: physically painted WIRE endpoints require a displayed accepted edge. - data-wire-connected remains independent graph truth for hidden/off-bank - inspection. Hover, magnet and deliberate patch intent remain transient. */ -.console-body.wire-routing-v15 .strip .wire-tray .wire-node-out[data-wire-paint="idle"]:not(.is-source):not(.is-drag-origin):not(.is-near):not(:hover):not(:focus-visible) .wire-pin, +/* V57: OUT connection paint indicates a real non-MAIN wire, even while + that cable is hidden. MAIN remains a separate canonical default edge. + IN still uses visible cable focus; hover/drag remain transient. */ +.console-body.wire-routing-v15 .strip .wire-tray .wire-node-out[data-wire-paint="idle"]:not([data-wire-connected="true"]):not(.is-drag-origin):not(.is-near):not(:hover):not(:focus-visible) .wire-pin, .console-body.wire-routing-v15 .strip .wire-tray .wire-node-in[data-wire-paint="idle"]:not(.is-snap-target):not(.is-replug-origin):not(:hover):not(:focus-visible) .wire-arrow{ background:#4b535b!important;border-color:#657681!important; box-shadow:inset 0 1px 2px #061017!important;opacity:1!important; @@ -936,38 +936,30 @@ box-shadow:inset 0 1px 2px #07141c!important; } -/* WIRE A2: MAIN-color cable stubs. Source and pinned MAIN consume the SAME - data-wire-main-edge identity. Scoped to the existing WIRE CSS owner. - No new layout box, no cross-bank SVG, no hit area or compositor animation. */ +/* V57: MAIN remains a canonical edge while physical fragments are revealed + only for ONE selected channel. MAIN wire docks at the INNER IN dot. */ /* Position source stub on the actual 12px OUT PIN, not the wider caption-bearing button: accurate at every density and browser width. */ .console-body.wire-routing-v15 .strip .wire-tray .wire-node-out[data-wire-main-edge] .wire-pin{position:relative;overflow:visible} .console-body.wire-routing-v15 .strip .wire-tray - .wire-node-out[data-wire-main-edge] .wire-pin::after, + .wire-node-out[data-wire-main-edge][data-wire-display-focus="true"] .wire-pin::after, .console-body.wire-routing-v15 #master .wire-tray - .wire-node-in[data-wire-main-edge]::before{ + .wire-node-in[data-wire-main-edge] .wire-arrow::after{ content:"";position:absolute;left:calc(50% - 1.25px);width:2.5px; height:12px;background:var(--main-wire-hue,#a04b65); border-radius:0 0 4px 4px;box-shadow:1px 0 #09121f,0 0 0 1px #111e29; pointer-events:none;z-index:1; } .console-body.wire-routing-v15 .strip .wire-tray - .wire-node-out[data-wire-main-edge] .wire-pin::after{top:10px;transform:rotate(-8deg);transform-origin:top center} + .wire-node-out[data-wire-main-edge][data-wire-display-focus="true"] .wire-pin::after{top:10px;transform:rotate(-8deg);transform-origin:top center} .console-body.wire-routing-v15 #master .wire-tray - .wire-node-in[data-wire-main-edge]::before{ - top:23px;transform:rotate(8deg);transform-origin:top center; - border-radius:4px 4px 0 0; -} -/* Folded 23px WIRE retains two discreet color fragments tied to exact graph IDs. - The accepted V52 fader, V51 meter and V54 jack material remain unchanged. */ -.console-body.wire-routing-v15.collapsed-send .strip - .wire-fold-summary[data-wire-main-edge]::after{ - content:"";position:absolute;left:22%;bottom:1px;width:2px;height:8px; - border-radius:2px;background:var(--main-wire-hue,#a04b65); - transform:rotate(-9deg);pointer-events:none;opacity:.85; -} -.console-body.wire-routing-v15.collapsed-send #master - .wire-fold-summary[data-wire-main-edge]::after{ - left:78%;transform:rotate(9deg); + .wire-node-in[data-wire-main-edge] .wire-arrow::after{ + top:calc(50% + 2px);height:15px; + transform:rotate(8deg);transform-origin:top center; + border-radius:4px 4px 0 0;z-index:-1; } +/* V58: Collapsed WIRE is a quiet routing overview, never a physical + hanging MAIN cable. Only the existing SVG fold-link dots indicate + committed NON-MAIN wires; no ::after stem on any folded strip or MAIN. */ + diff --git a/site/preview-v2/index.html b/site/preview-v2/index.html index d1e064bc5..a65a9f366 100644 --- a/site/preview-v2/index.html +++ b/site/preview-v2/index.html @@ -271,7 +271,7 @@ - + @@ -384,7 +384,7 @@
- +
SELECTED ROUTES & QUICK PATCH
Select a channel for IN / OUT
Mode affects new wires only · View never changes audio · GUI reference, no PCM
@@ -609,7 +609,7 @@ } function wireFor(src,dst){return wireEdges.find(e=>e.enabled&&e.sourceId===src&&e.destId===dst);} function outgoingWires(id){return wireEdges.filter(e=>e.enabled&&e.sourceId===id);} -function wireOutgoingCount(id){return outgoingWires(id).length;} +function wireOutgoingCount(id){return outgoingWires(id).filter(e=>e.destId!==master.id).length;} function wireIsCycle(src,dst){ if(src===dst)return true; const candidate={id:nextWireId,sourceId:src,destId:dst,kind:'send',mode:'send',levelDb:0,enabled:true}; @@ -800,17 +800,18 @@ /* Compact WIRE receives/sends: recomputed on DOM render, never in the audio callback. Count only custom intra-mixer paths; direct MAIN stays in I/O. */ function compactWireActivity(t){ - // CH→MAIN is also an actual graph route, not hidden OUT metadata. + // Folded socket LEDs represent only explicit non-MAIN patch cords. + // Keep CH→MAIN in the canonical graph; never let it color either dot. return { - incoming:wireEdges.filter(e=>e.enabled&&e.destId===t.id).length, - outgoing:wireEdges.filter(e=>e.enabled&&e.sourceId===t.id).length + incoming:wireEdges.filter(e=>e.enabled&&e.destId===t.id&&e.destId!==master.id).length, + outgoing:wireEdges.filter(e=>e.enabled&&e.sourceId===t.id&&e.destId!==master.id).length }; } function compactWireSummary(t){ const {incoming,outgoing}=compactWireActivity(t); - const activeIn=incoming>0,activeOut=outgoing>0,connected=activeIn||activeOut; + const activeIn=t.kind!=='master'&&incoming>0,activeOut=outgoing>0,connected=activeIn||activeOut; const title='Expand WIRE · '+t.name+' · '+incoming+' incoming, '+outgoing+ - ' outgoing canonical edges (including MAIN)'; + ' outgoing custom wires · MAIN uses its focused plug'; // 1:1 physical order with the expanded patch: // solid OUT dot LEFT, larger recessed IN circle RIGHT (with small center dot). // Both muted while unused. A channel-hue indicator lights independently @@ -1148,20 +1149,19 @@ const span=Math.abs(x1-x0),ceiling=Math.max(12,Math.min(100,Number(limit)||72)); const sag=Math.max(10,Math.min(ceiling,Math.min(ceiling-5,28+Math.sqrt(span)*1.55))); const c=sag*4/3,progress=Math.max(0,Math.min(1,elapsedMs/1600)); - // V44 geometric witness: 10.5px produced only 4.17px broad visible jolt - // against the approved >5px gate. 13.4 restores a gentle >5px packet, - // still below the retired 13.8px short/fast impulse; 1600ms remains. - const center=.99-progress*.98,amp=13.4*Math.exp(-progress*3.5); + // Stronger pulse travels from receiver IN all the way to source OUT. + // Attenuate continuously towards OUT, while pinning the physical endpoints. + const center=.97-progress*.92,amp=22*Math.exp(-progress*.72); let d='M '+x0.toFixed(1)+' '+y0.toFixed(1); - // Smooth curve samples; zero displacement at both anchored ends. for(let i=1;i<=56;i++){ const t=i/56,u=1-t; const x=u*u*u*x0+3*u*u*t*x0+3*u*t*t*x1+t*t*t*x1; const y=u*u*u*y0+3*u*u*t*(y0+c)+3*u*t*t*(y1+c)+t*t*t*y1; const dx=6*u*t*(x1-x0),dy=3*u*u*c+6*u*t*(y1-y0)+3*t*t*(-c); - const norm=Math.hypot(dx,dy)||1,delta=t-center; - const pulse=amp*Math.exp(-(delta*delta)/(.30*.30))* - Math.sin(delta*10-progress*6)*Math.sin(Math.PI*t); + const delta=t-center,norm=Math.hypot(dx,dy)||1; + const attenuation=.22+.78*t; + const pinned=Math.max(0,Math.min(1,t/.10,(1-t)/.10)); + const pulse=amp*attenuation*pinned*Math.exp(-(delta*delta)/(.19*.19))*Math.cos(delta*11); d+=' L '+(x-dy/norm*pulse).toFixed(1)+' '+(y+dx/norm*pulse).toFixed(1); } return d; @@ -1530,20 +1530,24 @@ } /* One pair of short MAIN-colored stubs is a projection of ONE real edgeId. */ function syncMainWireFragments(){ - const selectedSources=selection().filter(t=>t.kind!=='master'); - const focus=armedWireSource()||(selectedSources.length===1?selectedSources[0]:null); + // Keep default CH→MAIN as a real edge, but paint its stub ONLY when one + // channel is selected. A pinned patch source alone cannot reveal a cable. + const chosen=selection().filter(t=>t.kind!=='master'); + const focus=chosen.length===1?chosen[0]:null; const selected=focus&&wireFor(focus.id,master.id); for(const t of tracks){ const edge=wireFor(t.id,master.id); const lane=document.querySelector('.strip[data-id="'+t.id+'"]'); - for(const el of [lane?.querySelector('.wire-node-out'),lane?.querySelector('.wire-fold-summary')]){ + for(const el of [lane?.querySelector('.wire-node-out')]){ if(!el)continue; if(edge)el.setAttribute('data-wire-main-edge',String(edge.id)); else el.removeAttribute('data-wire-main-edge'); + if(edge&&focus?.id===t.id)el.setAttribute('data-wire-display-focus','true'); + else el.removeAttribute('data-wire-display-focus'); el.style.setProperty('--main-wire-hue',master.color); } } - for(const el of [masterEl.querySelector('.wire-node-in'),masterEl.querySelector('.wire-fold-summary')]){ + for(const el of [masterEl.querySelector('.wire-node-in')]){ if(!el)continue; if(selected)el.setAttribute('data-wire-main-edge',String(selected.id)); else el.removeAttribute('data-wire-main-edge'); @@ -1560,8 +1564,12 @@ // Display focus must NOT depend on an armed OUT. A mixer channel being // inspected always reveals its existing INCOMING and OUTGOING cables. // The separate 'focus' remains the only authority for making new routes. + const selectedChannels=selection().filter(t=>t.kind!=='master'); const source=dragging?wireSourceTrack(wireGesture.sourceId): - (focus||selection().find(t=>t.kind!=='master')||null); + (selectedChannels.length===1?selectedChannels[0]:null); + // Selected channel owns the drawn cables; explicitly armed OUT owns + // patch controls. The two must not fight over MAIN's pressed state. + const controlSource=focus||source; const legend=document.getElementById('wireLegend'),main=document.getElementById('wireMaster'); if(legend){ const filter=document.getElementById('viewFilter').value; @@ -1571,7 +1579,7 @@ const markup=focus&&!sourceInBank? ''+ 'Click any IN on this bank': - source?wireLegendHtml(source,routes):'Select a channel for IN / OUT'; + controlSource?wireLegendHtml(controlSource,routes):'Select a channel for IN / OUT'; const picker=focus?'CH'+ String(focus.id).padStart(2,'0')+' OUT →'+ '