[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/kgllib/examples
From:       Rivo Laks <rivolaks () hot ! ee>
Date:       2008-01-25 12:47:53
Message-ID: 1201265273.778827.5030.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 766228 by rivol:

Adapt to API changes

 M  +1 -3      coverbling/coverbling.cpp  
 M  +1 -1      coverbling/coverbling.h  
 M  +1 -4      simpleflying/testwidget.cpp  
 M  +1 -1      simpleflying/testwidget.h  
 M  +1 -3      spinninglogos/logos.cpp  
 M  +1 -1      spinninglogos/logos.h  


--- trunk/playground/libs/kgllib/examples/coverbling/coverbling.cpp #766227:766228
@@ -78,10 +78,8 @@
     camera()->setLookAt(Vector3f(0, 0.5, 0));
 }
 
-void CoverBling::paintGL()
+void CoverBling::render()
 {
-    GLWidget::paintGL();
-
     if (!covers.count()) {
         return;
     }
--- trunk/playground/libs/kgllib/examples/coverbling/coverbling.h #766227:766228
@@ -41,7 +41,7 @@
     };
 
     void initializeGL();
-    void paintGL();
+    void render();
     void renderCover(const Cover& c, bool reflection);
     void renderCovers(bool reflection);
 
--- trunk/playground/libs/kgllib/examples/simpleflying/testwidget.cpp #766227:766228
@@ -157,13 +157,11 @@
     camera()->setUp(trackball.transform(Vector3f(0, 1, 0)));
 }
 
-void TestWidget::paintGL()
+void TestWidget::render()
 {
-    GLWidget::paintGL();
     processInput();
     processMovement();
 
-    glLoadIdentity();
     camera()->applyView();
 
     tex->enable();
@@ -185,7 +183,6 @@
     terrain->render();
 
 
-    renderText(5, 15, "FPS: " + fpsCounter()->fpsString());
     renderText(10, 25, QString("Pos: (%1; %2; %3)").arg(pos.x(), 0, 'f', \
                2).arg(pos.y(), 0, 'f', 2).arg(pos.z(), 0, 'f', 2));
     renderText(10, 35, QString("Elapsed: %1").arg(fpsCounter()->timeElapsed(), 0, \
                'f', 3));
     renderText(10, 45, QString("GameSpeed: %1, target: %2").arg(gameSpeed, 0, 'f', \
                3).arg(targetGameSpeed, 0, 'f', 3));
--- trunk/playground/libs/kgllib/examples/simpleflying/testwidget.h #766227:766228
@@ -43,7 +43,7 @@
 
 protected:
     void initializeGL();
-    void paintGL();
+    void render();
 
     virtual void mousePressEvent(QMouseEvent* e);
     virtual void mouseMoveEvent(QMouseEvent* e);
--- trunk/playground/libs/kgllib/examples/spinninglogos/logos.cpp #766227:766228
@@ -90,10 +90,8 @@
     return logo;
 }
 
-void Logos::paintGL()
+void Logos::render()
 {
-    GLWidget::paintGL();
-
     // Rotate 20 degrees/sec
     mRotation += fpsCounter()->timeElapsed() * 20;
     glEnable(GL_BLEND);
--- trunk/playground/libs/kgllib/examples/spinninglogos/logos.h #766227:766228
@@ -36,7 +36,7 @@
 
 protected:
     void initializeGL();
-    void paintGL();
+    void render();
 
     KGLLib::Mesh* createLogo(KGLLib::Texture* tex);
     void renderLogo(KGLLib::Texture* tex);


[prev in list] [next in list] [prev in thread] [next in thread]