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

Smuga: współczynnik wzmocnienia łapiący zmiany dynamiczne.

Browse Source 
Model mechanika: Wyświetlany zależnie od obsady (do testu a nie mam na czym).
This commit is contained in:
antonisauren
2016-06-12 14:30:37 +02:00
parent a3e35f50db
commit 90ab2a5774
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DynObj.cpp
View File

@@ -867,7 +867,8 @@ void __inline TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
if (smWahacze[i]) if (smWahacze[i])
smWahacze[i]->SetRotate(float3(1, 0, 0), smWahacze[i]->SetRotate(float3(1, 0, 0),
fWahaczeAmp * cos(MoverParameters->eAngle)); fWahaczeAmp * cos(MoverParameters->eAngle));
if (Mechanik && (Controller != Humandriver)) //if (Mechanik && (Controller != Humandriver))
if (DriverType != "") //rysowanie dla pojazdu z obsadą
{ // rysowanie figurki mechanika { // rysowanie figurki mechanika
if (smMechanik0) // mechanik od strony sprzęgu 0 if (smMechanik0) // mechanik od strony sprzęgu 0
if (smMechanik1) // jak jest drugi, to pierwszego jedynie pokazujemy if (smMechanik1) // jak jest drugi, to pierwszego jedynie pokazujemy

6
World.cpp
View File

@@ -1552,7 +1552,7 @@ bool TWorld::Update()
glDisable(GL_FOG); glDisable(GL_FOG);
//glColor4f(0.15f, 0.15f, 0.15f, 0.25f); //glColor4f(0.15f, 0.15f, 0.15f, 0.25f);
glBindTexture(GL_TEXTURE_2D, light); // Select our texture 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); glBegin(GL_QUADS);
float fSmudge = Train->Dynamic()->MoverParameters->DimHalf.y + 7; // gdzie zaczynaæ smugê float fSmudge = Train->Dynamic()->MoverParameters->DimHalf.y + 7; // gdzie zaczynaæ smugê
if (Train->Controlled()->iLights[0] & 21) if (Train->Controlled()->iLights[0] & 21)
@@ -1561,7 +1561,7 @@ bool TWorld::Update()
{ {
float z = i * i * i * 0.01f;//25/4; 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*(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); 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(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); 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++) for (int i = 15; i <= 35; i++)
{ {
float z = i * i * i * 0.01f;//25/4; 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); 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(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); glTexCoord2f(1, 0); glVertex3f(-10 / 2 - 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3);