X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fviewmgr.cxx;h=eba47d0c974de2a7635e3cabaa1cd83deae449cd;hb=f6e80608797fa9ab9d44444eb7b031e412b83067;hp=110a06f591e811b2767c8e5f6e5a36df95d2430b;hpb=38c705b6c024ba39516cafab55a6e37dab4128ef;p=flightgear.git diff --git a/src/Main/viewmgr.cxx b/src/Main/viewmgr.cxx index 110a06f59..eba47d0c9 100644 --- a/src/Main/viewmgr.cxx +++ b/src/Main/viewmgr.cxx @@ -25,8 +25,6 @@ #include -#include // FIXME: this should NOT be needed - #include "viewmgr.hxx" #include "fg_props.hxx" @@ -47,8 +45,81 @@ FGViewMgr::~FGViewMgr( void ) { void FGViewMgr::init () { - add_view(new FGViewer, 0); - add_view(new FGViewer, 1); + char stridx [ 20 ]; + string viewpath, nodepath, strdata; + bool from_model = false; + bool at_model = false; + int from_model_index = 0; + int at_model_index = 0; + double x_offset_m, y_offset_m, z_offset_m; + double near_m; + + for (int i = 0; i < fgGetInt("/sim/number-views"); i++) { + viewpath = "/sim/view"; + sprintf(stridx, "[%d]", i); + viewpath += stridx; + + // find out what type of view this is... + nodepath = viewpath; + nodepath += "/type"; + strdata = fgGetString(nodepath.c_str()); + + // 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"; + at_model_index = fgGetInt(nodepath.c_str()); + } + } + + 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()); + + nodepath = viewpath; + nodepath += "/config/ground-level-nearplane-m"; + near_m = fgGetDouble(nodepath.c_str()); + + // supporting two types now "lookat" = 1 and "lookfrom" = 0 + if ( strcmp("lookat",strdata.c_str()) == 0 ) + add_view(new FGViewer ( FG_LOOKAT, from_model, from_model_index, + at_model, at_model_index, x_offset_m, y_offset_m, + z_offset_m, near_m )); + else + add_view(new FGViewer ( FG_LOOKFROM, from_model, from_model_index, false, + 0, x_offset_m, y_offset_m, z_offset_m, near_m )); + + } + + copyToCurrent(); + } typedef double (FGViewMgr::*double_getter)() const; @@ -56,118 +127,147 @@ typedef double (FGViewMgr::*double_getter)() const; void FGViewMgr::bind () { - fgTie("/sim/view/offset-deg", this, + // these are bound to the current view properties + fgTie("/sim/current-view/heading-offset-deg", this, &FGViewMgr::getViewOffset_deg, &FGViewMgr::setViewOffset_deg); - fgSetArchivable("/sim/view/offset-deg"); - fgTie("/sim/view/goal-offset-deg", this, + fgSetArchivable("/sim/current-view/heading-offset-deg"); + fgTie("/sim/current-view/goal-heading-offset-deg", this, &FGViewMgr::getGoalViewOffset_deg, &FGViewMgr::setGoalViewOffset_deg); - fgSetArchivable("/sim/view/goal-offset-deg"); - fgTie("/sim/view/tilt-deg", this, + fgSetArchivable("/sim/current-view/goal-heading-offset-deg"); + fgTie("/sim/current-view/pitch-offset-deg", this, &FGViewMgr::getViewTilt_deg, &FGViewMgr::setViewTilt_deg); - fgSetArchivable("/sim/view/tilt-deg"); - fgTie("/sim/view/goal-tilt-deg", this, + fgSetArchivable("/sim/current-view/pitch-offset-deg"); + fgTie("/sim/current-view/goal-pitch-offset-deg", this, &FGViewMgr::getGoalViewTilt_deg, &FGViewMgr::setGoalViewTilt_deg); - fgSetArchivable("/sim/view/goal-tilt-deg"); - fgTie("/sim/view/pilot/x-offset-m", this, - &FGViewMgr::getPilotXOffset_m, &FGViewMgr::setPilotXOffset_m); - fgSetArchivable("/sim/view/pilot/x-offset-m"); - fgTie("/sim/view/pilot/y-offset-m", this, - &FGViewMgr::getPilotYOffset_m, &FGViewMgr::setPilotYOffset_m); - fgSetArchivable("/sim/view/pilot/y-offset-m"); - fgTie("/sim/view/pilot/z-offset-m", this, - &FGViewMgr::getPilotZOffset_m, &FGViewMgr::setPilotZOffset_m); - fgSetArchivable("/sim/view/pilot/z-offset-m"); - fgTie("/sim/field-of-view", this, - &FGViewMgr::getFOV_deg, &FGViewMgr::setFOV_deg); - fgSetArchivable("/sim/field-of-view"); - fgTie("/sim/view/axes/long", this, + fgSetArchivable("/sim/current-view/goal-pitch-offset-deg"); + + fgTie("/sim/current-view/axes/long", this, (double_getter)0, &FGViewMgr::setViewAxisLong); - fgTie("/sim/view/axes/lat", this, + fgTie("/sim/current-view/axes/lat", this, (double_getter)0, &FGViewMgr::setViewAxisLat); + + 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"); + } void FGViewMgr::unbind () { - fgUntie("/sim/view/offset-deg"); - fgUntie("/sim/view/goal-offset-deg"); - fgUntie("/sim/view/tilt-deg"); - fgUntie("/sim/view/goal-tilt-deg"); - fgUntie("/sim/view/pilot/x-offset-m"); - fgUntie("/sim/view/pilot/y-offset-m"); - fgUntie("/sim/view/pilot/z-offset-m"); + // FIXME: + // need to redo these bindings to the new locations (move to viewer?) + 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"); fgUntie("/sim/field-of-view"); - fgUntie("/sim/view/axes/long"); - fgUntie("/sim/view/axes/lat"); + fgUntie("/sim/current-view/axes/long"); + fgUntie("/sim/current-view/axes/lat"); } void -FGViewMgr::update (int dt) +FGViewMgr::update (double dt) { + char stridx [20]; + string viewpath, nodepath; + double lon_deg, lat_deg, alt_ft, roll_deg, pitch_deg, heading_deg; + FGViewer * view = get_current_view(); if (view == 0) return; - // Grab some values we'll need. - double lon_rad = fgGetDouble("/position/longitude-deg") - * SGD_DEGREES_TO_RADIANS; - double lat_rad = fgGetDouble("/position/latitude-deg") - * SGD_DEGREES_TO_RADIANS; - double alt_m = fgGetDouble("/position/altitude-ft") - * SG_FEET_TO_METER; - double roll_rad = fgGetDouble("/orientation/roll-deg") - * SGD_DEGREES_TO_RADIANS; - double pitch_rad = fgGetDouble("/orientation/pitch-deg") - * SGD_DEGREES_TO_RADIANS; - double heading_rad = fgGetDouble("/orientation/heading-deg") - * SGD_DEGREES_TO_RADIANS; - - // Set up the pilot view - FGViewer *pilot_view = (FGViewer *)get_view( 0 ); - pilot_view ->setPosition( - fgGetDouble("/position/longitude-deg"), - fgGetDouble("/position/latitude-deg"), - fgGetDouble("/position/altitude-ft")); - pilot_view->setOrientation( - fgGetDouble("/orientation/roll-deg"), - fgGetDouble("/orientation/pitch-deg"), - fgGetDouble("/orientation/heading-deg")); - if (!strcmp(fgGetString("/sim/flight-model"), "ada")) { - //+ve x is aft, +ve z is up (see viewer.hxx) - pilot_view->setPositionOffsets( -5.0, 0.0, 1.0 ); + // + int i = current; + viewpath = "/sim/view"; + sprintf(stridx, "[%d]", i); + viewpath += stridx; + + + FGViewer *loop_view = (FGViewer *)get_view( i ); + + // Set up view location and orientation + + nodepath = viewpath; + nodepath += "/config/from-model"; + if (!fgGetBool(nodepath.c_str())) { + nodepath = viewpath; + nodepath += "/config/eye-lon-deg-path"; + lon_deg = fgGetDouble(fgGetString(nodepath.c_str())); + nodepath = viewpath; + nodepath += "/config/eye-lat-deg-path"; + lat_deg = fgGetDouble(fgGetString(nodepath.c_str())); + nodepath = viewpath; + nodepath += "/config/eye-alt-ft-path"; + alt_ft = fgGetDouble(fgGetString(nodepath.c_str())); + nodepath = viewpath; + nodepath += "/config/eye-roll-deg-path"; + roll_deg = fgGetDouble(fgGetString(nodepath.c_str())); + nodepath = viewpath; + nodepath += "/config/eye-pitch-deg-path"; + pitch_deg = fgGetDouble(fgGetString(nodepath.c_str())); + nodepath = viewpath; + nodepath += "/config/eye-heading-deg-path"; + heading_deg = fgGetDouble(fgGetString(nodepath.c_str())); + loop_view->setPosition(lon_deg, lat_deg, alt_ft); + loop_view->setOrientation(roll_deg, pitch_deg, heading_deg); + } else { + // force recalc in viewer + loop_view->set_dirty(); + } + + // if lookat (type 1) then get target data... + if (loop_view->getType() == FG_LOOKAT) { + nodepath = viewpath; + nodepath += "/config/from-model"; + if (!fgGetBool(nodepath.c_str())) { + 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())); + + loop_view ->setTargetPosition(lon_deg, lat_deg, alt_ft); + loop_view->setTargetOrientation(roll_deg, pitch_deg, heading_deg); + } else { + loop_view->set_dirty(); + } } + setPilotXOffset_m(fgGetDouble("/sim/current-view/x-offset-m")); + setPilotYOffset_m(fgGetDouble("/sim/current-view/y-offset-m")); + setPilotZOffset_m(fgGetDouble("/sim/current-view/z-offset-m")); - // Set up the chase view - - FGViewer *chase_view = (FGViewer *)get_view( 1 ); - - // get xyz Position offsets directly from GUI/sgVec3Slider - // FIXME: change GUI/sgVec3Slider to store the xyz in properties - // it would probably be faster than the way PilotOffsetGet() - // triggers a recalc all the time. - sgVec3 *pPO = PilotOffsetGet(); - sgVec3 zPO; - sgCopyVec3( zPO, *pPO ); - chase_view->setPositionOffsets(zPO[1], zPO[0], zPO[2] ); - - chase_view->setOrientation( - fgGetDouble("/orientation/roll-deg"), - fgGetDouble("/orientation/pitch-deg"), - fgGetDouble("/orientation/heading-deg")); - chase_view ->setPosition( - fgGetDouble("/position/longitude-deg"), - fgGetDouble("/position/latitude-deg"), - fgGetDouble("/position/altitude-ft")); - chase_view ->setTargetPosition( - fgGetDouble("/position/longitude-deg"), - fgGetDouble("/position/latitude-deg"), - fgGetDouble("/position/altitude-ft")); - - // Update the current view + // Update the current view do_axes(); view->update(dt); } +void +FGViewMgr::copyToCurrent() +{ + fgSetDouble("/sim/current-view/x-offset-m", getPilotXOffset_m()); + fgSetDouble("/sim/current-view/y-offset-m", getPilotYOffset_m()); + fgSetDouble("/sim/current-view/z-offset-m", getPilotZOffset_m()); +} + + double FGViewMgr::getViewOffset_deg () const { @@ -235,10 +335,9 @@ FGViewMgr::setGoalViewTilt_deg (double tilt) double FGViewMgr::getPilotXOffset_m () const { - // FIXME: hard-coded pilot view position - const FGViewer * pilot_view = get_view(0); - if (pilot_view != 0) { - return ((FGViewer *)pilot_view)->getXOffset_m(); + const FGViewer * view = get_current_view(); + if (view != 0) { + return ((FGViewer *)view)->getXOffset_m(); } else { return 0; } @@ -247,20 +346,18 @@ FGViewMgr::getPilotXOffset_m () const void FGViewMgr::setPilotXOffset_m (double x) { - // FIXME: hard-coded pilot view position - FGViewer * pilot_view = get_view(0); - if (pilot_view != 0) { - pilot_view->setXOffset_m(x); + FGViewer * view = get_current_view(); + if (view != 0) { + view->setXOffset_m(x); } } double FGViewMgr::getPilotYOffset_m () const { - // FIXME: hard-coded pilot view position - const FGViewer * pilot_view = get_view(0); - if (pilot_view != 0) { - return ((FGViewer *)pilot_view)->getYOffset_m(); + const FGViewer * view = get_current_view(); + if (view != 0) { + return ((FGViewer *)view)->getYOffset_m(); } else { return 0; } @@ -269,20 +366,18 @@ FGViewMgr::getPilotYOffset_m () const void FGViewMgr::setPilotYOffset_m (double y) { - // FIXME: hard-coded pilot view position - FGViewer * pilot_view = get_view(0); - if (pilot_view != 0) { - pilot_view->setYOffset_m(y); + FGViewer * view = get_current_view(); + if (view != 0) { + view->setYOffset_m(y); } } double FGViewMgr::getPilotZOffset_m () const { - // FIXME: hard-coded pilot view position - const FGViewer * pilot_view = get_view(0); - if (pilot_view != 0) { - return ((FGViewer *)pilot_view)->getZOffset_m(); + const FGViewer * view = get_current_view(); + if (view != 0) { + return ((FGViewer *)view)->getZOffset_m(); } else { return 0; } @@ -291,10 +386,9 @@ FGViewMgr::getPilotZOffset_m () const void FGViewMgr::setPilotZOffset_m (double z) { - // FIXME: hard-coded pilot view position - FGViewer * pilot_view = get_view(0); - if (pilot_view != 0) { - pilot_view->setZOffset_m(z); + FGViewer * view = get_current_view(); + if (view != 0) { + view->setZOffset_m(z); } } @@ -313,6 +407,21 @@ FGViewMgr::setFOV_deg (double fov) view->set_fov(fov); } +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); +} + void FGViewMgr::setViewAxisLong (double axis) { @@ -368,8 +477,3 @@ FGViewMgr::do_axes () get_current_view()->setGoalHeadingOffset_deg(viewDir); } - - - - -