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

Merge pull request #2262 from tong/replace-deprecated-std-is

Browse source 
Replace deprecated Std.is with Std.isOfType
This commit is contained in:
Lubos Lenco 2021-07-11 10:41:53 +02:00 committed by GitHub
parent 3c88ddcb23 b452acaebb
commit ff93e5f824
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Sources/armory/logicnode/CompareNode.hx
View file

@ -19,9 +19,9 @@ class CompareNode extends LogicNode {
switch (property0) { switch (property0) {
case "Equal": 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": 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": case "Greater":
cond = v1 > v2; cond = v1 > v2;
case "Greater Equal": case "Greater Equal":

4
Sources/armory/logicnode/GateNode.hx
View file

@ -18,9 +18,9 @@ class GateNode extends LogicNode {
switch (property0) { switch (property0) {
case "Equal": 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": 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": case "Greater":
cond = v1 > v2; cond = v1 > v2;
case "Greater Equal": case "Greater Equal":

4
Sources/armory/logicnode/GetTraitNameNode.hx
View file

@ -16,12 +16,12 @@ class GetTraitNameNode extends LogicNode {
case 0: { case 0: {
// Check CanvasScript // Check CanvasScript
var cname = cast Type.resolveClass("armory.trait.internal.CanvasScript"); var cname = cast Type.resolveClass("armory.trait.internal.CanvasScript");
if (Std.is(trait, cname)) { if (Std.isOfType(trait, cname)) {
return trait.cnvName; return trait.cnvName;
} }
// Check WasmScript // Check WasmScript
var cname = cast Type.resolveClass("armory.trait.internal.WasmScript"); var cname = cast Type.resolveClass("armory.trait.internal.WasmScript");
if (Std.is(trait, cname)) { if (Std.isOfType(trait, cname)) {
return trait.wasmName; return trait.wasmName;
} }
// Other // Other

2
Sources/armory/logicnode/PauseTraitNode.hx
View file

@ -8,7 +8,7 @@ class PauseTraitNode extends LogicNode {
override function run(from: Int) { override function run(from: Int) {
var trait: Dynamic = inputs[1].get(); 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(); cast(trait, LogicTree).pause();

2
Sources/armory/logicnode/ResumeTraitNode.hx
View file

@ -8,7 +8,7 @@ class ResumeTraitNode extends LogicNode {
override function run(from: Int) { override function run(from: Int) {
var trait: Dynamic = inputs[1].get(); 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(); cast(trait, LogicTree).resume();

2
Sources/armory/logicnode/SetParentNode.hx
View file

@ -14,7 +14,7 @@ class SetParentNode extends LogicNode {
var parent: Object; var parent: Object;
var isUnparent = false; var isUnparent = false;
if (Std.is(inputs[2].node, ObjectNode)) { if (Std.isOfType(inputs[2].node, ObjectNode)) {
var parentNode = cast(inputs[2].node, ObjectNode); var parentNode = cast(inputs[2].node, ObjectNode);
isUnparent = parentNode.objectName == ""; isUnparent = parentNode.objectName == "";
} }

2
Sources/armory/logicnode/SetTraitPausedNode.hx
View file

@ -10,7 +10,7 @@ class SetTraitPausedNode extends LogicNode {
var trait: Dynamic = inputs[1].get(); var trait: Dynamic = inputs[1].get();
var paused: Bool = inputs[2].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(); paused ? cast(trait, LogicTree).pause() : cast(trait, LogicTree).resume();

2
Sources/armory/trait/FollowCamera.hx
View file

@ -33,7 +33,7 @@ class FollowCamera extends iron.Trait {
trace("FollowCamera error, unable to set target object"); trace("FollowCamera error, unable to set target object");
} }
if (Std.is(object, iron.object.CameraObject)) { if (Std.isOfType(object, iron.object.CameraObject)) {
disabled = true; 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."); 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.");
} }

2
Sources/armory/trait/physics/bullet/RigidBody.hx
View file

@ -149,7 +149,7 @@ class RigidBody extends iron.Trait {
if (ready) return; if (ready) return;
ready = true; ready = true;
if (!Std.is(object, MeshObject)) return; // No mesh data if (!Std.isOfType(object, MeshObject)) return; // No mesh data
transform = object.transform; transform = object.transform;
physics = armory.trait.physics.PhysicsWorld.active; physics = armory.trait.physics.PhysicsWorld.active;