From 791bf36b906e1d38df3ba4ac7aa511c589b3d766 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Tue, 11 Nov 2025 09:03:24 +0100 Subject: [PATCH] Reviving old code. --- 3rdparty/ozz-animation/CMakeLists.txt | 2 +- .../include/ozz/base/containers/std_allocator.h | 2 +- src/Camera.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3rdparty/ozz-animation/CMakeLists.txt b/3rdparty/ozz-animation/CMakeLists.txt index 769c026..273e816 100644 --- a/3rdparty/ozz-animation/CMakeLists.txt +++ b/3rdparty/ozz-animation/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.3) +cmake_minimum_required (VERSION 3.20) # Defines the project's name project(ozz) diff --git a/3rdparty/ozz-animation/include/ozz/base/containers/std_allocator.h b/3rdparty/ozz-animation/include/ozz/base/containers/std_allocator.h index 0211253..9355815 100644 --- a/3rdparty/ozz-animation/include/ozz/base/containers/std_allocator.h +++ b/3rdparty/ozz-animation/include/ozz/base/containers/std_allocator.h @@ -49,7 +49,7 @@ class StdAllocator { StdAllocator(const StdAllocator&) noexcept {} template - StdAllocator(const StdAllocator<_Other>&) noexcept {} + StdAllocator(const StdAllocator<_Other>&) noexcept {} template struct rebind { diff --git a/src/Camera.c b/src/Camera.c index 5890221..e2a7b2e 100644 --- a/src/Camera.c +++ b/src/Camera.c @@ -42,8 +42,8 @@ inline void Camera_Init(Camera* camera) { camera->pitch = 10 * M_PI / 180.0f; memcpy(&camera->mtxView, &mtx_identity, sizeof(camera->mtxView)); - Camera_CalcToMatrix(camera, &camera->mtxView); - Camera_CalcFromMatrix(camera, &camera->mtxView); + Camera_CalcToMatrix(camera, &camera->mtxView[0]); + Camera_CalcFromMatrix(camera, &camera->mtxView[0]); } void Camera_CalcFromMatrix(Camera* camera, float* mat) { @@ -153,6 +153,6 @@ inline void Camera_Update( camera->vel[i] = camera->vel[i] * 0.1; } - Camera_CalcToMatrix(camera, &camera->mtxView); + Camera_CalcToMatrix(camera, &camera->mtxView[0]); } -} \ No newline at end of file +}