fly/flightgear
1
0
Fork 0
Code Activity

src/Viewer/view.: removed some now-unused code.

Browse source
This commit is contained in:
Julian Smith 2019-08-06 11:49:32 +01:00
parent af538746ac
commit 3b77ca4ce8
2 changed files with 0 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/Viewer/view.cxx
View file

@ -196,9 +196,6 @@ View* View::createFromProperties(SGPropertyNode_ptr config, int view_index)
target_x_offset_m, target_y_offset_m, target_x_offset_m, target_y_offset_m,
target_z_offset_m, near_m, internal, lookat_agl, target_z_offset_m, near_m, internal, lookat_agl,
lookat_agl_damping, view_index ); lookat_agl_damping, view_index );
if (!from_model) {
v->_targetProperties.init(config, "target-");
}
} else { } else {
v = new View ( FG_LOOKFROM, from_model, from_model_index, v = new View ( FG_LOOKFROM, from_model, from_model_index,
false, 0, 0.0, 0.0, 0.0, false, 0, 0.0, 0.0, 0.0,
@ -208,10 +205,6 @@ View* View::createFromProperties(SGPropertyNode_ptr config, int view_index)
0, 0, 0, near_m, internal, false, 0.0, view_index ); 0, 0, 0, near_m, internal, false, 0.0, view_index );
} }
if (!from_model) {
v->_eyeProperties.init(config, "eye-");
}
v->_name = config->getParent()->getStringValue("name"); v->_name = config->getParent()->getStringValue("name");
v->_typeString = type; v->_typeString = type;
v->_configHeadingOffsetDeg = config->getDoubleValue("default-heading-offset-deg"); v->_configHeadingOffsetDeg = config->getDoubleValue("default-heading-offset-deg");
@ -1439,73 +1432,6 @@ double View::getElev_ft() const
return _position.getElevationFt(); return _position.getElevationFt();
} }
View::PositionAttitudeProperties::PositionAttitudeProperties()
{
}
View::PositionAttitudeProperties::~PositionAttitudeProperties()
{
}
void View::PositionAttitudeProperties::init(SGPropertyNode_ptr parent, const std::string& prefix)
{
_lonPathProp = parent->getNode(prefix + "lon-deg-path", true);
_latPathProp = parent->getNode(prefix + "lat-deg-path", true);
_altPathProp = parent->getNode(prefix + "alt-ft-path", true);
_headingPathProp = parent->getNode(prefix + "heading-deg-path", true);
_pitchPathProp = parent->getNode(prefix + "pitch-deg-path", true);
_rollPathProp = parent->getNode(prefix + "roll-deg-path", true);
// update the real properties now
valueChanged(NULL);
_lonPathProp->addChangeListener(this);
_latPathProp->addChangeListener(this);
_altPathProp->addChangeListener(this);
_headingPathProp->addChangeListener(this);
_pitchPathProp->addChangeListener(this);
_rollPathProp->addChangeListener(this);
}
void View::PositionAttitudeProperties::valueChanged(SGPropertyNode* node)
{
_lonProp = resolvePathProperty(_lonPathProp);
_latProp = resolvePathProperty(_latPathProp);
_altProp = resolvePathProperty(_altPathProp);
_headingProp = resolvePathProperty(_headingPathProp);
_pitchProp = resolvePathProperty(_pitchPathProp);
_rollProp = resolvePathProperty(_rollPathProp);
}
SGPropertyNode_ptr View::PositionAttitudeProperties::resolvePathProperty(SGPropertyNode_ptr p)
{
if (!p)
return SGPropertyNode_ptr();
std::string path = p->getStringValue();
if (path.empty())
return SGPropertyNode_ptr();
return fgGetNode(path, true);
}
SGGeod View::PositionAttitudeProperties::position() const
{
double lon = _lonProp ? _lonProp->getDoubleValue() : 0.0;
double lat = _latProp ? _latProp->getDoubleValue() : 0.0;
double alt = _altProp ? _altProp->getDoubleValue() : 0.0;
return SGGeod::fromDegFt(lon, lat, alt);
}
SGVec3d View::PositionAttitudeProperties::attitude() const
{
double heading = _headingProp ? _headingProp->getDoubleValue() : 0.0;
double pitch = _pitchProp ? _pitchProp->getDoubleValue() : 0.0;
double roll = _rollProp ? _rollProp->getDoubleValue() : 0.0;
return SGVec3d(heading, pitch, roll);
}
// Register the subsystem. // Register the subsystem.
#if 0 #if 0
SGSubsystemMgr::Registrant<View> registrantView; SGSubsystemMgr::Registrant<View> registrantView;

39
src/Viewer/view.hxx
View file

@ -172,7 +172,6 @@ public:
// Vectors and positions... // Vectors and positions...
const SGVec3d& get_view_pos() { if ( _dirty ) { recalc(); } return _absolute_view_pos; }
const SGVec3d& getViewPosition() { if ( _dirty ) { recalc(); } return _absolute_view_pos; } const SGVec3d& getViewPosition() { if ( _dirty ) { recalc(); } return _absolute_view_pos; }
const SGQuatd& getViewOrientation() { if ( _dirty ) { recalc(); } return mViewOrientation; } const SGQuatd& getViewOrientation() { if ( _dirty ) { recalc(); } return mViewOrientation; }
const SGQuatd& getViewOrientationOffset() { if ( _dirty ) { recalc(); } return mViewOffsetOr; } const SGQuatd& getViewOrientationOffset() { if ( _dirty ) { recalc(); } return mViewOffsetOr; }
@ -419,44 +418,6 @@ private:
// multiplied into the aspect_ratio to get the actual vertical fov // multiplied into the aspect_ratio to get the actual vertical fov
double _aspect_ratio_multiplier; double _aspect_ratio_multiplier;
class PositionAttitudeProperties : public SGPropertyChangeListener
{
public:
PositionAttitudeProperties();
void init(SGPropertyNode_ptr parent, const std::string& prefix);
virtual ~PositionAttitudeProperties();
SGGeod position() const;
SGVec3d attitude() const; // as heading pitch roll
protected:
virtual void valueChanged(SGPropertyNode* prop);
private:
// disable copy
PositionAttitudeProperties(const PositionAttitudeProperties&);
SGPropertyNode_ptr resolvePathProperty(SGPropertyNode_ptr p);
SGPropertyNode_ptr _lonProp,
_latProp,
_altProp,
_headingProp,
_pitchProp,
_rollProp;
SGPropertyNode_ptr _lonPathProp,
_latPathProp,
_altPathProp,
_headingPathProp,
_pitchPathProp,
_rollPathProp;
};
PositionAttitudeProperties _eyeProperties;
PositionAttitudeProperties _targetProperties;
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// private functions // // private functions //
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////