b1674cb506
This is a new improved patch for the previous tile manager fixes. Rather than building dependencies between FGlocation or the viewer or fdm with tilemgr what I ended up doing was linking the pieces together in the Mainloop in main.cxx. You'll see what I mean...it's been commented fairly well. More than likely we should move that chunk somewhere...just not sure where yet. The changes seem clean now. As I get more ideas there could be some further improvement in organizing the update in tilemgr. You'll note that I left an override in there for the tilemgr::update() function to preserve earlier functionality if someone needs it (e.g. usage independent of an fdm or viewer), not to mention there are a few places in flightgear that call it directly that have not been changed to the new interface (and may not need to be). The code has been optimized to avoid duplicate traversals and seems to run generally quite well. Note that there can be a short delay reloading tiles that have been dropped from static views. We could call the tile scheduler on a view switch, but it's not a big deal and at the moment I'd like to get this in so people can try it and comment on it as it is. Everything has been resycned with CVS tonight and I've included the description submitted earlier (below). Best, Jim Changes synced with CVS approx 20:30EDT 2002-05-09 (after this evenings updates). Files: http://www.spiderbark.com/fgfs/viewer-update-20020516.tar.gz or http://www.spiderbark.com/fgfs/viewer-update-20020516.diffs.gz Description: In a nutshell, these patches begin to take what was one value for ground elevation and calculate ground elevation values seperately for the FDM and the viewer (eye position). Several outstanding view related bugs have been fixed. With the introduction of the new viewer code a lot of that Flight Gear code broke related to use of a global variable called "scenery.cur_elev". Therefore the ground_elevation and other associated items (like the current tile bucket) is maintained per FDM instance and per View. Each of these has a "point" or location that can be identified. See changes to FGLocation class and main.cxx. Most of the problems related to the new viewer in terms of sky, ground and runway lights, and tower views are fixed. There are four minor problems remaining. 1) The sun/moon spins when you pan the "lookat" tower view only (view #3). 2) Under stress (esp. magic carpet full speed with max visibility), there is a memory leak in the tile caching that was not introduced with these changes. 3) I have not tested these changes or made corrections to the ADA or External FDM interfaces. 4) The change view function doesn't call the time/light update (not a problem unless a tower is very far away). Details: FDM/flight.cxx, flight.hxx - FGInterface ties to FGAircraftModel so that it's location data can be accessed for runway (ground elevation under aircraft) elevation. FDM/larsim.cxx, larcsim.hxx - gets runway elevation from FGInterface now. Commented out function that is causing a namespace conflict, hasn't been called with recent code anyway. FDM/JSBSim/JSBSim.cxx, YASim/YASim.cxx - gets runway elevation from FGInterface now. Scenery/newcache.cxx, newcache.hxx - changed caching scheme to time based (oldest tiles discard). Scenery/tileentry.cxx, tileentry.hxx - added place to record time, changed rendering to reference viewer altitude in order to fix a problem with ground and runway lights. Scenery/tilemgr.cxx, tilemgr.hxx - Modified update() to accept values for multiple locations. Refresh function added in order to periodically make the tiles current for a non-moving view (like a tower). Main/fg_init.cxx - register event for making tiles current in a non-moving view (like a tower). Main/location.hxx - added support for current ground elevation data. Main/main.cxx - added second tilemgr call for fdm, fixed places where viewer position data was required for correct sky rendering. Main/options.cxx - fixed segfault reported by Curtis when using --view-offset command line parameter. Main/viewer.cxx, viewer.hxx - removed fudging of view position. Fixed numerous bugs that were causing eye and target values to get mixed up.
97 lines
2.7 KiB
C++
97 lines
2.7 KiB
C++
//*************************************************************************
|
|
// LaRCsim.hxx -- interface to the "LaRCsim" flight model
|
|
//
|
|
// Written by Curtis Olson, started May 1997.
|
|
//
|
|
// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
|
|
//
|
|
// This program is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU General Public License as
|
|
// published by the Free Software Foundation; either version 2 of the
|
|
// License, or (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful, but
|
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software
|
|
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
//
|
|
// $Id$
|
|
//*************************************************************************/
|
|
|
|
|
|
#ifndef _LARCSIM_HXX
|
|
#define _LARCSIM_HXX
|
|
|
|
|
|
#include "IO360.hxx"
|
|
#include "flight.hxx"
|
|
#include <FDM/LaRCsimIC.hxx>
|
|
|
|
class FGLaRCsim: public FGInterface {
|
|
|
|
private:
|
|
|
|
FGNewEngine eng;
|
|
LaRCsimIC* lsic;
|
|
void set_ls(void);
|
|
void snap_shot(void);
|
|
double time_step;
|
|
SGPropertyNode *speed_up;
|
|
SGPropertyNode *aero;
|
|
|
|
public:
|
|
|
|
FGLaRCsim( double dt );
|
|
~FGLaRCsim(void);
|
|
|
|
// copy FDM state to LaRCsim structures
|
|
bool copy_to_LaRCsim();
|
|
|
|
// copy FDM state from LaRCsim structures
|
|
bool copy_from_LaRCsim();
|
|
|
|
// reset flight params to a specific position
|
|
void init();
|
|
|
|
// update position based on inputs, positions, velocities, etc.
|
|
void update( double dt );
|
|
|
|
// Positions
|
|
void set_Latitude(double lat); //geocentric
|
|
void set_Longitude(double lon);
|
|
void set_Altitude(double alt); // triggers re-calc of AGL altitude
|
|
void set_AltitudeAGL(double altagl); // and vice-versa
|
|
|
|
// Speeds -- setting any of these will trigger a re-calc of the rest
|
|
void set_V_calibrated_kts(double vc);
|
|
void set_Mach_number(double mach);
|
|
void set_Velocities_Local( double north, double east, double down );
|
|
void set_Velocities_Wind_Body( double u, double v, double w);
|
|
|
|
// Euler angles
|
|
void set_Euler_Angles( double phi, double theta, double psi );
|
|
|
|
// Flight Path
|
|
void set_Climb_Rate( double roc);
|
|
void set_Gamma_vert_rad( double gamma);
|
|
|
|
// Earth
|
|
void set_Static_pressure(double p);
|
|
void set_Static_temperature(double T);
|
|
void set_Density(double rho);
|
|
|
|
/*
|
|
void set_Velocities_Local_Airmass (double wnorth,
|
|
double weast,
|
|
double wdown );
|
|
*/
|
|
};
|
|
|
|
|
|
#endif // _LARCSIM_HXX
|
|
|
|
|