FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various tweaks to handling taxiway lighting.

Browse Source
This commit is contained in:
curt
2003-09-23 23:06:50 +00:00
parent 695e112039
commit f3eeeb760f
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/scene/material/matlib.cxx
View File

@@ -491,6 +491,8 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath ) {
rwy_green_low_lights->setTexture( tex_name );
matlib["RWY_GREEN_LOW_LIGHTS"]
= new SGMaterial( rwy_green_low_lights );
matlib["RWY_GREEN_TAXIWAY_LIGHTS"]
= new SGMaterial( rwy_green_low_lights );
// hard coded low intensity taxiway blue light state
tex_name = gen_taxiway_dir_light_map( 90, 90, 235, 205 );

6
simgear/scene/tgdb/obj.cxx
View File

@@ -359,7 +359,11 @@ bool sgBinObjLoad( const string& path, const bool is_base,
pts_v[i], pts_n[i],
matlib,
pt_materials[i], up );
if ( pt_materials[i].substr(0, 16) == "RWY_BLUE_TAXIWAY" ) {
if ( pt_materials[i].substr(0, 16) == "RWY_BLUE_TAXIWAY_LIGHTS" ) {
taxi_lights->addKid( branch );
} else if ( pt_materials[i].substr(0, 16)
== "RWY_GREEN_TAXIWAY_LIGHTS" )
{
taxi_lights->addKid( branch );
} else {
rwy_lights->addKid( branch );

14
simgear/scene/tgdb/pt_lights.hxx
View File

@@ -49,20 +49,6 @@ typedef int_list::iterator int_list_iterator;
typedef int_list::const_iterator int_point_list_iterator;
// Define the various supported light types
typedef enum {
SG_RWYLIGHT_TAXI = 0,
SG_RWYLIGHT_VASI,
SG_RWYLIGHT_EDGE,
SG_RWYLIGHT_TOUCHDOWN,
SG_RWYLIGHT_THRESHOLD,
SG_RWYLIGHT_WHITE,
SG_RWYLIGHT_RED,
SG_RWYLIGHT_GREEN,
SG_RWYLIGHT_YELLOW
} sgPointLightType;
// Generate a directional light. This routines creates a
// 'directional' light that can only be viewed from within 90 degrees
// of the specified dir vector.