From 144daa8c3c7db368f9ec1471d47d1b939b35bac6 Mon Sep 17 00:00:00 2001
From: Anselme <anselme16@hotmail.fr>
Date: Wed, 9 Dec 2015 17:29:53 +0100
Subject: [PATCH] converted shaders to glsl extension

---
 CMakeLists.txt                    | 2 +-
 forward.frag => forward.frag.glsl | 5 ++---
 forward.vert => forward.vert.glsl | 0
 gbuffer.frag => gbuffer.frag.glsl | 0
 gbuffer.vert => gbuffer.vert.glsl | 0
 sparrowrenderer.cpp               | 2 ++
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename forward.frag => forward.frag.glsl (95%)
 rename forward.vert => forward.vert.glsl (100%)
 rename gbuffer.frag => gbuffer.frag.glsl (100%)
 rename gbuffer.vert => gbuffer.vert.glsl (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce62805..978f80b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ if(CMAKE_BUILD_TYPE MATCHES "Debug")
         set(CPP_DEFINES -DRENDER_DEBUG)
 endif()
 
-file(GLOB LIBRARY_RES_FILES *.h *.frag *.vert)
+file(GLOB LIBRARY_RES_FILES *.h *.glsl)
 
 add_library(${LIBRARY_NAME} STATIC ${LIB_SRC_LIST} ${LIBRARY_RES_FILES})
 add_definitions(-std=c++11 ${CPP_DEFINES})
diff --git a/forward.frag b/forward.frag.glsl
similarity index 95%
rename from forward.frag
rename to forward.frag.glsl
index 1260f5d..14f3149 100644
--- a/forward.frag
+++ b/forward.frag.glsl
@@ -49,7 +49,6 @@ vec3 phongLighting(in vec3 kd, in vec3 ks, in float ns, in vec3 color, in vec3 n
 }
 
 void main(void) {
-#ifdef
 #ifdef ALPHA_MASK
     if(texture(alphaMask, varTexCoord).r < 0.5)
         discard;
@@ -80,9 +79,9 @@ void main(void) {
 #endif
 
 #ifdef AMBIENT_LIGHT
-	outColor = vec4(lightColor*ambient, 1);
+        outColor = vec4(diffuse, 1);
 #else
 	vec3 light = phongLighting(diffuse, specular, materialNs, lightColor, normal, lightDirInView, halfVecInView);
-	outColor = vec4(light, 1);
+        outColor = vec4(light, 1);
 #endif
 }
diff --git a/forward.vert b/forward.vert.glsl
similarity index 100%
rename from forward.vert
rename to forward.vert.glsl
diff --git a/gbuffer.frag b/gbuffer.frag.glsl
similarity index 100%
rename from gbuffer.frag
rename to gbuffer.frag.glsl
diff --git a/gbuffer.vert b/gbuffer.vert.glsl
similarity index 100%
rename from gbuffer.vert
rename to gbuffer.vert.glsl
diff --git a/sparrowrenderer.cpp b/sparrowrenderer.cpp
index 5bbc856..7e8eb20 100644
--- a/sparrowrenderer.cpp
+++ b/sparrowrenderer.cpp
@@ -36,6 +36,8 @@ void SparrowRenderer::initGL(int width, int height, bool forceCrappy)
 
     std::cout << "OpenGL version " << glGetString(GL_VERSION) << std::endl;
     std::cout << "GLSL version " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl;
+    std::cout << "gl renderer " << glGetString(GL_RENDERER) << std::endl;
+    std::cout << "gl vendor " << glGetString(GL_VENDOR) << std::endl;
 
     glAssert(glEnable(GL_DEPTH_TEST));
     glAssert(glEnable(GL_CULL_FACE));