Wrapped QGLShaderProgram to Shader for future extension.

Author: Cheng Xie

src/camera.cpp

@@ -1,6 +1,6 @@
 #include "camera.h"
 #include "drawcontext.h"
-#include <QGLShaderProgram>
+#include "Shader.h"
 
 Camera::Camera()
 {

src/common.h

@@ -39,7 +39,6 @@ class SceneObject;
 class Scene;
 class CameraController;
 class Texture;
-class QGLShaderProgram;
 class MeshRenderer;
 
 inline float randf() {

src/directlight.cpp

@@ -1,6 +1,6 @@
 #include "directlight.h"
 #include "drawcontext.h"
-#include <QGLShaderProgram>
+#include "shader.h"
 
 DirectLight::DirectLight(const vec3 &direction, const Color &color) 
     : direction_(direction),

src/drawcontext.h

@@ -4,16 +4,15 @@
 #include "geometry.h"
 #include "common.h"
 #include "scene.h"
-
-class QGLShaderProgram;
+#include "shader.h"
 
 class DrawContext
 {
 public:
     Camera* camera = NULL;
 
     // Currently enabled shader
-    QGLShaderProgram* shader = NULL;
+    Shader* shader = NULL;
 
     // Time elapsed since last frame
     float deltaTime = 0;

src/final.pro

@@ -35,7 +35,8 @@ SOURCES += main.cpp \
     particlesystem.cpp \
     meshrenderer.cpp \
     phongmaterial.cpp \
-    particlematerial.cpp
+    particlematerial.cpp \
+    shader.cpp
 
 HEADERS += mainwindow.h \
     view.h \
@@ -59,6 +60,7 @@ HEADERS += mainwindow.h \
     particlesystem.h \
     meshrenderer.h \
     phongmaterial.h \
-    particlematerial.h
+    particlematerial.h \
+    shader.h
 
 FORMS += mainwindow.ui

src/material.h

@@ -2,6 +2,7 @@
 #define MATERIAL_H
 
 #include "common.h"
+#include "shader.h"
 
 class Material
 {
@@ -11,7 +12,7 @@ class Material
     virtual void endRender() {}
 
 protected:
-    QGLShaderProgram *shader_ = NULL;
+    Shader *shader_ = NULL;
 };
 
 #endif // MATERIAL_H

src/particlematerial.cpp

@@ -1,5 +1,5 @@
 #include "particlematerial.h"
-#include <QGLShaderProgram>
+#include "shader.h"
 #include "shadercache.h"
 #include "drawcontext.h"
 #include "texture.h"

src/phongmaterial.cpp

@@ -1,6 +1,6 @@
 #include <GL/glew.h>
 #include "PhongMaterial.h"
-#include <QGLShaderProgram>
+#include "shader.h"
 #include "shadercache.h"
 #include "drawcontext.h"
 #include "texture.h"

src/sceneobject.cpp

@@ -2,7 +2,7 @@
 #include "drawcontext.h"
 #include "camera.h"
 #include "light.h"
-#include <QGLShaderProgram>
+#include "shader.h"
 
 SceneObject::SceneObject()
 {

src/shader.cpp

@@ -0,0 +1,2 @@
+#include "shader.h"
+

src/shader.h

@@ -0,0 +1,8 @@
+#ifndef SHADER_H
+#define SHADER_H
+
+#include <QGLShaderProgram>
+
+typedef QGLShaderProgram Shader;
+
+#endif // SHADER_H

src/shadercache.cpp

@@ -17,15 +17,15 @@ ShaderCache::~ShaderCache()
     delete g_instance;
 }
 
-unique_ptr<QGLShaderProgram> ShaderCache::loadResource(string shader)
+unique_ptr<Shader> ShaderCache::loadResource(string shader)
 {
     string path = "shaders/";
 
     string vertexShader = path + shader + ".vs";
     string geometryShader = path + shader + ".gs";
     string fragmentShader = path + shader + ".fs";
 
-    unique_ptr<QGLShaderProgram> p(new QGLShaderProgram);
+    unique_ptr<Shader> p(new Shader);
 
     bool result;
 

src/shadercache.h

@@ -2,16 +2,16 @@
 #define SHADERCACHE_H
 
 #include <resourcecache.h>
-#include <QGLShaderProgram>
+#include "shader.h"
 
-class ShaderCache : public ResourceCache<QGLShaderProgram>
+class ShaderCache : public ResourceCache<Shader>
 {
 public:
     static ShaderCache* getInstance();
 
 private:
     virtual ~ShaderCache();
-    virtual unique_ptr<QGLShaderProgram> loadResource(string name) override;
+    virtual unique_ptr<Shader> loadResource(string name) override;
 };
 
 #endif // SHADERCACHE_H

src/texture.cpp

@@ -1,7 +1,7 @@
 #include <GL/glew.h>
 #include "texture.h"
 #include "drawcontext.h"
-#include <QGLShaderProgram>
+#include "shader.h"
 #include <QImage>
 #include <QFile>