Merge branch 'car3d_dev' of github.com:gagistech/carcockpit into car3…

…d_dev
gagistech · Jul 13, 2024 · a274e6f · a274e6f
2 parents cd06953 + e14367d
commit a274e6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,11 +9,11 @@ jobs:
 ##### coverage #####
   coverage:
     runs-on: ubuntu-latest
-    container: debian:bullseye
+    container: debian:bookworm
     name: coverage - measure
     env:
       linux_distro: debian
-      linux_release: bullseye
+      linux_release: bookworm
     steps:
       - name: add cppfw deb repo
         uses: myci-actions/add-deb-repo@master
@@ -67,8 +67,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {os: debian, codename: bullseye, image_owner: }
-          # - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: }
+          # - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
     name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -107,16 +107,16 @@ jobs:
         include:
           - {os: debian, codename: bullseye, image_owner: }
           # - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
-          - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm32,docker]}
           - {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [arm64,docker]}
           - {os: debian, codename: bookworm, image_owner: }
           # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
-          - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
           - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
           # - {os: ubuntu, codename: focal, image_owner: }
           - {os: ubuntu, codename: jammy, image_owner: }
-          - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm,docker]}
-          - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm,docker]}
+          # - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
+          - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
     name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}

diff --git a/src/carcockpit/gauge.cpp b/src/carcockpit/gauge.cpp
@@ -71,10 +71,10 @@ void gauge::render(const matrix4& matrix) const
 
 	matrix4 mmm;
 	mmm.set_identity();
-	mmm.rotate(
+	mmm.rotate(ruis::quat(
 		-(this->params.start_angle_rad +
 		  (this->params.end_angle_rad - this->params.start_angle_rad) * this->get_fraction())
-	);
+	));
 	{
 		auto div = ruis::real(this->arrow_tex->dims().x()) * this->params.arm_fraction;
 		ASSERT(div >= 0)