maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Addressing issues reported in the Armory forum

Browse source 
https://forums.armory3d.org/t/something-wrong-with-translate-on-local-axis/2772
https://forums.armory3d.org/t/how-to-avoid-camera-going-through-rigid-bodies/3945
This commit is contained in:
Sandy 2020-03-14 20:58:56 +09:00 committed by GitHub
parent 71796f4fab
commit d1a0fc69c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Sources/armory/logicnode/TranslateObjectNode.hx
View file

@ -22,12 +22,9 @@ class TranslateObjectNode extends LogicNode {
object.transform.buildMatrix();
}
else {
var look = object.transform.world.look().mult(vec.y);
var right = object.transform.world.right().mult(vec.x);
var up = object.transform.world.up().mult(vec.z);
object.transform.loc.add(look);
object.transform.loc.add(right);
object.transform.loc.add(up);
object.transform.move(object.transform.local.look(),vec.y);
object.transform.move(object.transform.local.up(),vec.z);
object.transform.move(object.transform.local.right(),vec.x);
object.transform.buildMatrix();
}

21
Sources/armory/logicnode/TranslateOnLocalAxisNode.hx
View file

@ -1,14 +1,10 @@
package armory.logicnode;
import iron.object.Object;
import iron.math.Vec4;
import armory.trait.physics.RigidBody;
class TranslateOnLocalAxisNode extends LogicNode {
var loc = new Vec4();
var vec = new Vec4();
public function new(tree: LogicTree) {
super(tree);
}
@ -21,21 +17,12 @@ class TranslateOnLocalAxisNode extends LogicNode {
if (object == null) return;
if (l == 1) loc.setFrom(object.transform.world.look());
else if (l == 2) loc.setFrom(object.transform.world.up());
else if (l == 3) loc.setFrom(object.transform.world.right());
if (ini) sp *= -1;
if (ini) {
loc.x = -loc.x;
loc.y = -loc.y;
loc.z = -loc.z;
}
if (l == 1) object.transform.move(object.transform.local.look(),sp);
else if (l == 2) object.transform.move(object.transform.local.up(),sp);
else if (l == 3) object.transform.move(object.transform.local.right(),sp);
vec.x = loc.x * sp;
vec.y = loc.y * sp;
vec.z = loc.z * sp;
object.transform.loc.add(vec);
object.transform.buildMatrix();
#if arm_physics