diff --git a/src/drivers/simplix/src/unitdriver.cpp b/src/drivers/simplix/src/unitdriver.cpp index 4f72f3927..0164af929 100644 --- a/src/drivers/simplix/src/unitdriver.cpp +++ b/src/drivers/simplix/src/unitdriver.cpp @@ -2396,7 +2396,7 @@ void TDriver::InitCa() if (index == 0) FrontWingArea = FrontWingArea * sin(FrontWingAngle - wing->AoAatZRad); else - RearWingArea = RearWingArea * sin(RearWingAngle - wing->AoAatZRad); + RearWingArea = RearWingArea * sin(RearWingAngle - wing->AoAatZRad); } } diff --git a/src/drivers/simplix/src/unitmain.cpp b/src/drivers/simplix/src/unitmain.cpp index 92c0adff3..752e04cb7 100644 --- a/src/drivers/simplix/src/unitmain.cpp +++ b/src/drivers/simplix/src/unitmain.cpp @@ -803,7 +803,7 @@ static int InitFuncPt(int Index, void *Pt) cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix; cInstances[Index-IndexOffset].cRobot->ScaleSide(0.95f,0.95f); cInstances[Index-IndexOffset].cRobot->SideBorderOuter(0.00f); - //cInstances[Index-IndexOffset].cRobot->UseFilterAccel(); + cInstances[Index-IndexOffset].cRobot->UseFilterAccel(); } else if (cRobotType == RTYPE_SIMPLIX_LS1) { diff --git a/src/modules/simu/simuv4/aero.cpp b/src/modules/simu/simuv4/aero.cpp index aa588a4c0..49324ae2d 100644 --- a/src/modules/simu/simuv4/aero.cpp +++ b/src/modules/simu/simuv4/aero.cpp @@ -122,7 +122,7 @@ tdble CliftFromAoA(tWing* wing) //fprintf(stderr,"a: %g\n",wing->a); double s = sin(wing->a/180.0*PI); //fprintf(stderr,"s: %g\n",s); - return (tdble)((s * s * (wing->CliftMax + wing->d) - wing->d) * wing->Kx); + return (tdble)(s * s * (wing->CliftMax + wing->d) - wing->d); } else { @@ -224,7 +224,7 @@ SimWingConfig(tCar *car, int index) } else /* if (wing->WingType == 1) */ { - wing->Kz = CliftFromAoA(wing); + wing->Kz = CliftFromAoA(wing) * wing->Kx; fprintf(stderr,"Kz: %g Kx: %g\n",wing->Kz,wing->Kx); if (index == 0) @@ -297,7 +297,8 @@ SimWingUpdate(tCar *car, int index, tSituation* s) else // if (wing->WingType == 1) { wing->forces.x = (tdble) (wing->Kx * vt2 * (1.0f + (tdble)car->dammage / 10000.0) * MAX(fabs(sin(aoa - wing->AoAatZRad)), 0.02)); - wing->forces.z = (tdble) MIN(0.0,vt2 * CliftFromAoA(wing)); + wing->forces.z = (tdble) MIN(0.0,wing->Kx* vt2 * CliftFromAoA(wing)); + // fprintf(stderr,"%d fz: %g (%g)\n",index,wing->forces.z,CliftFromAoA(wing)); } } else