Permalink
Browse files

cleanup

  • Loading branch information...
1 parent a6049f4 commit 7aa2da5d0e5c5ade50187f1a3544dd6bee4e8ad1 Kelly Brown committed Mar 20, 2012
Showing with 23 additions and 8 deletions.
  1. +13 −0 CanvasOpenGL.cpp
  2. +4 −3 CanvasOpenGL.hpp
  3. +3 −2 Droideka.pro
  4. +1 −1 LoginWindow.cpp
  5. +2 −2 LoginWindow.h → LoginWindow.hpp
View
@@ -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;
+}
View
@@ -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;
View
@@ -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
View
@@ -1,4 +1,4 @@
-#include "LoginWindow.h"
+#include "LoginWindow.hpp"
#include "ui_LoginWindow.h"
#include <QNetworkRequest>
@@ -1,5 +1,5 @@
-#ifndef LOGINWINDOW_H
-#define LOGINWINDOW_H
+#ifndef LOGINWINDOW_HPP
+#define LOGINWINDOW_HPP
#include <QMainWindow>
#include <QNetworkAccessManager>

0 comments on commit 7aa2da5

Please sign in to comment.