EpicSparrow/SparrowRenderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

converted shaders to glsl extension

Browse Source
This commit is contained in:
Anselme 2015-12-09 17:29:53 +01:00
parent 97032c2fe6
commit 144daa8c3c
6 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -42,7 +42,7 @@ if(CMAKE_BUILD_TYPE MATCHES "Debug")
set(CPP_DEFINES -DRENDER_DEBUG) set(CPP_DEFINES -DRENDER_DEBUG)
endif() 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_library(${LIBRARY_NAME} STATIC ${LIB_SRC_LIST} ${LIBRARY_RES_FILES})
add_definitions(-std=c++11 ${CPP_DEFINES}) add_definitions(-std=c++11 ${CPP_DEFINES})

5
forward.frag → forward.frag.glsl
View File

@ -49,7 +49,6 @@ vec3 phongLighting(in vec3 kd, in vec3 ks, in float ns, in vec3 color, in vec3 n
} }
void main(void) { void main(void) {
#ifdef
#ifdef ALPHA_MASK #ifdef ALPHA_MASK
if(texture(alphaMask, varTexCoord).r < 0.5) if(texture(alphaMask, varTexCoord).r < 0.5)
discard; discard;
@ -80,9 +79,9 @@ void main(void) {
#endif #endif
#ifdef AMBIENT_LIGHT #ifdef AMBIENT_LIGHT
outColor = vec4(lightColor*ambient, 1); outColor = vec4(diffuse, 1);
#else #else
vec3 light = phongLighting(diffuse, specular, materialNs, lightColor, normal, lightDirInView, halfVecInView); vec3 light = phongLighting(diffuse, specular, materialNs, lightColor, normal, lightDirInView, halfVecInView);
outColor = vec4(light, 1); outColor = vec4(light, 1);
#endif #endif
} }

0
forward.vert → forward.vert.glsl
View File

0
gbuffer.frag → gbuffer.frag.glsl
View File

0
gbuffer.vert → gbuffer.vert.glsl
View File

2
sparrowrenderer.cpp
View File

@ -36,6 +36,8 @@ void SparrowRenderer::initGL(int width, int height, bool forceCrappy)
std::cout << "OpenGL version " << glGetString(GL_VERSION) << std::endl; std::cout << "OpenGL version " << glGetString(GL_VERSION) << std::endl;
std::cout << "GLSL version " << glGetString(GL_SHADING_LANGUAGE_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_DEPTH_TEST));
glAssert(glEnable(GL_CULL_FACE)); glAssert(glEnable(GL_CULL_FACE));