From 5c6b31c024b60ae9c43dc48c04128de99d147f5a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 30 Apr 2015 11:34:24 -0300 Subject: [PATCH] -fixed broken lighting in release version of godot for isometric light demo, fixes #1697 --- demos/2d/isometric_light/character_shder.res | Bin 1150 -> 1152 bytes demos/2d/isometric_light/cubio.scn | Bin 6927 -> 7003 bytes demos/2d/isometric_light/floor_shader.res | Bin 1026 -> 1027 bytes demos/2d/isometric_light/map.scn | Bin 8535 -> 8634 bytes demos/2d/isometric_light/tileset.res | Bin 2775 -> 2781 bytes demos/2d/isometric_light/wall_shader.res | Bin 1684 -> 1687 bytes drivers/gles2/rasterizer_gles2.cpp | 2 ++ servers/visual/visual_server_raster.cpp | 4 ++++ 8 files changed, 6 insertions(+) diff --git a/demos/2d/isometric_light/character_shder.res b/demos/2d/isometric_light/character_shder.res index ca221f766c888d64be77bcdff6b23ba5764a4ab9..17cd9ad2870f58dfd89fba63dea4ae84a011e1eb 100644 GIT binary patch delta 243 zcmeyz(ZH!16zuHG00IIG3=V7z3>hp842%p64U7zo3TzI{4h#&!3M>(>>Ice z1X(ik(&KX-tQiC!Fo<)+7bF%X=ISTsH*8>FQjlQaQefuF$xlwqvC`K!U{F}_j6q64 zRG~{jm@zp+!H6MQ;VDymafU)RgPwvY6T@3p1vv!;Tbr5!7a5?B&A_b`QjlQaQefuF$xlwqvC`K!V31kxj6q64RH02l zm@zp+!H6MQ;UQCeafU)VgPwvY6T?eZ1vv!DFL1XZRdFfgzvupZ!cImjTQz%R_e&|v>UH_YC1 PuAx1M9TXho4Du2HlGii# diff --git a/demos/2d/isometric_light/cubio.scn b/demos/2d/isometric_light/cubio.scn index c8ab7ddd4e88e71f130b6c318af9db4bcabb7914..c52b7dfd4beb689eed157b248d4b1cef37f5c2ac 100644 GIT binary patch delta 4070 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 diff --git a/demos/2d/isometric_light/floor_shader.res b/demos/2d/isometric_light/floor_shader.res index 446c71d2271b49c6a0eabdd4f8b7f0fb6f1aeeb2..c078d27b97a505cc63578d43e62931860dfd6cbd 100644 GIT binary patch delta 235 zcmZqTXy#B23U+p800998hMTMm46m6P7#JBC8W$qNKDal|fX2TcLj9GG!B2 z2Wtfe25|-E1x746`T0fh4Rs893PMZ_xvUD(3JeT_3d|1~4H$wGHYQX#I59{m$T<9( z`0uhpA)~(j1BM^06^06#c?ya1ITVTuiZV-56_OSEm6(+lZ2rvnicvkng~frHK|<-j hQg{Lb1B(KygRldGi;RP`i|-SeGt5E3LCzo_0sy4AJXQbz delta 234 zcmZqXXyQ-~3U+p800998hO4X$46m3O7#JBC8Wj7>T83$<>-zPF>n1h0YoIxH0099{1+W-In diff --git a/demos/2d/isometric_light/map.scn b/demos/2d/isometric_light/map.scn index c939a4b392c02a53e4e3d5620ab3a021b7843f98..c1d11f8e4cd7892fd658cc3f309dfbd7210bbbcd 100644 GIT binary patch delta 4252 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 diff --git a/demos/2d/isometric_light/tileset.res b/demos/2d/isometric_light/tileset.res index 633bdada38f8c92a840901467a28c63507cb4d9c..dab6f36f577358d773f4c32fa648526db40c2bd3 100644 GIT binary patch delta 184 zcmcaEdRJ64DA?JV0R#jX7<6SA7(!VY7;;z{7#JBC8Ws=6Q0B4;V_c jR%u>LVq%!}fJv6Yf8~CLfG&SVBbTHwuP2+6SW4Ld05>!a delta 178 zcmcaBdRO;mB{Lub-Bfoa&sPlV7A)ke8k?o69*duPm|Hvm`aw_xKqGaRs{tdMr8l`9<*x zq3XvO^b~|1@EbCSJzy|oEKk(ve!ynnFoz{4KRGc+p<(hG=6MQ=7ZfKllxVHeyqI{8 eVb%jCSqA@=`xyed{27g0lES=RY|daQWdi`@r!-Um diff --git a/demos/2d/isometric_light/wall_shader.res b/demos/2d/isometric_light/wall_shader.res index 78c8fe57e19891d1db2e3ecde4b4bc0e8561553c..7e33c262010ae938a30746a19fc29d6a193c5db0 100644 GIT binary patch delta 363 zcmbQjJDpcGDA?JV0R#jX7*x0z80y&=7#JBC8WGH0yA4k zYDGzDQEGyQ!VGpRef_k=lkWye^5L94($e7I#obZN$!NJyn znL$cH#!-Hnt@S){e{eVw-^VX2kZt6!U_%yMK2i`UNGEd4hjx( H28A#H1ejdt delta 383 zcmbQvJB3#{DA?JV0R#jX7!&fvJ9gxw@5+jh>Y?!)sM~>)Fw{e$+DH5F)>9wJ&|v6 z8S7yt=T(!f*<>6VUNCaJWGG-@QG4Y6l0ia&-6P$B!9n-{x0+0XGy|go`wQmtF9g=O b#W?spU^ie8R&Zb_ddbPa926Yn3<`As@mFSn diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 585d512abb..feff49c1de 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -9452,6 +9452,7 @@ void RasterizerGLES2::canvas_render_items(CanvasItem *p_item_list,int p_z,const while(light) { + if (ci->light_mask&light->item_mask && p_z>=light->z_min && p_z<=light->z_max && ci->global_rect_cache.intersects_transformed(light->xform_cache,light->rect_cache)) { //intersects this light @@ -9489,6 +9490,7 @@ void RasterizerGLES2::canvas_render_items(CanvasItem *p_item_list,int p_z,const } + bool has_shadow = light->shadow_buffer.is_valid() && ci->light_mask&light->item_shadow_mask; canvas_shader.set_conditional(CanvasShaderGLES2::USE_SHADOWS,has_shadow); diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index 64ddc12513..6556f8bc42 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -7047,17 +7047,20 @@ void VisualServerRaster::_draw_viewport(Viewport *p_viewport,int p_ofs_x, int p_ for(Set::Element *F=E->get().canvas->lights.front();F;F=F->next()) { + Rasterizer::CanvasLight* cl=F->get(); if (cl->enabled && cl->texture.is_valid()) { //not super efficient.. Size2 tsize(rasterizer->texture_get_width(cl->texture),rasterizer->texture_get_height(cl->texture)); tsize*=cl->scale; + Vector2 offset=tsize/2.0; cl->rect_cache=Rect2(-offset+cl->texture_offset,tsize); cl->xform_cache=xf * cl->xform; if (clip_rect.intersects_transformed(cl->xform_cache,cl->rect_cache)) { + cl->filter_next_ptr=lights; lights=cl; cl->texture_cache=NULL; @@ -7067,6 +7070,7 @@ void VisualServerRaster::_draw_viewport(Viewport *p_viewport,int p_ofs_x, int p_ cl->light_shader_xform = (cl->xform_cache * scale).affine_inverse(); cl->light_shader_pos=cl->xform_cache[2]; if (cl->shadow_buffer.is_valid()) { + cl->shadows_next_ptr=lights_with_shadow; if (lights_with_shadow==NULL) { shadow_rect = cl->xform_cache.xform(cl->rect_cache);