#591: night-time rendering issues, avoid negative color values

[flightgear.git] / src / Cockpit / panel.cxx

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 9c39626ee6bd1dd4250047400a198064a1169b36..3ac15621ec80db5471284feae7c2b0e50896171e 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -40,6 +40,7 @@
 #include <osg/CullFace>
 #include <osg/Depth>
 #include <osg/Material>
+#include <osg/Matrixf>
 #include <osg/TexEnv>
 #include <osg/PolygonOffset>
 
@@ -56,13 +57,10 @@
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
 #include <Time/light.hxx>
-#include <GUI/new_gui.hxx>     // FGFontCache
+#include <GUI/FGFontCache.hxx> 
 #include <Main/viewer.hxx>
 #include <Instrumentation/dclgps.hxx>
 
-#include "hud.hxx"
-
-
 #define WIN_X 0
 #define WIN_Y 0
 #define WIN_W 1024
@@ -73,6 +71,8 @@
 // my hardware/driver requires many more.
 #define POFF_UNITS 8
 
+using std::map;
+
 ////////////////////////////////////////////////////////////////////////
 // Local functions.
 ////////////////////////////////////////////////////////////////////////
@@ -273,6 +273,7 @@ FGPanel::update (double dt)
 void
 FGPanel::update (osg::State& state, GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
 {
+  using namespace osg;
                                // Calculate accelerations
                                // and jiggle the panel accordingly
                                // The factors and bounds are just
@@ -284,12 +285,13 @@ FGPanel::update (osg::State& state, GLfloat winx, GLfloat winw, GLfloat winy, GL
 
   glMatrixMode(GL_PROJECTION);
   glPushMatrix();
-  glLoadIdentity();
+  Matrixf proj;
   if ( _flipx->getBoolValue() ) {
-    gluOrtho2D(winx + winw, winx, winy + winh, winy); /* up side down */
+      proj = Matrixf::ortho2D(winx + winw, winx, winy + winh, winy); /* up side down */
   } else {
-    gluOrtho2D(winx, winx + winw, winy, winy + winh); /* right side up */
+      proj = Matrixf::ortho2D(winx, winx + winw, winy, winy + winh); /* right side up */
   }
+  glLoadMatrix(proj.ptr());
   
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -1174,7 +1176,7 @@ FGTextLayer::setFontName(const string &name)
   FGFontCache *fc = globals->get_fontcache();
   fntFont* font = fc->getTexFont(_font_name.c_str());
   if (!font) {
-      SG_LOG(SG_GENERAL, SG_WARN, "unable to find font:" << name);
+      SG_LOG(SG_COCKPIT, SG_WARN, "unable to find font:" << name);
   }
 }