From 53e4ba84c7784ffb1aa6c4df79b01384dfd843ec Mon Sep 17 00:00:00 2001
From: Mathias Malmqvist <mathias.malmqvist@gmail.com>
Date: Sun, 12 Oct 2025 15:52:39 +0200
Subject: [PATCH] Rev 2 of DS4 SVG, with solid controller infill and larger
 trackpad infill

---
 assets/dualshock-controller.svg | 13 ++++++++++---
 js/core.js                      |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/assets/dualshock-controller.svg b/assets/dualshock-controller.svg
index 8c3154d..8a08822 100644
--- a/assets/dualshock-controller.svg
+++ b/assets/dualshock-controller.svg
@@ -1,4 +1,10 @@
 <svg id="controller-svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 518" style="width: 80%; height: auto; max-width: 80%;" stroke-width="0">
+
+  <g id="Controller_infills">
+    <path d="M622.95,326.87c-29.09-128.96-37.19-148.52-47.08-165.39-6.92-11.81-15.21-23.77-19.53-29.84-1.47-2.07-3.77-3.37-6.31-3.57-38.85-3.04-71.02-2.57-79.95-2.35-1.06.03-2.06.45-2.82,1.18l-2.73,2.63c-1.73,1.66-4,2.58-6.4,2.58H181.88c-2.4,0-4.67-.92-6.4-2.58l-2.73-2.63c-.76-.74-1.77-1.16-2.82-1.18-8.93-.22-41.11-.69-79.95,2.35-2.54.2-4.84,1.5-6.32,3.57-4.32,6.07-12.61,18.03-19.53,29.84-9.88,16.88-17.99,36.43-47.08,165.43-7.25,34.62-20.46,118.95,13.61,153.45,14.34,14.52,34.26,20.73,53.29,16.6,23.23-5.03,42.3-24.84,53.71-55.79,5.08-13.79,9.26-25.52,12.62-34.94,13.92-39.03,17.22-48.31,30.19-51.55l.3-.08h.31s77.55.17,77.55.17h122.75l77.86-.17.3.08c12.97,3.24,16.27,12.52,30.19,51.55,3.36,9.43,7.54,21.16,12.62,34.94,11.4,30.95,30.48,50.76,53.71,55.79,19.04,4.12,38.96-2.09,53.29-16.6,34.07-34.5,20.86-118.83,13.6-153.49Z"/>
+    <path d="M274.86,314.85c0-30.28-24.63-54.91-54.92-54.91s-54.92,24.63-54.92,54.91,24.63,54.92,54.92,54.92,54.92-24.63,54.92-54.92Z"/>
+    <path d="M420.06,259.93c-30.28,0-54.92,24.63-54.92,54.91s24.63,54.92,54.92,54.92,54.92-24.63,54.92-54.92-24.63-54.91-54.92-54.91Z"/>
+  </g>
   <g id="Button_infills">
     <g id="Down_infill">
       <path d="M104.86,265.19v-6.44c0-5.03,1.96-9.87,5.46-13.49l7.64-7.89c3-3.09,8-2.99,10.87.22l6.95,7.79c3.17,3.55,4.92,8.14,4.92,12.9v6.9c0,6.43-5.21,11.64-11.64,11.64h-12.57c-6.43,0-11.64-5.21-11.64-11.64Z"/>
@@ -55,7 +61,7 @@
       <path d="M72.26,503.22c-16.56,0-32.79-6.81-45.17-19.34-35.77-36.22-22.36-122.58-14.94-158.03,29.26-129.74,37.53-149.6,47.65-166.89,7.02-11.98,15.4-24.07,19.78-30.22,2.33-3.28,5.98-5.34,10-5.65,39.08-3.06,71.47-2.58,80.46-2.37,2.31.06,4.5.97,6.17,2.58l2.73,2.63c.79.76,1.83,1.18,2.93,1.18h36.97v5h-36.97c-2.4,0-4.67-.92-6.4-2.58l-2.73-2.63c-.76-.74-1.77-1.16-2.82-1.18-8.93-.21-41.11-.69-79.95,2.35-2.54.2-4.84,1.5-6.32,3.57-4.32,6.07-12.61,18.03-19.53,29.84-9.88,16.88-17.99,36.43-47.08,165.43-7.25,34.62-20.46,118.95,13.61,153.45,14.34,14.52,34.26,20.73,53.29,16.6,23.23-5.03,42.3-24.84,53.71-55.79,5.08-13.79,9.26-25.52,12.62-34.94,13.92-39.03,17.22-48.31,30.19-51.55l1.21,4.85c-10.08,2.52-12.69,9.11-26.69,48.38-3.36,9.44-7.55,21.18-12.64,34.99-12.01,32.61-32.38,53.55-57.34,58.95-4.23.91-8.5,1.36-12.74,1.36Z"/>
       <path d="M98.46,460.5c-10.71,0-23.53-1.31-38.69-4.41-28.57-5.83-42.38-20.36-48.94-31.52-7.15-12.17-7.45-22.9-7.46-23.35l5-.1-2.5.05,2.5-.06c0,.1.32,10.07,6.9,21.15,8.81,14.83,24.12,24.57,45.5,28.93,53.9,11,73.86-1.74,76.88-10.01l4.7,1.72c-3.38,9.23-16.88,17.6-43.89,17.6Z"/>
       <path d="M567.74,503.22c-4.25,0-8.51-.45-12.74-1.36-24.96-5.4-45.33-26.34-57.34-58.95-5.09-13.81-9.28-25.56-12.64-34.99-14-39.27-16.61-45.86-26.69-48.38l1.21-4.85c12.97,3.24,16.27,12.52,30.19,51.55,3.36,9.43,7.54,21.16,12.62,34.94,11.4,30.95,30.48,50.76,53.71,55.79,19.03,4.12,38.96-2.09,53.29-16.6,34.07-34.5,20.86-118.83,13.6-153.49-29.09-128.96-37.19-148.52-47.08-165.39-6.92-11.81-15.21-23.77-19.53-29.84-1.47-2.07-3.77-3.37-6.31-3.57-38.85-3.04-71.02-2.57-79.95-2.35-1.06.03-2.06.45-2.82,1.18l-2.73,2.63c-1.73,1.66-4,2.58-6.4,2.58h-36.97v-5h36.97c1.1,0,2.14-.42,2.93-1.18l2.73-2.63c1.67-1.61,3.86-2.52,6.17-2.58,8.99-.22,41.38-.69,80.46,2.37,4.02.31,7.66,2.37,10,5.65,4.37,6.14,12.76,18.23,19.78,30.22,10.13,17.29,18.39,37.15,47.65,166.86,7.43,35.48,20.84,121.84-14.93,158.06-12.37,12.53-28.61,19.34-45.17,19.34Z"/>
