From 9f7f1ae072f41f991d3d7e6ec2a73790a56ad6d1 Mon Sep 17 00:00:00 2001 From: Ziemas Date: Mon, 29 Jun 2020 06:30:27 +0200 Subject: [PATCH] Actually use renderpass2 (#485) --- d2core/d2map/d2maprenderer/renderer.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/d2core/d2map/d2maprenderer/renderer.go b/d2core/d2map/d2maprenderer/renderer.go index 857bc889..837f0cee 100644 --- a/d2core/d2map/d2maprenderer/renderer.go +++ b/d2core/d2map/d2maprenderer/renderer.go @@ -68,6 +68,7 @@ func (mr *MapRenderer) Render(target d2render.Surface) { endY := int(math.Min(float64(mapSize.Height), math.Ceil(etyf))) mr.renderPass1(target, startX, startY, endX, endY) + mr.renderPass2(target, startX, startY, endX, endY) if mr.debugVisLevel > 0 { mr.renderDebug(mr.debugVisLevel, target, startX, startY, endX, endY) } @@ -116,10 +117,10 @@ func (mr *MapRenderer) renderPass2(target d2render.Surface, startX, startY, endX // TODO: Do not loop over every entity every frame for _, mapEntity := range *mr.mapEngine.Entities() { entityX, entityY := mapEntity.GetPosition() - if (int(entityX) != tileX) || (int(entityY) != tileY) { + if mapEntity.GetLayer() != 1 { continue } - if mapEntity.GetLayer() != 1 { + if (int(entityX) != tileX) || (int(entityY) != tileY) { continue } target.PushTranslation(mr.viewport.GetTranslationScreen()) @@ -142,10 +143,10 @@ func (mr *MapRenderer) renderPass3(target d2render.Surface, startX, startY, endX // TODO: Do not loop over every entity every frame for _, mapEntity := range *mr.mapEngine.Entities() { entityX, entityY := mapEntity.GetPosition() - if (int(entityX) != tileX) || (int(entityY) != tileY) { + if mapEntity.GetLayer() == 1 { continue } - if mapEntity.GetLayer() == 1 { + if (int(entityX) != tileX) || (int(entityY) != tileY) { continue } target.PushTranslation(mr.viewport.GetTranslationScreen())