Mercurial > hg > dmlib
diff edview.cpp @ 403:d34922e6a244
Even more work towards the editor.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 19 Oct 2012 21:52:16 +0300 |
parents | 8660c6005032 |
children |
line wrap: on
line diff
--- a/edview.cpp Fri Oct 19 17:49:22 2012 +0300 +++ b/edview.cpp Fri Oct 19 21:52:16 2012 +0300 @@ -2,7 +2,7 @@ #include <QtGui> -GLDemoView::GLDemoView(QWidget *parent) : +QEDGLDemoView::QEDGLDemoView(QWidget *parent) : QGLWidget(QGLFormat(QGL::SampleBuffers|QGL::AlphaChannel), parent) { makeCurrent(); @@ -26,30 +26,30 @@ } -GLDemoView::~GLDemoView() +QEDGLDemoView::~QEDGLDemoView() { } -QSize GLDemoView::minimumSizeHint() const +QSize QEDGLDemoView::minimumSizeHint() const { return QSize(320, 240); } -QSize GLDemoView::sizeHint() const +QSize QEDGLDemoView::sizeHint() const { return QSize(640, 480); } -void GLDemoView::setEngineData(DMEngineData *mengine) +void QEDGLDemoView::setEngineData(DMEngineData *mengine) { engine = mengine; } -void GLDemoView::render(int frameTime) +void QEDGLDemoView::render(int frameTime) { if (engine != NULL) { @@ -69,7 +69,7 @@ } -void GLDemoView::paintEvent(QPaintEvent *) +void QEDGLDemoView::paintEvent(QPaintEvent *) { // save the GL state set for QPainter saveGLState(); @@ -79,7 +79,7 @@ } -void GLDemoView::saveGLState() +void QEDGLDemoView::saveGLState() { glPushAttrib(GL_ALL_ATTRIB_BITS); glMatrixMode(GL_PROJECTION); @@ -89,7 +89,7 @@ } -void GLDemoView::restoreGLState() +void QEDGLDemoView::restoreGLState() { glMatrixMode(GL_PROJECTION); glPopMatrix(); @@ -99,19 +99,19 @@ } -SWDemoView::SWDemoView(QWidget *parent) : GLDemoView(parent) +QEDSWDemoView::QEDSWDemoView(QWidget *parent) : QEDGLDemoView(parent) { img = NULL; } -SWDemoView::~SWDemoView() +QEDSWDemoView::~QEDSWDemoView() { delete img; } -void SWDemoView::setEngineData(DMEngineData *mengine) +void QEDSWDemoView::setEngineData(DMEngineData *mengine) { engine = mengine; delete img; @@ -122,7 +122,7 @@ } -void SWDemoView::paintEvent(QPaintEvent *) +void QEDSWDemoView::paintEvent(QPaintEvent *) { if (img != NULL) { @@ -132,12 +132,12 @@ } -void SWDemoView::render(int frameTime) +void QEDSWDemoView::render(int frameTime) { if (SDL_MUSTLOCK(engine->screen) != 0 && SDL_LockSurface(engine->screen) != 0) return; - GLDemoView::render(frameTime); + QEDGLDemoView::render(frameTime); if (SDL_MUSTLOCK(engine->screen) != 0) SDL_UnlockSurface(engine->screen);