mirror of
https://github.com/godotengine/godot.git
synced 2024-11-22 12:12:28 +00:00
-fixed broken lighting in release version of godot for isometric light demo, fixes #1697
This commit is contained in:
parent
21939ce08b
commit
5c6b31c024
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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);
|
||||
|
@ -7047,17 +7047,20 @@ void VisualServerRaster::_draw_viewport(Viewport *p_viewport,int p_ofs_x, int p_
|
||||
|
||||
for(Set<Rasterizer::CanvasLight*>::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);
|
||||
|
Loading…
Reference in New Issue
Block a user