fly/flightgear
1
0
Fork 0
Code Activity

Eliminate dependencie on tying variable pointers (in preparation for

Browse source 
property-code simplification).
This commit is contained in:
david 2002-03-13 15:16:24 +00:00
parent a0f50cd90d
commit 6cca1d6a75
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Cockpit/panel.cxx
View file

@ -180,7 +180,6 @@ FGPanel::FGPanel ()
_mouseInstrument(0), _mouseInstrument(0),
_width(WIN_W), _height(int(WIN_H * 0.5768 + 1)), _width(WIN_W), _height(int(WIN_H * 0.5768 + 1)),
_x_offset(0), _y_offset(0), _view_height(int(WIN_H * 0.4232)), _x_offset(0), _y_offset(0), _view_height(int(WIN_H * 0.4232)),
_bound(false),
_jitter(0.0), _jitter(0.0),
_xsize_node(fgGetNode("/sim/startup/xsize", true)), _xsize_node(fgGetNode("/sim/startup/xsize", true)),
_ysize_node(fgGetNode("/sim/startup/ysize", true)) _ysize_node(fgGetNode("/sim/startup/ysize", true))
@ -194,8 +193,6 @@ FGPanel::FGPanel ()
*/ */
FGPanel::~FGPanel () FGPanel::~FGPanel ()
{ {
if (_bound)
unbind();
for (instrument_list_type::iterator it = _instruments.begin(); for (instrument_list_type::iterator it = _instruments.begin();
it != _instruments.end(); it != _instruments.end();
it++) { it++) {
@ -252,15 +249,10 @@ FGPanel::init ()
void void
FGPanel::bind () FGPanel::bind ()
{ {
fgTie("/sim/panel/visibility", &_visibility);
fgSetArchivable("/sim/panel/visibility"); fgSetArchivable("/sim/panel/visibility");
fgTie("/sim/panel/x-offset", &_x_offset);
fgSetArchivable("/sim/panel/x-offset"); fgSetArchivable("/sim/panel/x-offset");
fgTie("/sim/panel/y-offset", &_y_offset);
fgSetArchivable("/sim/panel/y-offset"); fgSetArchivable("/sim/panel/y-offset");
fgTie("/sim/panel/jitter", &_jitter);
fgSetArchivable("/sim/panel/jitter"); fgSetArchivable("/sim/panel/jitter");
_bound = true;
} }
@ -270,10 +262,6 @@ FGPanel::bind ()
void void
FGPanel::unbind () FGPanel::unbind ()
{ {
fgUntie("/sim/panel/visibility");
fgUntie("/sim/panel/x-offset");
fgUntie("/sim/panel/y-offset");
_bound = false;
} }
@ -283,6 +271,12 @@ FGPanel::unbind ()
void void
FGPanel::update (int dt) FGPanel::update (int dt)
{ {
// TODO: cache the nodes
_visibility = fgGetBool("/sim/panel/visibility");
_x_offset = fgGetInt("/sim/panel/x-offset");
_y_offset = fgGetInt("/sim/panel/y-offset");
_jitter = fgGetFloat("/sim/panel/jitter");
// Do nothing if the panel isn't visible. // Do nothing if the panel isn't visible.
if ( !fgPanelVisible() ) { if ( !fgPanelVisible() ) {
return; return;

1
src/Cockpit/panel.hxx
View file

@ -195,7 +195,6 @@ private:
int _x_offset; int _x_offset;
int _y_offset; int _y_offset;
int _view_height; int _view_height;
bool _bound;
float _jitter; float _jitter;
const SGPropertyNode * _xsize_node; const SGPropertyNode * _xsize_node;