fly/flightgear
1
0
Fork 0
Code Activity

Maik JUSTUS: change /rotors/*/blade1_pos to /rotors/*/blade[0]/position-deg,

Browse source 
incidence to incidence-deg, and flap to flap-deg
This commit is contained in:
mfranz 2006-10-28 20:53:19 +00:00
parent 70bab80507
commit edd8c25fae
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/FDM/YASim/Rotor.cpp
View file

@ -300,9 +300,9 @@ int Rotor::getValueforFGSet(int j,char *text,float *f)
return 0;
}
int w=j%3;
sprintf(text,"/rotors/%s/blade%i_%s",
_name,b+1,
w==0?"pos":(w==1?"flap":"incidence"));
sprintf(text,"/rotors/%s/blade[%i]/%s",
_name,b,
w==0?"position-deg":(w==1?"flap-deg":"incidence-deg"));
*f=((Rotorpart*)getRotorpart(0))->getPhi()*180/pi
+360*b/_number_of_blades*(_ccw?1:-1);
if (*f>360) *f-=360;
@ -894,6 +894,9 @@ void Rotor::compile()
Math::unit3(directions[i],directions[i]);
}
Math::set3(directions[4],directions[0]);
// now directions[0] is perpendicular to the _normal.and has a length
// of 1. if _forward is already normalized and perpendicular to the
// normal, directions[0] will be the same
for (i=0;i<4;i++)
{
Math::mul3(_diameter*0.7,directions[i],_groundeffectpos[i]);
@ -1048,7 +1051,7 @@ void Rotor::compile()
&(torque[1]),&(lift[1])); //pitch b
rps[0]->calculateAlpha(v_wind,rho_null,0,0,0,
&(torque[3]),&(lift[3])); //pitch 0
SG_LOG(SG_GENERAL, SG_DEBUG,
SG_LOG(SG_GENERAL, SG_INFO,
"Rotor: coefficients for airfoil:" << endl << setprecision(6)
<< " drag0: " << _dragcoef0*_number_of_parts/_number_of_blades/_c2
<< " drag1: " << _dragcoef1*_number_of_parts/_number_of_blades/_c2

20
src/MultiPlayer/multiplaymgr.cxx
View file

@ -108,16 +108,16 @@ FGMultiplayMgr::sIdPropertyList[] = {
{800, "rotors/main/rpm", SGPropertyNode::FLOAT},
{801, "rotors/tail/rpm", SGPropertyNode::FLOAT},
{810, "rotors/main/blade1_pos", SGPropertyNode::FLOAT},
{811, "rotors/main/blade2_pos", SGPropertyNode::FLOAT},
{812, "rotors/main/blade3_pos", SGPropertyNode::FLOAT},
{813, "rotors/main/blade4_pos", SGPropertyNode::FLOAT},
{820, "rotors/main/blade1_flap", SGPropertyNode::FLOAT},
{821, "rotors/main/blade2_flap", SGPropertyNode::FLOAT},
{822, "rotors/main/blade3_flap", SGPropertyNode::FLOAT},
{823, "rotors/main/blade4_flap", SGPropertyNode::FLOAT},
{830, "rotors/tail/blade1_pos", SGPropertyNode::FLOAT},
{831, "rotors/tail/blade2_pos", SGPropertyNode::FLOAT},
{810, "rotors/main/blade[0]/position-deg", SGPropertyNode::FLOAT},
{811, "rotors/main/blade[1]/position-deg", SGPropertyNode::FLOAT},
{812, "rotors/main/blade[2]/position-deg", SGPropertyNode::FLOAT},
{813, "rotors/main/blade[3]/position-deg", SGPropertyNode::FLOAT},
{820, "rotors/main/blade[0]/flap-deg", SGPropertyNode::FLOAT},
{821, "rotors/main/blade[1]/flap-deg", SGPropertyNode::FLOAT},
{822, "rotors/main/blade[2]/flap-deg", SGPropertyNode::FLOAT},
{823, "rotors/main/blade[3]/flap-deg", SGPropertyNode::FLOAT},
{830, "rotors/tail/blade[0]/position-deg", SGPropertyNode::FLOAT},
{831, "rotors/tail/blade[1]/position-deg", SGPropertyNode::FLOAT},
{1001, "controls/flight/slats", SGPropertyNode::FLOAT},
{1002, "controls/flight/speedbrake", SGPropertyNode::FLOAT},