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

Move camera clip plane to preferences

Browse Source
This commit is contained in:
luboslenco
2020-03-28 21:35:45 +01:00
parent 4bed87cf5f
commit 4330e3adcd
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/BoxPreferences.hx
+12 -1
View File
@@ -182,7 +182,6 @@ class BoxPreferences {
#end
}
ui.row([0.5, 0.5]);
ui.enabled = Context.hvxao.selected;
var h = Id.handle({value: Context.vxaoOffset});
Context.vxaoOffset = ui.slider(h, tr("Cone Offset"), 1.0, 4.0, true);
@@ -210,6 +209,18 @@ class BoxPreferences {
// Context.autoExposureStrength = ui.slider(h, "Auto Exposure", 0.0, 2.0, true);
// if (h.changed) Context.ddirty = 2;
var cam = iron.Scene.active.camera;
var camRaw = cam.data.raw;
var near_handle = Id.handle();
var far_handle = Id.handle();
near_handle.value = Std.int(camRaw.near_plane * 1000) / 1000;
far_handle.value = Std.int(camRaw.far_plane * 100) / 100;
camRaw.near_plane = ui.slider(near_handle, tr("Clip Start"), 0.001, 1.0, true);
camRaw.far_plane = ui.slider(far_handle, tr("Clip End"), 50.0, 100.0, true);
if (near_handle.changed || far_handle.changed) {
cam.buildProjection();
}
#if arm_creator
var h = Id.handle({value: Context.vxaoExt});
Context.vxaoExt = ui.slider(h, tr("VXAO Ext"), 1.0, 10.0);
Sources/arm/ui/UIMenu.hx
+1 -14
View File
@@ -54,7 +54,7 @@ class UIMenu {
menuCommands(ui);
}
else {
var menuItems = [12, 3, 14, #if kha_direct3d12 13 #else 12 #end, 19, 5];
var menuItems = [12, 3, 14, #if kha_direct3d12 13 #else 12 #end, 17, 5];
if (viewportColorHandle.selected) menuItems[2] += 6;
var sepw = menuW / ui.SCALE();
g.color = ui.t.SEPARATOR_COL;
@@ -308,19 +308,6 @@ class UIMenu {
// ui.fill(0, 0, sepw, 1, ui.t.ACCENT_SELECT_COL);
var cam = Scene.active.camera;
var camRaw = cam.data.raw;
var near_handle = Id.handle({value: camRaw.near_plane});
var far_handle = Id.handle({value: camRaw.far_plane});
near_handle.value = Std.int(near_handle.value * 1000) / 1000;
far_handle.value = Std.int(far_handle.value * 100) / 100;
ui.row([1 / 8, 7 / 8]); ui.endElement();
camRaw.near_plane = ui.slider(near_handle, tr("Clip Start"), 0.001, 1.0, true);
ui.row([1 / 8, 7 / 8]); ui.endElement();
camRaw.far_plane = ui.slider(far_handle, tr("Clip End"), 50.0, 100.0, true);
if (near_handle.changed || far_handle.changed) {
Scene.active.camera.buildProjection();
}
Context.fovHandle = Id.handle({value: Std.int(cam.data.raw.fov * 100) / 100});
ui.row([1 / 8, 7 / 8]); ui.endElement();
cam.data.raw.fov = ui.slider(Context.fovHandle, tr("FoV"), 0.3, 2.0, true);