game-projects/sonic-radiance
1
0
Fork 0
Code Issues 33 Pull requests Projects 3 Releases Wiki Activity

big-refactor #106

Merged
kazhnuz merged 24 commits from big-refactor into master 2021-05-07 19:30:53 +02:00
Conversation 1 Commits 24 Files changed 192 +8 -16
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f3a98592b3 - Show all commits

11
sonic-radiance.love/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:getSpriteScalling() local sx, sy = self:getSpriteScalling()
local type = framedata[1] local type = framedata[1]
local ox = framedata[2] local data = 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(data, 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, data, sx, sy, isSolid)
return hitboxName return hitboxName
end end
end end

13
sonic-radiance.love/birb/modules/world/actors/actor3D.lua
View file

@ -168,22 +168,17 @@ end
function Actor3D:addHitboxFromFrameData(framedata, animationID, frameID, hitboxID) function Actor3D:addHitboxFromFrameData(framedata, animationID, frameID, hitboxID)
local sx, sy = self:getSpriteScalling() local sx, sy = self:getSpriteScalling()
local type = framedata[1] local type = framedata[1]
local ox = framedata[2] local data = 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(data, 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, data, sx, sy, isSolid)
return hitboxName return hitboxName
end end
end end