Changed Std.is to Std.isOfType (#212)

hide/Ide.hx

@@ -515,7 +515,7 @@ class Ide {
 	public function resolveCDBValue( path : String, key : Dynamic, obj : Dynamic ) : Dynamic {
 
 		// allow Array as key (first choice)
-		if( Std.is(key,Array) ) {
+		if( Std.isOfType(key,Array) ) {
 			for( v in (key:Array<Dynamic>) ) {
 				var value = resolveCDBValue(path, v, obj);
 				if( value != null ) return value;

hide/comp/IconTree.hx

@@ -85,7 +85,7 @@ class IconTree<T:{}> extends Component {
 			c.id = "titem__" + (UID++);
 			map.set(c.id, c);
 			var prevItem = revMap.get(c.value);
-			if( Std.is(c.value, String) )
+			if( Std.isOfType(c.value, String) )
 				revMapString.set(cast c.value, c);
 			else {
 				revMap.set(c.value, c);
@@ -248,7 +248,7 @@ class IconTree<T:{}> extends Component {
 	}
 
 	function getRev( o : T ) {
-		if( Std.is(o, String) )
+		if( Std.isOfType(o, String) )
 			return revMapString.get(cast o);
 		return revMap.get(o);
 	}

hide/comp/SceneEditor.hx

@@ -2277,7 +2277,7 @@ class SceneEditor {
 			var prevIndex = prev.children.indexOf(elt);
 
 			var obj3d = elt.to(Object3D);
-			var preserveTransform = Std.is(toElt, hrt.prefab.fx.Emitter) || Std.is(prev, hrt.prefab.fx.Emitter);
+			var preserveTransform = Std.isOfType(toElt, hrt.prefab.fx.Emitter) || Std.isOfType(prev, hrt.prefab.fx.Emitter);
 			var toObj = getObject(toElt);
 			var obj = getObject(elt);
 			var prevState = null, newState = null;

hide/comp/SceneTree.hx

@@ -35,9 +35,9 @@ class SceneTree extends IconTree<String> {
 
 	override function onClick(id:String, evt: Dynamic) {
 		var v : Dynamic = resolvePath(id);
-		if( Std.is(v, h3d.scene.Object) )
+		if( Std.isOfType(v, h3d.scene.Object) )
 			onSelectObject(v);
-		else if( Std.is(v, h3d.mat.Material) )
+		else if( Std.isOfType(v, h3d.mat.Material) )
 			onSelectMaterial(v);
 	}
 
@@ -51,7 +51,7 @@ class SceneTree extends IconTree<String> {
 		var v : Dynamic = resolvePath(id);
 
 		var obj = Std.downcast(v, h3d.scene.Object);
-		if( obj == null || Std.is(obj,h3d.scene.Skin.Joint) ) return;
+		if( obj == null || Std.isOfType(obj,h3d.scene.Skin.Joint) ) return;
 
 		if (el.find(".ico-eye").length == 0) {
 			var visibilityToggle = new Element('<i class="ico ico-eye visibility-large-toggle"/>').appendTo(el.find(".jstree-anchor").first());
@@ -65,13 +65,13 @@ class SceneTree extends IconTree<String> {
 
 	function getIcon( c : h3d.scene.Object ) {
 		if( c.isMesh() ) {
-			if( Std.is(c, h3d.scene.Skin) )
+			if( Std.isOfType(c, h3d.scene.Skin) )
 				return "male";
-			if( Std.is(c, h3d.parts.GpuParticles) || Std.is(c, h3d.parts.Particles) )
+			if( Std.isOfType(c, h3d.parts.GpuParticles) || Std.isOfType(c, h3d.parts.Particles) )
 				return "snowflake-o";
 			return "cube";
 		}
-		if( Std.is(c, h3d.scene.Light) )
+		if( Std.isOfType(c, h3d.scene.Light) )
 			return "sun-o";
 		return "circle-o";
 	}

hide/comp/cdb/Cell.hx

@@ -904,7 +904,7 @@ class Cell extends Component {
 
 	function setRawValue( str : Dynamic ) {
 		var newValue : Dynamic;
-		if( Std.is(str,String) ) {
+		if( Std.isOfType(str,String) ) {
 			newValue = try editor.base.parseValue(column.type, str, false) catch( e : Dynamic ) return;
 		} else
 			newValue = str;

hide/comp/cdb/Formulas.hx

@@ -51,7 +51,7 @@ class Formulas {
 					if( v == null && c.opt )
 						Reflect.deleteField(o, c.name);
 					else {
-						if( v == null || !Std.is(v, Float) ) v = Math.NaN;
+						if( v == null || !Std.isOfType(v, Float) ) v = Math.NaN;
 						Reflect.setField(o, c.name, v);
 					}
 				}

hide/comp/cdb/ScriptTable.hx

@@ -50,7 +50,7 @@ class ScriptTable extends SubTable {
 
 		div.on("keypress keydown keyup", (e) -> {
 			// let pass Ctrl+S if ObjEditor (allow save script)
-			if( e.keyCode != "S".code || !Std.is(editor, ObjEditor) ) e.stopPropagation();
+			if( e.keyCode != "S".code || !Std.isOfType(editor, ObjEditor) ) e.stopPropagation();
 		});
 		var checker = new ScriptEditor.ScriptChecker(editor.config,"cdb."+cell.getDocumentName(),[
 			"cdb."+cell.table.sheet.name => cell.line.obj,

hide/view/FileTree.hx

@@ -49,7 +49,7 @@ class FileTree extends FileView {
 		if( ext == "json" ) {
 			try {
 				var obj : Dynamic = haxe.Json.parse(sys.io.File.getContent(file));
-				if( obj.type != null && Std.is(obj.type, String) ) {
+				if( obj.type != null && Std.isOfType(obj.type, String) ) {
 					var e = EXTENSIONS.get("json." + obj.type);
 					if( e != null ) return e;
 				}

hide/view/shadereditor/ShaderEditor.hx

@@ -290,7 +290,7 @@ class ShaderEditor extends hide.view.Graph {
 				afterChange();
 				launchCompileShader();
 			} catch (e : Dynamic) {
-				if (Std.is(e, ShaderException)) {
+				if (Std.isOfType(e, ShaderException)) {
 					error(e.msg, e.idBox);
 				}
 			}
@@ -900,7 +900,7 @@ class ShaderEditor extends hide.view.Graph {
 			info('Shader compiled in  ${Date.now().getTime() - timeStart}ms');
 
 		} catch (e : Dynamic) {
-			if (Std.is(e, String)) {
+			if (Std.isOfType(e, String)) {
 				var str : String = e;
 				trace(str);
 				if (str.split(":")[0] == "An error occurred compiling the shaders") {
@@ -940,7 +940,7 @@ class ShaderEditor extends hide.view.Graph {
 					}
 					return;
 				}
-			} else if (Std.is(e, ShaderException)) {
+			} else if (Std.isOfType(e, ShaderException)) {
 				error(e.msg, e.idBox);
 				return;
 			}
@@ -1056,7 +1056,7 @@ class ShaderEditor extends hide.view.Graph {
 				return false;
 			}
 		} catch (e : Dynamic) {
-			if (Std.is(e, ShaderException)) {
+			if (Std.isOfType(e, ShaderException)) {
 				error(e.msg, e.idBox);
 			}
 			return false;
@@ -1527,7 +1527,7 @@ class ShaderEditor extends hide.view.Graph {
 	override function removeBox(box : Box, trackChanges = true) {
 		if( trackChanges )
 			beforeChange();
-		var isSubShader = Std.is(box.getInstance(), SubGraph);
+		var isSubShader = Std.isOfType(box.getInstance(), SubGraph);
 		var length = listOfEdges.length;
 		for (i in 0...length) {
 			var edge = listOfEdges[length-i-1];

hrt/prefab/Light.hx

@@ -129,7 +129,7 @@ class Light extends Object3D {
 	override function makeInstance( ctx : Context ) : Context {
 		ctx = ctx.clone(this);
 
-		var isPbr = Std.is(h3d.mat.MaterialSetup.current, h3d.mat.PbrMaterialSetup);
+		var isPbr = Std.isOfType(h3d.mat.MaterialSetup.current, h3d.mat.PbrMaterialSetup);
 		if( !isPbr ) {
 			switch( kind ) {
 			case Point: ctx.local3d = new h3d.scene.fwd.PointLight(ctx.local3d);

hrt/prefab/Material.hx

@@ -93,7 +93,7 @@ class Material extends Prefab {
 	#if editor
 	override function edit( ctx : EditContext ) {
 		super.edit(ctx);
-		var isPbr = Std.is(ctx.scene.s3d.renderer, h3d.scene.pbr.Renderer);
+		var isPbr = Std.isOfType(ctx.scene.s3d.renderer, h3d.scene.pbr.Renderer);
 		var mat = h3d.mat.Material.create();
 		mat.props = renderProps();
 		var group = ctx.properties.add(new hide.Element('<div class="group" name="Material"></div>'));
@@ -305,10 +305,10 @@ class Material extends Prefab {
 	#end
 
 	public static function hasOverride(p: Prefab) {
-		if(Lambda.exists(p.children, c -> Std.is(c, Material) && c.enabled))
+		if(Lambda.exists(p.children, c -> Std.isOfType(c, Material) && c.enabled))
 			return true;
 		if(Type.getClass(p.parent) == Object3D)
-			return Lambda.exists(p.parent.children, c -> Std.is(c, Material) && c.enabled);
+			return Lambda.exists(p.parent.children, c -> Std.isOfType(c, Material) && c.enabled);
 		return false;
 	}
 

hrt/prefab/Model.hx

@@ -33,7 +33,7 @@ class Model extends Object3D {
 			}
 			#if editor
 			for(m in obj.getMeshes())
-				if( !Std.is(m,h3d.scene.Skin) )
+				if( !Std.isOfType(m,h3d.scene.Skin) )
 					m.cullingCollider = new h3d.col.ObjectCollider(m, m.primitive.getBounds().toSphere());
 			#end
 			if( retargetAnim ) applyRetarget(obj);

hrt/prefab/Object3D.hx

@@ -190,7 +190,7 @@ class Object3D extends Prefab {
 				var icon = Reflect.field(huds, sheet);
 				if( icon != null ) {
 					var t : Dynamic = ide.resolveCDBValue(sheet,icon, props);
-					if( t != null && (t.file != null || Std.is(t,String)) ) {
+					if( t != null && (t.file != null || Std.isOfType(t,String)) ) {
 						var obj = Std.downcast(ctx.local2d, h2d.ObjectFollower);
 						if( obj == null || obj.follow != ctx.local3d ) {
 							ctx.local2d = obj = new h2d.ObjectFollower(ctx.local3d, ctx.local2d);

hrt/prefab/Shader.hx

@@ -34,7 +34,7 @@ class Shader extends Prefab {
 			switch(v.type) {
 			case TVec(_, VFloat):
 				if(val != null) {
-					if( Std.is(val,Int) ) {
+					if( Std.isOfType(val,Int) ) {
 						var v = new h3d.Vector();
 						v.setColor(val);
 						val = v;
@@ -76,7 +76,7 @@ class Shader extends Prefab {
 			parent = shared.parent.prefab.parent; // reference parent
 			shared = shared.parent.shared;
 		}
-		if( Std.is(parent, Material) ) {
+		if( Std.isOfType(parent, Material) ) {
 			var material : Material = cast parent;
 			for( m in material.getMaterials(ctx) )
 				callb(null, m);

hrt/prefab/fx/BaseFX.hx

@@ -132,7 +132,7 @@ class BaseFX extends hrt.prefab.Library {
 
 				default:
 					var base = 1.0;
-					if(Std.is(prop, Float) || Std.is(prop, Int))
+					if(Std.isOfType(prop, Float) || Std.isOfType(prop, Int))
 						base = cast prop;
 					var curve = Curve.getCurve(shaderElt, v.name);
 					var val = Value.VConst(base);
@@ -161,7 +161,7 @@ class BaseFX extends hrt.prefab.Library {
 
 		for(shCtx in ctx.shared.getContexts(elt)) {
 			if(shCtx.custom == null) continue;
-			var anim = Std.is(shCtx.custom,hxsl.DynamicShader) ? new ShaderDynAnimation(new hxd.Rand(0)) : new ShaderAnimation(new hxd.Rand(0));
+			var anim = Std.isOfType(shCtx.custom,hxsl.DynamicShader) ? new ShaderDynAnimation(new hxd.Rand(0)) : new ShaderAnimation(new hxd.Rand(0));
 			anim.shader = shCtx.custom;
 			anim.params = makeShaderParams(ctx, shader);
 			anims.push(anim);

hrt/prefab/fx/Emitter.hx

@@ -1373,7 +1373,7 @@ class Emitter extends Object3D {
 		var subEmitterTemplate : Emitter = cast children.find( p -> p.enabled && Std.downcast(p, Emitter) != null && p.to(Object3D).visible);
 		emitterObj.subEmitterTemplate = subEmitterTemplate;
 		// TRAIL
-		var trailTemplate : hrt.prefab.l3d.Trail = cast children.find( p -> p.enabled && Std.is(p, hrt.prefab.l3d.Trail) && p.to(Object3D).visible);
+		var trailTemplate : hrt.prefab.l3d.Trail = cast children.find( p -> p.enabled && Std.isOfType(p, hrt.prefab.l3d.Trail) && p.to(Object3D).visible);
 		emitterObj.trailTemplate = trailTemplate;
 		// RANDOM
 		emitterObj.seedGroup 			= 	getParamVal("seedGroup");

hrt/prefab/fx/FX.hx

@@ -296,13 +296,13 @@ class FXAnimation extends h3d.scene.Object {
 		}
 
 		var ap : AdditionalProperies = null;
-		if( Std.is(objCtx.local3d, h3d.scene.pbr.PointLight)) {
+		if( Std.isOfType(objCtx.local3d, h3d.scene.pbr.PointLight)) {
 			ap = PointLight(makeColor("color"), makeVal("power", null), makeVal("size", null), makeVal("range", null) );
 		}
-		else if( Std.is(objCtx.local3d, h3d.scene.pbr.SpotLight)) {
+		else if( Std.isOfType(objCtx.local3d, h3d.scene.pbr.SpotLight)) {
 			ap = SpotLight(makeColor("color"), makeVal("power", null), makeVal("range", null), makeVal("angle", null), makeVal("fallOff", null) );
 		}
-		else if( Std.is(objCtx.local3d, h3d.scene.pbr.DirLight)) {
+		else if( Std.isOfType(objCtx.local3d, h3d.scene.pbr.DirLight)) {
 			ap = DirLight(makeColor("color"), makeVal("power", null));
 		}
 

hrt/prefab/fx/FX2D.hx

@@ -235,7 +235,7 @@ class FX2D extends BaseFX {
 			anyFound = true;
 		}
 
-		if (Std.is(elt, hrt.prefab.l2d.Anim2D) || Std.is(elt, hrt.prefab.l2d.Atlas))
+		if (Std.isOfType(elt, hrt.prefab.l2d.Anim2D) || Std.isOfType(elt, hrt.prefab.l2d.Atlas))
 			anyFound = true;
 
 		if(anyFound)

hrt/prefab/fx/FXScript.hx

@@ -127,7 +127,7 @@ class FXScript {
 			default: {
 				if(Reflect.hasField(curObj, field)) {
 					var cur = Reflect.field(curObj, field);
-					if(Std.is(cur, Value))
+					if(Std.isOfType(cur, Value))
 						(v) -> Reflect.setProperty(curObj, field, Value.VConst(v));
 					else
 						(v) -> Reflect.setProperty(curObj, field, v);

hrt/prefab/l3d/AnimSpeedControl.hx

@@ -20,7 +20,7 @@ class AnimSpeedControl extends hrt.prefab.Prefab {
 		return {
 			name : "AnimSpeedCtrl",
 			icon : "cog",
-			allowParent : (p) -> Std.is(p,Object3D),
+			allowParent : (p) -> Std.isOfType(p,Object3D),
 		};
 	}
 	override function edit(ctx:EditContext) {

hrt/prefab/l3d/MeshSpray.hx

@@ -275,7 +275,7 @@ class MeshSprayObject extends h3d.scene.Object {
 			c.culled = false;
 			if( c.alwaysSync ) continue;
 			var m = Std.downcast(c, h3d.scene.Mesh);
-			if( m == null || !Std.is(m.primitive, h3d.prim.MeshPrimitive) ) continue;
+			if( m == null || !Std.isOfType(m.primitive, h3d.prim.MeshPrimitive) ) continue;
 
 			var batch = getBatch(m);
 			batch.worldPosition = c.absPos;
@@ -441,7 +441,7 @@ class MeshSpray extends Object3D {
 	}
 
 	override function getHideProps() : HideProps {
-		return { icon : "paint-brush", name : "MeshSpray", hideChildren : p -> return Std.is(p, Model) };
+		return { icon : "paint-brush", name : "MeshSpray", hideChildren : p -> return Std.isOfType(p, Model) };
 	}
 
 	function extractMeshName( path : String ) : String {
@@ -600,7 +600,7 @@ class MeshSpray extends Object3D {
 			selectElement.empty();
 			for (m in currentMeshes.copy()) {
 				var path : String = null;
-				if (Std.is(m, String)) { // retro-compatibility
+				if (Std.isOfType(m, String)) { // retro-compatibility
 					path = cast m;
 					currentMeshes.remove(m);
 					addMeshPath(path);
@@ -830,7 +830,7 @@ class MeshSpray extends Object3D {
 			if (hide.Ide.inst.confirm("Are you sure to remove all meshes for this MeshSpray ?")) {
 				var meshes = [];
 				for( c in children ) {
-					if( Std.is(c, Model) ) {
+					if( Std.isOfType(c, Model) ) {
 						meshes.push(c);
 					}
 				}

hrt/prefab/pbr/Anisotropy.hx

@@ -30,7 +30,7 @@ class Anisotropy extends Prefab {
 	}
 
 	function getMaterials( ctx : Context ) {
-		if( Std.is(parent, Material) ) {
+		if( Std.isOfType(parent, Material) ) {
 			var material : Material = cast parent;
 			return material.getMaterials(ctx);
 		}

hrt/prefab/pbr/SpecularColor.hx

@@ -31,7 +31,7 @@ class SpecularColor extends Prefab {
 	}
 
 	function getMaterials( ctx : Context ) {
-		if( Std.is(parent, Material) ) {
+		if( Std.isOfType(parent, Material) ) {
 			var material : Material = cast parent;
 			return material.getMaterials(ctx);
 		}

hrt/prefab/rfx/ScreenShaderGraph.hx

@@ -106,7 +106,7 @@ class ScreenShaderGraph extends RendererFX {
 			switch(v.type) {
 			case TVec(_, VFloat):
 				if(val != null) {
-					if( Std.is(val,Int) ) {
+					if( Std.isOfType(val,Int) ) {
 						var v = new h3d.Vector();
 						v.setColor(val);
 						val = v;

hrt/prefab/vlm/LightProbe.hx

@@ -226,7 +226,7 @@ class LightProbe extends Object3D {
 		while( root.parent != null ) {
 			root = root.parent;
 		}
-		var probeList : Array<LightProbe> = cast root.findAll( p -> Std.is(p, LightProbe) ? p : null );
+		var probeList : Array<LightProbe> = cast root.findAll( p -> Std.isOfType(p, LightProbe) ? p : null );
 		var curIndex = 0;
 		var needCheck = true;
 		while( needCheck ) {

hrt/shgraph/ShaderGraph.hx

@@ -82,7 +82,7 @@ class ShaderGraph {
 
 		for (p in parameters) {
 			var typeString : Array<Dynamic> = Reflect.field(p, "type");
-			if (Std.is(typeString, Array)) {
+			if (Std.isOfType(typeString, Array)) {
 				if (typeString[1] == null || typeString[1].length == 0)
 					p.type = std.Type.createEnum(Type, typeString[0]);
 				else {
@@ -204,7 +204,7 @@ class ShaderGraph {
 	static var alreadyBuiltSubGraphs : Array<Int> = [];
 	function buildNodeVar(nodeVar : NodeVar) : Array<TExpr>{
 		var node = nodeVar.node;
-		var isSubGraph = Std.is(node, hrt.shgraph.nodes.SubGraph);
+		var isSubGraph = Std.isOfType(node, hrt.shgraph.nodes.SubGraph);
 		if (node == null)
 			return [];
 		if (alreadyBuiltSubGraphs == null)
@@ -216,7 +216,7 @@ class ShaderGraph {
 		for (key in keys) {
 			var input = node.getInput(key);
 			if (input != null) {
-				if (!Std.is(input.node, hrt.shgraph.nodes.SubGraph) || !alreadyBuiltSubGraphs.contains(input.node.id))
+				if (!Std.isOfType(input.node, hrt.shgraph.nodes.SubGraph) || !alreadyBuiltSubGraphs.contains(input.node.id))
 					res = res.concat(buildNodeVar(input));
 			} else if (node.getInputInfo(key).hasProperty) {
 			} else if (!node.getInputInfo(key).isRequired) {
@@ -318,7 +318,7 @@ class ShaderGraph {
 		if( subShaderId == null )
 			alreadyBuiltSubGraphs = [];
 		for (n in nodes) {
-			if (!variableNamesAlreadyUpdated && subShaderId != null && !Std.is(n.instance, ShaderInput)) {
+			if (!variableNamesAlreadyUpdated && subShaderId != null && !Std.isOfType(n.instance, ShaderInput)) {
 				for (outputKey in n.instance.getOutputInfoKeys()) {
 					var output = n.instance.getOutput(outputKey);
 					if (output != null)

hrt/shgraph/nodes/SubGraph.hx

@@ -96,11 +96,11 @@ class SubGraph extends ShaderNode {
 						var shaderConst = Std.downcast(node.instance, ShaderConst);
 						if (shaderConst != null) { // input static become properties
 							if (shaderConst.name.length == 0) continue;
-							if (Std.is(shaderConst, BoolConst)) {
+							if (Std.isOfType(shaderConst, BoolConst)) {
 								parameters.push({ name : shaderConst.name, type : TBool, defaultValue : null, id : shaderConst.id, index : parameters.length });
-							} else if (Std.is(shaderConst, FloatConst)) {
+							} else if (Std.isOfType(shaderConst, FloatConst)) {
 								parameters.push({ name : shaderConst.name, type : TFloat, defaultValue : null, id : shaderConst.id, index : parameters.length });
-							} else if (Std.is(shaderConst, Color)) {
+							} else if (Std.isOfType(shaderConst, Color)) {
 								parameters.push({ name : shaderConst.name, type : TVec(4, VFloat), defaultValue : null, id : shaderConst.id, index : parameters.length });
 							}
 						}