changed structure of the renderer to modules

basicmodule.cpp

@@ -0,0 +1,19 @@
+#include "basicmodule.h"
+#include "shader.h"
+#include "entity.h"
+#include "camera.h"
+
+void BasicModule::addEntity(Entity* myEntity)
+{
+    entities.push_back(myEntity);
+}
+
+void BasicModule::render(Camera* myCamera)
+{
+    shader->bind();
+    bindModule();
+    for(Entity* e : entities)
+        e->draw(myCamera->getViewMatrix(), myCamera->getProjectionMatrix());
+}
+
+

basicmodule.h

@@ -0,0 +1,27 @@
+#ifndef BASICMODULE_H
+#define BASICMODULE_H
+
+#include "module.h"
+#include <vector>
+#include <cstddef>
+
+class Shader;
+class Entity;
+class Camera;
+
+class BasicModule : public Module
+{
+protected:
+    Shader* shader;
+    std::vector<Entity*> entities;
+
+    BasicModule(Shader* myShader = NULL) : shader(myShader) {}
+
+    virtual void bindModule() = 0;
+
+public:
+    void addEntity(Entity* myEntity);
+    void virtual render(Camera* myCamera);
+};
+
+#endif // BASICMODULE_H

data/sword.mtl

@@ -0,0 +1,15 @@
+#
+# generated by kHED
+#
+newmtl steel
+d 1.0
+Ka 1.0 1.0 1.0
+Ks 0.9 0.9 0.9
+Kd 0.3 0.3 0.3
+map_Kd res/textures/steel.jpg
+newmtl leather
+d 1.0
+Ka 1.0 1.0 1.0
+Ks 0.4 0.4 0.4
+Kd 0.9 0.9 0.9
+map_Kd res/textures/leather.jpg

entity.cpp

@@ -4,6 +4,13 @@
 #include "material.h"
 #include "mesh.h"
 
+Entity::Entity(Mesh* myMesh, Material* myMat) : mesh(myMesh), mat(myMat) {}
+
+Entity::Entity(Entity* myParent, Mesh* myMesh, Material* myMat) : mesh(myMesh), mat(myMat)
+{
+    myParent->addChild(this);
+}
+
 void Entity::draw(const glm::mat4 viewMatrix, const glm::mat4 projectionMatrix)
 {
     glm::mat4 modelViewMatrix = viewMatrix * modelMatrix;
@@ -32,3 +39,8 @@ Material* Entity::getMaterial()
 {
     return mat;
 }
+
+void Entity::addChild(Entity* child)
+{
+    children.push_back(child);
+}

entity.h

@@ -2,6 +2,7 @@
 #define ENTITY_H
 
 #include "glm/mat4x4.hpp"
+#include <vector>
 
 class Mesh;
 class Material;
@@ -10,16 +11,21 @@ class Shader;
 class Entity
 {
 protected:
-    Entity* parent;
+    std::vector<Entity*> children;
     Mesh* mesh;
     Material* mat;
     glm::mat4 modelMatrix;
 public:
-    Entity(Entity* myParent, Mesh* myMesh, Material* myMat) : parent(myParent), mesh(myMesh), mat(myMat) {}
+    Entity(Mesh* myMesh, Material* myMat);
+    /**
+     * NULL Material is acceptable for this constructor
+     */
+    Entity(Entity* myParent, Mesh* myMesh, Material* myMat);
     virtual void draw(const glm::mat4 viewMatrix, const glm::mat4 projectionMatrix);
     glm::mat4* getTransform();
     Shader* getShader();
     Material* getMaterial();
+    void addChild(Entity* child);
 };
 
 #endif // ENTITY_H

material.h

@@ -11,7 +11,6 @@ public:
 	Shader* getShader() {return shader;}
 
     virtual void bindAttributes() = 0;
-    virtual bool requireLights() {return true;}
 
 protected:
 	Shader* shader;

module.h

@@ -0,0 +1,13 @@
+#ifndef MODULE
+#define MODULE
+
+class Camera;
+
+class Module
+{
+public:
+    virtual void render(Camera* myCamera) = 0;
+};
+
+#endif // MODULE
+

myglwidget.cpp

@@ -1,12 +1,14 @@
 #include <glew/glew.h>
 #include "myglwidget.h"
-#include "scene.h"
 #include "glassert.h"
 #include "camera.h"
 #include "sphere.h"
 #include "phongmaterial.h"
-#include "skybox.h"
+#include "skyboxmodule.h"
+#include "entity.h"
+#include "phongmodule.h"
 #include "utils.h"
+#include "lights.h"
 #include "texture.h"
 #include "gridmesh.h"
 #include "sparrowrenderer.h"
@@ -31,42 +33,47 @@ MyGLWidget::~MyGLWidget()
         delete(controller);
 }
 
