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

sound positioning fixes and other changes

Browse Source
This commit is contained in:
milek7
2017-08-21 12:44:18 +02:00
parent 92442b8bf7
commit 5104d7f4fd
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EU07.cpp
View File

@@ -415,7 +415,9 @@ int main(int argc, char *argv[])
#endif #endif
} }
delete sound_man; //m7todo: restore
//delete sound_man;
TPythonInterpreter::killInstance(); TPythonInterpreter::killInstance();
#ifdef _WIN32 #ifdef _WIN32
delete pConsole; delete pConsole;

16
McZapkie/Mover.cpp
View File

@@ -7478,26 +7478,26 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet
auto &collectorparameters = Powerparameters.CollectorParameters; auto &collectorparameters = Powerparameters.CollectorParameters;
extract_value( collectorparameters.CollectorsNo, "CollectorsNo", Line, "0.0" ); extract_value( collectorparameters.CollectorsNo, "CollectorsNo", Line, "" );
extract_value( collectorparameters.MinH, "MinH", Line, "0.0" ); extract_value( collectorparameters.MinH, "MinH", Line, "" );
extract_value( collectorparameters.MaxH, "MaxH", Line, "0.0" ); extract_value( collectorparameters.MaxH, "MaxH", Line, "" );
extract_value( collectorparameters.CSW, "CSW", Line, "0.0" ); //szerokość części roboczej extract_value( collectorparameters.CSW, "CSW", Line, "" ); //szerokość części roboczej
extract_value( collectorparameters.MaxV, "MaxVoltage", Line, "0.0" ); extract_value( collectorparameters.MaxV, "MaxVoltage", Line, "" );
collectorparameters.OVP = //przekaźnik nadnapięciowy collectorparameters.OVP = //przekaźnik nadnapięciowy
extract_value( "OverVoltProt", Line ) == "Yes" ? extract_value( "OverVoltProt", Line ) == "Yes" ?
1 : 1 :
0; 0;
//napięcie rozłączające WS //napięcie rozłączające WS
collectorparameters.MinV = 0.5 * collectorparameters.MaxV; //gdyby parametr nie podany 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 //napięcie wymagane do załączenia WS
collectorparameters.InsetV = 0.6 * collectorparameters.MaxV; //gdyby parametr nie podany 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 //ciśnienie rozłączające WS
extract_value( collectorparameters.MinPress, "MinPress", Line, "3.5" ); //domyślnie 2 bary do załączenia WS extract_value( collectorparameters.MinPress, "MinPress", Line, "3.5" ); //domyślnie 2 bary do załączenia WS
//maksymalne ciśnienie za reduktorem //maksymalne ciśnienie za reduktorem
collectorparameters.MaxPress = 5.0 + 0.001 * ( Random( 50 ) - Random( 50 ) ); 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; break;
} }
case PowerCable: { case PowerCable: {

13
World.cpp
View File

@@ -1138,8 +1138,17 @@ bool TWorld::Update()
Update_Camera( dt ); 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 ); GfxRenderer.Update( dt );
ResourceSweep(); ResourceSweep();