X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel.hxx;h=9c110d0722d7a8e898782f76aec23a840b7f7e2a;hb=4bfd1722df24f5be89459b25010e5d7352720a7b;hp=12e1a27c92907054277bb976b9afa57a3ab879ea;hpb=cf7839a67b3f41a1b788902edce03fb9ede0b7a7;p=flightgear.git diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx index 12e1a27c9..9c110d072 100644 --- a/src/Cockpit/panel.hxx +++ b/src/Cockpit/panel.hxx @@ -30,33 +30,31 @@ # include #endif -#include - -#ifdef HAVE_WINDOWS_H +#ifdef HAVE_WINDOWS_H # include #endif -#include GLUT_H - -#include +#include +#include +#include +#include #include -#include #include #include #include #include -#include -#include
#include
- #include +#include SG_USING_STD(vector); SG_USING_STD(map); + +class ssgTexture; class FGPanelInstrument; @@ -132,7 +130,7 @@ private: * redraw themselves when necessary, and will pass mouse clicks on to * the appropriate instruments for processing. */ -class FGPanel : public FGSubsystem +class FGPanel : public SGSubsystem { public: @@ -172,11 +170,11 @@ public: // X-offset virtual void setXOffset (int offset); - virtual int getXOffset () const { return _x_offset; } + virtual int getXOffset () const { return _x_offset->getIntValue(); } // Y-offset. virtual void setYOffset (int offset); - virtual int getYOffset () const { return _y_offset; } + virtual int getYOffset () const { return _y_offset->getIntValue(); } // View height. virtual void setViewHeight (int height) { _view_height = height; } @@ -186,11 +184,12 @@ public: virtual bool doMouseAction (int button, int updown, int x, int y); virtual bool doLocalMouseAction(int button, int updown, int x, int y); + virtual void setDepthTest (bool enable); + private: void setupVirtualCockpit(); void cleanupVirtualCockpit(); - mutable bool _visibility; mutable bool _mouseDown; mutable int _mouseButton, _mouseX, _mouseY; mutable int _mouseDelay; @@ -198,11 +197,13 @@ private: typedef vector instrument_list_type; int _width; int _height; - int _x_offset; - int _y_offset; int _view_height; - float _jitter; - bool _flipx; + + SGPropertyNode * _visibility; + SGPropertyNode * _x_offset; + SGPropertyNode * _y_offset; + SGPropertyNode * _jitter; + SGPropertyNode * _flipx; const SGPropertyNode * _xsize_node; const SGPropertyNode * _ysize_node; @@ -211,6 +212,7 @@ private: ssgTexture * _mbg[8]; // List of instruments in panel. instrument_list_type _instruments; + bool _enable_depth_test; }; @@ -227,7 +229,7 @@ private: * or joystick, but they are tied to specific mouse actions in * rectangular areas of the panel. */ -class FGPanelAction : public FGConditional +class FGPanelAction : public SGConditional { public: FGPanelAction (); @@ -287,7 +289,7 @@ private: /** * A transformation for a layer. */ -class FGPanelTransformation : public FGConditional +class FGPanelTransformation : public SGConditional { public: @@ -326,7 +328,7 @@ public: * on current FGFS instrument readings: for example, a texture * representing a needle can rotate to show the airspeed. */ -class FGInstrumentLayer : public FGConditional +class FGInstrumentLayer : public SGConditional { public: @@ -368,7 +370,7 @@ protected: * may show up in the future (some complex instruments could be * entirely hand-coded, for example). */ -class FGPanelInstrument : public FGConditional +class FGPanelInstrument : public SGConditional { public: FGPanelInstrument (); @@ -416,7 +418,7 @@ public: // Transfer pointer ownership!! virtual int addLayer (FGInstrumentLayer *layer); - virtual int addLayer (FGCroppedTexture &texture, int w = -1, int h = -1); + virtual int addLayer (const FGCroppedTexture &texture, int w = -1, int h = -1); // Transfer pointer ownership!! virtual void addTransformation (FGPanelTransformation * transformation); @@ -427,6 +429,28 @@ protected: }; +/** + * An empty-shell instrument that exists soley in + * order to redirect commands from the panel to a + * complex instrument inherited from SGSubsystem. + * + * Currently the only complex instrument is the KLN89, + * which we've hardwired this to for now. + */ +class FGSpecialInstrument : public FGPanelInstrument +{ +public: + FGSpecialInstrument(DCLGPS* sb); + //FGSpecialInstrument (int x, int y, int w, int h); + virtual ~FGSpecialInstrument (); + + virtual void draw (); + +protected: + DCLGPS* complex; +}; + + /** * An instrument layer containing a group of sublayers. * @@ -466,11 +490,11 @@ public: virtual void setTexture (const FGCroppedTexture &texture) { _texture = texture; } - virtual FGCroppedTexture &getTexture () { return _texture; } virtual const FGCroppedTexture &getTexture () const { return _texture; } + virtual FGCroppedTexture *getTexture() { return &_texture; } private: - mutable FGCroppedTexture _texture; + FGCroppedTexture _texture; }; @@ -490,12 +514,13 @@ public: DOUBLE_VALUE }; - class Chunk : public FGConditional + class Chunk : public SGConditional { public: Chunk (const string &text, const string &fmt = "%s"); Chunk (ChunkType type, const SGPropertyNode * node, - const string &fmt = "", float mult = 1.0); + const string &fmt = "", float mult = 1.0, float offs = 0.0, + bool truncation = false); const char * getValue () const; private: @@ -504,6 +529,8 @@ public: const SGPropertyNode * _node; string _fmt; float _mult; + float _offs; + bool _trunc; mutable char _buf[1024]; };