Remove the seriously-outdated DCS code (we have different facilities
for including external objects now). Set the default logging level to 'alert' (i.e. pending disaster).
This commit is contained in:
david
parent
d296e5a7df
commit
01f8f51614
1 changed files with 2 additions and 326 deletions
|
|
@ -624,11 +624,6 @@ void fgRenderFrame() {
|
|||
|
||||
ssgSetNearFar( scene_nearplane, scene_farplane );
|
||||
|
||||
// $$$ begin - added VS Renganthan 17 Oct 2K
|
||||
if(objc)
|
||||
fgUpdateDCS();
|
||||
// $$$ end - added VS Renganthan 17 Oct 2K
|
||||
|
||||
#ifdef FG_MPLAYER_AS
|
||||
// Update any multiplayer models
|
||||
globals->get_multiplayer_rx_mgr()->Update();
|
||||
|
|
@ -1480,7 +1475,7 @@ bool fgMainInit( int argc, char **argv ) {
|
|||
#endif
|
||||
|
||||
// set default log levels
|
||||
sglog().setLogLevels( SG_ALL, SG_INFO );
|
||||
sglog().setLogLevels( SG_ALL, SG_ALERT );
|
||||
|
||||
string version;
|
||||
#ifdef FLIGHTGEAR_VERSION
|
||||
|
|
@ -1707,10 +1702,6 @@ bool fgMainInit( int argc, char **argv ) {
|
|||
// airport->setName( "Airport Lighting" );
|
||||
// lighting->addKid( airport );
|
||||
|
||||
// ADA
|
||||
fgLoadDCS();
|
||||
// ADA
|
||||
|
||||
// build our custom render states
|
||||
fgBuildRenderStates();
|
||||
|
||||
|
|
@ -1723,319 +1714,4 @@ bool fgMainInit( int argc, char **argv ) {
|
|||
}
|
||||
|
||||
|
||||
// $$$ end - added VS Renganathan, 15 Oct 2K
|
||||
// - added Venky , 12 Nov 2K
|
||||
|
||||
|
||||
void fgLoadDCS(void) {
|
||||
|
||||
ssgEntity *ship_obj = NULL;
|
||||
|
||||
char obj_filename[25];
|
||||
|
||||
for ( int k = 0; k < 32; k++ ) {
|
||||
ship_pos[k]=NULL;
|
||||
}
|
||||
|
||||
SGPath tile_path( globals->get_fg_root());
|
||||
tile_path.append( "Scenery" );
|
||||
tile_path.append( "Objects.txt" );
|
||||
sg_gzifstream in( tile_path.str() );
|
||||
if ( ! in.is_open() ) {
|
||||
SG_LOG( SG_TERRAIN, SG_ALERT, "Cannot open file: " << tile_path.str() );
|
||||
} else {
|
||||
|
||||
SGPath modelpath( globals->get_fg_root() );
|
||||
modelpath.append( "Models" );
|
||||
modelpath.append( "Geometry" );
|
||||
|
||||
SGPath texturepath( globals->get_fg_root() );
|
||||
texturepath.append( "Models" );
|
||||
texturepath.append( "Textures" );
|
||||
|
||||
ssgModelPath( (char *)modelpath.c_str() );
|
||||
ssgTexturePath( (char *)texturepath.c_str() );
|
||||
|
||||
ship_sel = new ssgSelector;
|
||||
|
||||
char c;
|
||||
while ( ! in.eof() ) {
|
||||
in >> ::skipws;
|
||||
if ( in.get( c ) && c == '#' ) {
|
||||
in >> skipeol;
|
||||
} else {
|
||||
in.putback(c);
|
||||
in >> obj_filename >> obj_lat[objc] >> obj_lon[objc] >> obj_alt[objc];
|
||||
/* cout << endl << obj_filename << " " << obj_lat[objc] << " " << obj_lon[objc] << " " << obj_alt[objc] << endl;
|
||||
int chj=getchar();*/
|
||||
|
||||
obj_lon[objc] *=SGD_DEGREES_TO_RADIANS;
|
||||
obj_lat[objc] *=SGD_DEGREES_TO_RADIANS;
|
||||
|
||||
ship_pos[objc] = new ssgTransform;
|
||||
|
||||
// type "repeat" in objects.txt to load one more
|
||||
// instance of the last object.
|
||||
|
||||
if ( strcmp(obj_filename,"repeat") != 0) {
|
||||
ship_obj =
|
||||
globals->get_model_lib()->load_model( globals->get_fg_root(), obj_filename, globals->get_props(), globals->get_sim_time_sec() );
|
||||
}
|
||||
|
||||
if ( ship_obj != NULL ) {
|
||||
ship_obj->setName(obj_filename);
|
||||
if (objc == 0)
|
||||
ship_obj->clrTraversalMaskBits( SSGTRAV_HOT );
|
||||
else
|
||||
ship_obj->setTraversalMaskBits( SSGTRAV_HOT );
|
||||
ship_pos[objc]->addKid( ship_obj ); // add object to transform node
|
||||
ship_sel->addKid( ship_pos[objc] ); // add transform node to selector
|
||||
SG_LOG( SG_TERRAIN, SG_ALERT, "Loaded file: "
|
||||
<< obj_filename );
|
||||
} else {
|
||||
SG_LOG( SG_TERRAIN, SG_ALERT, "Cannot open file: "
|
||||
<< obj_filename );
|
||||
}
|
||||
|
||||
// temporary hack for deck lights - ultimately should move to PLib (when??)
|
||||
//const char *extn = file_extension ( obj_filename ) ;
|
||||
if ( objc == 1 ){
|
||||
// ssgVertexArray *lights = new ssgVertexArray( 100 );
|
||||
ssgVertexArray *lightpoints = new ssgVertexArray( 100 );
|
||||
ssgVertexArray *lightnormals = new ssgVertexArray( 100 );
|
||||
ssgVertexArray *lightdir = new ssgVertexArray( 100 );
|
||||
int ltype[500], light_type = 0;
|
||||
static int ltcount = 0;
|
||||
string token;
|
||||
sgVec3 rway_dir,rway_normal,lightpt;
|
||||
Point3D node;
|
||||
modelpath.append(obj_filename);
|
||||
sg_gzifstream in1( modelpath.str() );
|
||||
if ( ! in1.is_open() ) {
|
||||
SG_LOG( SG_TERRAIN, SG_ALERT, "Cannot open file: " << modelpath.str() );
|
||||
} else {
|
||||
while ( ! in1.eof() ) {
|
||||
in1 >> ::skipws;
|
||||
if ( in1.get( c ) && c == '#' ) {
|
||||
in1 >> skipeol;
|
||||
} else {
|
||||
in1.putback(c);
|
||||
in1 >> token;
|
||||
//cout << token << endl;
|
||||
if ( token == "runway" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_dir, node[0], node[1], node[2] );
|
||||
} else if ( token == "edgelight" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_normal, node[0], node[1], node[2] );
|
||||
light_type = 1;
|
||||
} else if ( token == "taxi" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_normal, node[0], node[1], node[2] );
|
||||
light_type = 2;
|
||||
} else if ( token == "vasi" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_normal, node[0], node[1], node[2] );
|
||||
light_type = 3;
|
||||
} else if ( token == "threshold" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_normal, node[0], node[1], node[2] );
|
||||
light_type = 4;
|
||||
} else if ( token == "rabbit" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_normal, node[0], node[1], node[2] );
|
||||
light_type = 5;
|
||||
} else if ( token == "ols" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_ols, node[0], node[1], node[2] );
|
||||
light_type = 6;
|
||||
} else if ( token == "red" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_normal, node[0], node[1], node[2] );
|
||||
light_type = 7;
|
||||
} else if ( token == "green" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (rway_normal, node[0], node[1], node[2] );
|
||||
light_type = 8;
|
||||
} else if ( token == "lp" ) {
|
||||
in1 >> node;
|
||||
sgSetVec3 (lightpt, node[0], node[1], node[2] );
|
||||
lightpoints->add( lightpt );
|
||||
lightnormals->add( rway_normal );
|
||||
lightdir->add( rway_dir );
|
||||
ltype[ltcount]= light_type;
|
||||
ltcount++;
|
||||
}
|
||||
if (in1.eof()) break;
|
||||
}
|
||||
} //while
|
||||
|
||||
#if 0
|
||||
if ( lightpoints->getNum() ) {
|
||||
ssgBranch *lightpoints_branch;
|
||||
long int dummy = -999;
|
||||
dummy_tile = new FGTileEntry((SGBucket)dummy);
|
||||
dummy_tile->lightmaps_sequence = new ssgSelector;
|
||||
dummy_tile->ols_transform = new ssgTransform;
|
||||
|
||||
// call function to generate the runway lights
|
||||
lightpoints_branch =
|
||||
dummy_tile->gen_runway_lights( lightpoints, lightnormals,
|
||||
lightdir, ltype);
|
||||
lightpoints_brightness->addKid(lightpoints_branch);
|
||||
lightpoints_transform->addKid(lightpoints_brightness);
|
||||
//dummy_tile->lightmaps_sequence->setTraversalMaskBits( SSGTRAV_HOT );
|
||||
lightpoints_transform->addKid( dummy_tile->lightmaps_sequence );
|
||||
lightpoints_transform->ref();
|
||||
globals->get_scenery()->get_gnd_lights_root()->addKid( lightpoints_transform );
|
||||
}
|
||||
#endif
|
||||
} //if in1
|
||||
} //if objc
|
||||
// end hack for deck lights
|
||||
|
||||
objc++;
|
||||
|
||||
if (in.eof()) break;
|
||||
}
|
||||
} // while
|
||||
|
||||
SG_LOG ( SG_TERRAIN, SG_ALERT, "Finished object processing." );
|
||||
|
||||
globals->get_scenery()->get_terrain_branch()->addKid( ship_sel ); //add selector node to root node
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
void fgUpdateDCS (void) {
|
||||
|
||||
// double eye_lat,eye_lon,eye_alt;
|
||||
// static double obj_head;
|
||||
double sl_radius,obj_latgc;
|
||||
// float nresultmat[4][4];
|
||||
// sgMat4 Trans,rothead,rotlon,rot180,rotlat,resultmat1,resultmat2,resultmat3;
|
||||
double bz[3];
|
||||
|
||||
// Instantaneous Geodetic Lat/Lon/Alt of moving object
|
||||
FGADA *fdm = (FGADA *)current_aircraft.fdm_state;
|
||||
|
||||
// Deck should be the first object in objects.txt in case of fdm=ada
|
||||
|
||||
if (!strcmp(fgGetString("/sim/flight-model"), "ada")) {
|
||||
if ((fdm->get_iaux(1))==1)
|
||||
{
|
||||
obj_lat[1] = fdm->get_daux(1)*SGD_DEGREES_TO_RADIANS;
|
||||
obj_lon[1] = fdm->get_daux(2)*SGD_DEGREES_TO_RADIANS;
|
||||
obj_alt[1] = fdm->get_daux(3);
|
||||
obj_pitch[1] = fdm->get_faux(1);
|
||||
obj_roll[1] = fdm->get_faux(2);
|
||||
}
|
||||
}
|
||||
|
||||
for ( int m = 0; m < objc; m++ ) {
|
||||
//cout << endl << obj_lat[m]*SGD_RADIANS_TO_DEGREES << " " << obj_lon[m]*SGD_RADIANS_TO_DEGREES << " " << obj_alt[m] << " " << objc << endl;
|
||||
//int v=getchar();
|
||||
|
||||
//Geodetic to Geocentric angles for rotation
|
||||
sgGeodToGeoc(obj_lat[m],obj_alt[m],&sl_radius,&obj_latgc);
|
||||
|
||||
//moving object gbs-posn in cartesian coords
|
||||
Point3D obj_posn = Point3D( obj_lon[m],obj_lat[m],obj_alt[m]);
|
||||
Point3D obj_pos = sgGeodToCart( obj_posn );
|
||||
|
||||
// Translate moving object w.r.t eye
|
||||
Point3D Objtrans = obj_pos - globals->get_scenery()->get_center();
|
||||
bz[0]=Objtrans.x();
|
||||
bz[1]=Objtrans.y();
|
||||
bz[2]=Objtrans.z();
|
||||
|
||||
// rotate dynamic objects for lat,lon & alt and other motion about its axes
|
||||
|
||||
sgMat4 sgTRANS;
|
||||
sgMakeTransMat4( sgTRANS, bz[0],bz[1],bz[2]);
|
||||
|
||||
sgVec3 ship_fwd,ship_rt,ship_up;
|
||||
sgSetVec3( ship_fwd, 1.0, 0.0, 0.0);//east,roll
|
||||
sgSetVec3( ship_rt, 0.0, 1.0, 0.0);//up,pitch
|
||||
sgSetVec3( ship_up, 0.0, 0.0, 1.0); //north,yaw
|
||||
|
||||
sgMat4 sgROT_lon, sgROT_lat, sgROT_hdg, sgROT_pitch, sgROT_roll;
|
||||
sgMakeRotMat4( sgROT_lon, obj_lon[m]*SGD_RADIANS_TO_DEGREES, ship_up );
|
||||
sgMakeRotMat4( sgROT_lat, 90-obj_latgc*SGD_RADIANS_TO_DEGREES, ship_rt );
|
||||
sgMakeRotMat4( sgROT_hdg, 180.0, ship_up );
|
||||
sgMakeRotMat4( sgROT_pitch, obj_pitch[m], ship_rt );
|
||||
sgMakeRotMat4( sgROT_roll, obj_roll[m], ship_fwd );
|
||||
|
||||
sgMat4 sgTUX;
|
||||
sgCopyMat4( sgTUX, sgROT_hdg );
|
||||
sgPostMultMat4( sgTUX, sgROT_pitch );
|
||||
sgPostMultMat4( sgTUX, sgROT_roll );
|
||||
sgPostMultMat4( sgTUX, sgROT_lat );
|
||||
sgPostMultMat4( sgTUX, sgROT_lon );
|
||||
sgPostMultMat4( sgTUX, sgTRANS );
|
||||
|
||||
sgCoord shippos;
|
||||
sgSetCoord(&shippos, sgTUX );
|
||||
ship_pos[m]->setTransform( &shippos );
|
||||
// temporary hack for deck lights - ultimately should move to PLib (when ??)
|
||||
if (m == 1) {
|
||||
if (lightpoints_transform) {
|
||||
lightpoints_transform->setTransform( &shippos );
|
||||
FGLight *l = (FGLight *)(globals->get_subsystem("lighting"));
|
||||
float sun_angle = l->get_sun_angle() * SGD_RADIANS_TO_DEGREES;
|
||||
if ( sun_angle > 89 ) {
|
||||
lightpoints_brightness->select(0x01);
|
||||
} else {
|
||||
lightpoints_brightness->select(0x00);
|
||||
}
|
||||
}
|
||||
|
||||
float elev;
|
||||
sgVec3 rp,to;
|
||||
float *vp;
|
||||
float alt;
|
||||
float ref_elev;
|
||||
sgXformPnt3( rp, rway_ols, sgTUX );
|
||||
vp = globals->get_current_view()->get_view_pos();
|
||||
to[0] = rp[0]-vp[0];
|
||||
to[1] = rp[1]-vp[1];
|
||||
to[2] = rp[2]-vp[2];
|
||||
float dist = sgLengthVec3( to );
|
||||
alt = (current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER)-rway_ols[2];
|
||||
|
||||
elev = asin(alt/dist)*SGD_RADIANS_TO_DEGREES;
|
||||
|
||||
ref_elev = elev - 3.75; // +ve above, -ve below
|
||||
|
||||
unsigned int sel;
|
||||
sel = 0xFF;
|
||||
// DO NOT DELETE THIS CODE - This is to compare a discrete FLOLS (without LOD) with analog FLOLS
|
||||
// if (ref_elev > 0.51) sel = 0x21;
|
||||
// if ((ref_elev <= 0.51) & (ref_elev > 0.17)) sel = 0x22;
|
||||
// if ((ref_elev <= 0.17) & (ref_elev >= -0.17)) sel = 0x24;
|
||||
// if ((ref_elev < -0.17) & (ref_elev >= -0.51)) sel = 0x28;
|
||||
// if (ref_elev < -0.51) sel = 0x30;
|
||||
// DO NOT DELETE THIS CODE - This is to compare a discrete FLOLS (without LOD) with analog FLOLS
|
||||
// dummy_tile->lightmaps_sequence->select(sel);
|
||||
|
||||
sgVec3 up;
|
||||
sgCopyVec3 (up, ship_up);
|
||||
if (dist > 750)
|
||||
sgScaleVec3 (up, 4.0*ref_elev*dist/750.0);
|
||||
else
|
||||
sgScaleVec3 (up, 4.0*ref_elev);
|
||||
// dummy_tile->ols_transform->setTransform(up);
|
||||
//cout << "ref_elev " << ref_elev << endl;
|
||||
}
|
||||
// end hack for deck lights
|
||||
|
||||
}
|
||||
if ( ship_sel != NULL ) {
|
||||
ship_sel->select(0xFFFFFFFE); // first object is ownship, added to acmodel
|
||||
}
|
||||
}
|
||||
|
||||
// $$$ end - added VS Renganathan, 15 Oct 2K
|
||||
// added Venky , 12 Nov 2K
|
||||
// end of main.cxx
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue