fly/flightgear
1
0
Fork 0
Code Activity
flightgear/src/Main/viewmgr.cxx

807 lines
23 KiB
C++
Raw Normal View History

Added a viewmgr system and made corresponding changes to support it.
2000-10-26 21:51:09 +00:00
// viewmgr.cxx -- class for managing all the views in the flightgear world.
//
// Written by Curtis Olson, started October 2000.
Major viewer-code overhaul from Jim Wilson: Description: This update includes the new viewer interface as proposed by David M. and a first pass at cleaning up the viewer/view manager code by Jim W. Note that I have dropped Main/viewer_lookat.?xx and Main/viewer_rph.?xx and modified the Makefile.am accordingly. Detail of work: Overall: The code reads a little easier. There are still some unnecessary bits in there and I'd like to supplement the comments in the viewer.hxx with a tiny bit on each interface group and what the groupings mean (similar but briefer than what you emailed me the other day). I tried not to mess up the style, but there is an occasional inconsistency. In general I wouldn't call it done (especially since there's no tower yet! :)), but I'd like to get this out there so others can comment, and test. In Viewer: The interface as you suggested has been implemented. Basically everything seems to work as it did visually. There is no difference that I can see in performance, although some things might be a tiny bit faster. I've merged the lookat and rph (pilot view) code into the recalc for the viewer. There is still some redundancy between the two, but a lot has been removed. In some cases I've taken some code that we'd likely want to inline anyway and left it in there in duplicate. You'll see that the code for both looks a little cleaner. I need to take a closer look at the rotations in particular. I've cleaned up a little there, but I suspect more can be done to streamline this. The external declaration to the Quat_mat in mouse.cxx has been removed. IMHO the quat doesn't serve any intrinsic purpose in mouse.cxx, but I'm not about to rip it out. It would seem that there more conventional ways to get spherical data that are just as fast. In any case all the viewer was pulling from the quat matrix was the pitch value so I modified mouse.cxx to output to our pitchOffset input and that works fine. I've changed the native values to degrees from radians where appropriate. This required a conversion from degrees to radians in a couple modules that access the interface. Perhaps we should add interface calls that do the conversion, e.g. a getHeadingOffset_rad() to go along with the getHeadingOffset_deg(). On the view_offset (now headingOffset) thing there are two entry points because of the ability to instantly switch views or to scroll to a new view angle (by hitting the numeric keys for example). This leaves an anomaly in the interface which should be resolved by adding "goal" settings to the interface, e.g. a setGoalHeadingOffset_deg(), setGoalPitchOffset_deg(), etc. Other than these two issues, the next step here will be to look at some further optimizations, and to write support code for a tower view. That should be fairly simple at this point. I was considering creating a "simulated tower view" or "pedestrian view" that defaulted to a position off to the right of whereever the plane is at the moment you switch to the tower view. This could be a fall back when we don't have an actual tower location at hand (as would be the case with rural airports). ViewManager: Basically all I did here was neaten things up by ripping out excess crap and made it compatible as is with the new interface. The result is that viewmanager is now ready to be developed. The two preexisting views are still hardcoded into the view manager. The next step would be to design configuration xml (eg /sim/view[x]/config/blahblah) that could be used to set up as many views as we want. If we want to take the easy way out, we might want to insist that view[0] be a pilot-view and have viewmanager check for that.
2002-03-20 17:43:28 +00:00
// partially rewritten by Jim Wilson March 2002
Added a viewmgr system and made corresponding changes to support it.
2000-10-26 21:51:09 +00:00
//
Fix my mailing address by replacing it with my web page.
2004-11-19 22:10:41 +00:00
// Copyright (C) 2000 Curtis L. Olson - http://www.flightgear.org/~curt
Added a viewmgr system and made corresponding changes to support it.
2000-10-26 21:51:09 +00:00
//
// 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$
Use !strcmp for all property string-value comparisons.
2002-03-20 22:15:22 +00:00
#include <string.h> // strcmp
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
#include <plib/sg.h>
Added a viewmgr system and made corresponding changes to support it.
2000-10-26 21:51:09 +00:00
#include "viewmgr.hxx"
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
#include "fg_props.hxx"
Added a viewmgr system and made corresponding changes to support it.
2000-10-26 21:51:09 +00:00
// Constructor
Tweaks.
2000-10-30 15:09:17 +00:00
FGViewMgr::FGViewMgr( void ) :
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
axis_long(0),
axis_lat(0),
current(0)
Tweaks.
2000-10-30 15:09:17 +00:00
{
Added a viewmgr system and made corresponding changes to support it.
2000-10-26 21:51:09 +00:00
}
// Destructor
FGViewMgr::~FGViewMgr( void ) {
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
void
FGViewMgr::init ()
{
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
char stridx [ 20 ];
Patch from Julian Foad: Make locally-used strings local instead of global. (The safety and cleanliness benefit outweights the slight performance hit. If performance is an issue, the way these strings are used should be optimised.) Use existing defined constant instead of a literal number.
2002-06-28 18:00:21 +00:00
string viewpath, nodepath, strdata;
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 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:26:07 +00:00
bool from_model = false;
bool at_model = false;
int from_model_index = 0;
int at_model_index = 0;
Clean up various compiler warnings that have crept into the code. This by no means get's them all, but it's a start.
2004-04-01 15:27:53 +00:00
// double damp_alt;
double damp_roll = 0.0, damp_pitch = 0.0, damp_heading = 0.0;
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
double x_offset_m, y_offset_m, z_offset_m, fov_deg;
double heading_offset_deg, pitch_offset_deg, roll_offset_deg;
double target_x_offset_m, target_y_offset_m, target_z_offset_m;
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
double near_m;
Jim Wilson: This makes it possible to setup multiple cockpit views and have the correct clipping plane set for rendering the model.
2003-10-22 18:48:31 +00:00
bool internal;
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 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:26:07 +00:00
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
for (int i = 0; i < fgGetInt("/sim/number-views"); i++) {
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 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:26:07 +00:00
viewpath = "/sim/view";
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
sprintf(stridx, "[%d]", i);
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 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:26:07 +00:00
viewpath += stridx;
// find out what type of view this is...
nodepath = viewpath;
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
nodepath += "/type";
strdata = fgGetString(nodepath.c_str());
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 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:26:07 +00:00
Jim Wilson: This makes it possible to setup multiple cockpit views and have the correct clipping plane set for rendering the model.
2003-10-22 18:48:31 +00:00
// find out if this is an internal view (e.g. in cockpit, low near plane)
internal = false; // default
nodepath = viewpath;
nodepath += "/internal";
internal = fgGetBool(nodepath.c_str());
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 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:26:07 +00:00
// FIXME:
// this is assumed to be an aircraft model...we will need to read
// model-from-type as well.
// find out if this is a model we are looking from...
nodepath = viewpath;
nodepath += "/config/from-model";
from_model = fgGetBool(nodepath.c_str());
// get model index (which model)
if (from_model) {
nodepath = viewpath;
nodepath += "/config/from-model-idx";
from_model_index = fgGetInt(nodepath.c_str());
}
if ( strcmp("lookat",strdata.c_str()) == 0 ) {
// find out if this is a model we are looking at...
nodepath = viewpath;
nodepath += "/config/at-model";
at_model = fgGetBool(nodepath.c_str());
// get model index (which model)
if (at_model) {
nodepath = viewpath;
nodepath += "/config/at-model-idx";
Melchior FRANZ: The current chase view respects heading but ignores roll & pitch. And it follows heading without delay, which makes the viewer behave quite strange. This change makes the chase view feel more natural. You aren't fixed behind the plane, but follow all its movements with a delay. Erik Hofman: I've decided not to add the patch to preferences.xml in the base package because something feels funny with that. I think there needs to be some more discussion about it.
2003-07-11 08:58:26 +00:00
at_model_index = fgGetInt(nodepath.c_str());
Framerate independent viewer fixes from Melchior FRANZ
2003-07-14 14:20:45 +00:00
nodepath = viewpath;
nodepath += "/config/at-model-roll-damping";
damp_roll = fgGetDouble(nodepath.c_str(), 0.0);
nodepath = viewpath;
nodepath += "/config/at-model-pitch-damping";
damp_pitch = fgGetDouble(nodepath.c_str(), 0.0);
nodepath = viewpath;
nodepath += "/config/at-model-heading-damping";
damp_heading = fgGetDouble(nodepath.c_str(), 0.0);
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 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:26:07 +00:00
}
}
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
nodepath = viewpath;
nodepath += "/config/x-offset-m";
x_offset_m = fgGetDouble(nodepath.c_str());
nodepath = viewpath;
nodepath += "/config/y-offset-m";
y_offset_m = fgGetDouble(nodepath.c_str());
nodepath = viewpath;
nodepath += "/config/z-offset-m";
z_offset_m = fgGetDouble(nodepath.c_str());
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
nodepath = viewpath;
nodepath += "/config/pitch-offset-deg";
pitch_offset_deg = fgGetDouble(nodepath.c_str());
fgSetDouble(nodepath.c_str(),pitch_offset_deg);
nodepath = viewpath;
nodepath += "/config/heading-offset-deg";
heading_offset_deg = fgGetDouble(nodepath.c_str());
fgSetDouble(nodepath.c_str(),heading_offset_deg);
nodepath = viewpath;
nodepath += "/config/roll-offset-deg";
roll_offset_deg = fgGetDouble(nodepath.c_str());
fgSetDouble(nodepath.c_str(),roll_offset_deg);
nodepath = viewpath;
nodepath += "/config/default-field-of-view-deg";
fov_deg = fgGetDouble(nodepath.c_str());
// target offsets for lookat mode only...
nodepath = viewpath;
nodepath += "/config/target-x-offset-m";
target_x_offset_m = fgGetDouble(nodepath.c_str());
nodepath = viewpath;
nodepath += "/config/target-y-offset-m";
target_y_offset_m = fgGetDouble(nodepath.c_str());
nodepath = viewpath;
nodepath += "/config/target-z-offset-m";
target_z_offset_m = fgGetDouble(nodepath.c_str());
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
nodepath = viewpath;
nodepath += "/config/ground-level-nearplane-m";
near_m = fgGetDouble(nodepath.c_str());
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 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:26:07 +00:00
// supporting two types now "lookat" = 1 and "lookfrom" = 0
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
if ( strcmp("lookat",strdata.c_str()) == 0 )
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
add_view(new FGViewer ( FG_LOOKAT, from_model, from_model_index,
Framerate independent viewer fixes from Melchior FRANZ
2003-07-14 14:20:45 +00:00
at_model, at_model_index,
Melchior FRANZ: The jitter is most likely caused by the irregular frame rate and CPU clock dependent intervals. There's no easy way around that. I tried some fancy interpolation and all that -- to no avail.
2003-07-24 15:00:16 +00:00
damp_roll, damp_pitch, damp_heading,
Melchior FRANZ: The current chase view respects heading but ignores roll & pitch. And it follows heading without delay, which makes the viewer behave quite strange. This change makes the chase view feel more natural. You aren't fixed behind the plane, but follow all its movements with a delay. Erik Hofman: I've decided not to add the patch to preferences.xml in the base package because something feels funny with that. I think there needs to be some more discussion about it.
2003-07-11 08:58:26 +00:00
x_offset_m, y_offset_m,z_offset_m,
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
heading_offset_deg, pitch_offset_deg,
roll_offset_deg, fov_deg,
target_x_offset_m, target_y_offset_m,
Jim Wilson: This makes it possible to setup multiple cockpit views and have the correct clipping plane set for rendering the model.
2003-10-22 18:48:31 +00:00
target_z_offset_m, near_m, internal ));
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
else
Framerate independent viewer fixes from Melchior FRANZ
2003-07-14 14:20:45 +00:00
add_view(new FGViewer ( FG_LOOKFROM, from_model, from_model_index,
Melchior FRANZ: The jitter is most likely caused by the irregular frame rate and CPU clock dependent intervals. There's no easy way around that. I tried some fancy interpolation and all that -- to no avail.
2003-07-24 15:00:16 +00:00
false, 0, 0.0, 0.0, 0.0,
Framerate independent viewer fixes from Melchior FRANZ
2003-07-14 14:20:45 +00:00
x_offset_m, y_offset_m, z_offset_m,
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
heading_offset_deg, pitch_offset_deg,
Jim Wilson: This makes it possible to setup multiple cockpit views and have the correct clipping plane set for rendering the model.
2003-10-22 18:48:31 +00:00
roll_offset_deg, fov_deg, 0, 0, 0, near_m,
internal ));
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
}
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
copyToCurrent();
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
void
FGViewMgr::reinit ()
{
char stridx [ 20 ];
string viewpath, nodepath, strdata;
double fov_deg;
// reset offsets and fov to configuration defaults
for (int i = 0; i < fgGetInt("/sim/number-views"); i++) {
viewpath = "/sim/view";
sprintf(stridx, "[%d]", i);
viewpath += stridx;
setView(i);
nodepath = viewpath;
nodepath += "/config/x-offset-m";
fgSetDouble("/sim/current-view/x-offset-m",fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/y-offset-m";
fgSetDouble("/sim/current-view/y-offset-m",fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/z-offset-m";
fgSetDouble("/sim/current-view/z-offset-m",fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/pitch-offset-deg";
fgSetDouble("/sim/current-view/pitch-offset-deg",
fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/heading-offset-deg";
fgSetDouble("/sim/current-view/heading-offset-deg",
fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/roll-offset-deg";
fgSetDouble("/sim/current-view/roll-offset-deg",
fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/default-field-of-view-deg";
fov_deg = fgGetDouble(nodepath.c_str());
if (fov_deg < 10.0) {
fov_deg = 55.0;
}
fgSetDouble("/sim/current-view/field-of-view",fov_deg);
// target offsets for lookat mode only...
nodepath = viewpath;
nodepath += "/config/target-x-offset-m";
fgSetDouble("/sim/current-view/target-x-offset-deg",
fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/target-y-offset-m";
fgSetDouble("/sim/current-view/target-y-offset-deg",
fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/target-z-offset-m";
fgSetDouble("/sim/current-view/target-z-offset-deg",
fgGetDouble(nodepath.c_str()));
}
setView(0);
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
typedef double (FGViewMgr::*double_getter)() const;
void
FGViewMgr::bind ()
{
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
// these are bound to the current view properties
fgTie("/sim/current-view/heading-offset-deg", this,
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
&FGViewMgr::getViewHeadingOffset_deg,
&FGViewMgr::setViewHeadingOffset_deg);
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgSetArchivable("/sim/current-view/heading-offset-deg");
fgTie("/sim/current-view/goal-heading-offset-deg", this,
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
&FGViewMgr::getViewGoalHeadingOffset_deg,
&FGViewMgr::setViewGoalHeadingOffset_deg);
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgSetArchivable("/sim/current-view/goal-heading-offset-deg");
fgTie("/sim/current-view/pitch-offset-deg", this,
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
&FGViewMgr::getViewPitchOffset_deg,
&FGViewMgr::setViewPitchOffset_deg);
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgSetArchivable("/sim/current-view/pitch-offset-deg");
fgTie("/sim/current-view/goal-pitch-offset-deg", this,
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
&FGViewMgr::getGoalViewPitchOffset_deg,
&FGViewMgr::setGoalViewPitchOffset_deg);
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgSetArchivable("/sim/current-view/goal-pitch-offset-deg");
Jim Wilson: Remove some hardcoded dependencies between fdm, viewer and acmodel classes and replaced them with property references. Fix roll offset in viewer.
2004-03-19 03:30:18 +00:00
fgTie("/sim/current-view/roll-offset-deg", this,
&FGViewMgr::getViewRollOffset_deg,
&FGViewMgr::setViewRollOffset_deg);
fgSetArchivable("/sim/current-view/roll-offset-deg");
fgTie("/sim/current-view/goal-roll-offset-deg", this,
&FGViewMgr::getGoalViewRollOffset_deg,
&FGViewMgr::setGoalViewRollOffset_deg);
fgSetArchivable("/sim/current-view/goal-roll-offset-deg");
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
fgTie("/sim/current-view/view-number", this,
&FGViewMgr::getView, &FGViewMgr::setView);
fgSetArchivable("/sim/current-view/view-number", FALSE);
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgTie("/sim/current-view/axes/long", this,
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
(double_getter)0, &FGViewMgr::setViewAxisLong);
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
fgSetArchivable("/sim/current-view/axes/long");
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgTie("/sim/current-view/axes/lat", this,
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
(double_getter)0, &FGViewMgr::setViewAxisLat);
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
fgSetArchivable("/sim/current-view/axes/lat");
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgTie("/sim/current-view/field-of-view", this,
&FGViewMgr::getFOV_deg, &FGViewMgr::setFOV_deg);
fgSetArchivable("/sim/current-view/field-of-view");
fgTie("/sim/current-view/ground-level-nearplane-m", this,
&FGViewMgr::getNear_m, &FGViewMgr::setNear_m);
fgSetArchivable("/sim/current-view/ground-level-nearplane-m");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
void
FGViewMgr::unbind ()
{
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
// FIXME:
// need to redo these bindings to the new locations (move to viewer?)
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgUntie("/sim/current-view/heading-offset-deg");
fgUntie("/sim/current-view/goal-heading-offset-deg");
fgUntie("/sim/current-view/pitch-offset-deg");
fgUntie("/sim/current-view/goal-pitch-offset-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
fgUntie("/sim/field-of-view");
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
fgUntie("/sim/current-view/view-number");
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
fgUntie("/sim/current-view/axes/long");
fgUntie("/sim/current-view/axes/lat");
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
fgUntie("/sim/current-view/ground-level-nearplane-m");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
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
FGViewMgr::update (double dt)
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
char stridx [20];
Patch from Julian Foad: Make locally-used strings local instead of global. (The safety and cleanliness benefit outweights the slight performance hit. If performance is an issue, the way these strings are used should be optimised.) Use existing defined constant instead of a literal number.
2002-06-28 18:00:21 +00:00
string viewpath, nodepath;
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 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:26:07 +00:00
double lon_deg, lat_deg, alt_ft, roll_deg, pitch_deg, heading_deg;
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
FGViewer * view = get_current_view();
if (view == 0)
return;
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 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:26:07 +00:00
//
int i = current;
viewpath = "/sim/view";
sprintf(stridx, "[%d]", i);
viewpath += stridx;
FGViewer *loop_view = (FGViewer *)get_view( i );
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +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 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:26:07 +00:00
// Set up view location and orientation
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +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 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:26:07 +00:00
nodepath = viewpath;
nodepath += "/config/from-model";
if (!fgGetBool(nodepath.c_str())) {
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
nodepath = viewpath;
nodepath += "/config/eye-lon-deg-path";
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 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:26:07 +00:00
lon_deg = fgGetDouble(fgGetString(nodepath.c_str()));
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
nodepath = viewpath;
nodepath += "/config/eye-lat-deg-path";
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 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:26:07 +00:00
lat_deg = fgGetDouble(fgGetString(nodepath.c_str()));
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
nodepath = viewpath;
nodepath += "/config/eye-alt-ft-path";
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 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:26:07 +00:00
alt_ft = fgGetDouble(fgGetString(nodepath.c_str()));
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
nodepath = viewpath;
nodepath += "/config/eye-roll-deg-path";
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 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:26:07 +00:00
roll_deg = fgGetDouble(fgGetString(nodepath.c_str()));
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
nodepath = viewpath;
nodepath += "/config/eye-pitch-deg-path";
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 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:26:07 +00:00
pitch_deg = fgGetDouble(fgGetString(nodepath.c_str()));
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
nodepath = viewpath;
nodepath += "/config/eye-heading-deg-path";
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 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:26:07 +00:00
heading_deg = fgGetDouble(fgGetString(nodepath.c_str()));
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
loop_view->setPosition(lon_deg, lat_deg, alt_ft);
loop_view->setOrientation(roll_deg, pitch_deg, heading_deg);
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 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:26:07 +00:00
} else {
// force recalc in viewer
loop_view->set_dirty();
}
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +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 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:26:07 +00:00
// if lookat (type 1) then get target data...
Patch from Julian Foad: Make locally-used strings local instead of global. (The safety and cleanliness benefit outweights the slight performance hit. If performance is an issue, the way these strings are used should be optimised.) Use existing defined constant instead of a literal number.
2002-06-28 18:00:21 +00:00
if (loop_view->getType() == FG_LOOKAT) {
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 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:26:07 +00:00
nodepath = viewpath;
nodepath += "/config/from-model";
if (!fgGetBool(nodepath.c_str())) {
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
nodepath = viewpath;
nodepath += "/config/target-lon-deg-path";
lon_deg = fgGetDouble(fgGetString(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/target-lat-deg-path";
lat_deg = fgGetDouble(fgGetString(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/target-alt-ft-path";
alt_ft = fgGetDouble(fgGetString(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/target-roll-deg-path";
roll_deg = fgGetDouble(fgGetString(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/target-pitch-deg-path";
pitch_deg = fgGetDouble(fgGetString(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/target-heading-deg-path";
heading_deg = fgGetDouble(fgGetString(nodepath.c_str()));
Framerate independent viewer fixes from Melchior FRANZ
2003-07-14 14:20:45 +00:00
loop_view->setTargetPosition(lon_deg, lat_deg, alt_ft);
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
loop_view->setTargetOrientation(roll_deg, pitch_deg, heading_deg);
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 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:26:07 +00:00
} else {
loop_view->set_dirty();
Viewer update from Jim Wilson: Tower View and viewer config is in place. Note that the interface is still in a state of flux. A couple of the config items (namely the offsets) are still using the old settings. The tower is hard coded into the base package for a position off the starting runway at KSFO and is probably not in the right place for there even. Looks pretty cool though! Tower View is the third view. If you aren't at KSFO you'll just see blank space in view 3. It's looking through the earth or something like that :-). Important note: zoom in with a few hits of the "x" key to see the plane better in tower view.
2002-04-05 18:49:04 +00:00
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
setViewXOffset_m(fgGetDouble("/sim/current-view/x-offset-m"));
setViewYOffset_m(fgGetDouble("/sim/current-view/y-offset-m"));
setViewZOffset_m(fgGetDouble("/sim/current-view/z-offset-m"));
setViewTargetXOffset_m(fgGetDouble("/sim/current-view/target-x-offset-m"));
setViewTargetYOffset_m(fgGetDouble("/sim/current-view/target-y-offset-m"));
setViewTargetZOffset_m(fgGetDouble("/sim/current-view/target-z-offset-m"));
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
// Update the current view
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
do_axes();
view->update(dt);
}
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
void
FGViewMgr::copyToCurrent()
{
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
char stridx [20];
string viewpath, nodepath;
int i = current;
viewpath = "/sim/view";
sprintf(stridx, "[%d]", i);
viewpath += stridx;
// copy certain view config data for default values
nodepath = viewpath;
nodepath += "/config/default-heading-offset-deg";
fgSetDouble("/sim/current-view/config/heading-offset-deg",
fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/pitch-offset-deg";
fgSetDouble("/sim/current-view/config/pitch-offset-deg",
fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/roll-offset-deg";
fgSetDouble("/sim/current-view/config/roll-offset-deg",
fgGetDouble(nodepath.c_str()));
nodepath = viewpath;
nodepath += "/config/default-field-of-view-deg";
fgSetDouble("/sim/current-view/config/default-field-of-view-deg",
fgGetDouble(nodepath.c_str()));
Jim Wilson: Remove some hardcoded dependencies between fdm, viewer and acmodel classes and replaced them with property references. Fix roll offset in viewer.
2004-03-19 03:30:18 +00:00
nodepath = viewpath;
nodepath += "/config/from-model";
fgSetBool("/sim/current-view/config/from-model",
fgGetBool(nodepath.c_str()));
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
// copy view data
fgSetDouble("/sim/current-view/x-offset-m", getViewXOffset_m());
fgSetDouble("/sim/current-view/y-offset-m", getViewYOffset_m());
fgSetDouble("/sim/current-view/z-offset-m", getViewZOffset_m());
fgSetDouble("/sim/current-view/goal-heading-offset-deg",
get_current_view()->getGoalHeadingOffset_deg());
fgSetDouble("/sim/current-view/goal-pitch-offset-deg",
get_current_view()->getGoalPitchOffset_deg());
fgSetDouble("/sim/current-view/goal-roll-offset-deg",
get_current_view()->getRollOffset_deg());
fgSetDouble("/sim/current-view/heading-offset-deg",
get_current_view()->getHeadingOffset_deg());
fgSetDouble("/sim/current-view/pitch-offset-deg",
get_current_view()->getPitchOffset_deg());
fgSetDouble("/sim/current-view/roll-offset-deg",
get_current_view()->getRollOffset_deg());
fgSetDouble("/sim/current-view/target-x-offset-m",
get_current_view()->getTargetXOffset_m());
fgSetDouble("/sim/current-view/target-y-offset-m",
get_current_view()->getTargetYOffset_m());
fgSetDouble("/sim/current-view/target-z-offset-m",
get_current_view()->getTargetZOffset_m());
Jim Wilson: Remove some hardcoded dependencies between fdm, viewer and acmodel classes and replaced them with property references. Fix roll offset in viewer.
2004-03-19 03:30:18 +00:00
fgSetBool("/sim/current-view/internal",
get_current_view()->getInternal());
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
double
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::getViewHeadingOffset_deg () const
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
const FGViewer * view = get_current_view();
Major viewer-code overhaul from Jim Wilson: Description: This update includes the new viewer interface as proposed by David M. and a first pass at cleaning up the viewer/view manager code by Jim W. Note that I have dropped Main/viewer_lookat.?xx and Main/viewer_rph.?xx and modified the Makefile.am accordingly. Detail of work: Overall: The code reads a little easier. There are still some unnecessary bits in there and I'd like to supplement the comments in the viewer.hxx with a tiny bit on each interface group and what the groupings mean (similar but briefer than what you emailed me the other day). I tried not to mess up the style, but there is an occasional inconsistency. In general I wouldn't call it done (especially since there's no tower yet! :)), but I'd like to get this out there so others can comment, and test. In Viewer: The interface as you suggested has been implemented. Basically everything seems to work as it did visually. There is no difference that I can see in performance, although some things might be a tiny bit faster. I've merged the lookat and rph (pilot view) code into the recalc for the viewer. There is still some redundancy between the two, but a lot has been removed. In some cases I've taken some code that we'd likely want to inline anyway and left it in there in duplicate. You'll see that the code for both looks a little cleaner. I need to take a closer look at the rotations in particular. I've cleaned up a little there, but I suspect more can be done to streamline this. The external declaration to the Quat_mat in mouse.cxx has been removed. IMHO the quat doesn't serve any intrinsic purpose in mouse.cxx, but I'm not about to rip it out. It would seem that there more conventional ways to get spherical data that are just as fast. In any case all the viewer was pulling from the quat matrix was the pitch value so I modified mouse.cxx to output to our pitchOffset input and that works fine. I've changed the native values to degrees from radians where appropriate. This required a conversion from degrees to radians in a couple modules that access the interface. Perhaps we should add interface calls that do the conversion, e.g. a getHeadingOffset_rad() to go along with the getHeadingOffset_deg(). On the view_offset (now headingOffset) thing there are two entry points because of the ability to instantly switch views or to scroll to a new view angle (by hitting the numeric keys for example). This leaves an anomaly in the interface which should be resolved by adding "goal" settings to the interface, e.g. a setGoalHeadingOffset_deg(), setGoalPitchOffset_deg(), etc. Other than these two issues, the next step here will be to look at some further optimizations, and to write support code for a tower view. That should be fairly simple at this point. I was considering creating a "simulated tower view" or "pedestrian view" that defaulted to a position off to the right of whereever the plane is at the moment you switch to the tower view. This could be a fall back when we don't have an actual tower location at hand (as would be the case with rural airports). ViewManager: Basically all I did here was neaten things up by ripping out excess crap and made it compatible as is with the new interface. The result is that viewmanager is now ready to be developed. The two preexisting views are still hardcoded into the view manager. The next step would be to design configuration xml (eg /sim/view[x]/config/blahblah) that could be used to set up as many views as we want. If we want to take the easy way out, we might want to insist that view[0] be a pilot-view and have viewmanager check for that.
2002-03-20 17:43:28 +00:00
return (view == 0 ? 0 : view->getHeadingOffset_deg());
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
void
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::setViewHeadingOffset_deg (double offset)
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
FGViewer * view = get_current_view();
Setting offset or tilt always sets goal-offset or goal-tilt as well.
2002-03-26 13:44:43 +00:00
if (view != 0) {
view->setGoalHeadingOffset_deg(offset);
Major viewer-code overhaul from Jim Wilson: Description: This update includes the new viewer interface as proposed by David M. and a first pass at cleaning up the viewer/view manager code by Jim W. Note that I have dropped Main/viewer_lookat.?xx and Main/viewer_rph.?xx and modified the Makefile.am accordingly. Detail of work: Overall: The code reads a little easier. There are still some unnecessary bits in there and I'd like to supplement the comments in the viewer.hxx with a tiny bit on each interface group and what the groupings mean (similar but briefer than what you emailed me the other day). I tried not to mess up the style, but there is an occasional inconsistency. In general I wouldn't call it done (especially since there's no tower yet! :)), but I'd like to get this out there so others can comment, and test. In Viewer: The interface as you suggested has been implemented. Basically everything seems to work as it did visually. There is no difference that I can see in performance, although some things might be a tiny bit faster. I've merged the lookat and rph (pilot view) code into the recalc for the viewer. There is still some redundancy between the two, but a lot has been removed. In some cases I've taken some code that we'd likely want to inline anyway and left it in there in duplicate. You'll see that the code for both looks a little cleaner. I need to take a closer look at the rotations in particular. I've cleaned up a little there, but I suspect more can be done to streamline this. The external declaration to the Quat_mat in mouse.cxx has been removed. IMHO the quat doesn't serve any intrinsic purpose in mouse.cxx, but I'm not about to rip it out. It would seem that there more conventional ways to get spherical data that are just as fast. In any case all the viewer was pulling from the quat matrix was the pitch value so I modified mouse.cxx to output to our pitchOffset input and that works fine. I've changed the native values to degrees from radians where appropriate. This required a conversion from degrees to radians in a couple modules that access the interface. Perhaps we should add interface calls that do the conversion, e.g. a getHeadingOffset_rad() to go along with the getHeadingOffset_deg(). On the view_offset (now headingOffset) thing there are two entry points because of the ability to instantly switch views or to scroll to a new view angle (by hitting the numeric keys for example). This leaves an anomaly in the interface which should be resolved by adding "goal" settings to the interface, e.g. a setGoalHeadingOffset_deg(), setGoalPitchOffset_deg(), etc. Other than these two issues, the next step here will be to look at some further optimizations, and to write support code for a tower view. That should be fairly simple at this point. I was considering creating a "simulated tower view" or "pedestrian view" that defaulted to a position off to the right of whereever the plane is at the moment you switch to the tower view. This could be a fall back when we don't have an actual tower location at hand (as would be the case with rural airports). ViewManager: Basically all I did here was neaten things up by ripping out excess crap and made it compatible as is with the new interface. The result is that viewmanager is now ready to be developed. The two preexisting views are still hardcoded into the view manager. The next step would be to design configuration xml (eg /sim/view[x]/config/blahblah) that could be used to set up as many views as we want. If we want to take the easy way out, we might want to insist that view[0] be a pilot-view and have viewmanager check for that.
2002-03-20 17:43:28 +00:00
view->setHeadingOffset_deg(offset);
Setting offset or tilt always sets goal-offset or goal-tilt as well.
2002-03-26 13:44:43 +00:00
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
double
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::getViewGoalHeadingOffset_deg () const
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
const FGViewer * view = get_current_view();
Viewer update from Jim Wilson: This patch renames the "goal" orientation offsets inputs/outputs to conform with the naming of the new interface.
2002-03-21 20:59:43 +00:00
return (view == 0 ? 0 : view->getGoalHeadingOffset_deg());
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
void
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::setViewGoalHeadingOffset_deg (double offset)
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
FGViewer * view = get_current_view();
if (view != 0)
Viewer update from Jim Wilson: This patch renames the "goal" orientation offsets inputs/outputs to conform with the naming of the new interface.
2002-03-21 20:59:43 +00:00
view->setGoalHeadingOffset_deg(offset);
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
double
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::getViewPitchOffset_deg () const
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
const FGViewer * view = get_current_view();
Major viewer-code overhaul from Jim Wilson: Description: This update includes the new viewer interface as proposed by David M. and a first pass at cleaning up the viewer/view manager code by Jim W. Note that I have dropped Main/viewer_lookat.?xx and Main/viewer_rph.?xx and modified the Makefile.am accordingly. Detail of work: Overall: The code reads a little easier. There are still some unnecessary bits in there and I'd like to supplement the comments in the viewer.hxx with a tiny bit on each interface group and what the groupings mean (similar but briefer than what you emailed me the other day). I tried not to mess up the style, but there is an occasional inconsistency. In general I wouldn't call it done (especially since there's no tower yet! :)), but I'd like to get this out there so others can comment, and test. In Viewer: The interface as you suggested has been implemented. Basically everything seems to work as it did visually. There is no difference that I can see in performance, although some things might be a tiny bit faster. I've merged the lookat and rph (pilot view) code into the recalc for the viewer. There is still some redundancy between the two, but a lot has been removed. In some cases I've taken some code that we'd likely want to inline anyway and left it in there in duplicate. You'll see that the code for both looks a little cleaner. I need to take a closer look at the rotations in particular. I've cleaned up a little there, but I suspect more can be done to streamline this. The external declaration to the Quat_mat in mouse.cxx has been removed. IMHO the quat doesn't serve any intrinsic purpose in mouse.cxx, but I'm not about to rip it out. It would seem that there more conventional ways to get spherical data that are just as fast. In any case all the viewer was pulling from the quat matrix was the pitch value so I modified mouse.cxx to output to our pitchOffset input and that works fine. I've changed the native values to degrees from radians where appropriate. This required a conversion from degrees to radians in a couple modules that access the interface. Perhaps we should add interface calls that do the conversion, e.g. a getHeadingOffset_rad() to go along with the getHeadingOffset_deg(). On the view_offset (now headingOffset) thing there are two entry points because of the ability to instantly switch views or to scroll to a new view angle (by hitting the numeric keys for example). This leaves an anomaly in the interface which should be resolved by adding "goal" settings to the interface, e.g. a setGoalHeadingOffset_deg(), setGoalPitchOffset_deg(), etc. Other than these two issues, the next step here will be to look at some further optimizations, and to write support code for a tower view. That should be fairly simple at this point. I was considering creating a "simulated tower view" or "pedestrian view" that defaulted to a position off to the right of whereever the plane is at the moment you switch to the tower view. This could be a fall back when we don't have an actual tower location at hand (as would be the case with rural airports). ViewManager: Basically all I did here was neaten things up by ripping out excess crap and made it compatible as is with the new interface. The result is that viewmanager is now ready to be developed. The two preexisting views are still hardcoded into the view manager. The next step would be to design configuration xml (eg /sim/view[x]/config/blahblah) that could be used to set up as many views as we want. If we want to take the easy way out, we might want to insist that view[0] be a pilot-view and have viewmanager check for that.
2002-03-20 17:43:28 +00:00
return (view == 0 ? 0 : view->getPitchOffset_deg());
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
void
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::setViewPitchOffset_deg (double tilt)
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
FGViewer * view = get_current_view();
Setting offset or tilt always sets goal-offset or goal-tilt as well.
2002-03-26 13:44:43 +00:00
if (view != 0) {
view->setGoalPitchOffset_deg(tilt);
Major viewer-code overhaul from Jim Wilson: Description: This update includes the new viewer interface as proposed by David M. and a first pass at cleaning up the viewer/view manager code by Jim W. Note that I have dropped Main/viewer_lookat.?xx and Main/viewer_rph.?xx and modified the Makefile.am accordingly. Detail of work: Overall: The code reads a little easier. There are still some unnecessary bits in there and I'd like to supplement the comments in the viewer.hxx with a tiny bit on each interface group and what the groupings mean (similar but briefer than what you emailed me the other day). I tried not to mess up the style, but there is an occasional inconsistency. In general I wouldn't call it done (especially since there's no tower yet! :)), but I'd like to get this out there so others can comment, and test. In Viewer: The interface as you suggested has been implemented. Basically everything seems to work as it did visually. There is no difference that I can see in performance, although some things might be a tiny bit faster. I've merged the lookat and rph (pilot view) code into the recalc for the viewer. There is still some redundancy between the two, but a lot has been removed. In some cases I've taken some code that we'd likely want to inline anyway and left it in there in duplicate. You'll see that the code for both looks a little cleaner. I need to take a closer look at the rotations in particular. I've cleaned up a little there, but I suspect more can be done to streamline this. The external declaration to the Quat_mat in mouse.cxx has been removed. IMHO the quat doesn't serve any intrinsic purpose in mouse.cxx, but I'm not about to rip it out. It would seem that there more conventional ways to get spherical data that are just as fast. In any case all the viewer was pulling from the quat matrix was the pitch value so I modified mouse.cxx to output to our pitchOffset input and that works fine. I've changed the native values to degrees from radians where appropriate. This required a conversion from degrees to radians in a couple modules that access the interface. Perhaps we should add interface calls that do the conversion, e.g. a getHeadingOffset_rad() to go along with the getHeadingOffset_deg(). On the view_offset (now headingOffset) thing there are two entry points because of the ability to instantly switch views or to scroll to a new view angle (by hitting the numeric keys for example). This leaves an anomaly in the interface which should be resolved by adding "goal" settings to the interface, e.g. a setGoalHeadingOffset_deg(), setGoalPitchOffset_deg(), etc. Other than these two issues, the next step here will be to look at some further optimizations, and to write support code for a tower view. That should be fairly simple at this point. I was considering creating a "simulated tower view" or "pedestrian view" that defaulted to a position off to the right of whereever the plane is at the moment you switch to the tower view. This could be a fall back when we don't have an actual tower location at hand (as would be the case with rural airports). ViewManager: Basically all I did here was neaten things up by ripping out excess crap and made it compatible as is with the new interface. The result is that viewmanager is now ready to be developed. The two preexisting views are still hardcoded into the view manager. The next step would be to design configuration xml (eg /sim/view[x]/config/blahblah) that could be used to set up as many views as we want. If we want to take the easy way out, we might want to insist that view[0] be a pilot-view and have viewmanager check for that.
2002-03-20 17:43:28 +00:00
view->setPitchOffset_deg(tilt);
Setting offset or tilt always sets goal-offset or goal-tilt as well.
2002-03-26 13:44:43 +00:00
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
double
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::getGoalViewPitchOffset_deg () const
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
const FGViewer * view = get_current_view();
Viewer update from Jim Wilson: This patch renames the "goal" orientation offsets inputs/outputs to conform with the naming of the new interface.
2002-03-21 20:59:43 +00:00
return (view == 0 ? 0 : view->getGoalPitchOffset_deg());
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
void
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::setGoalViewPitchOffset_deg (double tilt)
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
FGViewer * view = get_current_view();
if (view != 0)
Viewer update from Jim Wilson: This patch renames the "goal" orientation offsets inputs/outputs to conform with the naming of the new interface.
2002-03-21 20:59:43 +00:00
view->setGoalPitchOffset_deg(tilt);
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
Jim Wilson: Remove some hardcoded dependencies between fdm, viewer and acmodel classes and replaced them with property references. Fix roll offset in viewer.
2004-03-19 03:30:18 +00:00
double
FGViewMgr::getViewRollOffset_deg () const
{
const FGViewer * view = get_current_view();
return (view == 0 ? 0 : view->getRollOffset_deg());
}
void
FGViewMgr::setViewRollOffset_deg (double tilt)
{
FGViewer * view = get_current_view();
if (view != 0) {
view->setGoalRollOffset_deg(tilt);
view->setRollOffset_deg(tilt);
}
}
double
FGViewMgr::getGoalViewRollOffset_deg () const
{
const FGViewer * view = get_current_view();
return (view == 0 ? 0 : view->getGoalRollOffset_deg());
}
void
FGViewMgr::setGoalViewRollOffset_deg (double tilt)
{
FGViewer * view = get_current_view();
if (view != 0)
view->setGoalRollOffset_deg(tilt);
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
double
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::getViewXOffset_m () const
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
const FGViewer * view = get_current_view();
if (view != 0) {
return ((FGViewer *)view)->getXOffset_m();
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
} else {
return 0;
}
}
void
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::setViewXOffset_m (double x)
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
FGViewer * view = get_current_view();
if (view != 0) {
view->setXOffset_m(x);
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
}
double
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::getViewYOffset_m () const
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
const FGViewer * view = get_current_view();
if (view != 0) {
return ((FGViewer *)view)->getYOffset_m();
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
} else {
return 0;
}
}
void
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::setViewYOffset_m (double y)
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
FGViewer * view = get_current_view();
if (view != 0) {
view->setYOffset_m(y);
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
}
double
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::getViewZOffset_m () const
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
const FGViewer * view = get_current_view();
if (view != 0) {
return ((FGViewer *)view)->getZOffset_m();
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
} else {
return 0;
}
}
void
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
FGViewMgr::setViewZOffset_m (double z)
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
{
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
FGViewer * view = get_current_view();
if (view != 0) {
view->setZOffset_m(z);
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
}
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
double
FGViewMgr::getViewTargetXOffset_m () const
{
const FGViewer * view = get_current_view();
if (view != 0) {
return ((FGViewer *)view)->getTargetXOffset_m();
} else {
return 0;
}
}
void
FGViewMgr::setViewTargetXOffset_m (double x)
{
FGViewer * view = get_current_view();
if (view != 0) {
view->setTargetXOffset_m(x);
}
}
double
FGViewMgr::getViewTargetYOffset_m () const
{
const FGViewer * view = get_current_view();
if (view != 0) {
return ((FGViewer *)view)->getTargetYOffset_m();
} else {
return 0;
}
}
void
FGViewMgr::setViewTargetYOffset_m (double y)
{
FGViewer * view = get_current_view();
if (view != 0) {
view->setTargetYOffset_m(y);
}
}
double
FGViewMgr::getViewTargetZOffset_m () const
{
const FGViewer * view = get_current_view();
if (view != 0) {
return ((FGViewer *)view)->getTargetZOffset_m();
} else {
return 0;
}
}
void
FGViewMgr::setViewTargetZOffset_m (double z)
{
FGViewer * view = get_current_view();
if (view != 0) {
view->setTargetZOffset_m(z);
}
}
int
FGViewMgr::getView () const
{
return ( current );
}
void
FGViewMgr::setView (int newview )
{
Jim Wilson: This is a patch to viewmgr.cxx that I've had for a long time. This just prevents a possible segfault caused by misconfiguration.
2003-05-09 08:31:56 +00:00
// if newview number too low wrap to last view...
if ( newview < 0 ) {
newview = (int)views.size() -1;
}
// if newview number to high wrap to zero...
if ( newview > ((int)views.size() -1) ) {
There are a number of little changes. Tested with current cvs as of 20:30EST 04Feb. Actually been running since the beginning of January with these patches. All changes work without crashing with the current base package cvs, but there are some visual problems with the views (other than pilot view) without changes to the base package. As soon as you can build test and commit I can add in those base package updates that will make it all work nicely. I will also go through all the 3D Aircraft configs to make sure the change in the "pitch-offset" for cockpit views (see below) are made to maintain current behavior. Here are the files (changes listed below): http://www.spiderbark.com/fgfs/viewerupdate.diffs.gz http://www.spiderbark.com/fgfs/viewerupdate.tar.gz
2003-02-06 19:44:32 +00:00
newview = 0;
}
// set new view
set_view( newview );
// copy in view data
copyToCurrent ();
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
double
FGViewMgr::getFOV_deg () const
{
const FGViewer * view = get_current_view();
return (view == 0 ? 0 : view->get_fov());
}
void
FGViewMgr::setFOV_deg (double fov)
{
FGViewer * view = get_current_view();
if (view != 0)
view->set_fov(fov);
}
Jim Wilson: These are the updates for the View manager properties. Removed the last of items (within the viewer/viewmgr) hard coded to view number. Added support for per view configuration of ground level nearplane value. Tower views look very nice with little or no z-buffer problem in the models. Pilot offset dialog can be used to move eye in all views.
2002-04-18 16:51:47 +00:00
double
FGViewMgr::getNear_m () const
{
const FGViewer * view = get_current_view();
return (view == 0 ? 0.5f : view->getNear_m());
}
void
FGViewMgr::setNear_m (double near_m)
{
FGViewer * view = get_current_view();
if (view != 0)
view->setNear_m(near_m);
}
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
void
FGViewMgr::setViewAxisLong (double axis)
{
axis_long = axis;
}
void
FGViewMgr::setViewAxisLat (double axis)
{
axis_lat = axis;
}
void
FGViewMgr::do_axes ()
{
// Take no action when hat is centered
if ( ( axis_long < 0.01 ) &&
( axis_long > -0.01 ) &&
( axis_lat < 0.01 ) &&
( axis_lat > -0.01 )
)
return;
double viewDir = 999;
/* Do all the quick and easy cases */
if (axis_long < 0) { // Longitudinal axis forward
if (axis_lat == axis_long)
Modified /sim/current-view/axes/long and /sim/current-view/axes/lat to use the user-configurable view defaults.
2002-11-02 21:43:15 +00:00
viewDir = fgGetDouble("/sim/view/config/front-left-direction-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
else if (axis_lat == - axis_long)
Modified /sim/current-view/axes/long and /sim/current-view/axes/lat to use the user-configurable view defaults.
2002-11-02 21:43:15 +00:00
viewDir = fgGetDouble("/sim/view/config/front-right-direction-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
else if (axis_lat == 0)
Modified /sim/current-view/axes/long and /sim/current-view/axes/lat to use the user-configurable view defaults.
2002-11-02 21:43:15 +00:00
viewDir = fgGetDouble("/sim/view/config/front-direction-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
} else if (axis_long > 0) { // Longitudinal axis backward
if (axis_lat == - axis_long)
Modified /sim/current-view/axes/long and /sim/current-view/axes/lat to use the user-configurable view defaults.
2002-11-02 21:43:15 +00:00
viewDir = fgGetDouble("/sim/view/config/back-left-direction-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
else if (axis_lat == axis_long)
Modified /sim/current-view/axes/long and /sim/current-view/axes/lat to use the user-configurable view defaults.
2002-11-02 21:43:15 +00:00
viewDir = fgGetDouble("/sim/view/config/back-right-direction-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
else if (axis_lat == 0)
Modified /sim/current-view/axes/long and /sim/current-view/axes/lat to use the user-configurable view defaults.
2002-11-02 21:43:15 +00:00
viewDir = fgGetDouble("/sim/view/config/back-direction-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
} else if (axis_long == 0) { // Longitudinal axis neutral
if (axis_lat < 0)
Modified /sim/current-view/axes/long and /sim/current-view/axes/lat to use the user-configurable view defaults.
2002-11-02 21:43:15 +00:00
viewDir = fgGetDouble("/sim/view/config/left-direction-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
else if (axis_lat > 0)
Modified /sim/current-view/axes/long and /sim/current-view/axes/lat to use the user-configurable view defaults.
2002-11-02 21:43:15 +00:00
viewDir = fgGetDouble("/sim/view/config/right-direction-deg");
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
else return; /* And assertion failure maybe? */
}
// Do all the difficult cases
if ( viewDir > 900 )
viewDir = SGD_RADIANS_TO_DEGREES * atan2 ( -axis_lat, -axis_long );
if ( viewDir < -1 ) viewDir += 360;
Viewer update from Jim Wilson: This patch renames the "goal" orientation offsets inputs/outputs to conform with the naming of the new interface.
2002-03-21 20:59:43 +00:00
get_current_view()->setGoalHeadingOffset_deg(viewDir);
Centralized most view-management code in FGViewMgr. It's still a mess, but the mess is all in one place now.
2002-03-14 00:29:20 +00:00
}
Copy permalink