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

Bake workspace

Browse Source
This commit is contained in:
luboslenco
2020-04-27 15:32:02 +02:00
parent 395f07aa3c
commit 4018a2389f
8 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/common/icons.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Assets/common/icons2x.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 135 KiB

Sources/arm/Enums.hx
+6 -6
View File
@@ -9,18 +9,18 @@ package arm;
var ToolClone = 5; var ToolClone = 5;
var ToolBlur = 6; var ToolBlur = 6;
var ToolParticle = 7; var ToolParticle = 7;
var ToolBake = 8; var ToolColorId = 8;
var ToolColorId = 9; var ToolPicker = 9;
var ToolPicker = 10; var ToolGizmo = 10;
var ToolGizmo = 11; var ToolBake = 11;
} }
@:enum abstract SpaceType(Int) from Int to Int { @:enum abstract SpaceType(Int) from Int to Int {
var SpacePaint = 0; var SpacePaint = 0;
// var SpaceSculpt = 0; // var SpaceSculpt = 0;
var SpaceMaterial = 1; var SpaceMaterial = 1;
// var SpaceBake = 0; var SpaceBake = 2;
var SpaceRender = 2; var SpaceRender = 3;
} }
@:enum abstract BakeType(Int) from Int to Int { @:enum abstract BakeType(Int) from Int to Int {
Sources/arm/io/ImportMesh.hx
+1 -1
View File
@@ -67,7 +67,7 @@ class ImportMesh {
} }
Project.meshAssets = [path]; Project.meshAssets = [path];
if (UIHeader.inst.worktab.position == SpacePaint) { if (UIHeader.inst.worktab.position != SpaceRender) {
ViewportUtil.scaleToBounds(); ViewportUtil.scaleToBounds();
} }
Sources/arm/render/RenderPathPaint.hx
+2 -1
View File
@@ -97,7 +97,8 @@ class RenderPathPaint {
public static function commandsPaint() { public static function commandsPaint() {
var tid = Context.layer.id; var tid = Context.layer.id;
if (Context.pdirty > 0 && UIHeader.inst.worktab.position == SpacePaint) { var paintSpace = UIHeader.inst.worktab.position == SpacePaint || UIHeader.inst.worktab.position == SpaceBake;
if (Context.pdirty > 0 && paintSpace) {
if (Context.tool == ToolParticle) { if (Context.tool == ToolParticle) {
path.setTarget("texparticle"); path.setTarget("texparticle");
path.clearTarget(0x00000000); path.clearTarget(0x00000000);
Sources/arm/ui/UIMenubar.hx
+4
View File
@@ -60,6 +60,7 @@ class UIMenubar {
if (ui.window(workspaceHandle, panelx, 0, System.windowWidth() - UISidebar.inst.windowW - menubarw, Std.int(UIHeader.defaultHeaderH * ui.SCALE()))) { if (ui.window(workspaceHandle, panelx, 0, System.windowWidth() - UISidebar.inst.windowW - menubarw, Std.int(UIHeader.defaultHeaderH * ui.SCALE()))) {
ui.tab(UIHeader.inst.worktab, tr("Paint")); ui.tab(UIHeader.inst.worktab, tr("Paint"));
ui.tab(UIHeader.inst.worktab, tr("Material")); ui.tab(UIHeader.inst.worktab, tr("Material"));
ui.tab(UIHeader.inst.worktab, tr("Bake"));
ui.tab(UIHeader.inst.worktab, tr("Render")); ui.tab(UIHeader.inst.worktab, tr("Render"));
if (UIHeader.inst.worktab.changed) { if (UIHeader.inst.worktab.changed) {
Context.ddirty = 2; Context.ddirty = 2;
@@ -72,6 +73,9 @@ class UIMenubar {
if (UIHeader.inst.worktab.position == SpacePaint) { if (UIHeader.inst.worktab.position == SpacePaint) {
Context.selectTool(ToolBrush); Context.selectTool(ToolBrush);
} }
else if (UIHeader.inst.worktab.position == SpaceBake) {
Context.selectTool(ToolBake);
}
else { else {
Context.selectTool(ToolGizmo); Context.selectTool(ToolGizmo);
} }
Sources/arm/ui/UISidebar.hx
-1
View File
@@ -315,7 +315,6 @@ class UISidebar {
if (Operator.shortcut(Config.keymap.tool_brush)) Context.selectTool(ToolBrush); if (Operator.shortcut(Config.keymap.tool_brush)) Context.selectTool(ToolBrush);
else if (Operator.shortcut(Config.keymap.tool_eraser)) Context.selectTool(ToolEraser); else if (Operator.shortcut(Config.keymap.tool_eraser)) Context.selectTool(ToolEraser);
else if (Operator.shortcut(Config.keymap.tool_fill)) Context.selectTool(ToolFill); else if (Operator.shortcut(Config.keymap.tool_fill)) Context.selectTool(ToolFill);
else if (Operator.shortcut(Config.keymap.tool_bake)) Context.selectTool(ToolBake);
else if (Operator.shortcut(Config.keymap.tool_colorid)) Context.selectTool(ToolColorId); else if (Operator.shortcut(Config.keymap.tool_colorid)) Context.selectTool(ToolColorId);
else if (Operator.shortcut(Config.keymap.tool_decal)) Context.selectTool(ToolDecal); else if (Operator.shortcut(Config.keymap.tool_decal)) Context.selectTool(ToolDecal);
else if (Operator.shortcut(Config.keymap.tool_text)) Context.selectTool(ToolText); else if (Operator.shortcut(Config.keymap.tool_text)) Context.selectTool(ToolText);
Sources/arm/ui/UIToolbar.hx
+11 -5
View File
@@ -22,7 +22,6 @@ class UIToolbar {
tr("Clone"), tr("Clone"),
tr("Blur"), tr("Blur"),
tr("Particle"), tr("Particle"),
tr("Bake"),
tr("ColorID"), tr("ColorID"),
tr("Picker") tr("Picker")
]; ];
@@ -52,7 +51,6 @@ class UIToolbar {
"(" + Config.keymap.tool_clone + ") - " + tr("Hold") + " (" + Config.keymap.set_clone_source + ") " + tr("to set source"), "(" + Config.keymap.tool_clone + ") - " + tr("Hold") + " (" + Config.keymap.set_clone_source + ") " + tr("to set source"),
"(" + Config.keymap.tool_blur + ")", "(" + Config.keymap.tool_blur + ")",
"(" + Config.keymap.tool_particle + ")", "(" + Config.keymap.tool_particle + ")",
"(" + Config.keymap.tool_bake + ")",
"(" + Config.keymap.tool_colorid + ")", "(" + Config.keymap.tool_colorid + ")",
"(" + Config.keymap.tool_picker + ")" "(" + Config.keymap.tool_picker + ")"
]; ];
@@ -69,22 +67,30 @@ class UIToolbar {
else if (UIHeader.inst.worktab.position == SpaceMaterial) { else if (UIHeader.inst.worktab.position == SpaceMaterial) {
ui._x += 2; ui._x += 2;
if (Context.tool == ToolGizmo) ui.rect(-1, -1, 50 + 2, 50 + 2, ui.t.HIGHLIGHT_COL, 2); if (Context.tool == ToolGizmo) ui.rect(-1, -1, 50 + 2, 50 + 2, ui.t.HIGHLIGHT_COL, 2);
if (ui.image(img, -1, null, imgw * 11, 0, imgw, imgw) == State.Started) Context.selectTool(ToolGizmo); if (ui.image(img, -1, null, imgw * 10, 0, imgw, imgw) == State.Started) Context.selectTool(ToolGizmo);
if (ui.isHovered) ui.tooltip(tr("Gizmo") + " (G)"); if (ui.isHovered) ui.tooltip(tr("Gizmo") + " (G)");
ui._x -= 2; ui._x -= 2;
ui._y += 2; ui._y += 2;
ui._x += 2; ui._x += 2;
if (Context.tool == ToolPicker) ui.rect(-1, -1, 50 + 2, 50 + 2, ui.t.HIGHLIGHT_COL, 2); if (Context.tool == ToolPicker) ui.rect(-1, -1, 50 + 2, 50 + 2, ui.t.HIGHLIGHT_COL, 2);
if (ui.image(img, -1, null, imgw * 10, 0, imgw, imgw) == State.Started) Context.selectTool(ToolPicker); if (ui.image(img, -1, null, imgw * 9, 0, imgw, imgw) == State.Started) Context.selectTool(ToolPicker);
if (ui.isHovered) ui.tooltip(tr("Picker") + " (V)"); if (ui.isHovered) ui.tooltip(tr("Picker") + " (V)");
ui._x -= 2; ui._x -= 2;
ui._y += 2; ui._y += 2;
} }
else if (UIHeader.inst.worktab.position == SpaceBake) {
ui._x += 2;
if (Context.tool == ToolBake) ui.rect(-1, -1, 50 + 2, 50 + 2, ui.t.HIGHLIGHT_COL, 2);
if (ui.image(img, -1, null, imgw * 11, 0, imgw, imgw) == State.Started) Context.selectTool(ToolBake);
if (ui.isHovered) ui.tooltip(tr("Bake") + " (K)");
ui._x -= 2;
ui._y += 2;
}
else if (UIHeader.inst.worktab.position == SpaceRender) { else if (UIHeader.inst.worktab.position == SpaceRender) {
ui._x += 2; ui._x += 2;
if (Context.tool == ToolGizmo) ui.rect(-1, -1, 50 + 2, 50 + 2, ui.t.HIGHLIGHT_COL, 2); if (Context.tool == ToolGizmo) ui.rect(-1, -1, 50 + 2, 50 + 2, ui.t.HIGHLIGHT_COL, 2);
if (ui.image(img, -1, null, imgw * 11, 0, imgw, imgw) == State.Started) Context.selectTool(ToolGizmo); if (ui.image(img, -1, null, imgw * 10, 0, imgw, imgw) == State.Started) Context.selectTool(ToolGizmo);
if (ui.isHovered) ui.tooltip(tr("Gizmo") + " (G)"); if (ui.isHovered) ui.tooltip(tr("Gizmo") + " (G)");
ui._x -= 2; ui._x -= 2;
ui._y += 2; ui._y += 2;