commaai · incognitojam · May 16, 2025 · May 15, 2025 · May 16, 2025 · May 16, 2025
diff --git a/selfdrive/assets/icons/checkmark.png b/selfdrive/assets/icons/checkmark.png
diff --git a/selfdrive/assets/icons/circled_check.png b/selfdrive/assets/icons/circled_check.png
diff --git a/selfdrive/assets/icons/circled_slash.png b/selfdrive/assets/icons/circled_slash.png
diff --git a/selfdrive/assets/icons/close.png b/selfdrive/assets/icons/close.png
diff --git a/selfdrive/assets/icons/close2.png b/selfdrive/assets/icons/close2.png
diff --git a/selfdrive/assets/icons/couch.png b/selfdrive/assets/icons/couch.png
diff --git a/selfdrive/assets/icons/disengage_on_accelerator.png b/selfdrive/assets/icons/disengage_on_accelerator.png
diff --git a/selfdrive/assets/icons/experimental.png b/selfdrive/assets/icons/experimental.png
diff --git a/selfdrive/assets/icons/experimental_grey.png b/selfdrive/assets/icons/experimental_grey.png
diff --git a/selfdrive/assets/icons/experimental_white.png b/selfdrive/assets/icons/experimental_white.png
diff --git a/selfdrive/assets/icons/eye_closed.png b/selfdrive/assets/icons/eye_closed.png
diff --git a/selfdrive/assets/icons/eye_open.png b/selfdrive/assets/icons/eye_open.png
diff --git a/selfdrive/assets/icons/lock_closed.png b/selfdrive/assets/icons/lock_closed.png
diff --git a/selfdrive/assets/icons/triangle.png b/selfdrive/assets/icons/triangle.png
diff --git a/selfdrive/assets/icons/wifi_strength_full.png b/selfdrive/assets/icons/wifi_strength_full.png
diff --git a/selfdrive/assets/icons/wifi_strength_high.png b/selfdrive/assets/icons/wifi_strength_high.png
diff --git a/selfdrive/assets/icons/wifi_strength_low.png b/selfdrive/assets/icons/wifi_strength_low.png
diff --git a/selfdrive/assets/icons/wifi_strength_medium.png b/selfdrive/assets/icons/wifi_strength_medium.png
diff --git a/selfdrive/assets/icons/wifi_uploading.png b/selfdrive/assets/icons/wifi_uploading.png
diff --git a/selfdrive/assets/images/button_continue_triangle.png b/selfdrive/assets/images/button_continue_triangle.png
diff --git a/selfdrive/assets/prep-svg.sh b/selfdrive/assets/prep-svg.sh
@@ -1,10 +1,23 @@
 #!/usr/bin/env bash
 set -e
 
-for svg in $(find icons/ images/ -type f | grep svg$); do
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# sudo apt install inkscape
+
+for svg in $(find $DIR -type f | grep svg$); do
   bunx svgo $svg --multipass --pretty --indent 2
 
   # convert to PNG
-  # sudo apt install inkscape
-  convert -background none -resize 400% -density 384 $svg "${svg%.svg}.png"
+  png="${svg%.svg}.png"
+  width=$(inkscape --query-width "$svg")
+  height=$(inkscape --query-height "$svg")
+  if (( $(echo "$width > $height" | bc -l) )); then
+    export_dim="--export-width=512"
+  else
+    export_dim="--export-height=512"
+  fi
+  inkscape "$svg" --export-filename="$png" $export_dim
+
+  optipng -o7 -strip all "$png"
 done
diff --git a/system/ui/lib/application.py b/system/ui/lib/application.py
@@ -80,10 +80,7 @@ def texture(self, asset_path: str, width: int, height: int, alpha_premultiply=Fa
 
   def _load_texture_from_image(self, image_path: str, width: int, height: int, alpha_premultiply = False, keep_aspect_ratio=True):
     """Load and resize a texture, storing it for later automatic unloading."""
-    if image_path.endswith('.svg'):
-      image = self._load_image_from_svg(image_path)
-    else:
-      image = rl.load_image(image_path)
+    image = rl.load_image(image_path)
 
     if alpha_premultiply:
       rl.image_alpha_premultiply(image)
@@ -112,10 +109,6 @@ def _load_texture_from_image(self, image_path: str, width: int, height: int, alp
     rl.unload_image(image)
     return texture
 
-  def _load_image_from_svg(self, svg_path: str):
-    # TODO: Implement SVG loading
-    assert(0)
-
   def close(self):
     if not rl.is_window_ready():
       return