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

Mat preview thumb

Browse Source
This commit is contained in:
unknown
2018-10-24 02:05:32 +02:00
parent cce8ebf4bc
commit 96b1a81024
3 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/App.hx
+2 -2
View File
@@ -89,7 +89,7 @@ class App extends iron.Trait {
}
public static function w():Int {
if (UITrait.inst != null && UITrait.inst.materialPreview) return 50;
if (UITrait.inst != null && UITrait.inst.materialPreview) return 100;
if (UITrait.inst != null && UITrait.inst.stickerPreview) return 512;
var res = 0;
@@ -110,7 +110,7 @@ class App extends iron.Trait {
}
public static function h():Int {
if (UITrait.inst != null && UITrait.inst.materialPreview) return 50;
if (UITrait.inst != null && UITrait.inst.materialPreview) return 100;
if (UITrait.inst != null && UITrait.inst.stickerPreview) return 512;
var res = 0;
Sources/arm/UITrait.hx
+35 -21
View File
@@ -31,7 +31,7 @@ class MaterialSlot {
public var data:iron.data.MaterialData;
#end
public function new(m:iron.data.MaterialData = null) {
image = kha.Image.createRenderTarget(50, 50);
image = kha.Image.createRenderTarget(100, 100);
#if arm_editor
data = m;
#end
@@ -157,6 +157,8 @@ class UITrait extends iron.Trait {
var savedEnvmap:kha.Image = null;
var emptyEnvmap:kha.Image = null;
var previewEnvmap:kha.Image = null;
var drawWorld = true;
public var ddirty = 0;
public var pdirty = 0;
@@ -445,6 +447,26 @@ class UITrait extends iron.Trait {
undoLayers.push(new LayerSlot("_undo"));
}
if (savedEnvmap == null) {
savedEnvmap = iron.Scene.active.world.envmap;
}
if (emptyEnvmap == null) {
var b = haxe.io.Bytes.alloc(4);
b.set(0, 5);
b.set(1, 5);
b.set(2, 5);
b.set(3, 255);
emptyEnvmap = kha.Image.fromBytes(b, 1, 1);
}
if (previewEnvmap == null) {
var b = haxe.io.Bytes.alloc(4);
b.set(0, 0);
b.set(1, 0);
b.set(2, 0);
b.set(3, 255);
previewEnvmap = kha.Image.fromBytes(b, 1, 1);
}
// Save last pos for continuos paint
iron.App.notifyOnRender(function(g:kha.graphics4.Graphics) { //
@@ -801,12 +823,13 @@ class UITrait extends iron.Trait {
iron.Scene.active.camera.data.raw.fov = 0.92;
var light = iron.Scene.active.lights[0];
light.data.raw.cast_shadow = false;
// iron.Scene.active.world.envmap = previewEnvmap;
// No jitter
// @:privateAccess iron.Scene.active.camera.frame = 0;
// No resize
@:privateAccess iron.RenderPath.active.lastW = 50;
@:privateAccess iron.RenderPath.active.lastH = 50;
@:privateAccess iron.RenderPath.active.lastW = 100;
@:privateAccess iron.RenderPath.active.lastH = 100;
iron.Scene.active.camera.buildProjection();
iron.Scene.active.camera.buildMatrix();
@@ -835,6 +858,7 @@ class UITrait extends iron.Trait {
iron.Scene.active.camera.buildMatrix();
var light = iron.Scene.active.lights[0];
light.data.raw.cast_shadow = true;
iron.Scene.active.world.envmap = drawWorld ? savedEnvmap : emptyEnvmap;
UINodes.inst.parseMeshMaterial();
}
@@ -1792,10 +1816,10 @@ void main() {
if (selectedMaterial == materials[i]) {
// ui.fill(1, -2, img.width + 3, img.height + 3, 0xff205d9c); // TODO
var off = row % 2 == 1 ? 1 : 0;
ui.fill(1, -2, img.width + 3, 2, 0xff205d9c);
ui.fill(1, img.height - 1 - off, img.width + 3, 2 + off, 0xff205d9c);
ui.fill(1, -2, 2, img.height + 3, 0xff205d9c);
ui.fill(img.width + 2, -2, 2, img.height + 3, 0xff205d9c);
ui.fill(1, -2, 50 + 3, 2, 0xff205d9c);
ui.fill(1, 50 - 1 - off, 50 + 3, 2 + off, 0xff205d9c);
ui.fill(1, -2, 2, 50 + 3, 0xff205d9c);
ui.fill(50 + 2, -2, 2, 50 + 3, 0xff205d9c);
}
if (ui.image(img) == State.Started && img != empty) {
@@ -1803,6 +1827,7 @@ void main() {
if (iron.system.Time.time() - selectTime < 0.3) showMaterialNodes();
selectTime = iron.system.Time.time();
}
if (img != empty && ui.isHovered) ui.tooltipImage(img);
}
ui.imageInvertY = false; // Material preview
}
@@ -2348,23 +2373,14 @@ void main() {
var hsupersample = Id.handle({position: getSuperSampleQuality(apconfig.rp_supersample)});
if (ui.panel(Id.handle({selected: true}), "Viewport", 1)) {
apconfig.window_vsync = ui.check(Id.handle({selected: apconfig.window_vsync}), "VSync");
var drawWorldHandle = Id.handle({selected: true});
var drawWorld = ui.check(drawWorldHandle, "Envmap");
var drawWorldHandle = Id.handle({selected: drawWorld});
drawWorld = ui.check(drawWorldHandle, "Envmap");
if (drawWorldHandle.changed) {
ddirty = 2;
}
if (savedEnvmap == null) savedEnvmap = iron.Scene.active.world.envmap;
if (!drawWorld) {
var hwheel = Id.handle({color: 0xff030303});
var worldColor:kha.Color = Ext.colorWheel(ui, hwheel);
if (emptyEnvmap == null) {
var b = haxe.io.Bytes.alloc(4);
b.set(0, worldColor.Rb);
b.set(1, worldColor.Gb);
b.set(2, worldColor.Bb);
b.set(3, 255);
emptyEnvmap = kha.Image.fromBytes(b, 1, 1);
}
if (hwheel.changed) {
var b = emptyEnvmap.lock();
b.set(0, worldColor.Rb);
@@ -2373,10 +2389,8 @@ void main() {
emptyEnvmap.unlock();
ddirty = 2;
}
iron.Scene.active.world.envmap = emptyEnvmap;
}
else iron.Scene.active.world.envmap = savedEnvmap;
iron.Scene.active.world.envmap = drawWorld ? savedEnvmap : emptyEnvmap;
ui.check(hssgi, "SSAO");
ui.check(hssr, "SSR");
ui.check(hbloom, "Bloom");
Sources/arm/renderpath/RenderPathDeferred.hx
+14 -14
View File
@@ -435,8 +435,8 @@ class RenderPathDeferred {
var t = new RenderTargetRaw();
t.name = "mtex";
t.width = 50;
t.height = 50;
t.width = 100;
t.height = 100;
t.format = Inc.getHdrFormat();
t.scale = Inc.getSuperSampling();
t.depth_buffer = "mmain";
@@ -446,8 +446,8 @@ class RenderPathDeferred {
{
var t = new RenderTargetRaw();
t.name = "mbuf";
t.width = 50;
t.height = 50;
t.width = 100;
t.height = 100;
t.format = Inc.getHdrFormat();
t.scale = Inc.getSuperSampling();
path.createRenderTarget(t);
@@ -456,8 +456,8 @@ class RenderPathDeferred {
{
var t = new RenderTargetRaw();
t.name = "mgbuffer0";
t.width = 50;
t.height = 50;
t.width = 100;
t.height = 100;
t.format = "RGBA64";
t.scale = Inc.getSuperSampling();
t.depth_buffer = "mmain";
@@ -467,8 +467,8 @@ class RenderPathDeferred {
{
var t = new RenderTargetRaw();
t.name = "mgbuffer1";
t.width = 50;
t.height = 50;
t.width = 100;
t.height = 100;
t.format = "RGBA64";
t.scale = Inc.getSuperSampling();
path.createRenderTarget(t);
@@ -478,8 +478,8 @@ class RenderPathDeferred {
{
var t = new RenderTargetRaw();
t.name = "mgbuffer2";
t.width = 50;
t.height = 50;
t.width = 100;
t.height = 100;
t.format = "RGBA64";
t.scale = Inc.getSuperSampling();
path.createRenderTarget(t);
@@ -490,8 +490,8 @@ class RenderPathDeferred {
{
var t = new RenderTargetRaw();
t.name = "mbufa";
t.width = 50;
t.height = 50;
t.width = 100;
t.height = 100;
t.format = "RGBA32";
t.scale = Inc.getSuperSampling();
path.createRenderTarget(t);
@@ -499,8 +499,8 @@ class RenderPathDeferred {
{
var t = new RenderTargetRaw();
t.name = "mbufb";
t.width = 50;
t.height = 50;
t.width = 100;
t.height = 100;
t.format = "RGBA32";
t.scale = Inc.getSuperSampling();
path.createRenderTarget(t);