diff --git a/Sources/armory/logicnode/CompareNode.hx b/Sources/armory/logicnode/CompareNode.hx index 88dc97be..cfc02823 100644 --- a/Sources/armory/logicnode/CompareNode.hx +++ b/Sources/armory/logicnode/CompareNode.hx @@ -19,9 +19,9 @@ class CompareNode extends LogicNode { switch (property0) { case "Equal": - cond = Std.is(v1, Vec4) ? v1.equals(v2) : v1 == v2; + cond = Std.isOfType(v1, Vec4) ? v1.equals(v2) : v1 == v2; case "Almost Equal": - cond = Std.is(v1, Vec4) ? v1.almostEquals(v2, property1) : Math.abs(v1 - v2) < property1; + cond = Std.isOfType(v1, Vec4) ? v1.almostEquals(v2, property1) : Math.abs(v1 - v2) < property1; case "Greater": cond = v1 > v2; case "Greater Equal": diff --git a/Sources/armory/logicnode/GateNode.hx b/Sources/armory/logicnode/GateNode.hx index ca310419..ae0014e8 100644 --- a/Sources/armory/logicnode/GateNode.hx +++ b/Sources/armory/logicnode/GateNode.hx @@ -18,9 +18,9 @@ class GateNode extends LogicNode { switch (property0) { case "Equal": - cond = Std.is(v1, Vec4) ? v1.equals(v2) : v1 == v2; + cond = Std.isOfType(v1, Vec4) ? v1.equals(v2) : v1 == v2; case "Almost Equal": - cond = Std.is(v1, Vec4) ? v1.almostEquals(v2, property1) : Math.abs(v1 - v2) < property1; + cond = Std.isOfType(v1, Vec4) ? v1.almostEquals(v2, property1) : Math.abs(v1 - v2) < property1; case "Greater": cond = v1 > v2; case "Greater Equal": diff --git a/Sources/armory/logicnode/GetTraitNameNode.hx b/Sources/armory/logicnode/GetTraitNameNode.hx index dd1ded50..ca04f375 100644 --- a/Sources/armory/logicnode/GetTraitNameNode.hx +++ b/Sources/armory/logicnode/GetTraitNameNode.hx @@ -16,12 +16,12 @@ class GetTraitNameNode extends LogicNode { case 0: { // Check CanvasScript var cname = cast Type.resolveClass("armory.trait.internal.CanvasScript"); - if (Std.is(trait, cname)) { + if (Std.isOfType(trait, cname)) { return trait.cnvName; } // Check WasmScript var cname = cast Type.resolveClass("armory.trait.internal.WasmScript"); - if (Std.is(trait, cname)) { + if (Std.isOfType(trait, cname)) { return trait.wasmName; } // Other diff --git a/Sources/armory/logicnode/PauseTraitNode.hx b/Sources/armory/logicnode/PauseTraitNode.hx index a040f5d1..7dc3c084 100644 --- a/Sources/armory/logicnode/PauseTraitNode.hx +++ b/Sources/armory/logicnode/PauseTraitNode.hx @@ -8,7 +8,7 @@ class PauseTraitNode extends LogicNode { override function run(from: Int) { var trait: Dynamic = inputs[1].get(); - if (trait == null || !Std.is(trait, LogicTree)) return; + if (trait == null || !Std.isOfType(trait, LogicTree)) return; cast(trait, LogicTree).pause(); diff --git a/Sources/armory/logicnode/ResumeTraitNode.hx b/Sources/armory/logicnode/ResumeTraitNode.hx index c3c8b26b..c8a62011 100644 --- a/Sources/armory/logicnode/ResumeTraitNode.hx +++ b/Sources/armory/logicnode/ResumeTraitNode.hx @@ -8,7 +8,7 @@ class ResumeTraitNode extends LogicNode { override function run(from: Int) { var trait: Dynamic = inputs[1].get(); - if (trait == null || !Std.is(trait, LogicTree)) return; + if (trait == null || !Std.isOfType(trait, LogicTree)) return; cast(trait, LogicTree).resume(); diff --git a/Sources/armory/logicnode/SetParentNode.hx b/Sources/armory/logicnode/SetParentNode.hx index 8d37720d..81045a1e 100644 --- a/Sources/armory/logicnode/SetParentNode.hx +++ b/Sources/armory/logicnode/SetParentNode.hx @@ -14,7 +14,7 @@ class SetParentNode extends LogicNode { var parent: Object; var isUnparent = false; - if (Std.is(inputs[2].node, ObjectNode)) { + if (Std.isOfType(inputs[2].node, ObjectNode)) { var parentNode = cast(inputs[2].node, ObjectNode); isUnparent = parentNode.objectName == ""; } diff --git a/Sources/armory/logicnode/SetTraitPausedNode.hx b/Sources/armory/logicnode/SetTraitPausedNode.hx index 87099948..53327e1f 100644 --- a/Sources/armory/logicnode/SetTraitPausedNode.hx +++ b/Sources/armory/logicnode/SetTraitPausedNode.hx @@ -10,7 +10,7 @@ class SetTraitPausedNode extends LogicNode { var trait: Dynamic = inputs[1].get(); var paused: Bool = inputs[2].get(); - if (trait == null || !Std.is(trait, LogicTree)) return; + if (trait == null || !Std.isOfType(trait, LogicTree)) return; paused ? cast(trait, LogicTree).pause() : cast(trait, LogicTree).resume(); diff --git a/Sources/armory/trait/FollowCamera.hx b/Sources/armory/trait/FollowCamera.hx index 6cfdf84e..99df3c70 100644 --- a/Sources/armory/trait/FollowCamera.hx +++ b/Sources/armory/trait/FollowCamera.hx @@ -33,7 +33,7 @@ class FollowCamera extends iron.Trait { trace("FollowCamera error, unable to set target object"); } - if (Std.is(object, iron.object.CameraObject)) { + if (Std.isOfType(object, iron.object.CameraObject)) { disabled = true; trace("FollowCamera error, this trait should not be placed directly on a camera objet. It should be placed on another object such as an Empty. The camera should be placed as a child to the Empty object with offset, creating a camera boom."); } diff --git a/Sources/armory/trait/physics/bullet/RigidBody.hx b/Sources/armory/trait/physics/bullet/RigidBody.hx index 5ec1eb83..3c48adc7 100644 --- a/Sources/armory/trait/physics/bullet/RigidBody.hx +++ b/Sources/armory/trait/physics/bullet/RigidBody.hx @@ -149,7 +149,7 @@ class RigidBody extends iron.Trait { if (ready) return; ready = true; - if (!Std.is(object, MeshObject)) return; // No mesh data + if (!Std.isOfType(object, MeshObject)) return; // No mesh data transform = object.transform; physics = armory.trait.physics.PhysicsWorld.active;