merge upstream

leenkx/Sources/iron/App.hx

@@ -54,6 +54,22 @@ class App {
 		if (Scene.active == null || !Scene.active.ready) return;
 		
 		iron.system.Time.update();
+		
+		if (lastw == -1) {
+			lastw = App.w();
+			lasth = App.h();
+		}
+		if (lastw != App.w() || lasth != App.h()) {
+			if (onResize != null) onResize();
+			else {
+				if (Scene.active != null && Scene.active.camera != null) {
+					Scene.active.camera.buildProjection();
+				}
+			}
+		}
+		lastw = App.w();
+		lasth = App.h();
+		
 		if (pauseUpdates) return;
 
 		#if lnx_debug
@@ -98,22 +114,6 @@ class App {
 		for (cb in endFrameCallbacks) cb();
 		updateTime = kha.Scheduler.realTime() - startTime;
 		#end
-
-		// Rebuild projection on window resize
-		if (lastw == -1) {
-			lastw = App.w();
-			lasth = App.h();
-		}
-		if (lastw != App.w() || lasth != App.h()) {
-			if (onResize != null) onResize();
-			else {
-				if (Scene.active != null && Scene.active.camera != null) {
-					Scene.active.camera.buildProjection();
-				}
-			}
-		}
-		lastw = App.w();
-		lasth = App.h();
 	}
 
 	static function render(frames: Array<kha.Framebuffer>) {

leenkx/Sources/iron/Scene.hx

@@ -887,7 +887,7 @@ class Scene {
 						var ptype: String = t.props[i * 3 + 1];
 						var pval: Dynamic = t.props[i * 3 + 2];
 
-						if (StringTools.endsWith(ptype, "Object") && pval != "") {
+						if (StringTools.endsWith(ptype, "Object") && pval != "" && pval != null) {
 							Reflect.setProperty(traitInst, pname, Scene.active.getChild(pval));
 						} else if (ptype == "TSceneFormat" && pval != "") {
 							Data.getSceneRaw(pval, function (r: TSceneFormat) {

leenkx/Sources/leenkx/logicnode/DrawStringNode.hx

@@ -62,7 +62,7 @@ class DrawStringNode extends LogicNode {
 
 	override function get(from: Int): Dynamic {
 
-		return from == 1 ? RenderToTexture.g.font.height(RenderToTexture.g.fontSize) : RenderToTexture.g.font.width(RenderToTexture.g.fontSize, string);
-	
+		return from == 1 ? RenderToTexture.g.font.width(RenderToTexture.g.fontSize, string) : RenderToTexture.g.font.height(RenderToTexture.g.fontSize);
+			
 	}
 }

leenkx/Sources/leenkx/trait/PhysicsBreak.hx

@@ -73,7 +73,17 @@ class PhysicsBreak extends Trait {
 						collisionMargin: 0.04,
 						linearDeactivationThreshold: 0.0,
 						angularDeactivationThrshold: 0.0,
-						deactivationTime: 0.0
+						deactivationTime: 0.0,
+						linearVelocityMin: 0.0,
+						linearVelocityMax: 0.0,
+						angularVelocityMin: 0.0,
+						angularVelocityMax: 0.0,
+						lockTranslationX: false,
+						lockTranslationY: false,
+						lockTranslationZ: false,
+						lockRotationX: false,
+						lockRotationY: false,
+						lockRotationZ: false
 					};
 					o.addTrait(new RigidBody(Shape.ConvexHull, ud.mass, ud.friction, 0, 1, params));
 					if (cast(o, MeshObject).data.geom.positions.values.length < 600) {

leenkx/Sources/leenkx/trait/internal/DebugConsole.hx

@@ -281,7 +281,7 @@ class DebugConsole extends Trait {
 					function drawObjectNameInList(object: iron.object.Object, selected: Bool) {
 						var _y = ui._y;
 
-						if (object.parent.name == 'Root')
+						if (object.parent.name == 'Root' && object.raw == null)
 							ui.text(object.uid+'_'+object.name+' ('+iron.Scene.active.raw.world_ref+')');
 						else
 							ui.text(object.uid+'_'+object.name);