From eacac1714882b65d8a51c7fad20cad5b99138b43 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Sun, 1 Nov 2026 09:23:15 +0700 Subject: [PATCH] feat(m6.3): install approved flat brushed metal slider track and circular PNG thumb --- CMakeLists.txt | 6 +- assets/sliders/arsoncomp_flat_track_480.png | Bin 0 -> 3731 bytes assets/sliders/arsoncomp_silver_thumb_96.png | Bin 0 -> 2675 bytes docs/M63-BRUSHED-METAL-SLIDERS.md | 18 +++ plugin/Editor.cpp | 84 ++++--------- plugin/Editor.h | 1 + plugin/FaderGeometry.h | 28 +++-- tests/PluginSmoke.cpp | 123 ++++++++----------- 8 files changed, 114 insertions(+), 146 deletions(-) create mode 100644 assets/sliders/arsoncomp_flat_track_480.png create mode 100644 assets/sliders/arsoncomp_silver_thumb_96.png create mode 100644 docs/M63-BRUSHED-METAL-SLIDERS.md diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dc1800..b1b475f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,10 +50,12 @@ if(ARSON_BUILD_PLUGIN) PRODUCT_NAME "ArSonComp" IS_SYNTH FALSE NEEDS_MIDI_INPUT FALSE NEEDS_MIDI_OUTPUT FALSE IS_MIDI_EFFECT FALSE EDITOR_WANTS_KEYBOARD_FOCUS FALSE COPY_PLUGIN_AFTER_BUILD FALSE VST3_CATEGORIES Fx Dynamics) - # Keep only knob, toggle and logo assets: faders are pure JUCE vectors. - # No track/thumb PNG or runtime resampling. + # Knob/toggle artwork and the approved flat brushed-metal fader pair + # are compiled into the VST3/Standalone. No file-system reads at runtime. juce_add_binary_data(ArSonCompKnobAssets SOURCES assets/black_brushed_knob.jpg + assets/sliders/arsoncomp_flat_track_480.png + assets/sliders/arsoncomp_silver_thumb_96.png assets/toggle/arson_toggle_on.png assets/toggle/arson_toggle_off.png assets/arsoncomp_header_logo.png) diff --git a/assets/sliders/arsoncomp_flat_track_480.png b/assets/sliders/arsoncomp_flat_track_480.png new file mode 100644 index 0000000000000000000000000000000000000000..9068e61b7c1c1089838c6fcbb698befe2e0b99ac GIT binary patch literal 3731 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 literal 0 HcmV?d00001 diff --git a/assets/sliders/arsoncomp_silver_thumb_96.png b/assets/sliders/arsoncomp_silver_thumb_96.png new file mode 100644 index 0000000000000000000000000000000000000000..6b9e9fe1ffab933cbf3a6c1b3ab0ef70d31811e7 GIT binary patch literal 2675 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 literal 0 HcmV?d00001 diff --git a/docs/M63-BRUSHED-METAL-SLIDERS.md b/docs/M63-BRUSHED-METAL-SLIDERS.md new file mode 100644 index 0000000..63b8d2d --- /dev/null +++ b/docs/M63-BRUSHED-METAL-SLIDERS.md @@ -0,0 +1,18 @@ +# M6.3 approved flat brushed-metal photographic fader + +Two distinct user-approved transparent PNGs are bundled in the VST3 and +Standalone binary: + +- assets/sliders/arsoncomp_flat_track_480.png — 480×66 cropped transparent + stationary horizontally brushed metal ruler, with dark recessed slot. +- assets/sliders/arsoncomp_silver_thumb_96.png — 96×96 circular satin brushed + silver thumb, moves independently. + +These are cropped/downsized from the approved rendered assets, not new vector +approximations. Thumb and ruler retain original aspect ratio at all slider +widths, including the smaller Sidechain pair. Both assets decode once on the +JUCE editor creation thread; the audio thread is unaffected. The 612×580 +taller LCD and MINI mode remain unchanged. + +Release gates: Windows compile/CTest/screenshot artifacts, Linux sanitizer +engine tests. Final visual acceptance and physical audio tests are separate. diff --git a/plugin/Editor.cpp b/plugin/Editor.cpp index a3b14fd..4b4474a 100644 --- a/plugin/Editor.cpp +++ b/plugin/Editor.cpp @@ -52,6 +52,15 @@ CompLook::CompLook() { static_cast(BinaryData::arson_toggle_off_pngSize)); jassert(toggleOn.isValid() && toggleOff.isValid()); jassert(toggleOn.getBounds()==toggleOff.getBounds()); + // Independent stationary track + moving circular silver thumb. + // Decode only on editor construction, never in draw or the audio thread. + sliderTrack=juce::ImageFileFormat::loadFrom( + BinaryData::arsoncomp_flat_track_480_png, + static_cast(BinaryData::arsoncomp_flat_track_480_pngSize)); + sliderThumb=juce::ImageFileFormat::loadFrom( + BinaryData::arsoncomp_silver_thumb_96_png, + static_cast(BinaryData::arsoncomp_silver_thumb_96_pngSize)); + jassert(sliderTrack.isValid() && sliderThumb.isValid()); setColour(juce::Slider::textBoxTextColourId,text); setColour(juce::Slider::textBoxBackgroundColourId,juce::Colour{0xff111417}); setColour(juce::Slider::textBoxOutlineColourId,juce::Colour{0xff31383e}); @@ -194,71 +203,20 @@ void CompLook::drawRotarySlider(juce::Graphics& g,int x,int y,int w,int h, void CompLook::drawLinearSlider(juce::Graphics& g,int x,int y,int w,int h, float pos,float,float, const juce::Slider::SliderStyle,juce::Slider&) { - // Modern vector-only JUCE fader; no texture, sprite or image resampling. - // Host automation, keyboard input and gestures remain native JUCE Slider. - const auto geometry=arson::ui::FaderGeometry::calculate( + // Two approved photographic assets: the flat grey brushed-metal ruler + // stays stationary; only the circular satin-metal thumb moves. + // Preserve aspect ratio of both PNGs for a true hardware appearance. + const auto geom=arson::ui::FaderGeometry::calculate( static_cast(w),static_cast(h),pos); - const auto track=geometry.track.translated(static_cast(x), - static_cast(y)); - const auto thumb=geometry.thumb.translated(static_cast(x), - static_cast(y)); - const float cy=static_cast(y)+static_cast(h)*0.5f; - const float progress=juce::jlimit(0.0f,1.0f, - (geometry.position-geometry.left)/(geometry.right-geometry.left)); - - // Inset charcoal rail: restrained outline, clear separation from chassis. - const auto housing=track.expanded(1.4f,2.6f); - g.setColour(juce::Colour{0xff11171b}); - g.fillRoundedRectangle(housing,4.2f); - g.setColour(juce::Colour{0xff6e777c}.withAlpha(0.43f)); - g.drawRoundedRectangle(housing.reduced(0.35f),4.0f,0.85f); - g.setColour(juce::Colour{0xff070c10}); - g.fillRoundedRectangle(track,track.getHeight()*0.5f); - g.setColour(juce::Colour{0xff9ba4a8}.withAlpha(0.15f)); - g.drawHorizontalLine(juce::roundToInt(track.getY()+1.0f), - track.getX()+3.0f,track.getRight()-3.0f); - - // Coral level fill, clipped into rounded channel. Minimum is fully dark. - if(progress>0.001f) { - juce::Graphics::ScopedSaveState clip(g); - juce::Path channel; - channel.addRoundedRectangle(track,track.getHeight()*0.5f); - g.reduceClipRegion(channel); - const float litRight=track.getX()+track.getWidth()*progress; - g.setGradientFill(juce::ColourGradient( - juce::Colour{0xfffc8587},track.getX(),track.getY(), - juce::Colour{0xffb33b4d},track.getX(),track.getBottom(),false)); - g.fillRect(track.getX(),track.getY(), - litRight-track.getX(),track.getHeight()); - if(litRight>track.getX()+4.0f) { - g.setColour(juce::Colour{0xffffd1cf}.withAlpha(0.43f)); - g.drawHorizontalLine(juce::roundToInt(cy-0.5f), - track.getX()+2.0f,litRight-1.0f); - } + const auto rail=geom.track.translated(static_cast(x), + static_cast(y)); + const auto cap=geom.thumb.translated(static_cast(x), + static_cast(y)); + if(sliderTrack.isValid() && sliderThumb.isValid()) { + g.setImageResamplingQuality(juce::Graphics::highResamplingQuality); + g.drawImage(sliderTrack,rail); + g.drawImage(sliderThumb,cap); } - - // Sharp graphite thumb with soft satin bevel + small red engraved grip. - // At actual 34px height the thumb remains 13-15px wide and 28px tall. - g.setColour(juce::Colours::black.withAlpha(0.48f)); - g.fillRoundedRectangle(thumb.translated(0.0f,1.4f),3.2f); - juce::ColourGradient brushed(juce::Colour{0xff869198},thumb.getX(),cy, - juce::Colour{0xff414a51},thumb.getRight(),cy,false); - brushed.addColour(0.19,juce::Colour{0xff707c83}); - brushed.addColour(0.40,juce::Colour{0xff333c43}); - brushed.addColour(0.73,juce::Colour{0xff222b31}); - g.setGradientFill(brushed); - g.fillRoundedRectangle(thumb,3.1f); - g.setColour(juce::Colour{0xffa3adb2}.withAlpha(0.62f)); - g.drawRoundedRectangle(thumb.reduced(0.7f),2.6f,0.85f); - g.setColour(juce::Colours::white.withAlpha(0.10f)); - g.drawVerticalLine(juce::roundToInt(thumb.getX()+2.1f), - thumb.getY()+4.0f,thumb.getBottom()-4.0f); - const juce::Rectangle grip{ - thumb.getX()+3.1f,cy-1.2f,thumb.getWidth()-6.2f,2.4f}; - g.setColour(juce::Colour{0xff141a1f}); - g.fillRoundedRectangle(grip.expanded(0.4f,0.65f),1.25f); - g.setColour(juce::Colour{0xffed7279}); - g.fillRoundedRectangle(grip,1.2f); } void CompLook::drawToggleButton(juce::Graphics& g,juce::ToggleButton& button, bool highlighted,bool down) { diff --git a/plugin/Editor.h b/plugin/Editor.h index c260259..3e43dbb 100644 --- a/plugin/Editor.h +++ b/plugin/Editor.h @@ -22,6 +22,7 @@ class CompLook final : public juce::LookAndFeel_V4 { std::array faces; // normal + oversized Threshold only juce::Image sourceFace; // decoded once on GUI initialization juce::Image toggleOn, toggleOff; // matched, predecoded state sprites + juce::Image sliderTrack, sliderThumb; // approved separate flat-metal PNGs const juce::Image& knobFace(int diameter,bool primary); }; class Editor final : public juce::AudioProcessorEditor, private juce::Timer { diff --git a/plugin/FaderGeometry.h b/plugin/FaderGeometry.h index f2de112..e35c4ea 100644 --- a/plugin/FaderGeometry.h +++ b/plugin/FaderGeometry.h @@ -3,23 +3,27 @@ #include namespace arson::ui { -// Canonical vector geometry for the six horizontal faders. -// No bitmap aspect ratios, resampling or stretched controls. +// Cropped, transparent PNG source dimensions: 480x66 track, 96x96 thumb. +// The track remains stationary; the round silver cap slides on its axis. struct FaderGeometry { - static constexpr float railHeight=6.0f; - juce::Rectangle track, thumb; - float left=0.0f, right=0.0f, position=0.0f; + static constexpr float trackAspect=480.0f/66.0f; + juce::Rectangle track,thumb; + float left=0.0f,right=0.0f,position=0.0f; static FaderGeometry calculate(float width,float height,float sliderPos) noexcept { - const float inset=juce::jlimit(8.0f,11.0f,width*0.10f); - const float capW=juce::jlimit(12.0f,15.0f,height*0.40f); - const float capH=juce::jlimit(22.0f,29.0f,height-5.0f); + // Prevent image stretching at any supported Dynamics/Sidechain width. + const float trackWidth=juce::jmax(1.0f, + std::min(width-4.0f,(height-3.0f)*trackAspect)); + const float trackHeight=trackWidth/trackAspect; + const float thumbSize=juce::jlimit(22.0f,33.0f,height-4.0f); + const float railX=(width-trackWidth)*0.5f; const float cy=height*0.5f; FaderGeometry g; - g.track={inset,cy-railHeight*0.5f,width-2.0f*inset,railHeight}; - g.left=inset+capW*0.5f; - g.right=width-inset-capW*0.5f; + g.track={railX,cy-trackHeight*0.5f,trackWidth,trackHeight}; + g.left=railX+thumbSize*0.5f+2.0f; + g.right=railX+trackWidth-thumbSize*0.5f-2.0f; g.position=juce::jlimit(g.left,g.right,sliderPos); - g.thumb={g.position-capW*0.5f,cy-capH*0.5f,capW,capH}; + g.thumb={g.position-thumbSize*0.5f,cy-thumbSize*0.5f, + thumbSize,thumbSize}; return g; } }; diff --git a/tests/PluginSmoke.cpp b/tests/PluginSmoke.cpp index aa5a545..6510c96 100644 --- a/tests/PluginSmoke.cpp +++ b/tests/PluginSmoke.cpp @@ -209,53 +209,42 @@ static int runSmoke(int argc,char** argv) { if(std::abs(audio.getSample(0,0)-0.123f)>1.0e-6f || std::abs(audio.getSample(0,31)-0.123f)>1.0e-6f)return failHost(46); } - // Fully vector JUCE Graphics faders; raster and geometric regression. + // Approved M6.3 PNG resources are embedded and independently decoded. + // Never replace the textured ruler or circular thumb with drawn shapes. { + const auto track=juce::ImageFileFormat::loadFrom( + BinaryData::arsoncomp_flat_track_480_png, + static_cast(BinaryData::arsoncomp_flat_track_480_pngSize)); + const auto thumb=juce::ImageFileFormat::loadFrom( + BinaryData::arsoncomp_silver_thumb_96_png, + static_cast(BinaryData::arsoncomp_silver_thumb_96_pngSize)); + if(!track.isValid() || !thumb.isValid() || + track.getWidth()!=480 || track.getHeight()!=66 || + thumb.getWidth()!=96 || thumb.getHeight()!=96 || + track.getPixelAt(0,0).getFloatAlpha()>0.05f || + thumb.getPixelAt(0,0).getFloatAlpha()>0.05f || + track.getPixelAt(240,33).getFloatAlpha()<0.80f || + thumb.getPixelAt(48,48).getFloatAlpha()<0.80f) { + std::cerr<<"PHOTO_ASSET_47: invalid dimensions or alpha\n"; + return 47; + } for(float width : {70.0f,90.0f,105.0f,150.0f}) - for(float height : {34.0f,36.0f,40.0f}) + for(float height : {34.0f,40.0f}) for(float pos : {-100.0f,width*0.5f,width+100.0f}) { const auto shape=arson::ui::FaderGeometry::calculate( width,height,pos); - if(shape.track.getHeight()!=arson::ui::FaderGeometry::railHeight || - shape.track.getX()<0||shape.track.getRight()>width || - shape.thumb.getX()<0||shape.thumb.getRight()>width || - shape.thumb.getY()<0||shape.thumb.getBottom()>height || - shape.thumb.getWidth()<12.0f||shape.thumb.getHeight()<22.0f || - shape.right<=shape.left)return 73; + if(std::abs(shape.track.getWidth()/shape.track.getHeight()- + arson::ui::FaderGeometry::trackAspect)>0.001f || + std::abs(shape.thumb.getWidth()-shape.thumb.getHeight())>0.001f || + shape.track.getX()<0.0f || shape.track.getRight()>width || + shape.thumb.getX()<0.0f || shape.thumb.getRight()>width || + shape.thumb.getY()<0.0f || shape.thumb.getBottom()>height || + shape.left>=shape.right) { + std::cerr<<"PHOTO_GEOMETRY_73 w="< + 0.5f*std::min(width,arson::ui::EditorMetrics::knobHeight) + +0.01f)return 83; + } } // Production ON/OFF resources and Bypass inversion contract. {