-      <path d="M541.54,460.5c-27.01,0-40.51-8.36-43.89-17.6l4.7-1.72c3.03,8.27,22.99,21.01,76.88,10.01,21.38-4.36,36.68-14.1,45.5-28.93,6.58-11.08,6.9-21.05,6.9-21.15l5,.11c0,.45-.3,11.18-7.46,23.35-6.56,11.16-20.37,25.69-48.94,31.52-15.16,3.09-27.99,4.41-38.69,4.41Z"/>
+      <path d="M541.54,460.5c-27.01,0-40.51-8.36-43.89-17.6l4.7-1.72c3.03,8.27,22.99,21.01,76.88,10.01,21.38-4.36,36.68-14.1,45.5-28.93,6.58-11.08,6.9-21.05,6.9-21.15l5,.11c0,.45-.3,11.18-7.46,23.35-6.56,11.16-20.37,25.69-48.94,31.52-15.16,3.09-27.99,4.41-38.69,4.41Z"/> -->
       <rect x="258.62" y="354.78" width="122.75" height="5"/>
       <path d="M219.94,374.77c-33.04,0-59.92-26.88-59.92-59.92s26.88-59.91,59.92-59.91,59.92,26.88,59.92,59.91-26.88,59.92-59.92,59.92ZM219.94,259.94c-30.28,0-54.92,24.63-54.92,54.91s24.63,54.92,54.92,54.92,54.92-24.63,54.92-54.92-24.63-54.91-54.92-54.91Z"/>
       <path d="M122.78,301.15c-42.16,0-76.46-34.3-76.46-76.46s34.3-76.46,76.46-76.46,76.46,34.3,76.46,76.46-34.3,76.46-76.46,76.46ZM122.78,153.23c-39.4,0-71.46,32.06-71.46,71.46s32.06,71.46,71.46,71.46,71.46-32.06,71.46-71.46-32.06-71.46-71.46-71.46Z"/>
@@ -96,10 +102,11 @@
   </g>
   <g>
     <g id="Trackpad_infill" >
-      <path d="M224.42,132.47h191.15v102.42c0,1.92-1.56,3.48-3.48,3.48h-184.19c-1.92,0-3.48-1.56-3.48-3.48v-102.42h0Z"/>
+      <!-- smaller infill <path d="M224.42,133.65h-191.01c2.47h191.15v102.42c0,1.92-1.56,3.48-3.48,3.48h-184.19c-1.92,0-3.48-1.56-3.48-3.48v-102.42h0Z"/> -->
+      <path d="M419.35,234.87v-102.38c0-2.12-1.73-3.85-3.85-3.85h-191.01c-2.12,0-3.85,1.73-3.85,3.85v102.38c0,4.13,3.36,7.5,7.5,7.5h183.71c4.13,0,7.5-3.36,7.5-7.5Z"/>
     </g>
     <g id="Trackpad_outline" >
-      <path d="M411.86,247.37h-183.71c-6.89,0-12.5-5.61-12.5-12.5v-102.38c0-4.88,3.97-8.85,8.85-8.85h191.01c4.88,0,8.85,3.97,8.85,8.85v102.38c0,6.89-5.61,12.5-12.5,12.5ZM224.49,128.65c-2.12,0-3.85,1.73-3.85,3.85v102.38c0,4.13,3.36,7.5,7.5,7.5h183.71c4.13,0,7.5-3.36,7.5-7.5v-102.38c0-2.12-1.73-3.85-3.85-3.85h-191.01Z"/>
+      <path d="M415.51,123.65h-191.01c-4.88,0-8.85,3.97-8.85,8.85v102.38c0,6.89,5.61,12.5,12.5,12.5h183.71c6.89,0,12.5-5.61,12.5-12.5v-102.38c0-4.88-3.97-8.85-8.85-8.85ZM228.14,242.36c-4.13,0-7.5-3.36-7.5-7.5v-102.38c0-2.12,1.73-3.85,3.85-3.85h191.01c2.12,0,3.85,1.73,3.85,3.85v102.38c0,4.13-3.36,7.5-7.5,7.5h-183.71Z"/>
     </g>
   </g>
   <g id="L3">
diff --git a/js/core.js b/js/core.js
index f606377..616fc10 100644
--- a/js/core.js
+++ b/js/core.js
@@ -436,7 +436,7 @@ async function init_svg_controller(model) {
     set_svg_group_color(group, midBlue);
   });
 
-  ['Button_infills', 'L3_infill', 'R3_infill', 'Trackpad_infill'].forEach(id => {
+  ['Controller_infills', 'Button_infills', 'L3_infill', 'R3_infill', 'Trackpad_infill'].forEach(id => {
     const group = document.getElementById(id);
     set_svg_group_color(group, 'white');
   });