From 9a7b2a27620a2793edb308edf07ff9bdef8bafdf Mon Sep 17 00:00:00 2001 From: luboslenco Date: Wed, 25 May 2022 17:59:22 +0200 Subject: [PATCH] Update fill layers on resize --- Sources/arm/Layers.hx | 25 +++++++++++++++++++++++++ Sources/arm/ui/BoxExport.hx | 10 +--------- Sources/arm/ui/TabLayers.hx | 10 +--------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/Sources/arm/Layers.hx b/Sources/arm/Layers.hx index bc025ecc..9e9b9b69 100644 --- a/Sources/arm/Layers.hx +++ b/Sources/arm/Layers.hx @@ -977,4 +977,29 @@ class Layers { iron.App.notifyOnInit(_init); } + public static function onLayersResized() { + iron.App.notifyOnInit(function() { + Layers.resizeLayers(); + var _layer = Context.layer; + var _material = Context.material; + for (l in arm.Project.layers) { + if (l.fill_layer != null) { + Context.layer = l; + Context.material = l.fill_layer; + Layers.updateFillLayer(); + } + } + Context.layer = _layer; + Context.material = _material; + MakeMaterial.parsePaintMaterial(); + }); + UVUtil.uvmap = null; + UVUtil.uvmapCached = false; + UVUtil.trianglemap = null; + UVUtil.trianglemapCached = false; + UVUtil.dilatemapCached = false; + #if (kha_direct3d12 || kha_vulkan) + arm.render.RenderPathRaytrace.ready = false; + #end + } } diff --git a/Sources/arm/ui/BoxExport.hx b/Sources/arm/ui/BoxExport.hx index 440569a5..7bd9a3eb 100644 --- a/Sources/arm/ui/BoxExport.hx +++ b/Sources/arm/ui/BoxExport.hx @@ -70,15 +70,7 @@ class BoxExport { ui.combo(App.resHandle, ["128", "256", "512", "1K", "2K", "4K", "8K", "16K"], tr("Resolution"), true); #end if (App.resHandle.changed) { - iron.App.notifyOnInit(Layers.resizeLayers); - UVUtil.uvmap = null; - UVUtil.uvmapCached = false; - UVUtil.trianglemap = null; - UVUtil.trianglemapCached = false; - UVUtil.dilatemapCached = false; - #if (kha_direct3d12 || kha_vulkan) - arm.render.RenderPathRaytrace.ready = false; - #end + Layers.onLayersResized(); } #if (krom_android || krom_ios) ui.combo(App.bitsHandle, ["8bit"], tr("Color"), true); diff --git a/Sources/arm/ui/TabLayers.hx b/Sources/arm/ui/TabLayers.hx index 0f881bc6..b54dcc09 100644 --- a/Sources/arm/ui/TabLayers.hx +++ b/Sources/arm/ui/TabLayers.hx @@ -665,15 +665,7 @@ class TabLayers { UIMenu.keepOpen = true; } if (resHandleChangedLast && !App.resHandle.changed) { - iron.App.notifyOnInit(Layers.resizeLayers); - UVUtil.uvmap = null; - UVUtil.uvmapCached = false; - UVUtil.trianglemap = null; - UVUtil.trianglemapCached = false; - UVUtil.dilatemapCached = false; - #if (kha_direct3d12 || kha_vulkan) - arm.render.RenderPathRaytrace.ready = false; - #end + Layers.onLayersResized(); } ui.text(tr("Res"));