diff options
| author | David Walter Seikel | 2016-02-06 22:14:01 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2016-02-06 22:14:01 +1000 |
| commit | 6a15944f255d0d9653573ad0857e527f58f5f997 (patch) | |
| tree | 160c55c97b259b884b4d8cff29516049dad390c2 /lib | |
| parent | Put the ~/.SledHamr/ creation code into all three main binaries. sigh (diff) | |
| download | SledjHamr-6a15944f255d0d9653573ad0857e527f58f5f997.zip SledjHamr-6a15944f255d0d9653573ad0857e527f58f5f997.tar.gz SledjHamr-6a15944f255d0d9653573ad0857e527f58f5f997.tar.bz2 SledjHamr-6a15944f255d0d9653573ad0857e527f58f5f997.tar.xz | |
Pass stuff size up to C code.
This is getting unweildy. lol
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scenriLua.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/scenriLua.lua b/lib/scenriLua.lua index 2938a9d..f9cd0e5 100644 --- a/lib/scenriLua.lua +++ b/lib/scenriLua.lua | |||
| @@ -37,7 +37,7 @@ do | |||
| 37 | end | 37 | end |
| 38 | preallocateStuffs(count) | 38 | preallocateStuffs(count) |
| 39 | for k, v in pairs(Stuffs.details.stuffs) do | 39 | for k, v in pairs(Stuffs.details.stuffs) do |
| 40 | partFillStuffs(k, v.fileName, v.pos[1], v.pos[2], v.pos[3], v.rot[1], v.rot[2], v.rot[3], v.rot[4]) | 40 | partFillStuffs(k, v.fileName, v.pos[1], v.pos[2], v.pos[3], v.rot[1], v.rot[2], v.rot[3], v.rot[4], v.size[1], v.size[2], v.size[3]) |
| 41 | end | 41 | end |
| 42 | end | 42 | end |
| 43 | elseif 'cannot open ' ~= string.sub(err, 1, 12) then | 43 | elseif 'cannot open ' ~= string.sub(err, 1, 12) then |
| @@ -78,7 +78,7 @@ do | |||
| 78 | local meshFile = Stuffs.details.Mesh.fileName or v.fileName | 78 | local meshFile = Stuffs.details.Mesh.fileName or v.fileName |
| 79 | local eStuffs = addStuffs(Stuffs.uuid, Stuffs.name, Stuffs.description, | 79 | local eStuffs = addStuffs(Stuffs.uuid, Stuffs.name, Stuffs.description, |
| 80 | Stuffs.owner, v.fileName, MeshType[Stuffs.details.Mesh.kind], | 80 | Stuffs.owner, v.fileName, MeshType[Stuffs.details.Mesh.kind], |
| 81 | v.pos[1], v.pos[2], v.pos[3], v.rot[1], v.rot[2], v.rot[3], v.rot[4]) | 81 | v.pos[1], v.pos[2], v.pos[3], v.rot[1], v.rot[2], v.rot[3], v.rot[4], v.size[1], v.size[2], v.size[3]) |
| 82 | if eStuffs then | 82 | if eStuffs then |
| 83 | addMaterial(eStuffs, -1, TextureType[Stuffs.details.Mesh.materials[0].kind ], Stuffs.details.Mesh.materials[0].texture) | 83 | addMaterial(eStuffs, -1, TextureType[Stuffs.details.Mesh.materials[0].kind ], Stuffs.details.Mesh.materials[0].texture) |
| 84 | stuffsSetup(eStuffs, Stuffs.fake) | 84 | stuffsSetup(eStuffs, Stuffs.fake) |