// 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.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
+//JVK
+// On 2D panels all instruments include light sources were in night displayed
+// with a red mask (instrument light). It is not correct for light sources
+// (bulbs). There is added new layer property "emissive" (boolean) (only for
+// textured layers).
+// If a layer has to shine set it in the "instrument_def_file.xml" inside the
+// <layer> tag by adding <emissive>true</emissive> tag. When omitted the default
+// value is for backward compatibility set to false.
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h> // sprintf
#include <string.h>
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+#include SG_GLU_H
+
+#include <plib/ssg.h>
#include <plib/fnt.h>
#include <simgear/debug/logstream.hxx>
#include <Main/fg_props.hxx>
#include <Main/viewmgr.hxx>
#include <Time/light.hxx>
+#include <GUI/new_gui.hxx> // FGFontCache
#include "hud.hxx"
#include "panel.hxx"
////////////////////////////////////////////////////////////////////////
static fntRenderer text_renderer;
-static fntTexFont *default_font = 0;
-static fntTexFont *led_font = 0;
+static sgVec4 panel_color;
+static sgVec4 emissive_panel_color = {1,1,1,1};
/**
* Constructor.
_jitter(fgGetNode("/sim/panel/jitter", true)),
_flipx(fgGetNode("/sim/panel/flip-x", true)),
_xsize_node(fgGetNode("/sim/startup/xsize", true)),
- _ysize_node(fgGetNode("/sim/startup/ysize", true))
+ _ysize_node(fgGetNode("/sim/startup/ysize", true)),
+ _enable_depth_test(false)
{
}
void
FGPanel::init ()
{
- SGPath base_path;
- char* envp = ::getenv( "FG_FONTS" );
- if ( envp != NULL ) {
- base_path.set( envp );
- } else {
- base_path.set( globals->get_fg_root() );
- base_path.append( "Fonts" );
- }
-
- SGPath fntpath;
-
- // Install the default font
- fntpath = base_path;
- fntpath.append( "typewriter.txf" );
- default_font = new fntTexFont ;
- default_font -> load ( (char *)fntpath.c_str() ) ;
-
- // Install the LED font
- fntpath = base_path;
- fntpath.append( "led.txf" );
- led_font = new fntTexFont ;
- led_font -> load ( (char *)fntpath.c_str() ) ;
}
glEnable(GL_COLOR_MATERIAL);
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
- glDisable(GL_DEPTH_TEST);
- sgVec4 panel_color;
+ if( _enable_depth_test )
+ glDepthFunc(GL_ALWAYS);
+ else
+ glDisable(GL_DEPTH_TEST);
FGLight *l = (FGLight *)(globals->get_subsystem("lighting"));
sgCopyVec4( panel_color, l->scene_diffuse());
// restore some original state
+ if( _enable_depth_test )
+ glDepthFunc(GL_LESS);
glPopAttrib();
glPolygonOffset(0, 0);
glDisable(GL_POLYGON_OFFSET_FILL);
return doLocalMouseAction(button, updown, x, y);
}
+void FGPanel::setDepthTest (bool enable) {
+ _enable_depth_test = enable;
+}
+
\f
////////////////////////////////////////////////////////////////////////.
bool repeatable)
: _button(button), _x(x), _y(y), _w(w), _h(h), _repeatable(repeatable)
{
- for (unsigned int i = 0; i < 2; i++) {
- for (unsigned int j = 0; j < _bindings[i].size(); j++)
- delete _bindings[i][j];
- }
}
FGPanelAction::~FGPanelAction ()
{
+ for (unsigned int i = 0; i < 2; i++) {
+ for (unsigned int j = 0; j < _bindings[i].size(); j++)
+ delete _bindings[i][j];
+ }
}
void
}
int
-FGLayeredInstrument::addLayer (FGCroppedTexture &texture,
+FGLayeredInstrument::addLayer (const FGCroppedTexture &texture,
int w, int h)
{
return addLayer(new FGTexturedLayer(texture, w, h));
}
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGSpecialInstrument.
+////////////////////////////////////////////////////////////////////////
+
+FGSpecialInstrument::FGSpecialInstrument (DCLGPS* sb)
+ : FGPanelInstrument()
+{
+ complex = sb;
+}
+
+FGSpecialInstrument::~FGSpecialInstrument ()
+{
+}
+
+void
+FGSpecialInstrument::draw ()
+{
+ complex->draw();
+}
+
+
\f
////////////////////////////////////////////////////////////////////////
// Implementation of FGInstrumentLayer.
FGTexturedLayer::FGTexturedLayer (const FGCroppedTexture &texture, int w, int h)
- : FGInstrumentLayer(w, h)
+ : FGInstrumentLayer(w, h),
+ _emissive(false)
{
setTexture(texture);
}
transform();
glBindTexture(GL_TEXTURE_2D, _texture.getTexture()->getHandle());
glBegin(GL_POLYGON);
-
+
+ if (_emissive) {
+ glColor4fv( emissive_panel_color );
+ } else {
// From Curt: turn on the panel
// lights after sundown.
- sgVec4 panel_color;
-
- FGLight *l = (FGLight *)(globals->get_subsystem("lighting"));
- sgCopyVec4( panel_color, l->scene_diffuse());
- if ( fgGetDouble("/systems/electrical/outputs/instrument-lights") > 1.0 ) {
- if ( panel_color[0] < 0.7 ) panel_color[0] = 0.7;
- if ( panel_color[1] < 0.2 ) panel_color[1] = 0.2;
- if ( panel_color[2] < 0.2 ) panel_color[2] = 0.2;
+ glColor4fv( panel_color );
}
- glColor4fv( panel_color );
glTexCoord2f(_texture.getMinX(), _texture.getMinY()); glVertex2f(-w2, -h2);
glTexCoord2f(_texture.getMaxX(), _texture.getMinY()); glVertex2f(w2, -h2);
////////////////////////////////////////////////////////////////////////
FGTextLayer::FGTextLayer (int w, int h)
- : FGInstrumentLayer(w, h), _pointSize(14.0), _font_name("default")
+ : FGInstrumentLayer(w, h), _pointSize(14.0), _font_name("default.txf")
{
_then.stamp();
_color[0] = _color[1] = _color[2] = 0.0;
if (test()) {
glColor4fv(_color);
transform();
- if ( _font_name == "led" && led_font != 0) {
- text_renderer.setFont(led_font);
- } else {
- text_renderer.setFont(guiFntHandle);
- }
+
+ FGFontCache *fc = globals->get_fontcache();
+ text_renderer.setFont(fc->getTexFont(_font_name.c_str()));
+
text_renderer.setPointSize(_pointSize);
text_renderer.begin();
text_renderer.start3f(0, 0, 0);
void
FGTextLayer::setFontName(const string &name)
{
- _font_name = name;
+ _font_name = name + ".txf";
}