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

Cpp fixes

Browse source
This commit is contained in:
Lubos Lenco 2017-05-28 20:11:59 +02:00
parent f6a0eb27b4
commit ca3e8b6d29
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Sources/armory/trait/PhysicsBreak.hx
View file

@ -518,11 +518,11 @@ class ConvexBreaker {
}
// TODO:
var paa = new kha.arrays.Float32Array(pa.length);
var paa = new TFloat32Array(pa.length);
for (i in 0...pa.length) paa.set(i, pa[i]);
var naa = new kha.arrays.Float32Array(na.length);
var naa = new TFloat32Array(na.length);
for (i in 0...na.length) naa.set(i, na[i]);
var inda = new kha.arrays.Uint32Array(ind.length);
var inda = new TUint32Array(ind.length);
for (i in 0...ind.length) inda.set(i, ind[i]);
var pos:TVertexArray = {

5
Sources/armory/trait/internal/PhysicsWorld.hx
View file

@ -7,6 +7,7 @@ import iron.Trait;
import iron.system.Time;
import iron.math.Vec4;
import iron.math.RayCaster;
import iron.data.SceneFormat;
class ContactPair {
public var a:Int;
@ -97,8 +98,8 @@ class PhysicsWorld extends Trait {
});
}
function gravityArray():kha.arrays.Float32Array {
var ar = new kha.arrays.Float32Array(3);
function gravityArray():TFloat32Array {
var ar = new TFloat32Array(3);
ar[0] = 0.0;
ar[1] = 0.0;
ar[2] = -9.81;

4
Sources/armory/trait/internal/SoftBody.hx
View file

@ -44,13 +44,13 @@ class SoftBody extends Trait {
});
}
function fromF32(ar:kha.arrays.Float32Array):haxe.ds.Vector<kha.FastFloat> {
function fromF32(ar:TFloat32Array):haxe.ds.Vector<kha.FastFloat> {
var vals = new haxe.ds.Vector<kha.FastFloat>(ar.length);
for (i in 0...vals.length) vals[i] = ar[i];
return vals;
}
function fromU32(ar:kha.arrays.Uint32Array):haxe.ds.Vector<Int> {
function fromU32(ar:TUint32Array):haxe.ds.Vector<Int> {
var vals = new haxe.ds.Vector<Int>(ar.length);
for (i in 0...vals.length) vals[i] = ar[i];
return vals;