fly/flightgear
1
0
Fork 0
Code Activity

Setting up some more ground work for lighting.

Browse source
This commit is contained in:
curt 2002-03-01 18:08:30 +00:00
parent 348ac42c90
commit 7631c37f73
3 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/Scenery/tileentry.cxx
View file

@ -724,10 +724,10 @@ void FGTileEntry::free_tile() {
// disconnected from the scene graph) // disconnected from the scene graph)
ssgDeRefDelete( terra_transform ); ssgDeRefDelete( terra_transform );
if ( lights_transform ) { if ( gnd_lights_transform ) {
// delete the terrain lighting branch (this should already have been // delete the terrain lighting branch (this should already have been
// disconnected from the scene graph) // disconnected from the scene graph)
ssgDeRefDelete( lights_transform ); ssgDeRefDelete( gnd_lights_transform );
} }
// ADA // ADA
@ -751,23 +751,23 @@ void FGTileEntry::prep_ssg_node( const Point3D& p, float vis) {
#ifdef USE_UP_AND_COMING_PLIB_FEATURE #ifdef USE_UP_AND_COMING_PLIB_FEATURE
terra_range->setRange( 0, SG_ZERO ); terra_range->setRange( 0, SG_ZERO );
terra_range->setRange( 1, vis + bounding_radius ); terra_range->setRange( 1, vis + bounding_radius );
lights_range->setRange( 0, SG_ZERO ); gnd_lights_range->setRange( 0, SG_ZERO );
lights_range->setRange( 1, vis * 1.5 + bounding_radius ); gnd_lights_range->setRange( 1, vis * 1.5 + bounding_radius );
#else #else
float ranges[2]; float ranges[2];
ranges[0] = SG_ZERO; ranges[0] = SG_ZERO;
ranges[1] = vis + bounding_radius; ranges[1] = vis + bounding_radius;
terra_range->setRanges( ranges, 2 ); terra_range->setRanges( ranges, 2 );
if ( lights_range ) { if ( gnd_lights_range ) {
ranges[1] = vis * 1.5 + bounding_radius; ranges[1] = vis * 1.5 + bounding_radius;
lights_range->setRanges( ranges, 2 ); gnd_lights_range->setRanges( ranges, 2 );
} }
#endif #endif
sgVec3 sgTrans; sgVec3 sgTrans;
sgSetVec3( sgTrans, offset.x(), offset.y(), offset.z() ); sgSetVec3( sgTrans, offset.x(), offset.y(), offset.z() );
terra_transform->setTransform( sgTrans ); terra_transform->setTransform( sgTrans );
if ( lights_transform ) { if ( gnd_lights_transform ) {
// we need to lift the lights above the terrain to avoid // we need to lift the lights above the terrain to avoid
// z-buffer fighting. We do this based on our altitude and // z-buffer fighting. We do this based on our altitude and
// the distance this tile is away from scenery center. // the distance this tile is away from scenery center.
@ -796,18 +796,18 @@ void FGTileEntry::prep_ssg_node( const Point3D& p, float vis) {
sgScaleVec3( up, 10.0 + agl / 20.0 + dist / 5000 ); sgScaleVec3( up, 10.0 + agl / 20.0 + dist / 5000 );
} }
sgAddVec3( sgTrans, up ); sgAddVec3( sgTrans, up );
lights_transform->setTransform( sgTrans ); gnd_lights_transform->setTransform( sgTrans );
// select which set of lights based on sun angle // select which set of lights based on sun angle
float sun_angle = cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES; float sun_angle = cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES;
if ( sun_angle > 95 ) { if ( sun_angle > 95 ) {
lights_brightness->select(0x04); gnd_lights_brightness->select(0x04);
} else if ( sun_angle > 92 ) { } else if ( sun_angle > 92 ) {
lights_brightness->select(0x02); gnd_lights_brightness->select(0x02);
} else if ( sun_angle > 89 ) { } else if ( sun_angle > 89 ) {
lights_brightness->select(0x01); gnd_lights_brightness->select(0x01);
} else { } else {
lights_brightness->select(0x00); gnd_lights_brightness->select(0x00);
} }
} }
@ -1048,6 +1048,7 @@ FGTileEntry::load( const SGPath& base, bool is_base )
if ( custom_obj != NULL ) { if ( custom_obj != NULL ) {
new_tile -> addKid( custom_obj ); new_tile -> addKid( custom_obj );
} }
} else if ( token == "OBJECT_STATIC" ) { } else if ( token == "OBJECT_STATIC" ) {
// load object info // load object info
double lon, lat, elev, hdg; double lon, lat, elev, hdg;
@ -1302,31 +1303,30 @@ FGTileEntry::load( const SGPath& base, bool is_base )
terra_transform->setTransform( &sgcoord ); terra_transform->setTransform( &sgcoord );
// terrain->addKid( terra_transform ); // terrain->addKid( terra_transform );
lights_transform = NULL; // Add ground lights to scene graph if any exist
lights_range = NULL; gnd_lights_transform = NULL;
/* uncomment this section for testing ground lights */ gnd_lights_range = NULL;
if ( light_pts->getNum() ) { if ( light_pts->getNum() ) {
SG_LOG( SG_TERRAIN, SG_DEBUG, "generating lights" ); SG_LOG( SG_TERRAIN, SG_DEBUG, "generating lights" );
lights_transform = new ssgTransform; gnd_lights_transform = new ssgTransform;
lights_range = new ssgRangeSelector; gnd_lights_range = new ssgRangeSelector;
lights_brightness = new ssgSelector; gnd_lights_brightness = new ssgSelector;
ssgLeaf *lights; ssgLeaf *lights;
lights = gen_lights( light_pts, 4, 0.7 ); lights = gen_lights( light_pts, 4, 0.7 );
lights_brightness->addKid( lights ); gnd_lights_brightness->addKid( lights );
lights = gen_lights( light_pts, 2, 0.85 ); lights = gen_lights( light_pts, 2, 0.85 );
lights_brightness->addKid( lights ); gnd_lights_brightness->addKid( lights );
lights = gen_lights( light_pts, 1, 1.0 ); lights = gen_lights( light_pts, 1, 1.0 );
lights_brightness->addKid( lights ); gnd_lights_brightness->addKid( lights );
lights_range->addKid( lights_brightness ); gnd_lights_range->addKid( gnd_lights_brightness );
lights_transform->addKid( lights_range ); gnd_lights_transform->addKid( gnd_lights_range );
lights_transform->setTransform( &sgcoord ); gnd_lights_transform->setTransform( &sgcoord );
// ground->addKid( lights_transform ); // ground->addKid( gnd_lights_transform );
} }
/* end of ground light section */
// ADA // ADA
// Create runway lights - 23 Mar 2001 // Create runway lights - 23 Mar 2001
@ -1375,11 +1375,11 @@ FGTileEntry::add_ssg_nodes( ssgBranch* terrain, ssgBranch* ground )
SG_LOG( SG_TERRAIN, SG_DEBUG, "num parents now = " SG_LOG( SG_TERRAIN, SG_DEBUG, "num parents now = "
<< terra_transform->getNumParents() ); << terra_transform->getNumParents() );
if ( lights_transform != 0 ) { if ( gnd_lights_transform != 0 ) {
// bump up the ref count so we can remove this later without // bump up the ref count so we can remove this later without
// having ssg try to free the memory. // having ssg try to free the memory.
lights_transform->ref(); gnd_lights_transform->ref();
ground->addKid( lights_transform ); ground->addKid( gnd_lights_transform );
} }
// ADA // ADA
@ -1427,15 +1427,15 @@ FGTileEntry::disconnect_ssg_nodes()
} }
// find the terrain lighting branch // find the terrain lighting branch
if ( lights_transform ) { if ( gnd_lights_transform ) {
pcount = lights_transform->getNumParents(); pcount = gnd_lights_transform->getNumParents();
if ( pcount > 0 ) { if ( pcount > 0 ) {
// find the first parent (should only be one) // find the first parent (should only be one)
ssgBranch *parent = lights_transform->getParent( 0 ) ; ssgBranch *parent = gnd_lights_transform->getParent( 0 ) ;
if( parent ) { if( parent ) {
// disconnect the light branch (we previously ref()'d // disconnect the light branch (we previously ref()'d
// it so it won't get freed now) // it so it won't get freed now)
parent->removeKid( lights_transform ); parent->removeKid( gnd_lights_transform );
} else { } else {
SG_LOG( SG_TERRAIN, SG_ALERT, SG_LOG( SG_TERRAIN, SG_ALERT,
"parent pointer is NULL! Dying" ); "parent pointer is NULL! Dying" );

8
src/Scenery/tileentry.hxx
View file

@ -141,15 +141,17 @@ private:
// pointer to ssg transform for this tile // pointer to ssg transform for this tile
ssgTransform *terra_transform; ssgTransform *terra_transform;
ssgTransform *lights_transform; ssgTransform *rwy_lights_transform;
ssgTransform *gnd_lights_transform;
// pointer to ssg range selector for this tile // pointer to ssg range selector for this tile
ssgRangeSelector *terra_range; ssgRangeSelector *terra_range;
ssgRangeSelector *lights_range; ssgRangeSelector *rwy_lights_range;
ssgRangeSelector *gnd_lights_range;
// we create several preset brightness and can choose which one we // we create several preset brightness and can choose which one we
// want based on lighting conditions. // want based on lighting conditions.
ssgSelector *lights_brightness; ssgSelector *gnd_lights_brightness;
// ADA ---> // ADA --->
// Runway centre coords. // Runway centre coords.

1
src/Scenery/tilemgr.hxx
View file

@ -175,7 +175,6 @@ public:
const sgdVec3 p, const sgdVec3 dir, const sgdVec3 p, const sgdVec3 dir,
FGHitList *list ); FGHitList *list );
// Prepare the ssg nodes ... for each tile, set it's proper // Prepare the ssg nodes ... for each tile, set it's proper
// transform and update it's range selector based on current // transform and update it's range selector based on current
// visibilty // visibilty