fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
src/FDM/flight.cxx src/FDM/flight.hxx src/FDM/groundcache.cxx:
	Maik Justus: Provide the material we roll on in the groundcache.
This commit is contained in:
frohlich 2006-12-27 10:47:10 +00:00
parent 0a522b383a
commit 5a48bcf2a0
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/FDM/flight.cxx
View file

@ -883,6 +883,20 @@ FGInterface::get_agl_m(double t, const double pt[3],
return ret;
}
bool
FGInterface::get_agl_m(double t, const double pt[3],
double contact[3], double normal[3], double vel[3],
int *type, const SGMaterial **material, double *agl)
{
SGVec3d _contact, _normal, _vel;
bool ret = ground_cache.get_agl(t, SGVec3d(pt), 2.0, _contact, _normal,
_vel, type, material, agl);
sgdCopyVec3(contact, _contact.data());
sgdCopyVec3(normal, _normal.data());
sgdCopyVec3(vel, _vel.data());
return ret;
}
// Legacy interface just kept because of JSBSim
bool
FGInterface::get_agl_ft(double t, const double pt[3],

3
src/FDM/flight.hxx
View file

@ -1128,6 +1128,9 @@ public:
double contact[3], double normal[3], double vel[3],
int *type, double *loadCapacity,
double *frictionFactor, double *agl);
bool get_agl_m(double t, const double pt[3],
double contact[3], double normal[3], double vel[3],
int *type, const SGMaterial **material,double *agl);
bool get_agl_ft(double t, const double pt[3],
double contact[3], double normal[3], double vel[3],
int *type, double *loadCapacity,

1
src/FDM/groundcache.cxx
View file

@ -527,6 +527,7 @@ public:
t.rotation = mGroundProperty.rot;
t.rotation_pivot = mGroundProperty.pivot - mGroundCache->cache_center;
t.type = mGroundProperty.type;
t.material=mGroundProperty.material;
mGroundCache->triangles.push_back(t);
}
}