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

Camera orbit controls

Browse Source
This commit is contained in:
luboslenco
2019-05-07 12:00:55 +02:00
parent 38e4a5080b
commit 3f8f4f74cb
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/App.hx
+9 -2
View File
@@ -476,7 +476,7 @@ class App extends iron.Trait {
var menuButtonW = Std.int(ui.ELEMENT_W() * 0.5);
var px = panelx + menuButtonW * menuCategory;
var py = UITrait.inst.headerh;
var menuItems = [5, 2, 8, 4];
var menuItems = [5, 2, 13, 4];
var ph = 24 * menuItems[menuCategory] * ui.SCALE;
g.color = ui.t.SEPARATOR_COL;
@@ -526,13 +526,20 @@ class App extends iron.Trait {
// ui.button("Preferences...", Left);
}
else if (menuCategory == 2) {
if (ui.button("Reset", Left, "0")) { ViewportUtil.resetViewport(); ViewportUtil.scaleToBounds(); }
ui.fill(0, 0, sepw, 1, ui.t.ACCENT_SELECT_COL);
if (ui.button("Front", Left, "1")) { ViewportUtil.setView(0, -1, 0, Math.PI / 2, 0, 0); }
if (ui.button("Back", Left, "Ctrl+1")) { ViewportUtil.setView(0, 1, 0, Math.PI / 2, 0, Math.PI); }
if (ui.button("Right", Left, "3")) { ViewportUtil.setView(1, 0, 0, Math.PI / 2, 0, Math.PI / 2); }
if (ui.button("Left", Left, "Ctrl+3")) { ViewportUtil.setView(-1, 0, 0, Math.PI / 2, 0, -Math.PI / 2); }
if (ui.button("Top", Left, "7")) { ViewportUtil.setView(0, 0, 1, 0, 0, 0); }
if (ui.button("Bottom", Left, "Ctrl+7")) { ViewportUtil.setView(0, 0, -1, Math.PI, 0, Math.PI); }
if (ui.button("Reset", Left, "0")) { ViewportUtil.resetViewport(); ViewportUtil.scaleToBounds(); }
ui.fill(0, 0, sepw, 1, ui.t.ACCENT_SELECT_COL);
if (ui.button("Orbit Left", Left, "4")) { ViewportUtil.orbit(-Math.PI / 12, 0); }
if (ui.button("Orbit Right", Left, "6")) { ViewportUtil.orbit(Math.PI / 12, 0); }
if (ui.button("Orbit Up", Left, "8")) { ViewportUtil.orbit(0, -Math.PI / 12); }
if (ui.button("Orbit Down", Left, "2")) { ViewportUtil.orbit(0, Math.PI / 12); }
if (ui.button("Orbit Opposite", Left, "9")) { ViewportUtil.orbit(Math.PI, 0); }
ui.fill(0, 0, sepw, 1, ui.t.ACCENT_SELECT_COL);
if (ui.button("Distract Free", Left, "F11")) {
UITrait.inst.show = !UITrait.inst.show;
Sources/arm/trait/OrbitCamera.hx
+1 -1
View File
@@ -6,9 +6,9 @@ import arm.ui.*;
class OrbitCamera extends iron.Trait {
public static var inst:OrbitCamera;
public static var dist = 0.0;
var redraws = 0;
var first = true;
var dist = 0.0;
public function new() {
super();
Sources/arm/ui/UITrait.hx
+5
View File
@@ -600,6 +600,11 @@ class UITrait extends iron.Trait {
updateCameraType(cameraType);
statusHandle.redraws = 2;
}
else if (kb.started("4")) { ViewportUtil.orbit(-Math.PI / 12, 0); }
else if (kb.started("6")) { ViewportUtil.orbit(Math.PI / 12, 0); }
else if (kb.started("8")) { ViewportUtil.orbit(0, -Math.PI / 12); }
else if (kb.started("2")) { ViewportUtil.orbit(0, Math.PI / 12); }
else if (kb.started("9")) { ViewportUtil.orbit(Math.PI, 0); }
}
}
Sources/arm/util/ViewportUtil.hx
+10
View File
@@ -49,4 +49,14 @@ class ViewportUtil {
UITrait.inst.ddirty = 2;
arm.trait.OrbitCamera.inst.reset();
}
public static function orbit(x:Float, y:Float) {
var camera = iron.Scene.active.camera;
var dist = arm.trait.OrbitCamera.dist;
camera.transform.move(camera.lookWorld(), dist);
camera.transform.rotate(new iron.math.Vec4(0, 0, 1), x);
camera.transform.rotate(camera.rightWorld(), y);
camera.transform.move(camera.lookWorld(), -dist);
UITrait.inst.ddirty = 2;
}
}