fly/flightgear
1
0
Fork 0
Code Activity

Begin stubbing in some wrapper code in preparation for runway lighting.

Browse source
This commit is contained in:
curt 2001-07-12 15:03:49 +00:00
parent 2cb51a228b
commit 2fba4df258
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Scenery/tileentry.cxx
View file

@ -38,6 +38,7 @@
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Scenery/scenery.hxx> #include <Scenery/scenery.hxx>
#include <Time/light.hxx> #include <Time/light.hxx>
#include <Objects/apt_signs.hxx>
#include <Objects/matlib.hxx> #include <Objects/matlib.hxx>
#include <Objects/newmat.hxx> #include <Objects/newmat.hxx>
#include <Objects/obj.hxx> #include <Objects/obj.hxx>
@ -530,6 +531,17 @@ FGTileEntry::load( const SGPath& base, bool is_base )
obj_trans -> addKid( custom_obj ); obj_trans -> addKid( custom_obj );
} }
new_tile->addKid( obj_trans ); new_tile->addKid( obj_trans );
} else if ( token == "RWY_LIGHTS" ) {
double lon, lat, hdg, len, width;
string common, end1, end2;
in >> lon >> lat >> hdg >> len >> width
>> common >> end1 >> end2;
SG_LOG( SG_TERRAIN, SG_INFO, "token = " << token
<< " pos = " << lon << ", " << lat
<< " hdg = " << hdg
<< " size = " << len << ", " << width
<< " codes = " << common << " "
<< end1 << " " << end2 );
} else { } else {
SG_LOG( SG_TERRAIN, SG_ALERT, SG_LOG( SG_TERRAIN, SG_ALERT,
"Unknown token " << token << " in " "Unknown token " << token << " in "

5
src/Scenery/tilemgr.cxx
View file

@ -334,9 +334,8 @@ int FGTileMgr::update( double lon, double lat ) {
if ( scenery.center == Point3D(0.0) ) { if ( scenery.center == Point3D(0.0) ) {
// initializing // initializing
cout << "initializing scenery current elevation ... " << endl; cout << "initializing scenery current elevation ... " << endl;
sgdVec3 tmp_abs_view_pos; sgdVec3 tmp_abs_view_pos;
sgVec3 tmp_view_pos;
Point3D geod_pos = Point3D( longitude * SGD_DEGREES_TO_RADIANS, Point3D geod_pos = Point3D( longitude * SGD_DEGREES_TO_RADIANS,
latitude * SGD_DEGREES_TO_RADIANS, latitude * SGD_DEGREES_TO_RADIANS,
@ -347,7 +346,7 @@ int FGTileMgr::update( double lon, double lat ) {
// cout << "abs_view_pos = " << tmp_abs_view_pos << endl; // cout << "abs_view_pos = " << tmp_abs_view_pos << endl;
prep_ssg_nodes(); prep_ssg_nodes();
sgSetVec3( tmp_view_pos, 0.0, 0.0, 0.0 );
double tmp_elev; double tmp_elev;
if ( fgCurrentElev(tmp_abs_view_pos, sc, &hit_list, if ( fgCurrentElev(tmp_abs_view_pos, sc, &hit_list,
&tmp_elev, &scenery.cur_radius, scenery.cur_normal) ) &tmp_elev, &scenery.cur_radius, scenery.cur_normal) )