Replace deprecated Std.is with Std.isOfType
This commit is contained in:
parent
3c88ddcb23
commit
b452acaebb
|
@ -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":
|
||||
|
|
|
@ -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":
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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 == "";
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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.");
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue