From bf4daa27b3669fa7d080e977225cfd9a3d6f4976 Mon Sep 17 00:00:00 2001
From: Anselme <anselme16@hotmail.fr>
Date: Tue, 21 Jul 2015 07:42:37 +0200
Subject: [PATCH] fixed conflict between methods render of module and Qt
 widgets

---
 basicmodule.cpp     | 2 +-
 basicmodule.h       | 2 +-
 module.h            | 2 +-
 resourcebase.h      | 2 ++
 skyboxmodule.cpp    | 2 +-
 skyboxmodule.h      | 2 +-
 sparrowrenderer.cpp | 8 ++++----
 sparrowrenderer.h   | 4 ++--
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/basicmodule.cpp b/basicmodule.cpp
index 098efbc..9990890 100644
--- a/basicmodule.cpp
+++ b/basicmodule.cpp
@@ -8,7 +8,7 @@ void BasicModule::addEntity(Entity* myEntity)
     entities.push_back(myEntity);
 }
 
-void BasicModule::render(Camera* myCamera)
+void BasicModule::renderGL(Camera* myCamera)
 {
     shader->bind();
     bindModule();
diff --git a/basicmodule.h b/basicmodule.h
index c4254a3..31b4718 100644
--- a/basicmodule.h
+++ b/basicmodule.h
@@ -21,7 +21,7 @@ protected:
 
 public:
     void addEntity(Entity* myEntity);
-    void virtual render(Camera* myCamera);
+    void virtual renderGL(Camera* myCamera);
 };
 
 #endif // BASICMODULE_H
diff --git a/module.h b/module.h
index 0ed64cf..aaad992 100644
--- a/module.h
+++ b/module.h
@@ -6,7 +6,7 @@ class Camera;
 class Module
 {
 public:
-    virtual void render(Camera* myCamera) = 0;
+    virtual void renderGL(Camera* myCamera) = 0;
 };
 
 #endif // MODULE
diff --git a/resourcebase.h b/resourcebase.h
index 5f8c5d8..918df97 100644
--- a/resourcebase.h
+++ b/resourcebase.h
@@ -16,6 +16,8 @@ class Lights;
 class ResourceBase
 {
 public:
+    enum {TEXTURES, MESHES, MATERIALS, SHADERS, ENTITIES};
+
     static void setTexture(const std::string &textureName, Texture* myTexture);
 	static void setMesh(const std::string &meshName, Mesh* myMesh);
     static void setMaterial(const std::string &materialName, Material* myMaterial);
diff --git a/skyboxmodule.cpp b/skyboxmodule.cpp
index d017241..340788e 100644
--- a/skyboxmodule.cpp
+++ b/skyboxmodule.cpp
@@ -31,7 +31,7 @@ SkyboxModule::~SkyboxModule()
     glAssert(glDeleteBuffers(1, &vbo));
 }
 
-void SkyboxModule::render(Camera* myCamera)
+void SkyboxModule::renderGL(Camera* myCamera)
 {
     shader->bind();
     glm::mat4 mvp = myCamera->getProjectionMatrix() * glm::mat4(glm::mat3(myCamera->getViewMatrix()));
diff --git a/skyboxmodule.h b/skyboxmodule.h
index 1f2dacf..7868434 100644
--- a/skyboxmodule.h
+++ b/skyboxmodule.h
@@ -22,7 +22,7 @@ class SkyboxModule : public Module
 public:
     SkyboxModule(Texture* myCubeMap);
     ~SkyboxModule();
-    virtual void render(Camera* myCamera);
+    virtual void renderGL(Camera* myCamera);
 };
 
 #endif // SKYBOXMODULE_H
diff --git a/sparrowrenderer.cpp b/sparrowrenderer.cpp
index 8d5938a..9de6874 100644
--- a/sparrowrenderer.cpp
+++ b/sparrowrenderer.cpp
@@ -30,7 +30,7 @@ void SparrowRenderer::initGL(int width, int height)
     glAssert(glEnable(GL_DEPTH_TEST));
     glAssert(glEnable(GL_CULL_FACE));
     glAssert(glEnable(GL_TEXTURE_2D));
-    resize(width, height);
+    resizeGL(width, height);
 }
 
 void SparrowRenderer::destroyGL()
@@ -38,20 +38,20 @@ void SparrowRenderer::destroyGL()
 
 }
 
-void SparrowRenderer::resize(int width, int height)
+void SparrowRenderer::resizeGL(int width, int height)
 {
     glAssert(glViewport(0, 0, width, height));
     camera.resize(width, height);
 }
 
-void SparrowRenderer::render()
+void SparrowRenderer::renderGL()
 {
     glAssert(glClearColor(0.60, 0.65, 0.75, 1.0));
     glAssert(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
     for(ModuleNode &m : modules)
     {
         if(m.isEnabled)
-            m.module->render(getCamera());
+            m.module->renderGL(getCamera());
     }
 }
 
diff --git a/sparrowrenderer.h b/sparrowrenderer.h
index bc19f60..7c527c6 100644
--- a/sparrowrenderer.h
+++ b/sparrowrenderer.h
@@ -13,8 +13,8 @@ public:
     // main methods
     void initGL(int width, int height);
     void destroyGL();
-    void resize(int width, int height);
-    void render();
+	void resizeGL(int width, int height);
+	void renderGL();
 
     // modules methods
 	void addModule(Module* myModule, std::string name);