diff --git a/EU07.cpp b/EU07.cpp index c73f92b3..530fd121 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -415,7 +415,9 @@ int main(int argc, char *argv[]) #endif } - delete sound_man; + //m7todo: restore + //delete sound_man; + TPythonInterpreter::killInstance(); #ifdef _WIN32 delete pConsole; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b55a117d..d0dcf042 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7478,26 +7478,26 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet auto &collectorparameters = Powerparameters.CollectorParameters; - extract_value( collectorparameters.CollectorsNo, "CollectorsNo", Line, "0.0" ); - extract_value( collectorparameters.MinH, "MinH", Line, "0.0" ); - extract_value( collectorparameters.MaxH, "MaxH", Line, "0.0" ); - extract_value( collectorparameters.CSW, "CSW", Line, "0.0" ); //szerokość części roboczej - extract_value( collectorparameters.MaxV, "MaxVoltage", Line, "0.0" ); + extract_value( collectorparameters.CollectorsNo, "CollectorsNo", Line, "" ); + extract_value( collectorparameters.MinH, "MinH", Line, "" ); + extract_value( collectorparameters.MaxH, "MaxH", Line, "" ); + extract_value( collectorparameters.CSW, "CSW", Line, "" ); //szerokość części roboczej + extract_value( collectorparameters.MaxV, "MaxVoltage", Line, "" ); collectorparameters.OVP = //przekaźnik nadnapięciowy extract_value( "OverVoltProt", Line ) == "Yes" ? 1 : 0; //napięcie rozłączające WS collectorparameters.MinV = 0.5 * collectorparameters.MaxV; //gdyby parametr nie podany - extract_value( collectorparameters.MinV, "MinV", Line, "0.0" ); + extract_value( collectorparameters.MinV, "MinV", Line, "" ); //napięcie wymagane do załączenia WS collectorparameters.InsetV = 0.6 * collectorparameters.MaxV; //gdyby parametr nie podany - extract_value( collectorparameters.InsetV, "InsetV", Line, "0.0" ); + extract_value( collectorparameters.InsetV, "InsetV", Line, "" ); //ciśnienie rozłączające WS extract_value( collectorparameters.MinPress, "MinPress", Line, "3.5" ); //domyślnie 2 bary do załączenia WS //maksymalne ciśnienie za reduktorem collectorparameters.MaxPress = 5.0 + 0.001 * ( Random( 50 ) - Random( 50 ) ); - extract_value( collectorparameters.MaxPress, "MaxPress", Line, "0.0" ); + extract_value( collectorparameters.MaxPress, "MaxPress", Line, "" ); break; } case PowerCable: { diff --git a/World.cpp b/World.cpp index 1ba003f3..829e17ff 100644 --- a/World.cpp +++ b/World.cpp @@ -1138,8 +1138,17 @@ bool TWorld::Update() Update_Camera( dt ); - sound_man->set_listener(Camera.Pos, Camera.LookAt, Camera.vUp); - sound_man->update(dt); + { + glm::dmat4 cam_matrix; + Camera.SetMatrix(cam_matrix); + + glm::vec3 pos(Camera.Pos.x, Camera.Pos.y, Camera.Pos.z); + glm::vec3 at = glm::vec3(0.0, 0.0, -1.0) * glm::mat3(cam_matrix); + glm::vec3 up = glm::vec3(0.0, 1.0, 0.0) * glm::mat3(cam_matrix); + + sound_man->set_listener(pos, at, up); + sound_man->update(dt); + } GfxRenderer.Update( dt ); ResourceSweep();