From 664fbf58456b4ef1ee0ba7469df4ebaedf1ffa47 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Wed, 15 Feb 2023 17:46:40 +0100 Subject: [PATCH] Cleanup --- armorlab/Sources/Main.hx | 2 +- armorlab/Sources/arm/App.hx | 10 +++++----- armorlab/Sources/arm/ui/UINodes.hx | 2 +- armorlab/Sources/arm/ui/UISidebar.hx | 2 +- ...ense_cycles-nodes.md => license_cycles_nodes.md} | 0 armorpaint/Sources/Main.hx | 2 +- armorpaint/Sources/arm/App.hx | 10 +++++----- armorpaint/Sources/arm/ui/UINodes.hx | 2 +- armorpaint/Sources/arm/ui/UISidebar.hx | 2 +- armorpaint/Sources/arm/ui/UIView2D.hx | 2 +- ..._white_gradient.png => color_wheel_gradient.png} | Bin base/Sources/arm/render/RenderPathRaytrace.hx | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) rename armorpaint/Assets/licenses/{license_cycles-nodes.md => license_cycles_nodes.md} (100%) rename base/Assets/common/{black_white_gradient.png => color_wheel_gradient.png} (100%) diff --git a/armorlab/Sources/Main.hx b/armorlab/Sources/Main.hx index 5d2a6e31..332a7fc9 100644 --- a/armorlab/Sources/Main.hx +++ b/armorlab/Sources/Main.hx @@ -58,7 +58,7 @@ class Main { "World_radiance_8.k", "brdf.k", "color_wheel.k", - "black_white_gradient.k", + "color_wheel_gradient.k", "cursor.k", "icons.k", "icons2x.k", diff --git a/armorlab/Sources/arm/App.hx b/armorlab/Sources/arm/App.hx index 5a247de7..519b32e4 100644 --- a/armorlab/Sources/arm/App.hx +++ b/armorlab/Sources/arm/App.hx @@ -54,7 +54,7 @@ class App { public static var font: Font = null; public static var theme: TTheme; public static var colorWheel: Image; - public static var blackWhiteGradient: Image; + public static var colorWheelGradient: Image; public static var uiBox: Zui; public static var uiMenu: Zui; public static var defaultElementW = 100; @@ -115,7 +115,7 @@ class App { Data.getFont("font.ttf", function(f: Font) { Data.getImage("color_wheel.k", function(imageColorWheel: Image) { - Data.getImage("black_white_gradient.k", function(imageBlackWhiteGradient: Image) { + Data.getImage("color_wheel_gradient.k", function(imageColorWheelGradient: Image) { font = f; Config.loadTheme(Config.raw.theme, false); @@ -152,11 +152,11 @@ class App { } colorWheel = imageColorWheel; - blackWhiteGradient = imageBlackWhiteGradient; + colorWheelGradient = imageColorWheelGradient; Nodes.enumTexts = enumTexts; Nodes.tr = tr; - uiBox = new Zui({ theme: App.theme, font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel, black_white_gradient: blackWhiteGradient }); - uiMenu = new Zui({ theme: App.theme, font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel, black_white_gradient: blackWhiteGradient }); + uiBox = new Zui({ theme: App.theme, font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel, black_white_gradient: colorWheelGradient }); + uiMenu = new Zui({ theme: App.theme, font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel, black_white_gradient: colorWheelGradient }); defaultElementH = uiMenu.t.ELEMENT_H; // Init plugins diff --git a/armorlab/Sources/arm/ui/UINodes.hx b/armorlab/Sources/arm/ui/UINodes.hx index 2c9355fc..d7e545f0 100644 --- a/armorlab/Sources/arm/ui/UINodes.hx +++ b/armorlab/Sources/arm/ui/UINodes.hx @@ -65,7 +65,7 @@ class UINodes { Nodes.onCanvasControl = onCanvasControl; var scale = Config.raw.window_scale; - ui = new Zui({ theme: App.theme, font: App.font, color_wheel: App.colorWheel, black_white_gradient: App.blackWhiteGradient, scaleFactor: scale }); + ui = new Zui({ theme: App.theme, font: App.font, color_wheel: App.colorWheel, black_white_gradient: App.colorWheelGradient, scaleFactor: scale }); ui.scrollEnabled = false; } diff --git a/armorlab/Sources/arm/ui/UISidebar.hx b/armorlab/Sources/arm/ui/UISidebar.hx index a210f8ae..7f2a3887 100644 --- a/armorlab/Sources/arm/ui/UISidebar.hx +++ b/armorlab/Sources/arm/ui/UISidebar.hx @@ -98,7 +98,7 @@ class UISidebar { History.reset(); var scale = Config.raw.window_scale; - ui = new Zui({ theme: App.theme, font: App.font, scaleFactor: scale, color_wheel: App.colorWheel, black_white_gradient: App.blackWhiteGradient }); + ui = new Zui({ theme: App.theme, font: App.font, scaleFactor: scale, color_wheel: App.colorWheel, black_white_gradient: App.colorWheelGradient }); Zui.onBorderHover = onBorderHover; Zui.onTextHover = onTextHover; Zui.onDeselectText = onDeselectText; diff --git a/armorpaint/Assets/licenses/license_cycles-nodes.md b/armorpaint/Assets/licenses/license_cycles_nodes.md similarity index 100% rename from armorpaint/Assets/licenses/license_cycles-nodes.md rename to armorpaint/Assets/licenses/license_cycles_nodes.md diff --git a/armorpaint/Sources/Main.hx b/armorpaint/Sources/Main.hx index 64d4e4ad..57cfc992 100644 --- a/armorpaint/Sources/Main.hx +++ b/armorpaint/Sources/Main.hx @@ -62,7 +62,7 @@ class Main { "World_radiance_8.k", "brdf.k", "color_wheel.k", - "black_white_gradient.k", + "color_wheel_gradient.k", "cursor.k", "icons.k", "icons2x.k", diff --git a/armorpaint/Sources/arm/App.hx b/armorpaint/Sources/arm/App.hx index 19ebdf35..bbd6c668 100644 --- a/armorpaint/Sources/arm/App.hx +++ b/armorpaint/Sources/arm/App.hx @@ -64,7 +64,7 @@ class App { public static var font: Font = null; public static var theme: TTheme; public static var colorWheel: Image; - public static var blackWhiteGradient: Image; + public static var colorWheelGradient: Image; public static var uiBox: Zui; public static var uiMenu: Zui; public static var defaultElementW = 100; @@ -126,7 +126,7 @@ class App { Data.getFont("font.ttf", function(f: Font) { Data.getImage("color_wheel.k", function(imageColorWheel: Image) { - Data.getImage("black_white_gradient.k", function(imageBlackWhiteGradient: Image) { + Data.getImage("color_wheel_gradient.k", function(imageColorWheelGradient: Image) { font = f; Config.loadTheme(Config.raw.theme, false); defaultElementW = theme.ELEMENT_W; @@ -162,11 +162,11 @@ class App { } colorWheel = imageColorWheel; - blackWhiteGradient = imageBlackWhiteGradient; + colorWheelGradient = imageColorWheelGradient; Nodes.enumTexts = enumTexts; Nodes.tr = tr; - uiBox = new Zui({ theme: App.theme, font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel, black_white_gradient: blackWhiteGradient }); - uiMenu = new Zui({ theme: App.theme, font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel, black_white_gradient: blackWhiteGradient }); + uiBox = new Zui({ theme: App.theme, font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel, black_white_gradient: colorWheelGradient }); + uiMenu = new Zui({ theme: App.theme, font: f, scaleFactor: Config.raw.window_scale, color_wheel: colorWheel, black_white_gradient: colorWheelGradient }); defaultElementH = uiMenu.t.ELEMENT_H; // Init plugins diff --git a/armorpaint/Sources/arm/ui/UINodes.hx b/armorpaint/Sources/arm/ui/UINodes.hx index 556b57a2..790119c4 100644 --- a/armorpaint/Sources/arm/ui/UINodes.hx +++ b/armorpaint/Sources/arm/ui/UINodes.hx @@ -69,7 +69,7 @@ class UINodes { Nodes.onCanvasControl = onCanvasControl; var scale = Config.raw.window_scale; - ui = new Zui({ theme: App.theme, font: App.font, color_wheel: App.colorWheel, black_white_gradient: App.blackWhiteGradient, scaleFactor: scale }); + ui = new Zui({ theme: App.theme, font: App.font, color_wheel: App.colorWheel, black_white_gradient: App.colorWheelGradient, scaleFactor: scale }); ui.scrollEnabled = false; } diff --git a/armorpaint/Sources/arm/ui/UISidebar.hx b/armorpaint/Sources/arm/ui/UISidebar.hx index 09f01c3d..73a187b3 100644 --- a/armorpaint/Sources/arm/ui/UISidebar.hx +++ b/armorpaint/Sources/arm/ui/UISidebar.hx @@ -122,7 +122,7 @@ class UISidebar { History.reset(); var scale = Config.raw.window_scale; - ui = new Zui({ theme: App.theme, font: App.font, scaleFactor: scale, color_wheel: App.colorWheel, black_white_gradient: App.blackWhiteGradient }); + ui = new Zui({ theme: App.theme, font: App.font, scaleFactor: scale, color_wheel: App.colorWheel, black_white_gradient: App.colorWheelGradient }); Zui.onBorderHover = onBorderHover; Zui.onTextHover = onTextHover; Zui.onDeselectText = onDeselectText; diff --git a/armorpaint/Sources/arm/ui/UIView2D.hx b/armorpaint/Sources/arm/ui/UIView2D.hx index 8222dbaa..eb95cea4 100644 --- a/armorpaint/Sources/arm/ui/UIView2D.hx +++ b/armorpaint/Sources/arm/ui/UIView2D.hx @@ -56,7 +56,7 @@ class UIView2D { channelLocation = pipe.getConstantLocation("channel"); var scale = Config.raw.window_scale; - ui = new Zui({ theme: App.theme, font: App.font, color_wheel: App.colorWheel, black_white_gradient: App.blackWhiteGradient, scaleFactor: scale }); + ui = new Zui({ theme: App.theme, font: App.font, color_wheel: App.colorWheel, black_white_gradient: App.colorWheelGradient, scaleFactor: scale }); ui.scrollEnabled = false; } diff --git a/base/Assets/common/black_white_gradient.png b/base/Assets/common/color_wheel_gradient.png similarity index 100% rename from base/Assets/common/black_white_gradient.png rename to base/Assets/common/color_wheel_gradient.png diff --git a/base/Sources/arm/render/RenderPathRaytrace.hx b/base/Sources/arm/render/RenderPathRaytrace.hx index 4961b290..528ab31d 100644 --- a/base/Sources/arm/render/RenderPathRaytrace.hx +++ b/base/Sources/arm/render/RenderPathRaytrace.hx @@ -135,7 +135,7 @@ class RenderPathRaytrace { commands(useLiveLayer); if (Config.raw.rp_bloom != false) { - RenderPathDeferred.commandsBloom("buf"); + Inc.commandsBloom("buf"); } path.setTarget("buf"); path.drawMeshes("overlay");