Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ui-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
needs: quick
# Both 8D-SonKu and SOF native-owner PRs share ONE actual Chromium runner.
# Preserve fast-only checks for unrelated GUI and engine branches.
if: ${{ (github.event_name == 'pull_request' && (startsWith(github.head_ref, 'feat/8d-sonku-') || startsWith(github.head_ref, 'feat/sonku-p1-') || startsWith(github.head_ref, 'feat/sonku-flipped-') || startsWith(github.head_ref, 'test/sof-native-') || startsWith(github.head_ref, 'integration/sof-sonku-main-') || startsWith(github.head_ref, 'fix/native-wire-inspector-') || (startsWith(github.head_ref, 'integration/sonku-m4-wire-') || startsWith(github.head_ref, 'integration/sonku-m4-guitar-picker-') || startsWith(github.head_ref, 'fix/sonku-')))) || (github.event_name == 'workflow_dispatch' && startsWith(github.ref, 'refs/heads/feat/8d-sonku-') && inputs.expected_sha != '') }}
if: ${{ (github.event_name == 'pull_request' && (startsWith(github.head_ref, 'feat/8d-sonku-') || startsWith(github.head_ref, 'feat/sonku-p1-') || startsWith(github.head_ref, 'feat/sonku-flipped-') || startsWith(github.head_ref, 'feat/sonku-rear-') || startsWith(github.head_ref, 'test/sof-native-') || startsWith(github.head_ref, 'integration/sof-sonku-main-') || startsWith(github.head_ref, 'fix/native-wire-inspector-') || (startsWith(github.head_ref, 'integration/sonku-m4-wire-') || startsWith(github.head_ref, 'integration/sonku-m4-guitar-picker-') || startsWith(github.head_ref, 'fix/sonku-')))) || (github.event_name == 'workflow_dispatch' && startsWith(github.ref, 'refs/heads/feat/8d-sonku-') && inputs.expected_sha != '') }}
runs-on: ubuntu-latest
timeout-minutes: 12
steps:
Expand Down
6 changes: 3 additions & 3 deletions site/preview-v2/assets/mixer-native-sonku.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ root.innerHTML=[
'<text class="sk-direction sk-front" x="200" y="55" text-anchor="middle">FRONT</text>',
'<text class="sk-direction" x="200" y="317" text-anchor="middle">REAR</text>',
'<text class="sk-direction" x="11" y="149">LEFT</text><text class="sk-direction" x="352" y="149">RIGHT</text>',
// Flipped transparent PNG replaces the provisional vector listener.
// Anatomical nose/FRONT points TOP; source azimuth is unchanged.
// Rear/top-view translucent PNG: back of skull, protruding ears and shoulders.
// Listener looks toward FRONT at top; native source azimuth is unchanged.
'<ellipse class="sk-head-shadow" cx="200" cy="246" rx="76" ry="22" fill="#031621" fill-opacity=".27"/>',
'<g id="skRearSources" class="sk-rear-sources"></g>',
'<image id="skListenerArt" class="sk-listener-art" href="assets/sonku-listener-top.png" x="103" y="73" width="194" height="202" preserveAspectRatio="xMidYMid meet" data-orientation="front-up-flipped" aria-label="Top-view listener facing front at top" pointer-events="none"/>',
'<image id="skListenerArt" class="sk-listener-art" href="assets/sonku-listener-top.png" x="103" y="73" width="194" height="202" preserveAspectRatio="xMidYMid meet" data-orientation="front-up-rear" aria-label="Rear/top-view listener facing front at top" pointer-events="none"/>',
// Near orbit overlays lower bust, forming ONE plausible 3D spatial ring.
'<path id="skFrontArc" class="sk-orbit-front-shadow" d="M348 174 A148 83 0 0 0 52 174" fill="none" stroke="#061723" stroke-opacity=".7" stroke-width="4.5"/>',
'<path class="sk-orbit-front" d="M348 174 A148 83 0 0 0 52 174" fill="none" stroke="url(#skRail)" stroke-opacity=".9" stroke-width="1.8" stroke-dasharray="5 7"/>',
Expand Down
Binary file modified site/preview-v2/assets/sonku-listener-top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions tests/approved_native_sonku_smoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ def exercise(browser,out,width,height):
assert editor.locator("#"+knob).get_attribute("type")=="range"
assert editor.locator("#"+knob).evaluate("(n)=>n.closest('.sk-dial')!==null")
art=editor.locator("#skListenerArt")
assert art.count()==1 and art.get_attribute("data-orientation")=="front-up-flipped"
assert art.count()==1 and art.get_attribute("data-orientation")=="front-up-rear"
assert art.get_attribute("href")=="assets/sonku-listener-top.png"
# The vertically flipped PNG must actually resolve in the BUILT
# The rear-view alpha PNG must actually resolve in the BUILT
# native /preview/ bundle, and have transparent palette metadata.
assert page.evaluate("""async () => new Promise(resolve => {
const image=document.querySelector('#skListenerArt');
Expand All @@ -154,7 +154,7 @@ def exercise(browser,out,width,height):
im.onload=()=>resolve(im.naturalWidth===256&&im.naturalHeight===256);
im.onerror=()=>resolve(false);
im.src=href;
})"""),"Flipped transparent PNG missing from native GUI bundle"
})"""),"Rear-view transparent PNG missing from native GUI bundle"
# SVG <text> is not HTML text: Chromium 158 no longer exposes usable
# HTMLElement.innerText for these nodes. Read SVG textContent and verify
# the actual anchors, so front/rear cannot silently flip in the GUI.
Expand Down
13 changes: 6 additions & 7 deletions tests/native_peq_assembly_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,18 @@ def test_single_style_owner(self):
self.assertLess(len(png),45000)
self.assertNotIn("mixer-native-sonku.css",self.assembled)
sonku=(ROOT/"site/preview-v2/assets/mixer-native-sonku.js").read_text("utf-8")
# SonKu FRONT-up scene now uses a shaded inline vector back view
# rather than displaying the old face PNG upside-down. The legacy
# PNG is still packaged for historical/checkpoint builds.
# SonKu now paints the actual rear/top-view PNG with the listener
# facing FRONT at the top of the room, not the prior top-view face.
self.assertIn('id="skListenerArt"',sonku)
self.assertIn('href="assets/sonku-listener-top.png"',sonku)
self.assertIn('data-orientation="front-up-flipped"',sonku)
self.assertIn('data-orientation="front-up-rear"',sonku)
self.assertNotIn('id="skCrown"',sonku)
self.assertNotIn('id="skBackSuit"',sonku)
# Alpha-palette PNG asset is the exact vertically flipped user-approved
# listener; fail if a stale provisional source is repackaged.
# Pin the 256x256 rear-view alpha PNG used by the installed GUI;
# never silently repack the old flipped top-view artwork.
import hashlib
self.assertEqual(hashlib.sha256(png).hexdigest(),
"e4fa2f75a541615448dd2d2b0bcbbf7955428900b3bdba8ad45c1ff7374fefc8")
"34d067dce8fa83ed0233b61c326fc8b2182a08b5b2a875d2ca28d75b3d2be5d8")
self.assertEqual(png[16:24],bytes([0,0,1,0,0,0,1,0]))
self.assertIn(b"tRNS",png)
self.assertIn("FRONT</text>",sonku)
Expand Down
Loading