From ef0a9b07a0bcb49782da25254ee92bc2f796cdae Mon Sep 17 00:00:00 2001 From: Lubos Lenco Date: Mon, 1 Jun 2020 17:03:38 +0200 Subject: [PATCH] Move displace strength to preferences --- Sources/arm/ui/BoxPreferences.hx | 7 +++++++ Sources/arm/ui/UIMenu.hx | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Sources/arm/ui/BoxPreferences.hx b/Sources/arm/ui/BoxPreferences.hx index 7a2de7ff..4fa8c039 100644 --- a/Sources/arm/ui/BoxPreferences.hx +++ b/Sources/arm/ui/BoxPreferences.hx @@ -360,6 +360,13 @@ class BoxPreferences { cam.buildProjection(); } + var dispHandle = Id.handle({value: Context.displaceStrength}); + Context.displaceStrength = ui.slider(dispHandle, tr("Displace"), 0.0, 10.0, true); + if (dispHandle.changed) { + Context.ddirty = 2; + MaterialParser.parseMeshMaterial(); + } + #if arm_creator var h = Id.handle({value: Context.vxaoExt}); Context.vxaoExt = ui.slider(h, tr("VXAO Ext"), 1.0, 10.0); diff --git a/Sources/arm/ui/UIMenu.hx b/Sources/arm/ui/UIMenu.hx index 06fd31fe..b84eedaf 100644 --- a/Sources/arm/ui/UIMenu.hx +++ b/Sources/arm/ui/UIMenu.hx @@ -53,7 +53,7 @@ class UIMenu { menuCommands(ui); } else { - var menuItems = [14, 3, 14, #if kha_direct3d12 13 #else 12 #end, 17, 5]; + var menuItems = [14, 3, 13, #if kha_direct3d12 13 #else 12 #end, 17, 5]; var sepw = menuW / ui.SCALE(); g.color = ui.t.SEPARATOR_COL; g.fillRect(menuX, menuY, menuW, 28 * menuItems[menuCategory] * ui.SCALE()); @@ -145,13 +145,6 @@ class UIMenu { if (sxhandle.changed) Context.ddirty = 2; } - var dispHandle = Id.handle({value: Context.displaceStrength}); - ui.row([1 / 8, 7 / 8]); ui.endElement(); - Context.displaceStrength = ui.slider(dispHandle, tr("Displace"), 0.0, 2.0, true); - if (dispHandle.changed) { - MaterialParser.parseMeshMaterial(); - } - var splitViewHandle = Id.handle({selected: Context.splitView}); Context.splitView = ui.check(splitViewHandle, " " + tr("Split View")); if (splitViewHandle.changed) {