-Scene* MyGLWidget::buildScene()
+void MyGLWidget::buildScene()
 {
-    Scene* scene = new Scene();
-
-    Camera* cam = new Camera(width(), height());
+    // init camera
+    Camera* cam = renderer->getCamera();
     cam->moveTo(glm::vec3(0, 0, 3));
     cam->lookAt(glm::vec2(0, 0));
-    scene->setCamera(cam);
 
+    // create skybox module
     std::string filenames[6] = {
         "../data/skybox_ft", "../data/skybox_bk",
         "../data/skybox_up", "../data/skybox_dn",
         "../data/skybox_lf", "../data/skybox_rt"
     };
-    SkyBox* skybox = new SkyBox(filenames);
-    scene->addEntity(skybox);
+    Texture* skyboxCubemap = new Texture(filenames);
+    SkyboxModule* skybox = new SkyboxModule(skyboxCubemap);
 
+    // create a mesh
     //Mesh* myGrid = new GridMesh(10, 10, true); //new Sphere(2);
-    Mesh* myGrid = Utils::loadOBJ("../data/sphere.obj");
+    Mesh* myGrid = Utils::loadOBJ("../data/sword.obj");
     myGrid->initGL();
 
+    //
     std::string vertSource = Utils::fileToString("../phong.vert");
     std::string fragSource = Utils::fileToString("../phong.frag");
-    Shader* shader = new Shader(vertSource, fragSource);
-    PhongMaterial* mat = new PhongMaterial(shader, glm::vec3(1), glm::vec3(1), 20.0f);
+    Shader* phongShader = new Shader(vertSource, fragSource);
+    PhongMaterial* mat = new PhongMaterial(phongShader, glm::vec3(1), glm::vec3(1), 20.0f);
     Texture* tex = new Texture("../data/noise.png");
     mat->setTexture(tex);
 
-    Entity* myEntity = new Entity(NULL, myGrid, mat);
+    Entity* myEntity = new Entity(myGrid, mat);
     glm::mat4* transform = myEntity->getTransform();
-    *transform = glm::translate(glm::rotate(glm::scale(*transform, glm::vec3(0.1f)), 3.1416f/2, glm::vec3(-1, 0, 0)), glm::vec3(-0.5f, -0.5f, 0));
-    scene->addEntity(myEntity);
+    *transform = glm::scale(*transform, glm::vec3(0.01f));
 
-    scene->addDirectionnalLight(glm::vec3(6, 4, -4), glm::vec3(0.7f, 0.6f, 0.4f)); // sun
+    Lights* directionnalLights = new Lights();
+    directionnalLights->addLight(glm::vec3(6, 4, -4), glm::vec3(0.7f, 0.6f, 0.4f)); // sun
 
-    return scene;
+    PhongModule* myPhongModule = new PhongModule(directionnalLights, new Lights(), phongShader);
+    myPhongModule->addEntity(myEntity);
+
+    renderer->addModule(skybox);
+    renderer->addModule(myPhongModule);
 }
 
 void MyGLWidget::initializeGL()
@@ -74,10 +81,9 @@ void MyGLWidget::initializeGL()
     if(renderer != NULL)
         delete(renderer);
     renderer = new SparrowRenderer(width(), height());
-    Scene* scene = buildScene();
+    buildScene();
     controller = new FocusController(new glm::vec3(0));
