Revision: 42280
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42280
Author: moguri
Date: 2011-11-30 01:03:30 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Adding support for light cookies. This features uses lamp textures (all slots
supported) to alter the shadow buffer.
Modified Paths:
--------------
branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl
branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl.c
Modified: branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
===================================================================
--- branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
2011-11-30 00:43:33 UTC (rev 42279)
+++ branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
2011-11-30 01:03:30 UTC (rev 42280)
@@ -620,6 +620,7 @@
GPUNodeLink *lv, *dist, *visifac, *is, *inp, *i, *vn, *view;
GPUNodeLink *outcol, *specfac, *t, *shadcol, *shadfac= NULL;
float one = 1.0f;
+ int j;
if((lamp->mode & LA_ONLYSHADOW) && !(ma->mode & MA_SHADOW))
return;
@@ -680,12 +681,25 @@
if((ma->mode & MA_SHADOW) && GPU_lamp_has_shadow_buffer(lamp)) {
if(!(mat->scene->gm.flag & GAME_GLSL_NO_SHADOWS)) {
mat->dynproperty |= DYN_LAMP_PERSMAT;
-
+
GPU_link(mat, "test_shadowbuf",
GPU_builtin(GPU_VIEW_POSITION),
GPU_dynamic_texture(lamp->tex,
GPU_DYNAMIC_SAMPLER_2DSHADOW, lamp->ob),
GPU_dynamic_uniform((float*)lamp->dynpersmat,
GPU_DYNAMIC_LAMP_DYNPERSMAT, lamp->ob),
GPU_uniform(&lamp->bias), inp, &shadfac);
+
+ for (j=0; j<MAX_MTEX; ++j) {
+ if (lamp->la->mtex[j]
+ && lamp->la->mtex[j]->tex->type &
TEX_IMAGE
+ && lamp->la->mtex[j]->tex->ima) {
+ GPUTexture* cookie =
GPU_texture_from_blender(lamp->la->mtex[j]->tex->ima,
&lamp->la->mtex[j]->tex->iuser, 1.0, 0);
+ GPU_link(mat, "test_shadowbuf_cookie",
+ GPU_builtin(GPU_VIEW_POSITION),
+ GPU_dynamic_texture(cookie,
GPU_DYNAMIC_SAMPLER_2DSHADOW, lamp->ob),
+
GPU_dynamic_uniform((float*)lamp->dynpersmat, GPU_DYNAMIC_LAMP_DYNPERSMAT,
lamp->ob),
+ shadfac, &shadfac);
+ }
+ }
if(lamp->mode & LA_ONLYSHADOW) {
GPU_link(mat, "shade_only_shadow", i, shadfac,
@@ -703,6 +717,8 @@
add_user_list(&lamp->materials,
shi->gpumat->ma);
return;
}
+
+ //GPU_link(mat, "math_multiply", i, shadfac, &i);
}
}
else if((mat->scene->gm.flag & GAME_GLSL_NO_SHADOWS) && (lamp->mode &
LA_ONLYSHADOW)) {
@@ -717,7 +733,8 @@
if(!(lamp->mode & LA_NO_DIFF)) {
GPUNodeLink *rgb;
GPU_link(mat, "shade_mul_value", i,
GPU_dynamic_uniform(lamp->dyncol, GPU_DYNAMIC_LAMP_DYNCOL, lamp->ob), &rgb);
- GPU_link(mat, "shade_shadow_color", rgb, shadfac,
GPU_uniform(lamp->shadow_color), &rgb);
+ GPU_link(mat, "mtex_value_invert", shadfac, &shadfac);
+ GPU_link(mat, "mix_mult", shadfac, rgb,
GPU_uniform(lamp->shadow_color), &rgb);
add_to_diffuse(mat, ma, shi, is, rgb, &shr->diff);
}
}
Modified: branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl
===================================================================
--- branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl
2011-11-30 00:43:33 UTC (rev 42279)
+++ branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl
2011-11-30 01:03:30 UTC (rev 42280)
@@ -1754,7 +1754,7 @@
if (shadfac >= 1.0)
outcol = col;
else
- outcol = vec4(col.rgb*((1.0-shadfac)*shadowcol.rgb), col.a);
+ outcol =
col*shadfac;//vec4(col.rgb*((1.0-shadfac)*shadowcol.rgb), col.a);
}
void shade_obcolor(vec4 col, vec4 obcol, out vec4 outcol)
{
@@ -1796,6 +1796,18 @@
}
}
+void test_shadowbuf_cookie(vec3 rco, sampler2DShadow cookie, mat4
shadowpersmat, float inp, out float result)
+{
+ if(inp <= 0.0) {
+ result = 0.0;
+ }
+ else {
+ vec4 co = shadowpersmat*vec4(rco, 1.0);
+
+ result = inp*shadow2DProj(cookie, co).x;
+ }
+}
+
void shade_exposure_correct(vec3 col, float linfac, float logfac, out vec3
outcol)
{
outcol = linfac*(1.0 - exp(col*logfac));
Modified:
branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl.c
===================================================================
--- branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl.c
2011-11-30 00:43:33 UTC (rev 42279)
+++ branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl.c
2011-11-30 01:03:30 UTC (rev 42280)
@@ -1,1300 +1,1309 @@
/* DataToC output of file <gpu_shader_material_glsl> */
-int datatoc_gpu_shader_material_glsl_size= 49211;
+int datatoc_gpu_shader_material_glsl_size= 49486;
char datatoc_gpu_shader_material_glsl[]= {
- 13, 10,102,108,111, 97,116, 32,101,120,112, 95, 98,108,101,110,100,101,114,
40,102,108,111, 97,116, 32,102,
- 41, 13, 10,123, 13, 10, 9,114,101,116,117,114,110, 32,112,111,119, 40, 50,
46, 55, 49, 56, 50, 56, 49, 56, 50, 56, 52, 54, 44,
- 32,102, 41, 59, 13, 10,125, 13, 10, 13, 10,118,111,105,100, 32,114,103, 98,
95,116,111, 95,104,115,118, 40,118,101, 99, 52, 32,
-114,103, 98, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116,
99,111,108, 41, 13, 10,123, 13, 10, 9,102,108,111, 97,116,
- 32, 99,109, 97,120, 44, 32, 99,109,105,110, 44, 32,104, 44, 32,115, 44,
32,118, 44, 32, 99,100,101,108,116, 97, 59, 13, 10, 9,
-118,101, 99, 51, 32, 99, 59, 13, 10, 13, 10, 9, 99,109, 97,120, 32, 61,
32,109, 97,120, 40,114,103, 98, 91, 48, 93, 44, 32,109,
- 97,120, 40,114,103, 98, 91, 49, 93, 44, 32,114,103, 98, 91, 50, 93, 41, 41,
59, 13, 10, 9, 99,109,105,110, 32, 61, 32,109,105,
-110, 40,114,103, 98, 91, 48, 93, 44, 32,109,105,110, 40,114,103, 98, 91, 49,
93, 44, 32,114,103, 98, 91, 50, 93, 41, 41, 59, 13,
- 10, 9, 99,100,101,108,116, 97, 32, 61, 32, 99,109, 97,120, 45,
99,109,105,110, 59, 13, 10, 13, 10, 9,118, 32, 61, 32, 99,109,
- 97,120, 59, 13, 10, 9,105,102, 32, 40, 99,109, 97,120, 33, 61, 48, 46, 48,
41, 13, 10, 9, 9,115, 32, 61, 32, 99,100,101,108,
-116, 97, 47, 99,109, 97,120, 59, 13, 10, 9,101,108,115,101, 32,123, 13, 10,
9, 9,115, 32, 61, 32, 48, 46, 48, 59, 13, 10, 9,
- 9,104, 32, 61, 32, 48, 46, 48, 59, 13, 10, 9,125, 13, 10, 13, 10,
9,105,102, 32, 40,115, 32, 61, 61, 32, 48, 46, 48, 41, 32,
-123, 13, 10, 9, 9,104, 32, 61, 32, 48, 46, 48, 59, 13, 10, 9,125, 13, 10,
9,101,108,115,101, 32,123, 13, 10, 9, 9, 99, 32,
- 61, 32, 40,118,101, 99, 51, 40, 99,109, 97,120, 44, 32, 99,109, 97,120, 44,
32, 99,109, 97,120, 41, 32, 45, 32,114,103, 98, 46,
-120,121,122, 41, 47, 99,100,101,108,116, 97, 59, 13, 10, 13, 10, 9,
9,105,102, 32, 40,114,103, 98, 46,120, 61, 61, 99,109, 97,
-120, 41, 32,104, 32, 61, 32, 99, 91, 50, 93, 32, 45, 32, 99, 91, 49, 93, 59,
13, 10, 9, 9,101,108,115,101, 32,105,102, 32, 40,
-114,103, 98, 46,121, 61, 61, 99,109, 97,120, 41, 32,104, 32, 61, 32, 50, 46,
48, 32, 43, 32, 99, 91, 48, 93, 32, 45, 32, 32, 99,
- 91, 50, 93, 59, 13, 10, 9, 9,101,108,115,101, 32,104, 32, 61, 32, 52, 46,
48, 32, 43, 32, 99, 91, 49, 93, 32, 45, 32, 99, 91,
- 48, 93, 59, 13, 10, 13, 10, 9, 9,104, 32, 47, 61, 32, 54, 46, 48, 59, 13,
10, 13, 10, 9, 9,105,102, 32, 40,104, 60, 48, 46,
- 48, 41, 13, 10, 9, 9, 9,104, 32, 43, 61, 32, 49, 46, 48, 59, 13, 10,
9,125, 13, 10, 13, 10, 9,111,117,116, 99,111,108, 32,
- 61, 32,118,101, 99, 52, 40,104, 44, 32,115, 44, 32,118, 44, 32,114,103, 98,
46,119, 41, 59, 13, 10,125, 13, 10, 13, 10,118,111,
-105,100, 32,104,115,118, 95,116,111, 95,114,103, 98, 40,118,101, 99, 52,
32,104,115,118, 44, 32,111,117,116, 32,118,101, 99, 52,
- 32,111,117,116, 99,111,108, 41, 13, 10,123, 13, 10, 9,102,108,111, 97,116,
32,105, 44, 32,102, 44, 32,112, 44, 32,113, 44, 32,
-116, 44, 32,104, 44, 32,115, 44, 32,118, 59, 13, 10, 9,118,101, 99, 51,
32,114,103, 98, 59, 13, 10, 13, 10, 9,104, 32, 61, 32,
-104,115,118, 91, 48, 93, 59, 13, 10, 9,115, 32, 61, 32,104,115,118, 91, 49,
93, 59, 13, 10, 9,118, 32, 61, 32,104,115,118, 91,
- 50, 93, 59, 13, 10, 13, 10, 9,105,102, 40,115, 61, 61, 48, 46, 48, 41,
32,123, 13, 10, 9, 9,114,103, 98, 32, 61, 32,118,101,
- 99, 51, 40,118, 44, 32,118, 44, 32,118, 41, 59, 13, 10, 9,125, 13, 10,
9,101,108,115,101, 32,123, 13, 10, 9, 9,105,102, 40,
-104, 61, 61, 49, 46, 48, 41, 13, 10, 9, 9, 9,104, 32, 61, 32, 48, 46, 48,
59, 13, 10, 9, 9, 13, 10, 9, 9,104, 32, 42, 61,
- 32, 54, 46, 48, 59, 13, 10, 9, 9,105, 32, 61, 32,102,108,111,111,114,
40,104, 41, 59, 13, 10, 9, 9,102, 32, 61, 32,104, 32,
- 45, 32,105, 59, 13, 10, 9, 9,114,103, 98, 32, 61, 32,118,101, 99, 51,
40,102, 44, 32,102, 44, 32,102, 41, 59, 13, 10, 9, 9,
-112, 32, 61, 32,118, 42, 40, 49, 46, 48, 45,115, 41, 59, 13, 10, 9, 9,113,
32, 61, 32,118, 42, 40, 49, 46, 48, 45, 40,115, 42,
-102, 41, 41, 59, 13, 10, 9, 9,116, 32, 61, 32,118, 42, 40, 49, 46, 48, 45,
40,115, 42, 40, 49, 46, 48, 45,102, 41, 41, 41, 59,
- 13, 10, 9, 9, 13, 10, 9, 9,105,102, 32, 40,105, 32, 61, 61, 32, 48, 46,
48, 41, 32,114,103, 98, 32, 61, 32,118,101, 99, 51,
- 40,118, 44, 32,116, 44, 32,112, 41, 59, 13, 10, 9, 9,101,108,115,101,
32,105,102, 32, 40,105, 32, 61, 61, 32, 49, 46, 48, 41,
- 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,113, 44, 32,118, 44, 32,112,
41, 59, 13, 10, 9, 9,101,108,115,101, 32,105,102,
- 32, 40,105, 32, 61, 61, 32, 50, 46, 48, 41, 32,114,103, 98, 32, 61,
32,118,101, 99, 51, 40,112, 44, 32,118, 44, 32,116, 41, 59,
- 13, 10, 9, 9,101,108,115,101, 32,105,102, 32, 40,105, 32, 61, 61, 32, 51,
46, 48, 41, 32,114,103, 98, 32, 61, 32,118,101, 99,
- 51, 40,112, 44, 32,113, 44, 32,118, 41, 59, 13, 10, 9, 9,101,108,115,101,
32,105,102, 32, 40,105, 32, 61, 61, 32, 52, 46, 48,
- 41, 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,116, 44, 32,112, 44,
32,118, 41, 59, 13, 10, 9, 9,101,108,115,101, 32,114,
-103, 98, 32, 61, 32,118,101, 99, 51, 40,118, 44, 32,112, 44, 32,113, 41, 59,
13, 10, 9,125, 13, 10, 13, 10, 9,111,117,116, 99,
-111,108, 32, 61, 32,118,101, 99, 52, 40,114,103, 98, 44, 32,104,115,118,
46,119, 41, 59, 13, 10,125, 13, 10, 13, 10,102,108,111,
- 97,116, 32,115,114,103, 98, 95,116,111, 95,108,105,110,101, 97,114,114,103,
98, 40,102,108,111, 97,116, 32, 99, 41, 13, 10,123,
- 13, 10, 9,105,102, 40, 99, 32, 60, 32, 48, 46, 48, 52, 48, 52, 53, 41, 13,
10, 9, 9,114,101,116,117,114,110, 32, 40, 99, 32,
- 60, 32, 48, 46, 48, 41, 63, 32, 48, 46, 48, 58, 32, 99, 32, 42, 32, 40, 49,
46, 48, 47, 49, 50, 46, 57, 50, 41, 59, 13, 10, 9,
-101,108,115,101, 13, 10, 9, 9,114,101,116,117,114,110, 32,112,111,119, 40,
40, 99, 32, 43, 32, 48, 46, 48, 53, 53, 41, 42, 40,
- 49, 46, 48, 47, 49, 46, 48, 53, 53, 41, 44, 32, 50, 46, 52, 41, 59, 13,
10,125, 13, 10, 13, 10,102,108,111, 97,116, 32,108,105,
-110,101, 97,114,114,103, 98, 95,116,111, 95,115,114,103, 98, 40,102,108,111,
97,116, 32, 99, 41, 13, 10,123, 13, 10, 9,105,102,
- 40, 99, 32, 60, 32, 48, 46, 48, 48, 51, 49, 51, 48, 56, 41, 13, 10, 9,
9,114,101,116,117,114,110, 32, 40, 99, 32, 60, 32, 48,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
