From 32a9aab17b69f9b91c6a298cc97ebcbf79bfdcba Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Thu, 16 Apr 2020 10:35:30 +0200
Subject: [PATCH] Iron update

---
 Sources/arm/node/MakeMeshPreview.hx | 2 +-
 Sources/arm/plugin/PhysicsBody.hx   | 4 ++--
 Sources/arm/plugin/PhysicsWorld.hx  | 3 ++-
 Sources/arm/ui/TabTraits.hx         | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Sources/arm/node/MakeMeshPreview.hx b/Sources/arm/node/MakeMeshPreview.hx
index 5739cadb..6fdabaf6 100644
--- a/Sources/arm/node/MakeMeshPreview.hx
+++ b/Sources/arm/node/MakeMeshPreview.hx
@@ -29,7 +29,7 @@ class MakeMeshPreview {
 
 		#if arm_skin
 		var isMesh = Std.is(Context.object, MeshObject);
-		var skin = isMesh && cast(Context.object, MeshObject).data.geom.bones != null;
+		var skin = isMesh && cast(Context.object, MeshObject).data.geom.getVArray("bone") != null;
 		if (skin) {
 			pos = "spos";
 			con_mesh.add_elem("bone", 'short4norm');
diff --git a/Sources/arm/plugin/PhysicsBody.hx b/Sources/arm/plugin/PhysicsBody.hx
index 17b74830..cda37ef0 100644
--- a/Sources/arm/plugin/PhysicsBody.hx
+++ b/Sources/arm/plugin/PhysicsBody.hx
@@ -368,7 +368,7 @@ class PhysicsBody extends iron.Trait {
 		convexHullCache.set(data, shape);
 		usersCache.set(data, 1);
 
-		var positions = data.geom.positions;
+		var positions = data.geom.positions.values;
 
 		var sx: kha.FastFloat = scale.x * (1.0 - margin) * (1 / 32767);
 		var sy: kha.FastFloat = scale.y * (1.0 - margin) * (1 / 32767);
@@ -402,7 +402,7 @@ class PhysicsBody extends iron.Trait {
 		triangleMeshCache.set(data, triangleMesh);
 		usersCache.set(data, 1);
 
-		var positions = data.geom.positions;
+		var positions = data.geom.positions.values;
 		var indices = data.geom.indices;
 
 		var sx: kha.FastFloat = scale.x * (1 / 32767);
diff --git a/Sources/arm/plugin/PhysicsWorld.hx b/Sources/arm/plugin/PhysicsWorld.hx
index 52562272..4b825a6c 100644
--- a/Sources/arm/plugin/PhysicsWorld.hx
+++ b/Sources/arm/plugin/PhysicsWorld.hx
@@ -23,10 +23,11 @@ class PhysicsWorld extends iron.Trait {
 	var timeStep = 1 / 60;
 	var maxSteps = 1;
 
+	@:access(Main)
 	public static function load() {
 		var b = haxe.io.Bytes.ofData(Krom.loadBlob("data/ammo.wasm.js"));
 		var print = function(s: String) { trace(s); };
-		var loaded = function() { tasks--; start(); };
+		var loaded = function() { Main.tasks--; Main.start(); };
 		untyped __js__("(1, eval)({0})", b.toString());
 		var instantiateWasm = function(imports, successCallback) {
 			var wasmbin = Krom.loadBlob("data/ammo.wasm.wasm");
diff --git a/Sources/arm/ui/TabTraits.hx b/Sources/arm/ui/TabTraits.hx
index 9e6e3bf9..f6052961 100644
--- a/Sources/arm/ui/TabTraits.hx
+++ b/Sources/arm/ui/TabTraits.hx
@@ -11,8 +11,8 @@ class TabTraits {
 	static var traits = ["PhysicsBody"];
 
 	public static function draw() {
-		var ui = Context.ui;
-		if (ui.tab(Context.htab1, tr("Traits"))) {
+		var ui = UISidebar.inst.ui;
+		if (ui.tab(UISidebar.inst.htab1, tr("Traits"))) {
 			if (Context.object != null) {
 
 				ui.row([1 / 4]);