From 64f59121d460b51adcea0d3d76f1b7ad6505eb56 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Sat, 14 Nov 2026 12:27:41 +0700 Subject: [PATCH 1/7] refactor(sonku-p73): one typed v2/v3 SonKu JSON control contract for native bridge --- src/SonKuNativeBridgeContract.h | 80 +++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 src/SonKuNativeBridgeContract.h diff --git a/src/SonKuNativeBridgeContract.h b/src/SonKuNativeBridgeContract.h new file mode 100644 index 000000000..d23bf3f5f --- /dev/null +++ b/src/SonKuNativeBridgeContract.h @@ -0,0 +1,80 @@ +// SPDX-License-Identifier: AGPL-3.0-only +#pragma once +// One typed CONTROL-plane schema for the existing SonKu JUCE/JS bridge. +// No renderer, callback, allocation or additional FX authority lives here. +#include "../engine/builtin_fx/sonku/SonKuSpatialCore.h" +#include +#include +#include +namespace armix::builtin_fx::sonku_bridge { +inline constexpr int schemaVersion() noexcept { +#if defined(ARMIX_SONKU_EXPERIMENTAL_NATIVE_XYZ_RT) && ARMIX_SONKU_EXPERIMENTAL_NATIVE_XYZ_RT + return 3; +#else + return 2; +#endif +} +inline bool number(const juce::var& values,const char* key,float& result, + bool required) noexcept { + const auto raw=values.getProperty(key,{}); + if(raw.isVoid())return !required; + if(!raw.isDouble()&&!raw.isInt())return false; + const double d=static_cast(raw); + if(!std::isfinite(d)||d< -1000000.||d>1000000.)return false; + const auto f=static_cast(d); + if(!std::isfinite(f))return false; + result=f; + return true; +} +inline bool decodeSettings(const juce::var& values,armix::sonku::Settings& out) noexcept { + if(!values.isObject())return false; + armix::sonku::Settings proposed{}; + if(!number(values,"startAzimuthDegrees",proposed.startAzimuthDegrees,true)|| + !number(values,"revolutionSeconds",proposed.revolutionSeconds,true)|| + !number(values,"stereoSpreadDegrees",proposed.stereoSpreadDegrees,true)|| + !number(values,"spatialMix",proposed.spatialMix,true)|| + !number(values,"outputTrim",proposed.outputTrim,true))return false; + const auto moving=values.getProperty("moving",{}); + const auto clockwise=values.getProperty("clockwise",{}); + if(!moving.isBool()||!clockwise.isBool())return false; + proposed.moving=static_cast(moving); + proposed.clockwise=static_cast(clockwise); + const auto preset=values.getProperty("spacePreset",{}); + if(!preset.isVoid()){ + if(!preset.isInt())return false; + proposed.spacePreset=static_cast(preset); + } + if(!number(values,"sourceDistanceMeters",proposed.sourceDistanceMeters,false)|| + !number(values,"roomAmount",proposed.roomAmount,false)|| + !number(values,"ambience",proposed.ambience,false))return false; +#if defined(ARMIX_SONKU_EXPERIMENTAL_NATIVE_XYZ_RT) && ARMIX_SONKU_EXPERIMENTAL_NATIVE_XYZ_RT + // Legacy clients legitimately omit elevation; default exactly zero. + if(!number(values,"directElevationDegrees", + proposed.directElevationDegrees,false))return false; +#else + // Never falsely acknowledge 3D JSON in a public v2-only binary. + if(!values.getProperty("directElevationDegrees",{}).isVoid())return false; +#endif + if(!armix::sonku::valid(proposed))return false; + out=proposed; + return true; +} +inline juce::var acceptedSettings(const armix::sonku::Settings& s) { + auto values=std::make_unique(); + values->setProperty("startAzimuthDegrees",s.startAzimuthDegrees); + values->setProperty("revolutionSeconds",s.revolutionSeconds); + values->setProperty("stereoSpreadDegrees",s.stereoSpreadDegrees); + values->setProperty("spatialMix",s.spatialMix); + values->setProperty("outputTrim",s.outputTrim); + values->setProperty("moving",s.moving); + values->setProperty("clockwise",s.clockwise); + values->setProperty("spacePreset",s.spacePreset); + values->setProperty("sourceDistanceMeters",s.sourceDistanceMeters); + values->setProperty("roomAmount",s.roomAmount); + values->setProperty("ambience",s.ambience); +#if defined(ARMIX_SONKU_EXPERIMENTAL_NATIVE_XYZ_RT) && ARMIX_SONKU_EXPERIMENTAL_NATIVE_XYZ_RT + values->setProperty("directElevationDegrees",s.directElevationDegrees); +#endif + return juce::var(values.release()); +} +} // namespace armix::builtin_fx::sonku_bridge From 6d0ceb5c6b716fc6066f5b33376166252138e1a1 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Sat, 14 Nov 2026 12:28:09 +0700 Subject: [PATCH 2/7] feat(sonku-p73): wire native GUI dispatcher to one v2/v3 accepted-state codec --- src/Main.cpp | 61 ++++++++-------------------------------------------- 1 file changed, 9 insertions(+), 52 deletions(-) diff --git a/src/Main.cpp b/src/Main.cpp index 1d1c5c6ab..1e3ac7368 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -44,6 +44,7 @@ #include "NativeHotkeyRegistry.h" #include "NativeFxParameterHotkey.h" #include "NativeFxControlRequest.h" +#include "SonKuNativeBridgeContract.h" #include "NativeDeviceApplyCoordinator.h" #if defined(_WIN32) #include "../engine/device/WindowsFirstRunEndpointDiscovery.h" @@ -3003,23 +3004,13 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr reply->setProperty("deviceEpoch",epoch); reply->setProperty("graphRevision",revision); reply->setProperty("instanceId",instanceId); - reply->setProperty("schemaVersion",2); + reply->setProperty("schemaVersion", + armix::builtin_fx::sonku_bridge::schemaVersion()); reply->setProperty("status",processor?"ACCEPTED":"REJECTED"); if(processor) { - const auto s=processor->acceptedSettings(); - auto values=std::make_unique(); - values->setProperty("startAzimuthDegrees",s.startAzimuthDegrees); - values->setProperty("revolutionSeconds",s.revolutionSeconds); - values->setProperty("stereoSpreadDegrees",s.stereoSpreadDegrees); - values->setProperty("spatialMix",s.spatialMix); - values->setProperty("outputTrim",s.outputTrim); - values->setProperty("moving",s.moving); - values->setProperty("clockwise",s.clockwise); - values->setProperty("spacePreset",s.spacePreset); - values->setProperty("sourceDistanceMeters",s.sourceDistanceMeters); - values->setProperty("roomAmount",s.roomAmount); - values->setProperty("ambience",s.ambience); - reply->setProperty("settings",juce::var(values.release())); + reply->setProperty("settings", + armix::builtin_fx::sonku_bridge::acceptedSettings( + processor->acceptedSettings())); reply->setProperty("observedAzimuthDegrees", processor->observedAzimuthDegrees()); if(epoch=="0" && instanceId==lastLogicalFxInstance_ && @@ -4626,46 +4617,12 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr rawEpoch.toString(),rawRevision.toString(),rawInstance.toString(),p); return; } - const auto values=args.getProperty("settings",{}); armix::sonku::Settings settings{}; - auto number=[&values](const char* key,float& dest) { - const auto v=values.getProperty(key,{}); - if(!v.isDouble()&&!v.isInt())return false; - const double n=static_cast(v); - if(!std::isfinite(n) || n>1.0e6 || n< -1.0e6)return false; - dest=static_cast(n); - return std::isfinite(dest); - }; - const auto moving=values.getProperty("moving",{}); - const auto clockwise=values.getProperty("clockwise",{}); - const bool parameters=values.isObject() && - number("startAzimuthDegrees",settings.startAzimuthDegrees) && - number("revolutionSeconds",settings.revolutionSeconds) && - number("stereoSpreadDegrees",settings.stereoSpreadDegrees) && - number("spatialMix",settings.spatialMix) && - number("outputTrim",settings.outputTrim) && - moving.isBool()&&clockwise.isBool(); - if(parameters){settings.moving=static_cast(moving); - settings.clockwise=static_cast(clockwise);} - // Optional v2 fields preserve legacy v1 clients and old sessions. - // Typed native intent remains bounded and validated before SPSC. - const auto preset=values.getProperty("spacePreset",{}); - bool acousticParameters=true; - if(!preset.isVoid()){ - if(!preset.isInt())acousticParameters=false; - else settings.spacePreset=static_cast(preset); - } - const auto optionalNumber=[&](const char* key,float& target) { - if(values.getProperty(key,{}).isVoid())return true; - return number(key,target); - }; - acousticParameters=acousticParameters && - optionalNumber("sourceDistanceMeters",settings.sourceDistanceMeters) && - optionalNumber("roomAmount",settings.roomAmount) && - optionalNumber("ambience",settings.ambience); + const bool parameters=armix::builtin_fx::sonku_bridge::decodeSettings( + args.getProperty("settings",{}),settings); const auto numeric=fxRequest.sequence("sonku-"); bool queued=false; - if(p&&numeric&¶meters&&acousticParameters&&armix::sonku::valid(settings) && + if(p&&numeric&¶meters && !pendingNativeSonKu_.owner&&!nativeShowBusy_&&!studioBackupBusy_&& !engine_.independentClockActive()) { queued=p->queueSettings(settings,numeric); From a2bfcd0f5c363c162af086ac6bfe68f433dbaabf Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Sat, 14 Nov 2026 12:29:17 +0700 Subject: [PATCH 3/7] feat(sonku-p73): capability-gated compact elevation GUI with strict native v3 readback and bounded geometry --- site/preview-v2/assets/mixer-native-sonku.js | 74 +++++++++++++++++--- 1 file changed, 66 insertions(+), 8 deletions(-) diff --git a/site/preview-v2/assets/mixer-native-sonku.js b/site/preview-v2/assets/mixer-native-sonku.js index d9e22054f..89d48b032 100644 --- a/site/preview-v2/assets/mixer-native-sonku.js +++ b/site/preview-v2/assets/mixer-native-sonku.js @@ -7,6 +7,24 @@ const defaults=()=>({startAzimuthDegrees:0,revolutionSeconds:12, stereoSpreadDegrees:60,spatialMix:1,outputTrim:.75,moving:true,clockwise:true, spacePreset:0,sourceDistanceMeters:1.6,roomAmount:.55,ambience:.30}); const normalizeSettings=s=>({...defaults(),...s}); +// Native schema v3 is the ONLY authority that enables elevation controls. +// Public v2 never receives, edits or serializes a speculative XYZ field. +const roomHeights=[3.2,3.2,4.8,7.2]; +const elevationLimits=s=>{ + const distance=s.sourceDistanceMeters; + const height=roomHeights[s.spacePreset]; + if(!Number.isFinite(distance)||!height)return {min:0,max:0}; + const bottom=Math.max(-40,Math.asin(Math.max(-1,Math.min(1,(.5-1.45)/distance)))*180/Math.PI); + const top=Math.min(60,Math.asin(Math.max(-1,Math.min(1,(height-.5-1.45)/distance)))*180/Math.PI); + // Keep a 0.1 degree safety margin for C++ float boundary rounding. + return {min:Math.ceil((bottom+0.001)*10)/10, + max:Math.floor((top-0.001)*10)/10}; +}; +const fitElevation=s=>{ + if(!Object.prototype.hasOwnProperty.call(s,"directElevationDegrees"))return s; + const {min,max}=elevationLimits(s); + return {...s,directElevationDegrees:Math.min(max,Math.max(min,s.directElevationDegrees))}; +}; // Legacy v1/v2 states already persist a LINEAR outputTrim number (0..1). // Keep the native JSON key and its meaning intact; the visible GAIN dial // now expresses the SAME linear multiplier in dB and can exceed unity. @@ -26,7 +44,14 @@ const valid=s=>s && Number.isFinite(s.startAzimuthDegrees) && Number.isFinite(s.sourceDistanceMeters) && s.sourceDistanceMeters>=1.6 && s.sourceDistanceMeters<=roomMaxDistance[s.spacePreset]+.0001 && Number.isFinite(s.roomAmount) && s.roomAmount>=0 && s.roomAmount<=1 && - Number.isFinite(s.ambience) && s.ambience>=0 && s.ambience<=1; + Number.isFinite(s.ambience) && s.ambience>=0 && s.ambience<=1 && + (s.directElevationDegrees===undefined || ( + Number.isFinite(s.directElevationDegrees) && + s.directElevationDegrees>= -40 && s.directElevationDegrees<=60 && + s.sourceDistanceMeters*Math.cos(s.directElevationDegrees*Math.PI/180)>=.7 && + 1.45+s.sourceDistanceMeters*Math.sin(s.directElevationDegrees*Math.PI/180)>=.5 && + 1.45+s.sourceDistanceMeters*Math.sin(s.directElevationDegrees*Math.PI/180)<= + roomHeights[s.spacePreset]-.5)); const backend=()=>window.__JUCE__?.backend; const native=()=>typeof backend()?.emitEvent==="function"; const snapshot=()=>window.__ARMIX_NATIVE_M2__?.fxEditorState?.()|| @@ -129,6 +154,8 @@ root.innerHTML=[ '', '', + '', '', '