Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

Commit [26b340] Maximize Restore History

Disabled normalmapping of animated characters due to excessive complications.

Ari Mustonen Ari Mustonen 2013-06-09

changed data
changed data/lipsofsuna
changed data/lipsofsuna/character
changed data/lipsofsuna/character/celshading
changed data/lipsofsuna/character/celshading/animskin1.material
copied data/lipsofsuna/character/celshading/diffnormskin1.frag -> data/lipsofsuna/character/celshading/diffskin1.frag
copied data/lipsofsuna/character/celshading/diffnormskin1.program -> data/lipsofsuna/character/celshading/diffskin1.program
data
Directory.
data/lipsofsuna
Directory.
data/lipsofsuna/character/celshading/animskin1.material Diff Switch to side-by-side view
Loading...
data/lipsofsuna/character/celshading/diffnormskin1.frag to data/lipsofsuna/character/celshading/diffskin1.frag
--- a/data/lipsofsuna/character/celshading/diffnormskin1.frag
+++ b/data/lipsofsuna/character/celshading/diffskin1.frag
@@ -20,14 +20,12 @@
 varying vec3 F_eyev;
 varying vec3 F_lightv[LIGHTS];
 
-vec3 los_normal_mapping(in vec3 normal, in vec3 tangent, in vec4 sample);
 vec3 los_blinn_phong(in vec3 lv, in vec3 ev, in vec3 ld, in vec4 eq, in vec3 normal, in float shininess);
 vec3 los_cel_shading_skin(in vec4 material, in vec4 diff, in vec4 spec, in vec4 p, in sampler1D t1, in sampler1D t2);
 
 void main()
 {
-	vec4 normalmap = texture2D(LOS_diffuse_texture_1, F_texcoord);
-	vec3 normal = los_normal_mapping(F_normal, F_tangent, normalmap);
+	vec3 normal = normalize(F_normal);
 	vec4 diffuse = texture2D(LOS_diffuse_texture_0, F_texcoord);
 	vec4 diff = LOS_scene_ambient;
 	vec4 spec = vec4(0.0);
data/lipsofsuna/character/celshading/diffnormskin1.program to data/lipsofsuna/character/celshading/diffskin1.program
--- a/data/lipsofsuna/character/celshading/diffnormskin1.program
+++ b/data/lipsofsuna/character/celshading/diffskin1.program
@@ -1,6 +1,6 @@
-fragment_program diffnormskin1_frag glsl
+fragment_program diffskin1_frag glsl
 {
-	source diffnormskin1.frag
+	source diffskin1.frag
 	attach los_blinn_phong los_cel_shading_skin los_normal_mapping
 	preprocessor_defines LIGHTS=3
 	default_params