StelViewportEffect.cpp   StelViewportEffect.cpp 
skipping to change at line 38 skipping to change at line 38
#include <QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QSettings> #include <QSettings>
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>
void StelViewportEffect::paintViewportBuffer(const QOpenGLFramebufferObject * buf) const void StelViewportEffect::paintViewportBuffer(const QOpenGLFramebufferObject * buf) const
{ {
StelPainter sPainter(StelApp::getInstance().getCore()->getProjection 2d()); StelPainter sPainter(StelApp::getInstance().getCore()->getProjection 2d());
sPainter.setColor(1,1,1); sPainter.setColor(1,1,1);
sPainter.enableTexture2d(true); sPainter.glFuncs()->glBindTexture(GL_TEXTURE_2D, buf->texture());
glBindTexture(GL_TEXTURE_2D, buf->texture());
sPainter.drawRect2d(0, 0, buf->size().width(), buf->size().height()) ; sPainter.drawRect2d(0, 0, buf->size().width(), buf->size().height()) ;
} }
struct VertexPoint struct VertexPoint
{ {
Vec2f ver_xy; Vec2f ver_xy;
Vec4f color; Vec4f color;
double h; double h;
}; };
skipping to change at line 329 skipping to change at line 328
} }
} }
x = screen_w*texture_x - viewport_texture_offset[0] + newProjectorPa rams.viewportXywh[0]; x = screen_w*texture_x - viewport_texture_offset[0] + newProjectorPa rams.viewportXywh[0];
y = screen_h*texture_y - viewport_texture_offset[1] + newProjectorPa rams.viewportXywh[1]; y = screen_h*texture_y - viewport_texture_offset[1] + newProjectorPa rams.viewportXywh[1];
} }
void StelViewportDistorterFisheyeToSphericMirror::paintViewportBuffer(const QOpenGLFramebufferObject* buf) const void StelViewportDistorterFisheyeToSphericMirror::paintViewportBuffer(const QOpenGLFramebufferObject* buf) const
{ {
StelPainter sPainter(StelApp::getInstance().getCore()->getProjection 2d()); StelPainter sPainter(StelApp::getInstance().getCore()->getProjection 2d());
sPainter.enableTexture2d(true); QOpenGLFunctions* gl = sPainter.glFuncs();
glBindTexture(GL_TEXTURE_2D, buf->texture()); GL(gl->glBindTexture(GL_TEXTURE_2D, buf->texture()));
GL(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)) GL(gl->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINE
; AR));
GL(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)) GL(gl->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINE
; AR));
glDisable(GL_BLEND); sPainter.setBlending(false);
sPainter.enableClientStates(true, true, true); sPainter.enableClientStates(true, true, true);
sPainter.setColorPointer(4, GL_FLOAT, displayColorList.constData()); sPainter.setColorPointer(4, GL_FLOAT, displayColorList.constData());
sPainter.setVertexPointer(2, GL_FLOAT, displayVertexList.constData() ); sPainter.setVertexPointer(2, GL_FLOAT, displayVertexList.constData() );
sPainter.setTexCoordPointer(2, GL_FLOAT, displayTexCoordList.constDa ta()); sPainter.setTexCoordPointer(2, GL_FLOAT, displayTexCoordList.constDa ta());
for (int j=0;j<max_y;j++) for (int j=0;j<max_y;j++)
{ {
glDrawArrays(GL_TRIANGLE_STRIP, j*(max_x+1)*2, (max_x+1)*2); GL(gl->glDrawArrays(GL_TRIANGLE_STRIP, j*(max_x+1)*2, (max_x +1)*2));
sPainter.drawFromArray(StelPainter::TriangleStrip, (max_x+1) *2, j*(max_x+1)*2, false); sPainter.drawFromArray(StelPainter::TriangleStrip, (max_x+1) *2, j*(max_x+1)*2, false);
} }
sPainter.enableClientStates(false); sPainter.enableClientStates(false);
GL(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST) GL(gl->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAR
); EST));
GL(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST) GL(gl->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAR
); EST));
} }
 End of changes. 4 change blocks. 
14 lines changed or deleted 13 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/