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

Merge remote-tracking branch 'Milek7/lua' into mover_in_c++

Browse Source 
Merge remote-tracking branch 'Milek7/lua' into mover_in_c++
This commit is contained in:
firleju
2017-10-06 16:27:53 +02:00
parent c5097876e5
commit cd80c2ded6
12 changed files with 117 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
World.cpp
View File

@@ -1055,15 +1055,6 @@ bool TWorld::Update()
Ground.Update_Hidden();
Ground.Update_Lights();
{
glm::dmat4 cam_matrix;
Camera.SetMatrix(cam_matrix);
glm::vec3 pos(Camera.Pos.x, Camera.Pos.y, Camera.Pos.z);
sound_man->set_listener(pos, glm::mat3(cam_matrix));
sound_man->update(dt);
}
// render time routines follow:
dt = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu
@@ -1094,6 +1085,16 @@ bool TWorld::Update()
Update_Camera( dt );
{
glm::dmat4 cam_matrix;
Camera.SetMatrix(cam_matrix);
glm::vec3 pos(Camera.Pos.x, Camera.Pos.y, Camera.Pos.z);
sound_man->set_listener(pos, glm::mat3(cam_matrix));
sound_man->update(Global::iPause ? 0.0f : dt);
}
GfxRenderer.Update( dt );
ResourceSweep();