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

Update camera

Browse Source
This commit is contained in:
luboslenco
2019-03-14 11:22:11 +01:00
parent 71a99ac920
commit 04bf3f569d
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/trait/OrbitCamera.hx
+15 -8
View File
@@ -34,28 +34,35 @@ class OrbitCamera extends iron.Trait {
if (mouse.down("middle") || (mouse.down("right") && kb.down("space"))) {
redraws = 2;
camera.transform.loc.addf(-mouse.movementX / 150, 0.0, mouse.movementY / 150);
camera.buildMatrix();
if (kb.down("control")) {
camera.transform.move(camera.look(), mouse.movementX / 75);
}
else {
var look = camera.transform.look().normalize().mult(mouse.movementY / 150);
var right = camera.transform.right().normalize().mult(-mouse.movementX / 150);
camera.transform.loc.add(look);
camera.transform.loc.add(right);
camera.buildMatrix();
}
}
if (mouse.down("right") || (mouse.down("left") && kb.down("control"))) {
var dist = camera.transform.loc.length();
redraws = 2;
var d = camera.transform.loc.length();
camera.transform.loc.set(0, 0, 0);
camera.transform.move(camera.lookWorld(), dist);
camera.transform.rotate(new iron.math.Vec4(0, 0, 1), -mouse.movementX / 100);
camera.transform.move(camera.lookWorld(), -d);
camera.transform.move(camera.lookWorld(), -dist);
// Rotate Y
if (!kb.down("shift")) {
var d = camera.transform.loc.length();
camera.transform.loc.set(0, 0, 0);
camera.transform.move(camera.lookWorld(), dist);
camera.transform.rotate(camera.rightWorld(), -mouse.movementY / 100);
if (camera.upWorld().z < 0) {
camera.transform.rotate(camera.rightWorld(), mouse.movementY / 100);
}
camera.transform.move(camera.lookWorld(), -d);
camera.transform.move(camera.lookWorld(), -dist);
}
}
Sources/arm/trait/RotateCamera.hx
+4 -1
View File
@@ -38,7 +38,10 @@ class RotateCamera extends iron.Trait {
camera.transform.move(camera.look(), mouse.movementX / 75);
}
else {
camera.transform.loc.addf(-mouse.movementX / 150, 0.0, mouse.movementY / 150);
var look = camera.transform.look().normalize().mult(mouse.movementY / 150);
var right = camera.transform.right().normalize().mult(-mouse.movementX / 150);
camera.transform.loc.add(look);
camera.transform.loc.add(right);
camera.buildMatrix();
}
}