-    renderer->setScene(scene);
-    controller->setScene(scene);
+    controller->setCamera(renderer->getCamera());
 }
 
 void MyGLWidget::resizeGL(int width, int height)

myglwidget.h

@@ -3,7 +3,6 @@
 
 #include <QGLWidget>
 
-class Scene;
 class SparrowRenderer;
 class SceneController;
 
@@ -25,7 +24,7 @@ public:
 
 protected:
     void initializeGL();
-    Scene* buildScene();
+    void buildScene();
     void resizeGL(int width, int height);
     void paintGL();
 

phongmodule.cpp

@@ -0,0 +1,17 @@
+#include "phongmodule.h"
+#include "lights.h"
+
+PhongModule::PhongModule(Lights* myDirLights, Lights* myPointLights, Shader* phongShader) :
+    BasicModule(phongShader), dirLights(myDirLights), pointLights(myPointLights)
+{
+    nbDirLightsLocation = shader->getLocation("nbDirLights");
+    dirLightsLocation = shader->getLocation("dirLights");
+    nbPointLightsLocation = shader->getLocation("nbPointLights");
+    pointLightsLocation = shader->getLocation("pointLights");
+}
+
+void PhongModule::bindModule()
+{
+    dirLights->bind(dirLightsLocation, nbDirLightsLocation, shader);
+    pointLights->bind(pointLightsLocation, nbPointLightsLocation, shader);
+}

phongmodule.h

@@ -0,0 +1,24 @@
+#ifndef PHONGMODULE_H
+#define PHONGMODULE_H
+
+#include "basicmodule.h"
+#include "phongmaterial.h"
+#include "mesh.h"
+#include <glew/glew.h>
+
+class Lights;
+
+class PhongModule : public BasicModule
+{
+    Lights* dirLights;
+    Lights* pointLights;
+    GLuint nbDirLightsLocation;
+    GLuint dirLightsLocation;
+    GLuint nbPointLightsLocation;
+    GLuint pointLightsLocation;
+public:
+    PhongModule(Lights* myDirLights, Lights* myPointLights, Shader* phongShader);
+    virtual void bindModule();
+};
+
+#endif // PHONGMODULE_H

scene.cpp

@@ -1,74 +0,0 @@
-#include "scene.h"
-#include "glassert.h"
-#include <glm/glm.hpp>
-#include <glm/ext.hpp>
-#include "camera.h"
-#include "entity.h"
-#include "shader.h"
-#include "material.h"
-
-// MAIN METHODS
-
-Scene::~Scene()
-{
-    for(Entity* e : entities)
-        delete(e);
-}
-
-void Scene::drawAll()
-{
-    glm::mat4 viewMatrix = camera->getViewMatrix();
-    glm::mat4 projectionMatrix = camera->getProjectionMatrix();
-    for(Entity* e : entities)
-    {
-        Shader* shader = e->getShader();
-        shader->bind();
-        if(e->getMaterial()->requireLights())
-        {
-            directionnalLights.bind(shader->getLocation("dirLights"), shader->getLocation("nbDirLights"), shader);
-            pointLights.bind(shader->getLocation("pointLights"), shader->getLocation("nbPointLights"), shader);
-        }
-        e->draw(viewMatrix, projectionMatrix);
-    }
-}
-
-// ENTITIES
-
-void Scene::addEntity(Entity* parent, Mesh* mesh, Material* mat)
-{
-    entities.push_back(new Entity(parent, mesh, mat));
-}
-
-void Scene::addEntity(Mesh* mesh, Material* mat)
-{
-    entities.push_back(new Entity(NULL, mesh, mat));
-}
-
-void Scene::addEntity(Entity* entity)
-{
-    entities.push_back(entity);
-}
-
-// LIGHTS
-
-void Scene::addDirectionnalLight(const glm::vec3 &position, const glm::vec3 &color)
-{
-    directionnalLights.addLight(position, color);
-}
-
-void Scene::addPointLight(const glm::vec3 &position, const glm::vec3 &color)
-{
-    pointLights.addLight(position, color);
-}
-
-// CAMERA
-
-void Scene::setCamera(Camera* myCamera)
-{
-    camera = myCamera;
-}
-
-Camera* Scene::getCamera()
-{
-    return camera;
-}

