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

Softbody compile fix

Browse source
This commit is contained in:
luboslenco 2019-01-10 11:59:49 +01:00
parent bd88a4d67c
commit e15b213666
2 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Sources/armory/trait/physics/bullet/SoftBody.hx
View file

@ -48,9 +48,13 @@ class SoftBody extends Trait {
}); });
} }
function fromF32(ar:kha.arrays.Float32Array):kha.arrays.Float32Array { function fromI16(ar:kha.arrays.Int16Array, scalePos:Float):kha.arrays.Float32Array {
var vals = new kha.arrays.Float32Array(ar.length); var vals = new kha.arrays.Float32Array(Std.int(ar.length / 4) * 3);
for (i in 0...vals.length) vals[i] = ar[i]; for (i in 0...Std.int(vals.length / 3)) {
vals[i * 3 ] = ar[i * 4 ] / 32767 * scalePos;
vals[i * 3 + 1] = ar[i * 4 + 1] / 32767 * scalePos;
vals[i * 3 + 2] = ar[i * 4 + 2] / 32767 * scalePos;
}
return vals; return vals;
} }
@ -88,7 +92,7 @@ class SoftBody extends Trait {
object.transform.buildMatrix(); object.transform.buildMatrix();
} }
var positions = fromF32(geom.positions); var positions = fromI16(geom.positions, mo.data.scalePos);
for (i in 0...Std.int(positions.length / 4)) { for (i in 0...Std.int(positions.length / 4)) {
v.set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2]); v.set(positions[i * 3], positions[i * 3 + 1], positions[i * 3 + 2]);
v.applyQuat(object.transform.rot); v.applyQuat(object.transform.rot);
@ -96,7 +100,7 @@ class SoftBody extends Trait {
v.y *= object.transform.scale.y; v.y *= object.transform.scale.y;
v.z *= object.transform.scale.z; v.z *= object.transform.scale.z;
v.addf(object.transform.worldx(), object.transform.worldy(), object.transform.worldz()); v.addf(object.transform.worldx(), object.transform.worldy(), object.transform.worldz());
positions[i * 3] = v.x; positions[i * 3 ] = v.x;
positions[i * 3 + 1] = v.y; positions[i * 3 + 1] = v.y;
positions[i * 3 + 2] = v.z; positions[i * 3 + 2] = v.z;
} }
@ -153,7 +157,7 @@ class SoftBody extends Trait {
body.getCollisionShape().setMargin(margin); body.getCollisionShape().setMargin(margin);
physics.world.addSoftBody(body, 1, -1); physics.world.addSoftBody(body, 1, -1);
body.setActivationState(BtCollisionObject.DISABLE_DEACTIVATION); body.setActivationState(bullet.Bt.CollisionObject.DISABLE_DEACTIVATION);
notifyOnUpdate(update); notifyOnUpdate(update);
} }
@ -164,14 +168,15 @@ class SoftBody extends Trait {
var cb = new Vec4(); var cb = new Vec4();
var ab = new Vec4(); var ab = new Vec4();
function update() { function update() {
var geom = cast(object, MeshObject).data.geom; var mo = cast(object, MeshObject);
var geom = mo.data.geom;
var scalePos = mo.data.scalePos;
#if arm_deinterleaved #if arm_deinterleaved
var v = geom.vertexBuffers[0].lock(); var v = geom.vertexBuffers[0].lockInt16();
var n = geom.vertexBuffers[1].lock(); var n = geom.vertexBuffers[1].lockInt16();
var l = 3;//geom.structLength;
#else #else
var v = geom.vertexBuffer.lock(); var v = geom.vertexBuffer.lockInt16();
var l = geom.structLength; var l = geom.structLength;
#end #end
var numVerts = Std.int(v.length / l); var numVerts = Std.int(v.length / l);
@ -192,19 +197,19 @@ class SoftBody extends Trait {
var nodeNor = node.m_n; var nodeNor = node.m_n;
#end #end
#if arm_deinterleaved #if arm_deinterleaved
v.set(i * l, nodePos.x()); v.set(i * 4 , Std.int(nodePos.x() * 32767 / scalePos));
v.set(i * l + 1, nodePos.y()); v.set(i * 4 + 1, Std.int(nodePos.y() * 32767 / scalePos));
v.set(i * l + 2, nodePos.z()); v.set(i * 4 + 2, Std.int(nodePos.z() * 32767 / scalePos));
n.set(i * l, nodeNor.x()); n.set(i * 2 , Std.int(nodeNor.x() * 32767));
n.set(i * l + 1, nodeNor.y()); n.set(i * 2 + 1, Std.int(nodeNor.y() * 32767));
n.set(i * l + 2, nodeNor.z()); v.set(i * 4 + 3, Std.int(nodeNor.z() * 32767));
#else #else
v.set(i * l, nodePos.x()); v.set(i * l , Std.int(nodePos.x() * 32767 / scalePos));
v.set(i * l + 1, nodePos.y()); v.set(i * l + 1, Std.int(nodePos.y() * 32767 / scalePos));
v.set(i * l + 2, nodePos.z()); v.set(i * l + 2, Std.int(nodePos.z() * 32767 / scalePos));
v.set(i * l + 3, nodeNor.x()); v.set(i * l + 4, Std.int(nodeNor.x() * 32767));
v.set(i * l + 4, nodeNor.y()); v.set(i * l + 5, Std.int(nodeNor.y() * 32767));
v.set(i * l + 5, nodeNor.z()); v.set(i * l + 3, Std.int(nodeNor.z() * 32767));
#end #end
} }
// for (i in 0...Std.int(geom.indices[0].length / 3)) { // for (i in 0...Std.int(geom.indices[0].length / 3)) {

2
blender/arm/exporter.py
View file

@ -2550,7 +2550,7 @@ class ArmoryExporter:
bend = (soft_mod.settings.bend + 1.0) * 10 bend = (soft_mod.settings.bend + 1.0) * 10
trait['parameters'] = [str(soft_type), str(bend), str(soft_mod.settings.mass), str(bobject.arm_soft_body_margin)] trait['parameters'] = [str(soft_type), str(bend), str(soft_mod.settings.mass), str(bobject.arm_soft_body_margin)]
o['traits'].append(trait) o['traits'].append(trait)
if soft_type == 0 and soft_mod.settings.use_pin_cloth: if soft_type == 0:
self.add_hook_mod(o, bobject, '', soft_mod.settings.vertex_group_mass) self.add_hook_mod(o, bobject, '', soft_mod.settings.vertex_group_mass)
def add_hook_mod(self, o, bobject, target_name, group_name): def add_hook_mod(self, o, bobject, target_name, group_name):