Successfully integrated ZIP file fishing of images & software

[virtualjaguar] / src / gui / glwidget.cpp

diff --git a/src/gui/glwidget.cpp b/src/gui/glwidget.cpp
index 109c1c9b1ec235b2e6cc9098e391691f6dae972f..e32dde3682aa65c4b6d842e6d960313803e669ae 100644 (file)
--- a/src/gui/glwidget.cpp
+++ b/src/gui/glwidget.cpp
@@ -16,8 +16,7 @@
 #include "settings.h"
 
 GLWidget::GLWidget(QWidget * parent/*= 0*/): QGLWidget(parent), texture(0),
-       textureWidth(0), textureHeight(0), buffer(0), rasterWidth(64), rasterHeight(64)
-//     textureWidth(0), textureHeight(0), buffer(0), rasterWidth(256), rasterHeight(256)
+       textureWidth(0), textureHeight(0), buffer(0), rasterWidth(320), rasterHeight(240)
 {
 }
 
@@ -42,6 +41,9 @@ void GLWidget::initializeGL()
 
 void GLWidget::paintGL()
 {
+//kludge
+rasterHeight = (vjs.hardwareTypeNTSC ? 240 : 256);
+
        unsigned outputWidth  = width();
        unsigned outputHeight = height();
 
@@ -53,10 +55,8 @@ void GLWidget::paintGL()
        glMatrixMode(GL_MODELVIEW);
        glLoadIdentity();
 
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (smoothGLOutput ? GL_LINEAR : GL_NEAREST));
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (smoothGLOutput ? GL_LINEAR : GL_NEAREST));
-//     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST /*GL_LINEAR*/);
-//     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST /*GL_LINEAR*/);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (vjs.glFilter ? GL_LINEAR : GL_NEAREST));
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (vjs.glFilter ? GL_LINEAR : GL_NEAREST));
 //     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rasterWidth, rasterHeight, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buffer);
        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rasterWidth, rasterHeight, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, buffer);