cleanup

TheBuzzSaw · Mar 20, 2012 · 7aa2da5 · 7aa2da5
1 parent a6049f4
commit 7aa2da5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/CanvasOpenGL.cpp b/CanvasOpenGL.cpp
@@ -95,3 +95,16 @@ void CanvasOpenGL::testFolders()
     bool success = home.mkpath("Droideka/data/huh");
     qDebug() << (success ? "WOOT" : "dawww");
 }
+
+GLuint CanvasOpenGL::loadCardTexture(const QImage& inImage)
+{
+    GLuint outTexture = 0;
+
+    if (!inImage.isNull())
+    {
+        QImage adjustedImage = inImage.scaled(QSize(512, 512), Qt::KeepAspectRatio,
+            Qt::FastTransformation);
+    }
+
+    return outTexture;
+}
diff --git a/CanvasOpenGL.hpp b/CanvasOpenGL.hpp
@@ -1,5 +1,5 @@
-#ifndef WIDGETTESTOPENGL_HPP
-#define WIDGETTESTOPENGL_HPP
+#ifndef CANVASOPENGL_HPP
+#define CANVASOPENGL_HPP
 
 #include "Matrix4x4.hpp"
 #include "CardModel.hpp"
@@ -13,7 +13,7 @@ class CanvasOpenGL : public QGLWidget
     CanvasOpenGL(QWidget* inParent = 0);
     ~CanvasOpenGL();
 
-public slots:
+protected slots:
     void onPulse();
 
 protected:
@@ -25,6 +25,7 @@ public slots:
 
 private:
     void testFolders();
+    GLuint loadCardTexture(const QImage& inImage);
 
     mat4f mProjectionMatrix;
     mat4f mModelViewMatrix;

diff --git a/Droideka.pro b/Droideka.pro
@@ -21,7 +21,7 @@ SOURCES += main.cpp\
     MainWindow.cpp \
     CanvasOpenGL.cpp
 
-HEADERS  += LoginWindow.h \
+HEADERS  += \
     Matrix4x4.hpp \
     SceneGraphNode.hpp \
     Vectors.hpp \
@@ -31,7 +31,8 @@ HEADERS  += LoginWindow.h \
     VertexBufferObject.hpp \
     IndexBufferObject.hpp \
     MainWindow.hpp \
-    CanvasOpenGL.hpp
+    CanvasOpenGL.hpp \
+    LoginWindow.hpp
 
 FORMS    += LoginWindow.ui
 

diff --git a/LoginWindow.cpp b/LoginWindow.cpp
@@ -1,4 +1,4 @@
-#include "LoginWindow.h"
+#include "LoginWindow.hpp"
 #include "ui_LoginWindow.h"
 
 #include <QNetworkRequest>

diff --git a/LoginWindow.h → LoginWindow.hpp b/LoginWindow.h → LoginWindow.hpp
@@ -1,5 +1,5 @@
-#ifndef LOGINWINDOW_H
-#define LOGINWINDOW_H
+#ifndef LOGINWINDOW_HPP
+#define LOGINWINDOW_HPP
 
 #include <QMainWindow>
 #include <QNetworkAccessManager>