fly/flightgear
1
0
Fork 0
Code Activity
flightgear/src/Model/acmodel.cxx

131 lines
3.4 KiB
C++
Raw Normal View History

Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
// model.cxx - manage a 3D aircraft model.
// Written by David Megginson, started 2002.
//
// This file is in the Public Domain, and comes with no warranty.
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h> // for strcmp()
#include <plib/sg.h>
#include <plib/ssg.h>
#include <simgear/compiler.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/exception.hxx>
#include <simgear/misc/sg_path.hxx>
- Added "SG" prefix to sound classes that recently moved to SimGear. - Cleaned up some minor compiler warnings. - Moved src/Model/placement.[ch]xx over into simgear/scene/model/
2003-05-09 19:39:48 +00:00
#include <simgear/scene/model/placement.hxx>
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include <Main/viewmgr.hxx>
Consolodating scenery structures in scenery.hxx.
2002-05-14 05:49:47 +00:00
#include <Scenery/scenery.hxx>
Remove header dependencies where possible, to speed up rebuilds.
2002-04-20 14:07:03 +00:00
Working at unraveling and breaking dependencies inside of src/Model. I split the FGModelPlacement code out into it's own set of source files. I created two versions of the fgLoad3DModel() routine. One that is unecumbered by a panelnode dependency and one that is. acmodel.cxx is the only place that needs to load an aircraft with instrument panels. model.[ch]xx are now pretty much free to move over into simgear. loader.[ch]xx should be able to follow closely behind. This will be a big step towards being able to move the material management code over into simgear.
2003-05-08 20:28:46 +00:00
#include "model_panel.hxx"
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
#include "acmodel.hxx"
////////////////////////////////////////////////////////////////////////
// Implementation of FGAircraftModel
////////////////////////////////////////////////////////////////////////
FGAircraftModel::FGAircraftModel ()
The 3D aircraft model scene is now managed by FGAircraftModel::update. We should do the same thing for the scenery, to simplify the top-level loop.
2002-04-09 21:08:28 +00:00
: _aircraft(0),
Fix for vanishing-model problem: models are drawn in the same scene graph as the terrain, except for internal cockpit view. The SSG scene-graph variables (except for the lighting root -- I'll get that later) are now held in globals.hxx. FGModelMgr::draw() is obsolete; I'll remove it in a future revision.
2002-04-13 21:36:22 +00:00
_selector(new ssgSelector),
The 3D aircraft model scene is now managed by FGAircraftModel::update. We should do the same thing for the scenery, to simplify the top-level loop.
2002-04-09 21:08:28 +00:00
_scene(new ssgRoot),
_nearplane(0.01f),
Added a command line option to specify a starting time of day in the sense of: --timeofday=dawn --timeofday=dusk --timeofday=noon --timeofday=midnight
2003-09-15 22:55:39 +00:00
_farplane(1000.0f)
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
{
}
FGAircraftModel::~FGAircraftModel ()
{
delete _aircraft;
The 3D aircraft model scene is now managed by FGAircraftModel::update. We should do the same thing for the scenery, to simplify the top-level loop.
2002-04-09 21:08:28 +00:00
delete _scene;
Fix for vanishing-model problem: models are drawn in the same scene graph as the terrain, except for internal cockpit view. The SSG scene-graph variables (except for the lighting root -- I'll get that later) are now held in globals.hxx. FGModelMgr::draw() is obsolete; I'll remove it in a future revision.
2002-04-13 21:36:22 +00:00
// SSG will delete it
Consolodating scenery structures in scenery.hxx.
2002-05-14 05:49:47 +00:00
globals->get_scenery()->get_aircraft_branch()->removeKid(_selector);
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
}
void
FGAircraftModel::init ()
{
Cosmetic changes for new code moved into simgear to make the naming scheme better follow simgear conventions.
2003-05-13 03:18:42 +00:00
_aircraft = new SGModelPlacement;
Default to glider again when model is not present.
2002-05-29 22:04:36 +00:00
string path = fgGetString("/sim/model/path", "Models/Geometry/glider.ac");
try {
Working at unraveling and breaking dependencies inside of src/Model. I split the FGModelPlacement code out into it's own set of source files. I created two versions of the fgLoad3DModel() routine. One that is unecumbered by a panelnode dependency and one that is. acmodel.cxx is the only place that needs to load an aircraft with instrument panels. model.[ch]xx are now pretty much free to move over into simgear. loader.[ch]xx should be able to follow closely behind. This will be a big step towards being able to move the material management code over into simgear.
2003-05-08 20:28:46 +00:00
ssgBranch *model = fgLoad3DModelPanel( globals->get_fg_root(),
path,
globals->get_props(),
globals->get_sim_time_sec() );
_aircraft->init( model );
Default to glider again when model is not present.
2002-05-29 22:04:36 +00:00
} catch (const sg_exception &ex) {
SG_LOG(SG_GENERAL, SG_ALERT, "Failed to load aircraft from " << path);
SG_LOG(SG_GENERAL, SG_ALERT, "(Falling back to glider.ac.)");
Working at unraveling and breaking dependencies inside of src/Model. I split the FGModelPlacement code out into it's own set of source files. I created two versions of the fgLoad3DModel() routine. One that is unecumbered by a panelnode dependency and one that is. acmodel.cxx is the only place that needs to load an aircraft with instrument panels. model.[ch]xx are now pretty much free to move over into simgear. loader.[ch]xx should be able to follow closely behind. This will be a big step towards being able to move the material management code over into simgear.
2003-05-08 20:28:46 +00:00
ssgBranch *model = fgLoad3DModelPanel( globals->get_fg_root(),
"Models/Geometry/glider.ac",
globals->get_props(),
globals->get_sim_time_sec() );
_aircraft->init( model );
Default to glider again when model is not present.
2002-05-29 22:04:36 +00:00
}
The 3D aircraft model scene is now managed by FGAircraftModel::update. We should do the same thing for the scenery, to simplify the top-level loop.
2002-04-09 21:08:28 +00:00
_scene->addKid(_aircraft->getSceneGraph());
Fix for vanishing-model problem: models are drawn in the same scene graph as the terrain, except for internal cockpit view. The SSG scene-graph variables (except for the lighting root -- I'll get that later) are now held in globals.hxx. FGModelMgr::draw() is obsolete; I'll remove it in a future revision.
2002-04-13 21:36:22 +00:00
_selector->addKid(_aircraft->getSceneGraph());
Consolodating scenery structures in scenery.hxx.
2002-05-14 05:49:47 +00:00
globals->get_scenery()->get_aircraft_branch()->addKid(_selector);
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
}
void
FGAircraftModel::bind ()
{
// No-op
}
void
FGAircraftModel::unbind ()
{
// No-op
}
void
Major overhaul: - changed FGSubsystem::update(int) to FGSubsystem::update(delta_time_sec); the argument is now delta time in seconds rather than milliseconds - added FGSubsystem::suspend(), FGSubsystem::suspend(bool), FGSubsystem::resume(), and FGSubsystem::is_suspended(), all with default implementations; is_suspended takes account of the master freeze as well as the subsystem's individual suspended state - the FDMs now use the delta time argument the same as the rest of FlightGear; formerly, main.cxx made a special case and passed a multiloop argument - FDMs now calculate multiloop internally instead of relying on main.cxx There are probably some problems -- I've done basic testing with the major FDMs and subsystems, but we'll probably need a few weeks to sniff out bugs.
2002-05-11 16:28:50 +00:00
FGAircraftModel::update (double dt)
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
{
int view_number = globals->get_viewmgr()->get_current();
if (view_number == 0 && !fgGetBool("/sim/view/internal")) {
_aircraft->setVisible(false);
This patch includes the FGLocation class, a few fixes, cleanup in viewer code. Synced to CVS 19:36 EDT 2002-04-10 (after this evenings JSMsim and Base package updates). Description: Added FGLocation class which is new home for calculating matrix rotations. Viewer can now be configured to access rotations created by the model rather than repeating the same calculations again. Changed model initialization for the time being so that its location data is available for the viewer (currently required by other subsystems). At some point we can move this back to fg_init along with the viewer initialization. Seperated the update from the draw function in the model code. The viewer code needs the same matrix data, and moving the update portion at this time does not increase the number of matrix math iterations. Moved the model draw so that it always appears "in front" of lights and clouds. Reogranized viewer update routine for using the FGLocation class and simplified some more tasks. The routine is fairly easy to follow now, with the steps ordered and spelled out in comments. Viewmgr only updates the current (visible) view now, with the exception of an old reference to "chase view" that will be corrected in forthcoming changes. Also will be doing some work on the viewmgr outputs. Model is now clears the z-buffer in all modes. This will be changed with the next viewmgr update. The only side effect is that models always disappear when over 5km distant from the eye point (can't really see them anyway:-)). Other than a flag to indicate "internal" view I don't anticipate the configuration interface for viewmgr/views will be changed a lot for now. It is close to done. The next viewmgr update will however rework the outputs so you can expect that the data that viewmgr is writing to the property tree may change location. This code will run with the previous version of preferences.xml, but will run faster with the newer version. I am attaching a preferences.xml that should not be commited before the code. All the changes are in the /sim/view section and should show a simpler view configuration that references model locations. Note that I've added a 2nd tower view in "lookfrom" mode for illustration purposes. You can look around using the mouse. You may want to remove that or comment it out.
2002-04-11 04:25:30 +00:00
} else {
_aircraft->setVisible(true);
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
}
_aircraft->setPosition(fgGetDouble("/position/longitude-deg"),
fgGetDouble("/position/latitude-deg"),
fgGetDouble("/position/altitude-ft"));
_aircraft->setOrientation(fgGetDouble("/orientation/roll-deg"),
fgGetDouble("/orientation/pitch-deg"),
fgGetDouble("/orientation/heading-deg"));
This is step "1" of probably "many" in the process of separating out the scene management code and organizing it within simgear. My strategy is to identify the code I want to move, and break it's direct flightgear dependencies. Then it will be free to move over into the simgear package. - Moved some property specific code into simgear/props/ - Split out the condition code from fgfs/src/Main/fg_props and put it in it's own source file in simgear/props/ - Created a scene subdirectory for scenery, model, and material property related code. - Moved location.[ch]xx into simgear/scene/model/ - The location and condition code had dependencies on flightgear's global state (all the globals-> stuff, the flightgear property tree, etc.) SimGear code can't depend on it so that data has to be passed as parameters to the functions/methods/constructors. - This need to pass data as function parameters had a dramatic cascading effect throughout the FlightGear code.
2003-05-06 23:46:24 +00:00
_aircraft->update( globals->get_scenery()->get_center() );
The 3D aircraft model scene is now managed by FGAircraftModel::update. We should do the same thing for the scenery, to simplify the top-level loop.
2002-04-09 21:08:28 +00:00
This patch includes the FGLocation class, a few fixes, cleanup in viewer code. Synced to CVS 19:36 EDT 2002-04-10 (after this evenings JSMsim and Base package updates). Description: Added FGLocation class which is new home for calculating matrix rotations. Viewer can now be configured to access rotations created by the model rather than repeating the same calculations again. Changed model initialization for the time being so that its location data is available for the viewer (currently required by other subsystems). At some point we can move this back to fg_init along with the viewer initialization. Seperated the update from the draw function in the model code. The viewer code needs the same matrix data, and moving the update portion at this time does not increase the number of matrix math iterations. Moved the model draw so that it always appears "in front" of lights and clouds. Reogranized viewer update routine for using the FGLocation class and simplified some more tasks. The routine is fairly easy to follow now, with the steps ordered and spelled out in comments. Viewmgr only updates the current (visible) view now, with the exception of an old reference to "chase view" that will be corrected in forthcoming changes. Also will be doing some work on the viewmgr outputs. Model is now clears the z-buffer in all modes. This will be changed with the next viewmgr update. The only side effect is that models always disappear when over 5km distant from the eye point (can't really see them anyway:-)). Other than a flag to indicate "internal" view I don't anticipate the configuration interface for viewmgr/views will be changed a lot for now. It is close to done. The next viewmgr update will however rework the outputs so you can expect that the data that viewmgr is writing to the property tree may change location. This code will run with the previous version of preferences.xml, but will run faster with the newer version. I am attaching a preferences.xml that should not be commited before the code. All the changes are in the /sim/view section and should show a simpler view configuration that references model locations. Note that I've added a 2nd tower view in "lookfrom" mode for illustration purposes. You can look around using the mouse. You may want to remove that or comment it out.
2002-04-11 04:25:30 +00:00
}
void
FGAircraftModel::draw ()
{
The 3D aircraft model scene is now managed by FGAircraftModel::update. We should do the same thing for the scenery, to simplify the top-level loop.
2002-04-09 21:08:28 +00:00
// OK, now adjust the clip planes and draw
// FIXME: view number shouldn't be
// hard-coded.
Ensure that the aircraft model is in the same clip plane as everything else and *doesn't* clear the z-buffer when in external view; tighten the far plane for internal view back to 100m to give us maximum precision (this will be important for some instruments; I might even move it to 50m).
2002-04-13 12:11:27 +00:00
int view_number = globals->get_viewmgr()->get_current();
Fix for vanishing-model problem: models are drawn in the same scene graph as the terrain, except for internal cockpit view. The SSG scene-graph variables (except for the lighting root -- I'll get that later) are now held in globals.hxx. FGModelMgr::draw() is obsolete; I'll remove it in a future revision.
2002-04-13 21:36:22 +00:00
if (_aircraft->getVisible() && view_number == 0) {
glClearDepth(1);
glClear(GL_DEPTH_BUFFER_BIT);
ssgSetNearFar(_nearplane, _farplane);
This patch includes the FGLocation class, a few fixes, cleanup in viewer code. Synced to CVS 19:36 EDT 2002-04-10 (after this evenings JSMsim and Base package updates). Description: Added FGLocation class which is new home for calculating matrix rotations. Viewer can now be configured to access rotations created by the model rather than repeating the same calculations again. Changed model initialization for the time being so that its location data is available for the viewer (currently required by other subsystems). At some point we can move this back to fg_init along with the viewer initialization. Seperated the update from the draw function in the model code. The viewer code needs the same matrix data, and moving the update portion at this time does not increase the number of matrix math iterations. Moved the model draw so that it always appears "in front" of lights and clouds. Reogranized viewer update routine for using the FGLocation class and simplified some more tasks. The routine is fairly easy to follow now, with the steps ordered and spelled out in comments. Viewmgr only updates the current (visible) view now, with the exception of an old reference to "chase view" that will be corrected in forthcoming changes. Also will be doing some work on the viewmgr outputs. Model is now clears the z-buffer in all modes. This will be changed with the next viewmgr update. The only side effect is that models always disappear when over 5km distant from the eye point (can't really see them anyway:-)). Other than a flag to indicate "internal" view I don't anticipate the configuration interface for viewmgr/views will be changed a lot for now. It is close to done. The next viewmgr update will however rework the outputs so you can expect that the data that viewmgr is writing to the property tree may change location. This code will run with the previous version of preferences.xml, but will run faster with the newer version. I am attaching a preferences.xml that should not be commited before the code. All the changes are in the /sim/view section and should show a simpler view configuration that references model locations. Note that I've added a 2nd tower view in "lookfrom" mode for illustration purposes. You can look around using the mouse. You may want to remove that or comment it out.
2002-04-11 04:25:30 +00:00
ssgCullAndDraw(_scene);
Fix for vanishing-model problem: models are drawn in the same scene graph as the terrain, except for internal cockpit view. The SSG scene-graph variables (except for the lighting root -- I'll get that later) are now held in globals.hxx. FGModelMgr::draw() is obsolete; I'll remove it in a future revision.
2002-04-13 21:36:22 +00:00
_selector->select(0);
} else {
_selector->select(1);
The 3D aircraft model scene is now managed by FGAircraftModel::update. We should do the same thing for the scenery, to simplify the top-level loop.
2002-04-09 21:08:28 +00:00
}
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
This patch includes the FGLocation class, a few fixes, cleanup in viewer code. Synced to CVS 19:36 EDT 2002-04-10 (after this evenings JSMsim and Base package updates). Description: Added FGLocation class which is new home for calculating matrix rotations. Viewer can now be configured to access rotations created by the model rather than repeating the same calculations again. Changed model initialization for the time being so that its location data is available for the viewer (currently required by other subsystems). At some point we can move this back to fg_init along with the viewer initialization. Seperated the update from the draw function in the model code. The viewer code needs the same matrix data, and moving the update portion at this time does not increase the number of matrix math iterations. Moved the model draw so that it always appears "in front" of lights and clouds. Reogranized viewer update routine for using the FGLocation class and simplified some more tasks. The routine is fairly easy to follow now, with the steps ordered and spelled out in comments. Viewmgr only updates the current (visible) view now, with the exception of an old reference to "chase view" that will be corrected in forthcoming changes. Also will be doing some work on the viewmgr outputs. Model is now clears the z-buffer in all modes. This will be changed with the next viewmgr update. The only side effect is that models always disappear when over 5km distant from the eye point (can't really see them anyway:-)). Other than a flag to indicate "internal" view I don't anticipate the configuration interface for viewmgr/views will be changed a lot for now. It is close to done. The next viewmgr update will however rework the outputs so you can expect that the data that viewmgr is writing to the property tree may change location. This code will run with the previous version of preferences.xml, but will run faster with the newer version. I am attaching a preferences.xml that should not be commited before the code. All the changes are in the /sim/view section and should show a simpler view configuration that references model locations. Note that I've added a 2nd tower view in "lookfrom" mode for illustration purposes. You can look around using the mouse. You may want to remove that or comment it out.
2002-04-11 04:25:30 +00:00
}
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
// end of model.cxx
Copy permalink