epervier/epervier-old
1
0
Fork 0
Code Issues 30 Pull requests Releases Wiki Activity

improvement: use directly a table for box attr

Browse source
This commit is contained in:
Kazhnuz 2020-11-26 20:16:19 +01:00
parent b071547630
commit 9993221e0d
4 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
birb/modules/world/actors/actor2D.lua
View file

@ -145,20 +145,17 @@ end
function Actor2D:addHitboxFromFrameData(framedata, animationID, frameID, hitboxID) function Actor2D:addHitboxFromFrameData(framedata, animationID, frameID, hitboxID)
local sx, sy = self.sprite:getScalling() local sx, sy = self.sprite:getScalling()
local type = framedata[1] local type = framedata[1]
local ox = framedata[2] local box = framedata[2]
local oy = framedata[3] local isSolid = framedata[3] or false
local w = framedata[4]
local h = framedata[5]
local isSolid = framedata[6] or false
local anim = animationID or "null" local anim = animationID or "null"
local frame = frameID or 0 local frame = frameID or 0
local id = hitboxID or 0 local id = hitboxID or 0
if (type == "main") then if (type == "main") then
self.mainHitbox:setFromData({ox, oy, w, h}, sx, sy) self.mainHitbox:setFromData(box, sx, sy)
else else
local hitboxName = anim .. frame .. type .. id local hitboxName = anim .. frame .. type .. id
self:addHitbox(hitboxName, type, {ox, oy, w, h}, sx, sy, isSolid) self:addHitbox(hitboxName, type, box, sx, sy, isSolid)
return hitboxName return hitboxName
end end
end end

13
birb/modules/world/actors/actor3D.lua
View file

@ -167,22 +167,17 @@ end
function Actor3D:addHitboxFromFrameData(framedata, animationID, frameID, hitboxID) function Actor3D:addHitboxFromFrameData(framedata, animationID, frameID, hitboxID)
local sx, sy = self.sprite:getScalling() local sx, sy = self.sprite:getScalling()
local type = framedata[1] local type = framedata[1]
local ox = framedata[2] local box = framedata[2]
local oy = framedata[3] local isSolid = framedata[3] or false
local oz = framedata[4]
local w = framedata[5]
local h = framedata[6]
local d = framedata[7]
local isSolid = framedata[8] or false
local anim = animationID or "null" local anim = animationID or "null"
local frame = frameID or 0 local frame = frameID or 0
local id = hitboxID or 0 local id = hitboxID or 0
if (type == "main") then if (type == "main") then
self.mainHitbox:setFromData({ox, oy, oz, w, h, d}, sx, sy) self.mainHitbox:setFromData(box, sx, sy)
else else
local hitboxName = anim .. frame .. type .. id local hitboxName = anim .. frame .. type .. id
self:addHitbox(hitboxName, type, {ox, oy, oz, w, h, d}, sx, sy, isSolid) self:addHitbox(hitboxName, type, box, sx, sy, isSolid)
return hitboxName return hitboxName
end end
end end

6
examples/scenes/gameplay/action3D/actors/hitboxes/player.lua
View file

@ -1,13 +1,13 @@
return { return {
["idle"] = { ["idle"] = {
{ {
{"main", 0, 0, 0, 16, 16, 24, true} {"main", {0, 0, 0, 16, 16, 24}, true}
} }
}, },
["punch"] = { ["punch"] = {
{ {
{"main", 0, 0, 0, 16, 16, 24, true}, {"main", {0, 0, 0, 16, 16, 24}, true},
{"punch", 16, 2, 6, 12, 12, 12, false} {"punch", {16, 2, 6, 12, 12, 12}, false}
} }
} }
} }

6
examples/scenes/gameplay/plateform/actors/hitboxes/player.lua
View file

@ -1,13 +1,13 @@
return { return {
["idle"] = { ["idle"] = {
{ {
{"main", 0, 0, 16, 24, true} {"main", {0, 0, 16, 24}, true}
} }
}, },
["punch"] = { ["punch"] = {
{ {
{"main", 0, 0, 16, 24, true}, {"main", {0, 0, 16, 24}, true},
{"punch", 16, 6, 12, 12, false} {"punch", {16, 6, 12, 12}, false}
} }
} }
} }