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

Keep compatibility

Browse source
This commit is contained in:
Henrique 2021-06-27 20:47:55 -03:00
parent 3d49edee71
commit 7515a20d93
3 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Sources/armory/logicnode/GetLocationNode.hx
View file

@ -1,7 +1,6 @@
package armory.logicnode;
import iron.object.Object;
import iron.math.Vec4;
class GetLocationNode extends LogicNode {
@ -11,20 +10,23 @@ class GetLocationNode extends LogicNode {
override function get(from: Int): Dynamic {
var object: Object = inputs[0].get();
var relative: Bool = inputs[1].get();
if (object == null) return null;
var loc = object.transform.world.getLoc();
if (relative && object.parent != null) {
loc.sub(object.parent.transform.world.getLoc()); // Add parent location influence
if (inputs.length > 1) { // Keep compatibility
var relative: Bool = inputs[1].get();
// Convert vec to parent local space
var dotX = vec.dot(object.parent.transform.right());
var dotY = vec.dot(object.parent.transform.look());
var dotZ = vec.dot(object.parent.transform.up());
loc.set(dotX, dotY, dotZ);
if (relative && object.parent != null) {
loc.sub(object.parent.transform.world.getLoc()); // Add parent location influence
// Convert vec to parent local space
var dotX = vec.dot(object.parent.transform.right());
var dotY = vec.dot(object.parent.transform.look());
var dotZ = vec.dot(object.parent.transform.up());
loc.set(dotX, dotY, dotZ);
}
}
return loc;

19
Sources/armory/logicnode/SetLocationNode.hx
View file

@ -13,18 +13,21 @@ class SetLocationNode extends LogicNode {
override function run(from: Int) {
var object: Object = inputs[1].get();
var vec: Vec4 = inputs[2].get();
var relative: Bool = inputs[3].get();
if (object == null || vec == null) return;
if (!relative && object.parent != null) {
vec.sub(object.parent.transform.world.getLoc()); // Remove parent location influence
if (inputs.length > 3) { // Keep compatibility
var relative: Bool = inputs[3].get();
// Convert vec to parent local space
var dotX = vec.dot(object.parent.transform.right());
var dotY = vec.dot(object.parent.transform.look());
var dotZ = vec.dot(object.parent.transform.up());
vec.set(dotX, dotY, dotZ);
if (!relative && object.parent != null) {
vec.sub(object.parent.transform.world.getLoc()); // Remove parent location influence
// Convert vec to parent local space
var dotX = vec.dot(object.parent.transform.right());
var dotY = vec.dot(object.parent.transform.look());
var dotZ = vec.dot(object.parent.transform.up());
vec.set(dotX, dotY, dotZ);
}
}
object.transform.loc.setFrom(vec);

10
Sources/armory/logicnode/WorldVectorToLocalSpaceNode.hx
View file

@ -12,14 +12,18 @@ class WorldVectorToLocalSpaceNode extends LogicNode {
override function get(from: Int): Vec4 {
var object: Object = inputs[0].get();
var worldVec: Vec4 = inputs[1].get();
var sub: Bool = inputs[2].get();
if (object == null || worldVec == null) return null;
var localVec = new Vec4();
if (sub) {
localVec.sub(object.transform.world.getLoc());
if (inputs.length > 2) { // Keep compatibility
var sub: Bool = inputs[2].get();
if (sub) {
localVec.sub(object.transform.world.getLoc());
}
}
localVec.x = worldVec.dot(object.transform.right());