scene.h

@@ -1,41 +0,0 @@
-#ifndef SCENE_H
-#define SCENE_H
-
-#include "lights.h"
-#include <glew/glew.h>
-#include <vector>
-
-class Entity;
-class Camera;
-class Mesh;
-class Material;
-class Shader;
-
-class Scene
-{
-   Lights directionnalLights;
-   Lights pointLights;
-   std::vector<Entity*> entities;
-   Camera* camera;
-
-public:
-    // main methods
-    Scene() : camera(NULL) {}
-    ~Scene();
-    void drawAll();
-
-    // entities
-    void addEntity(Entity* parent, Mesh* mesh, Material* mat);
-    void addEntity(Mesh* mesh, Material* mat);
-    void addEntity(Entity* entity);
-
-    // lights
-    void addDirectionnalLight(const glm::vec3 &position, const glm::vec3 &color);
-    void addPointLight(const glm::vec3 &position, const glm::vec3 &color);
-
-    // camera
-    void setCamera(Camera* myCamera);
-    Camera* getCamera();
-};
-
-#endif // SCENE_H

scenecontroller.cpp

@@ -1,12 +1,10 @@
 #include "scenecontroller.h"
-#include "scene.h"
 #include "camera.h"
 #include <QObject>
 
-void SceneController::setScene(Scene* myScene)
+void SceneController::setCamera(Camera* myCamera)
 {
-    scene = myScene;
-    camera = scene->getCamera();
+    camera = myCamera;
 }
 
 void SceneController::mouseEvent(int button, bool state)

scenecontroller.h

@@ -3,19 +3,17 @@
 
 #include <cstddef>
 
-class Scene;
 class Camera;
 
 class SceneController
 {
 protected:
     Camera* camera;
-    Scene* scene;
     int grabbed;
 public:
-    SceneController() : camera(NULL), scene(NULL), grabbed(0) {}
+    SceneController() : camera(NULL), grabbed(0) {}
 
-    void setScene(Scene* myScene);
+    void setCamera(Camera* myCamera);
     virtual void mouseMove(int dx, int dy) {}
     virtual void mouseEvent(int button, bool state);
     virtual void keyEvent(int key, bool state) {}

shader.cpp

@@ -31,8 +31,6 @@ Shader::Shader(const std::string &vertexSource, const std::string &fragmentSourc
         printProgramInfoLog(program);
         program = 0;
     }
-    else
-        std::cout << "Shader successfully compiled" << std::endl;
 
     glAssert(glDetachShader(program, vertexShaderId));
     glAssert(glDetachShader(program, fragmentShaderId));

skybox.h

@@ -1,22 +0,0 @@
-#ifndef SKYBOX_H
-#define SKYBOX_H
-
-#include "entity.h"
-#include <glew/glew.h>
-#include <string>
-
-class SkyBox : public Entity
-{
-private:
-    static const GLfloat skyboxVertices[];
-    static const std::string vertSource;
-    static const std::string fragSource;
-    GLuint vao;
-    GLuint vbo;
-public:
-    SkyBox(const std::string filename[6]);
-    ~SkyBox();
-    virtual void draw(const glm::mat4 viewMatrix, const glm::mat4 projectionMatrix);
-};
-
-#endif // SKYBOX_H

skyboxmaterial.cpp

@@ -1,17 +0,0 @@
-#include "skyboxmaterial.h"
-#include "texture.h"
-
-SkyBoxMaterial::SkyBoxMaterial(Shader* myShader, const std::string filenames[6]) : Material(myShader)
-{
-    skyboxTex = new Texture(filenames);
-}
-
-void SkyBoxMaterial::bindAttributes()
-{
-    skyboxTex->bind(0);
-}
-
-bool SkyBoxMaterial::requireLights()
-{
-    return false;
-}

skyboxmaterial.h

@@ -1,19 +0,0 @@
-#ifndef SKYBOXMATERIAL_H
-#define SKYBOXMATERIAL_H
-
-#include "material.h"
-
-class Texture;
-
-class SkyBoxMaterial : public Material
-{
-public:
-    SkyBoxMaterial(Shader* myShader, const std::string filenames[6]);
-    virtual void bindAttributes();
-    virtual bool requireLights();
-
-private:
-    Texture* skyboxTex;
-};
-
-#endif // SKYBOXMATERIAL_H

skyboxmodule.cpp

@@ -1,15 +1,16 @@
-#include "skybox.h"
-#include "glassert.h"
+#include <glm/mat4x4.hpp>
+#include <glm/mat3x3.hpp>
+#include "skyboxmodule.h"
+#include "entity.h"
 #include "shader.h"
-#include "material.h"
-#include "skyboxmaterial.h"
-#include "glm/glm.hpp"
-#include "glm/ext.hpp"
+#include "texture.h"
+#include "camera.h"
+#include "glassert.h"
 
-SkyBox::SkyBox(const std::string filename[6]) : Entity(NULL, NULL, NULL)
+SkyboxModule::SkyboxModule(Texture* myCubeMap)
 {
-    Shader* shader = new Shader(vertSource, fragSource);
-    mat = new SkyBoxMaterial(shader, filename);
+    shader = new Shader(vertSource, fragSource);
+    cubeMap = myCubeMap;
 
     // set up vao
     glAssert(glGenVertexArrays(1, &vao));
@@ -20,27 +21,29 @@ SkyBox::SkyBox(const std::string filename[6]) : Entity(NULL, NULL, NULL)
     glAssert(glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(float)*3, NULL));
     glAssert(glEnableVertexAttribArray(0));
     glAssert(glBindVertexArray(0));
+
+    mvpLocation = shader->getLocation("MVP");
 }
 
