edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Cleanup

Browse Source
This commit is contained in:
luboslenco
2023-02-15 17:46:40 +01:00
parent e8f99af9f8
commit 664fbf5845
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
armorlab/Sources/Main.hx
+1 -1
View File
@@ -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",
armorlab/Sources/arm/App.hx
+5 -5
View File
@@ -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
armorlab/Sources/arm/ui/UINodes.hx
+1 -1
View File
@@ -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;
}
armorlab/Sources/arm/ui/UISidebar.hx
+1 -1
View File
@@ -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;
armorpaint/Assets/licenses/license_cycles-nodes.md → armorpaint/Assets/licenses/license_cycles_nodes.md
View File
armorpaint/Sources/Main.hx
+1 -1
View File
@@ -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",
armorpaint/Sources/arm/App.hx
+5 -5
View File
@@ -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
armorpaint/Sources/arm/ui/UINodes.hx
+1 -1
View File
@@ -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;
}
armorpaint/Sources/arm/ui/UISidebar.hx
+1 -1
View File
@@ -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;
armorpaint/Sources/arm/ui/UIView2D.hx
+1 -1
View File
@@ -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;
}
base/Assets/common/black_white_gradient.png → base/Assets/common/color_wheel_gradient.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

base/Sources/arm/render/RenderPathRaytrace.hx
+1 -1
View File
@@ -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");