From 1cfcf47788ade38e3456d0728daf86cdf4bef75a Mon Sep 17 00:00:00 2001 From: docentYT <63965954+docentYT@users.noreply.github.com> Date: Sun, 26 Apr 2026 23:27:10 +0200 Subject: [PATCH] use glm instead of Math3D in Globals --- simulation/simulationstateserializer.cpp | 2 +- utilities/Globals.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index cbd7dd53..3c0a6dcd 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -278,7 +278,7 @@ state_serializer::deserialize_camera( cParser &Input, scene::scratch_data &Scrat if( into < 10 ) { // przepisanie do odpowiedniego miejsca w tabelce Global.FreeCameraInit[ into ] = xyz; Global.FreeCameraInitAngle[ into ] = - Math3D::vector3( + glm::dvec3( glm::radians( abc.x ), glm::radians( abc.y ), glm::radians( abc.z ) ); diff --git a/utilities/Globals.h b/utilities/Globals.h index efbdc29d..f9513b45 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -11,7 +11,6 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Classes.h" #include "vehicle/Camera.h" -#include "utilities/dumb3d.h" #include "utilities/Float3d.h" #include "rendering/light.h" #include "utilities/utilities.h" @@ -46,8 +45,8 @@ struct global_settings { uint32_t random_seed = 0; TCamera pCamera; // parametry kamery TCamera pDebugCamera; - std::array FreeCameraInit; // pozycje kamery - std::array FreeCameraInitAngle; + std::array FreeCameraInit; // pozycje kamery + std::array FreeCameraInitAngle; int iCameraLast{ -1 }; int iSlowMotion{ 0 }; // info o malym FPS: 0-OK, 1-wyłączyć multisampling, 3-promień 1.5km, 7-1km basic_light DayLight;