WallyHackenslacker/NxtAR-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Added a test model.

Browse Source
This commit is contained in:
Wally Hackenslacker
2014-05-20 20:16:31 -04:30
parent 67c4c99cc5
commit 963b774c0a
4 changed files with 3625 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3542
assets/models/Bomb_test_1.g3dj Normal file
View File

File diff suppressed because it is too large Load Diff

2
assets/shaders/singleDiffuseLight/singleDiffuseLight_frag.glsl
View File

@@ -56,5 +56,5 @@ void main(){
vec4 lightColor = clamp(vec4(u_ambient.rgb + v_diffuse.rgb + specular.rgb, 1.0), 0.0, 1.0);
// Final color.
gl_FragColor = clamp(lightColor * v_color, 0.0, 1.0);
gl_FragColor = clamp(lightColor, 0.0, 1.0);
}

2
assets/shaders/singleDiffuseLight/singleDiffuseLight_vert.glsl
View File

@@ -64,7 +64,7 @@ void main(){
v_color = a_color;
// Diffuse Term.
v_diffuse = u_lightDiffuse * max(dot(a_normal.xyz, v_lightVector), 0.0);
v_diffuse = u_lightDiffuse * vec4(1.0) * max(dot(a_normal.xyz, v_lightVector), 0.0);
gl_Position = u_projTrans * transformedPosition;
}