edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Iron update

Browse Source
This commit is contained in:
luboslenco
2020-04-16 10:35:30 +02:00
parent 4472b39b46
commit 32a9aab17b
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/node/MakeMeshPreview.hx
+1 -1
View File
@@ -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');
Sources/arm/plugin/PhysicsBody.hx
+2 -2
View File
@@ -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);
Sources/arm/plugin/PhysicsWorld.hx
+2 -1
View File
@@ -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");
Sources/arm/ui/TabTraits.hx
+2 -2
View File
@@ -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]);