Merge branch 'commaai:master' into PA-dev2

SConstruct

@@ -366,6 +366,7 @@ SConscript(['rednose/SConscript'])
 
 # Build system services
 SConscript([
+  'system/ui/SConscript',
   'system/proclogd/SConscript',
   'system/ubloxd/SConscript',
   'system/loggerd/SConscript',

selfdrive/ui/SConscript

@@ -110,5 +110,3 @@ if GetOption('extras') and arch != "Darwin":
 # build watch3
 if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
   qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'msgq', 'visionipc'])
-
-SConscript(['raylib/SConscript'])

system/ui/.gitignore

@@ -0,0 +1 @@
+spinner

system/ui/SConscript

@@ -0,0 +1,18 @@
+Import('env', 'arch', 'common')
+
+renv = env.Clone()
+
+rayutil = env.Library("rayutil", ['raylib/util.cc'], LIBS='raylib')
+linked_libs = ['raylib', rayutil, common]
+renv['LIBPATH'] += [f'#third_party/raylib/{arch}/']
+
+mac_frameworks = []
+if arch == "Darwin":
+  mac_frameworks += ['OpenCL', 'CoreVideo', 'Cocoa', 'GLUT', 'CoreFoundation', 'OpenGL', 'IOKit']
+elif arch == 'larch64':
+  linked_libs += ['GLESv2', 'GL', 'EGL', 'wayland-client', 'wayland-egl']
+else:
+  linked_libs += ['OpenCL', 'dl', 'pthread']
+
+if arch != 'aarch64':
+  renv.Program("spinner", ["raylib/spinner.cc"], LIBS=linked_libs, FRAMEWORKS=mac_frameworks)

selfdrive/ui/raylib/spinner.cc → system/ui/raylib/spinner.cc

@@ -2,7 +2,7 @@
 #include <cmath>
 #include <iostream>
 
-#include "selfdrive/ui/raylib/util.h"
+#include "system/ui/raylib/util.h"
 #include "third_party/raylib/include/raylib.h"
 
 constexpr int kProgressBarWidth = 1000;
@@ -19,8 +19,8 @@ int main(int argc, char *argv[]) {
   std::cin.sync_with_stdio(false);
   std::cin.tie(nullptr);
 
-  Texture2D commaTexture = LoadTextureResized("../../assets/img_spinner_comma.png", kTextureSize);
-  Texture2D spinnerTexture = LoadTextureResized("../../assets/img_spinner_track.png", kTextureSize);
+  Texture2D commaTexture = LoadTextureResized("../../selfdrive/assets/img_spinner_comma.png", kTextureSize);
+  Texture2D spinnerTexture = LoadTextureResized("../../selfdrive/assets/img_spinner_track.png", kTextureSize);
 
   float rotation = 0.0f;
   std::string userInput;

selfdrive/ui/raylib/util.cc → system/ui/raylib/util.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/raylib/util.h"
+#include "system/ui/raylib/util.h"
 
 #include <array>
 
@@ -23,7 +23,6 @@ struct FontManager {
   FontManager() {
     for (int i = 0; i < fonts.size(); ++i) {
       fonts[i] = LoadFontEx(FONT_FILE_PATHS[i], 120, nullptr, 250);
-      SetTextureFilter(fonts[i].texture, TEXTURE_FILTER_TRILINEAR);
     }
   }
 
@@ -43,14 +42,13 @@ Texture2D LoadTextureResized(const char *fileName, int size) {
   Image img = LoadImage(fileName);
   ImageResize(&img, size, size);
   Texture2D texture = LoadTextureFromImage(img);
-  SetTextureFilter(texture, TEXTURE_FILTER_TRILINEAR);
   return texture;
 }
 
 void initApp(const char *title, int fps) {
   Hardware::set_display_power(true);
   Hardware::set_brightness(65);
   // SetTraceLogLevel(LOG_NONE);
-  InitWindow(0, 0, title);
+  InitWindow(2160, 1080, title);
   SetTargetFPS(fps);
 }