From 90ab2a5774f24fd8c7241ea92f4a83d43d3d654d Mon Sep 17 00:00:00 2001 From: antonisauren Date: Sun, 12 Jun 2016 14:30:37 +0200 Subject: [PATCH] =?UTF-8?q?Smuga:=20wsp=C3=B3=C5=82czynnik=20wzmocnienia?= =?UTF-8?q?=20=C5=82api=C4=85cy=20zmiany=20dynamiczne.=20Model=20mechanika?= =?UTF-8?q?:=20Wy=C5=9Bwietlany=20zale=C5=BCnie=20od=20obsady=20(do=20test?= =?UTF-8?q?u=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);