X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Frender_area_2d.hxx;h=646045ea4559f357ab71da22cbb1542122831577;hb=bc31bdbbbbd97f08bbcb77aea34b60de9fa9fb1f;hp=de41798d05b2deb94ff8b3f577619506d9b1c657;hpb=b0f9d24f9dbab9eb2de07c48e8bfe48f3851d7e4;p=flightgear.git diff --git a/src/Instrumentation/render_area_2d.hxx b/src/Instrumentation/render_area_2d.hxx index de41798d0..646045ea4 100644 --- a/src/Instrumentation/render_area_2d.hxx +++ b/src/Instrumentation/render_area_2d.hxx @@ -28,12 +28,16 @@ # include #endif -#include +#include +#include +#include + #include +#include #include -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 drawing_list;