fly/flightgear
1
0
Fork 0
Code Activity

Remove use of plig/sg from render-area-2d.

Browse source
This commit is contained in:
jmt 2009-09-19 19:21:28 +00:00 committed by Tim Moore
parent 0dbf2de0b6
commit 956ecf1cf2
2 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/Instrumentation/render_area_2d.cxx
View file

@ -28,11 +28,6 @@
#include "render_area_2d.hxx" #include "render_area_2d.hxx"
static const float dummy_normals[][3] = {{0.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 0.0f}};
RA2DPrimitive::RA2DPrimitive() { RA2DPrimitive::RA2DPrimitive() {
invert = false; invert = false;
debug = false; debug = false;
@ -184,13 +179,13 @@ void RenderArea2D::oldDrawPixel(int x, int y, bool invert) {
//cout << "DP: " << fx1 << ", " << fy1 << " ... " << fx2 << ", " << fy2 << '\n'; //cout << "DP: " << fx1 << ", " << fy1 << " ... " << fx2 << ", " << fy2 << '\n';
doSetColor(invert ? _backgroundColor : _pixelColor); doSetColor(invert ? _backgroundColor : _pixelColor);
sgVec2 corners[4]; SGVec2f corners[4] = {
sgSetVec2(corners[0], fx1, fy1); SGVec2f(fx1, fy1),
sgSetVec2(corners[1], fx2, fy1); SGVec2f(fx2, fy1),
sgSetVec2(corners[2], fx2, fy2); SGVec2f(fx2, fy2),
sgSetVec2(corners[3], fx1, fy2); SGVec2f(fx1, fy2)
//cout << "Drawing pixel, x,y is " << x << ", " << y << ", fx is [x1,x2,y1,y2] " << fx1 << ", " << fx2 << ", " << fy1 << ", " << fy2 << '\n'; };
doDrawQuad(&corners[0], dummy_normals); doDrawQuad(corners);
} }
void RenderArea2D::DrawLine(int x1, int y1, int x2, int y2) { void RenderArea2D::DrawLine(int x1, int y1, int x2, int y2) {
@ -314,12 +309,13 @@ void RenderArea2D::oldDrawQuad(int x1, int y1, int x2, int y2, bool invert) {
//cout << "DP: " << fx1 << ", " << fy1 << " ... " << fx2 << ", " << fy2 << '\n'; //cout << "DP: " << fx1 << ", " << fy1 << " ... " << fx2 << ", " << fy2 << '\n';
doSetColor(invert ? _backgroundColor : _pixelColor); doSetColor(invert ? _backgroundColor : _pixelColor);
sgVec2 corners[4]; SGVec2f corners[4] = {
sgSetVec2(corners[0], fx1, fy1); SGVec2f(fx1, fy1),
sgSetVec2(corners[1], fx2, fy1); SGVec2f(fx2, fy1),
sgSetVec2(corners[2], fx2, fy2); SGVec2f(fx2, fy2),
sgSetVec2(corners[3], fx1, fy2); SGVec2f(fx1, fy2)
doDrawQuad(&corners[0], dummy_normals); };
doDrawQuad(corners);
} }
void RenderArea2D::DrawBackground() { void RenderArea2D::DrawBackground() {
@ -328,12 +324,14 @@ void RenderArea2D::DrawBackground() {
void RenderArea2D::oldDrawBackground() { void RenderArea2D::oldDrawBackground() {
doSetColor(_backgroundColor); doSetColor(_backgroundColor);
sgVec2 corners[4]; SGVec2f corners[4] = {
sgSetVec2(corners[0], (float)_posx, (float)_posy); SGVec2f(_posx, _posy),
sgSetVec2(corners[1], (float)(_posx + _sizex), (float)_posy); SGVec2f(_posx + _sizex, _posy),
sgSetVec2(corners[2], (float)(_posx + _sizex), (float)(_posy + _sizey)); SGVec2f(_posx + _sizex, _posy + _sizey),
sgSetVec2(corners[3], (float)_posx, (float)(_posy + _sizey)); SGVec2f(_posx, _posy + _sizey)
doDrawQuad(&corners[0], dummy_normals); };
doDrawQuad(corners);
} }
void RenderArea2D::Flush() { void RenderArea2D::Flush() {
@ -351,20 +349,23 @@ void RenderArea2D::doSetColor( const float *rgba ) {
glColor4fv( rgba ); glColor4fv( rgba );
} }
void RenderArea2D::doDrawQuad( const sgVec2 *p, const sgVec3 *normals ) { void RenderArea2D::doDrawQuad( const SGVec2f *p) {
glBegin(GL_QUADS); glBegin(GL_QUADS);
glNormal3fv( normals[0] ); glVertex2fv( p[0] ); glNormal3f(0.0f, 0.0f, 0.0f);
glNormal3fv( normals[1] ); glVertex2fv( p[1] ); glVertex2fv( p[0].data() );
glNormal3fv( normals[2] ); glVertex2fv( p[2] ); glVertex2fv( p[1].data() );
glNormal3fv( normals[3] ); glVertex2fv( p[3] ); glVertex2fv( p[2].data() );
glVertex2fv( p[3].data() );
glEnd(); glEnd();
} }
void RenderArea2D::doDrawQuad( const sgVec2 *p, const sgVec3 *normals, const sgVec4 *color ) { void RenderArea2D::doDrawQuad( const SGVec2f *p, const SGVec4f *color ) {
glBegin(GL_QUADS); glBegin(GL_QUADS);
glColor4fv( color[0] );glNormal3fv( normals[0] ); glVertex2fv( p[0] ); glNormal3f(0.0f, 0.0f, 0.0f);
glColor4fv( color[1] );glNormal3fv( normals[1] ); glVertex2fv( p[1] ); glColor4fv( color[0].data() ); glVertex2fv( p[0].data() );
glColor4fv( color[2] );glNormal3fv( normals[2] ); glVertex2fv( p[2] ); glColor4fv( color[1].data() ); glVertex2fv( p[1].data() );
glColor4fv( color[3] );glNormal3fv( normals[3] ); glVertex2fv( p[3] ); glColor4fv( color[2].data() ); glVertex2fv( p[2].data() );
glColor4fv( color[3].data() ); glVertex2fv( p[3].data() );
glEnd(); glEnd();
} }

6
src/Instrumentation/render_area_2d.hxx
View file

@ -32,8 +32,8 @@
#include <osg/State> #include <osg/State>
#include <osg/StateSet> #include <osg/StateSet>
#include <plib/sg.h>
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/math/SGMath.hxx>
#include <vector> #include <vector>
@ -106,8 +106,8 @@ private:
// Actual drawing routines copied from Atlas // Actual drawing routines copied from Atlas
void doSetColor( const float *rgb ); void doSetColor( const float *rgb );
void doDrawQuad( const sgVec2 *p, const sgVec3 *normals ); void doDrawQuad( const SGVec2f *p);
void doDrawQuad( const sgVec2 *p, const sgVec3 *normals, const sgVec4 *color ); void doDrawQuad( const SGVec2f *p, const SGVec4f *color );
vector<RA2DPrimitive> drawing_list; vector<RA2DPrimitive> drawing_list;