faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'master' of https://github.com/Faerbit/swp

Browse Source
This commit is contained in:
Jasper 2014-11-17 16:29:10 +01:00
commit d4e38b7a41
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shader/phong.fsh
View File

@ -38,6 +38,6 @@ void main()
} }
vec3 finalColor = specularColor + diffuseColor + ambientColor; vec3 finalColor = specularColor + diffuseColor + ambientColor;
vec3 texture = texture(uTexture, vTexCoord).rgb; vec4 texture = texture(uTexture, vTexCoord).rgba;
oColor = vec4(finalColor*texture, 1.0 ); oColor = vec4(finalColor, 1.0f)*texture;
} }

2
main.cc
View File

@ -112,6 +112,8 @@ int main( int argc, char *argv[] )
// //
glClearColor( 0.0, 0.0, 0.0, 1.0 ); glClearColor( 0.0, 0.0, 0.0, 1.0 );
glEnable( GL_DEPTH_TEST ); glEnable( GL_DEPTH_TEST );
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
app.init(); app.init();
int frameCount = 0; int frameCount = 0;