From 70fd03b724fb66981af89efc86064700b1ea1511 Mon Sep 17 00:00:00 2001 From: Treeki Date: Mon, 17 Sep 2012 00:03:50 +0200 Subject: should fix path layer overlaps, hopefully? --- src/koopatlas/map.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/koopatlas/map.cpp') diff --git a/src/koopatlas/map.cpp b/src/koopatlas/map.cpp index 65d71b8..7869fde 100644 --- a/src/koopatlas/map.cpp +++ b/src/koopatlas/map.cpp @@ -126,6 +126,14 @@ void dWMMap_c::renderer_c::drawLayers() { renderTileLayer(layer, data->sectors); else if (layer->type == dKPLayer_s::DOODADS) renderDoodadLayer(layer); + + if (layer->type == dKPLayer_s::PATHS) { + // rebase the camera matrix + baseZ = 3500.0f; + nw4r::g3d::Camera cam3d(GetCameraByID(0)); + cam3d.GetCameraMtx(&renderMtx); + MTXTransApply(renderMtx, renderMtx, 0, 0, baseZ); + } } endRendering(); -- cgit v1.2.3 From 1c8b69ac3606dccfe94cab943c925877a5683535 Mon Sep 17 00:00:00 2001 From: Treeki Date: Wed, 19 Sep 2012 03:15:41 +0200 Subject: okay this one REALLY does fix the overlaps --- src/koopatlas/map.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/koopatlas/map.cpp') diff --git a/src/koopatlas/map.cpp b/src/koopatlas/map.cpp index 7869fde..316c001 100644 --- a/src/koopatlas/map.cpp +++ b/src/koopatlas/map.cpp @@ -115,6 +115,14 @@ void dWMMap_c::renderer_c::drawLayers() { dKPLayer_s *layer = data->layers[iLayer]; renderMtx[2][3] += 2.0f; + if (layer->type == dKPLayer_s::PATHS) { + // rebase the camera matrix + baseZ = 3500.0f; + nw4r::g3d::Camera cam3d(GetCameraByID(0)); + cam3d.GetCameraMtx(&renderMtx); + MTXTransApply(renderMtx, renderMtx, 0, 0, baseZ); + } + if (layer->alpha == 0) continue; // invisible @@ -126,14 +134,6 @@ void dWMMap_c::renderer_c::drawLayers() { renderTileLayer(layer, data->sectors); else if (layer->type == dKPLayer_s::DOODADS) renderDoodadLayer(layer); - - if (layer->type == dKPLayer_s::PATHS) { - // rebase the camera matrix - baseZ = 3500.0f; - nw4r::g3d::Camera cam3d(GetCameraByID(0)); - cam3d.GetCameraMtx(&renderMtx); - MTXTransApply(renderMtx, renderMtx, 0, 0, baseZ); - } } endRendering(); -- cgit v1.2.3