eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 Wiki Activity

use glm instead of Math3D in Globals

Browse Source
This commit is contained in:
docentYT
2026-04-26 23:27:10 +02:00
parent 9fef303ec0
commit 1cfcf47788
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simulation/simulationstateserializer.cpp
View File

@@ -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 ) );

5
utilities/Globals.h
View File

@@ -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<Math3D::vector3, 10> FreeCameraInit; // pozycje kamery
std::array<Math3D::vector3, 10> FreeCameraInitAngle;
std::array<glm::dvec3, 10> FreeCameraInit; // pozycje kamery
std::array<glm::dvec3, 10> 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;