-SkyBox::~SkyBox()
+SkyboxModule::~SkyboxModule()
 {
     glAssert(glDeleteVertexArrays(1, &vao));
     glAssert(glDeleteBuffers(1, &vbo));
 }
 
-void SkyBox::draw(const glm::mat4 viewMatrix, const glm::mat4 projectionMatrix)
+void SkyboxModule::render(Camera* myCamera)
 {
-    glm::mat4 mvp = projectionMatrix * glm::mat4(glm::mat3(viewMatrix));
+    shader->bind();
+    glm::mat4 mvp = myCamera->getProjectionMatrix() * glm::mat4(glm::mat3(myCamera->getViewMatrix()));
     glAssert(glDepthMask(GL_FALSE));
-    mat->bindAttributes();
-    Shader* shader = mat->getShader();
-    shader->bindMatrix(shader->getLocation("MVP"), mvp);
+    cubeMap->bind(0);
+    shader->bindMatrix(mvpLocation, mvp);
     glAssert(glBindVertexArray(vao));
     glAssert(glDrawArrays(GL_TRIANGLES, 0, 36));
     glAssert(glDepthMask(GL_TRUE));
 }
 
-const GLfloat SkyBox::skyboxVertices[] = {
+const GLfloat SkyboxModule::skyboxVertices[] = {
     -1.0f,  1.0f, -1.0f,
     -1.0f, -1.0f, -1.0f,
      1.0f, -1.0f, -1.0f,
@@ -84,7 +87,7 @@ const GLfloat SkyBox::skyboxVertices[] = {
      1.0f, -1.0f,  1.0f
 };
 
-const std::string SkyBox::vertSource =
+const std::string SkyboxModule::vertSource =
         "#version 330 core\n\
         layout(location = 0)in vec3 inPosition;\n\
         out vec3 varTexCoord;\n\
@@ -95,7 +98,7 @@ const std::string SkyBox::vertSource =
             varTexCoord = inPosition;\n\
         }\n";
 
-const std::string SkyBox::fragSource =
+const std::string SkyboxModule::fragSource =
         "#version 330 core\n\
         in vec3 varTexCoord;\n\
         out vec4 outColor;\n\

skyboxmodule.h

@@ -0,0 +1,28 @@
+#ifndef SKYBOXMODULE_H
+#define SKYBOXMODULE_H
+
+#include <glew/glew.h>
+#include "module.h"
+#include <string>
+
+class Shader;
+class Texture;
+
+class SkyboxModule : public Module
+{
+    static const GLfloat skyboxVertices[];
+    static const std::string vertSource;
+    static const std::string fragSource;
+
+    GLuint vao;
+    GLuint vbo;
+    GLuint mvpLocation;
+    Shader* shader;
+    Texture* cubeMap;
+public:
+    SkyboxModule(Texture* myCubeMap);
+    ~SkyboxModule();
+    virtual void render(Camera* myCamera);
+};
+
+#endif // SKYBOXMODULE_H

sparrowRenderer.pro

@@ -27,20 +27,20 @@ SOURCES += main.cpp\
     shader.cpp \
     mesh.cpp \
     camera.cpp \
-    scene.cpp \
     gridmesh.cpp \
     texture.cpp \
     phongmaterial.cpp \
     scenecontroller.cpp \
     sphere.cpp \
-    skyboxmaterial.cpp \
-    skybox.cpp \
     entity.cpp \
     utils.cpp \
     lights.cpp \
     sparrowrenderer.cpp \
     resourcebase.cpp \
-    focuscontroller.cpp
+    focuscontroller.cpp \
+    phongmodule.cpp \
+    skyboxmodule.cpp \
+    basicmodule.cpp
 
 HEADERS += mainwindow.h \
     myglwidget.h \
@@ -48,21 +48,22 @@ HEADERS += mainwindow.h \
     mesh.h \
     camera.h \
     glassert.h \
-    scene.h \
     material.h \
     gridmesh.h \
     texture.h \
     phongmaterial.h \
     scenecontroller.h \
     sphere.h \
-    skyboxmaterial.h \
-    skybox.h \
     entity.h \
     utils.h \
     lights.h \
     sparrowrenderer.h \
     resourcebase.h \
-    focuscontroller.h
+    focuscontroller.h \
+    phongmodule.h \
+    skyboxmodule.h \
+    basicmodule.h \
+    module.h
 
 FORMS   += mainwindow.ui
 

sparrowrenderer.cpp

@@ -3,8 +3,9 @@
 #include <iostream>
 #include "glassert.h"
 #include "camera.h"
+#include "basicmodule.h"
 
-SparrowRenderer::SparrowRenderer(int width, int height)
+SparrowRenderer::SparrowRenderer(int width, int height) : camera(width, height)
 {
     glewExperimental = GL_TRUE;
     GLenum err = glewInit();
@@ -30,22 +31,26 @@ SparrowRenderer::SparrowRenderer(int width, int height)
     glAssert(glViewport(0, 0, width, height));
 }
 
-void SparrowRenderer::setScene(Scene* myScene)
+void SparrowRenderer::addModule(Module* myModule)
 {
-    scene = myScene;
+    modules.push_back(myModule);
+}
+
+Camera* SparrowRenderer::getCamera()
+{
+    return &camera;
 }
 
 void SparrowRenderer::resize(int width, int height)
 {
     glAssert(glViewport(0, 0, width, height));
-    if(scene != NULL)
-        scene->getCamera()->resize(width, height);
+    camera.resize(width, height);
 }
 
 void SparrowRenderer::render()
 {
     glAssert(glClearColor(0.60, 0.65, 0.75, 1.0));
     glAssert(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
-    if(scene != NULL)
-        scene->drawAll();
+    for(Module* m : modules)
+        m->render(getCamera());
 }

sparrowrenderer.h

@@ -1,15 +1,19 @@
 #ifndef SPARROWRENDERER_H
 #define SPARROWRENDERER_H
 
-#include "scene.h"
+#include <vector>
+#include "camera.h"
+
+class Module;
 
 class SparrowRenderer
 {
-    Scene* scene;
-    // TODO : data bank
+    Camera camera;
+    std::vector<Module*> modules;
 public:
     SparrowRenderer(int width, int height);
-    void setScene(Scene* myScene);
+    void addModule(Module* myModule);
+    Camera* getCamera();
     void resize(int width, int height);
     void render();
 };