Update Mac configure script for new ALUT scheme; support --with-alut-framework.

[flightgear.git] / src / Instrumentation / render_area_2d.hxx

diff --git a/src/Instrumentation/render_area_2d.hxx b/src/Instrumentation/render_area_2d.hxx
index 490d2c99eafe720682c26a2f86397e3c335af286..646045ea4559f357ab71da22cbb1542122831577 100644 (file)
--- a/src/Instrumentation/render_area_2d.hxx
+++ b/src/Instrumentation/render_area_2d.hxx
@@ -17,7 +17,7 @@
 //
 // 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$
 
@@ -28,12 +28,16 @@
 #  include <config.h>
 #endif
 
+#include <osg/ref_ptr>
+#include <osg/State>
+#include <osg/StateSet>
+
 #include <simgear/compiler.h>
+#include <simgear/math/SGMath.hxx>
 
-#include <plib/ssg.h>
 #include <vector>
 
-SG_USING_STD(vector);
+using std::vector;
 
 enum RA2DDrawingType {
        RA2D_LINE,
@@ -56,7 +60,7 @@ public:
        RenderArea2D(int logx, int logy, int sizex, int sizey, int posx, int posy);
        ~RenderArea2D();
        
-       void draw();
+       void draw(osg::State& state);
        
        void SetPixelColor(const float* rgba);
        void SetBackgroundColor(const float* rgba);
@@ -102,8 +106,8 @@ private:
        
        // Actual drawing routines copied from Atlas
        void doSetColor( const float *rgb );
-       void doDrawQuad( const sgVec2 *p, const sgVec3 *normals );
-       void doDrawQuad( const sgVec2 *p, const sgVec3 *normals, const sgVec4 *color );
+       void doDrawQuad( const SGVec2f *p);
+       void doDrawQuad( const SGVec2f *p, const SGVec4f *color );
        
        vector<RA2DPrimitive> drawing_list;