From 90ab2a5774f24fd8c7241ea92f4a83d43d3d654d Mon Sep 17 00:00:00 2001 From: antonisauren Date: Sun, 12 Jun 2016 14:30:37 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Smuga:=20wsp=C3=B3=C5=82czynnik=20wzmocnien?= =?UTF-8?q?ia=20=C5=82api=C4=85cy=20zmiany=20dynamiczne.=20Model=20mechani?= =?UTF-8?q?ka:=20Wy=C5=9Bwietlany=20zale=C5=BCnie=20od=20obsady=20(do=20te?= =?UTF-8?q?stu=20a=20nie=20mam=20na=20czym).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DynObj.cpp | 3 ++- World.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index b9128d9c..40593e94 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -867,7 +867,8 @@ void __inline TDynamicObject::ABuLittleUpdate(double ObjSqrDist) if (smWahacze[i]) smWahacze[i]->SetRotate(float3(1, 0, 0), fWahaczeAmp * cos(MoverParameters->eAngle)); - if (Mechanik && (Controller != Humandriver)) + //if (Mechanik && (Controller != Humandriver)) + if (DriverType != "") //rysowanie dla pojazdu z obsadą { // rysowanie figurki mechanika if (smMechanik0) // mechanik od strony sprzęgu 0 if (smMechanik1) // jak jest drugi, to pierwszego jedynie pokazujemy diff --git a/World.cpp b/World.cpp index 441bcd4a..8582f2a1 100644 --- a/World.cpp +++ b/World.cpp @@ -1552,7 +1552,7 @@ bool TWorld::Update() glDisable(GL_FOG); //glColor4f(0.15f, 0.15f, 0.15f, 0.25f); glBindTexture(GL_TEXTURE_2D, light); // Select our texture - float ddl = (0.15*Global::diffuseDayLight[0]+0.295*Global::diffuseDayLight[1]+0.055*Global::diffuseDayLight[2]); //0.24:0 + //float ddl = (0.15*Global::diffuseDayLight[0]+0.295*Global::diffuseDayLight[1]+0.055*Global::diffuseDayLight[2]); //0.24:0 glBegin(GL_QUADS); float fSmudge = Train->Dynamic()->MoverParameters->DimHalf.y + 7; // gdzie zaczynać smugę if (Train->Controlled()->iLights[0] & 21) @@ -1561,7 +1561,7 @@ bool TWorld::Update() { float z = i * i * i * 0.01f;//25/4; //float C = (36 - i*0.5)*0.005*(1.5 - sqrt(ddl)); - float C = (36 - i*0.5)*0.005*sqrt((1/sqrt(ddl+0.015))-1); + float C = (36 - i*0.5)*0.005*sqrt((1/sqrt(Global::fLuminance+0.015))-1); glColor4f(C, C, C, 0.25f); glTexCoord2f(0, 0); glVertex3f(-10 / 2 - 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3); glTexCoord2f(1, 0); glVertex3f(10 / 2 + 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3); @@ -1574,7 +1574,7 @@ bool TWorld::Update() for (int i = 15; i <= 35; i++) { float z = i * i * i * 0.01f;//25/4; - float C = (36 - i*0.5)*0.005*sqrt((1/sqrt(ddl+0.015))-1); + float C = (36 - i*0.5)*0.005*sqrt((1/sqrt(Global::fLuminance+0.015))-1); glColor4f(C, C, C, 0.25f); glTexCoord2f(0, 0); glVertex3f(10 / 2 + 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3); glTexCoord2f(1, 0); glVertex3f(-10 / 2 - 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3); From ef3e8b59295e5bb378cfc891fa6bdca7bd1fb5a6 Mon Sep 17 00:00:00 2001 From: antonisauren Date: Thu, 23 Jun 2016 20:30:54 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Cofni=C4=99cie=20zmian=20wy=C5=9Bwietlania?= =?UTF-8?q?=20mechanika;=20to=20trzeba=20dog=C5=82=C4=99bniej=20przerobi?= =?UTF-8?q?=C4=87.=20Aktualizacja=20=C5=9Bwiate=C5=82=20z=20programatora?= =?UTF-8?q?=20przy=20za=C5=82=C4=85czaniu=20baterii=20tylko=20gdy=20ten=20?= =?UTF-8?q?istnieje.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DynObj.cpp | 3 +-- EU07.bpr | 4 ++-- EU07.res | Bin 3152 -> 3152 bytes Globals.cpp | 4 ++-- Train.cpp | 5 ++++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 40593e94..b9128d9c 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -867,8 +867,7 @@ void __inline TDynamicObject::ABuLittleUpdate(double ObjSqrDist) if (smWahacze[i]) smWahacze[i]->SetRotate(float3(1, 0, 0), fWahaczeAmp * cos(MoverParameters->eAngle)); - //if (Mechanik && (Controller != Humandriver)) - if (DriverType != "") //rysowanie dla pojazdu z obsadą + if (Mechanik && (Controller != Humandriver)) { // rysowanie figurki mechanika if (smMechanik0) // mechanik od strony sprzęgu 0 if (smMechanik1) // jak jest drugi, to pierwszego jedynie pokazujemy diff --git a/EU07.bpr b/EU07.bpr index 8c547f2a..4d6169e2 100644 --- a/EU07.bpr +++ b/EU07.bpr @@ -60,7 +60,7 @@ AutoIncBuild=0 MajorVer=16 MinorVer=0 Release=1173 -Build=477 +Build=478 Debug=1 PreRelease=0 Special=0 @@ -72,7 +72,7 @@ CodePage=1250 [Version Info Keys] CompanyName=EU07 Team FileDescription=MaSzyna EU07-424 -FileVersion=16.0.1173.477 +FileVersion=16.0.1173.478 InternalName=DP+SPKS+asynch+python LegalCopyright= LegalTrademarks= diff --git a/EU07.res b/EU07.res index 4c2d29abc4f0876542e756d043f6ae487b939033..b826ec23f8e823d966b812f55a54f36f2c94a319 100644 GIT binary patch delta 29 lcmca0aY15311IM_#;Gg}3<3=IHg|FgGcsCip3AkF5df2H2^jzY delta 29 lcmca0aY15311INQ#;Gg}3<3;yH+OOhGcuZQp3AkF5df1!2^IhV diff --git a/Globals.cpp b/Globals.cpp index 0479b6b1..175bfb07 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -49,9 +49,9 @@ double Global::fLuminance = 1.0; // jasno int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki HWND Global::hWnd = NULL; // uchwyt okna int Global::iCameraLast = -1; -AnsiString Global::asRelease = "16.0.1172.477"; +AnsiString Global::asRelease = "16.0.1172.478"; AnsiString Global::asVersion = - "Compilation 2016-06-10, release " + Global::asRelease + "."; // tutaj, bo wysyłany + "Compilation 2016-06-23, release " + Global::asRelease + "."; // tutaj, bo wysyłany int Global::iViewMode = 0; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, diff --git a/Train.cpp b/Train.cpp index 538c572c..942fa9f8 100644 --- a/Train.cpp +++ b/Train.cpp @@ -459,7 +459,10 @@ void TTrain::OnKeyDown(int cKey) if (mvOccupied->BatterySwitch(true)) // bateria potrzebna np. do zapalenia świateł { dsbSwitch->Play(0, 0, 0); - SetLights(); + if (mvOccupied->LightsPosNo > 0) + { + SetLights(); + } if (TestFlag(mvOccupied->SecuritySystem.SystemType, 2)) // Ra: znowu w kabinie jest coś, co być nie powinno! {