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

chore: pack and unpack the coordinates

Browse source
This commit is contained in:
Kazhnuz 2021-05-07 11:56:44 +02:00
parent edf44fd252
commit 040240492e
6 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sonic-radiance.love/birb/modules/world/actors/actor2D.lua
View file

@ -161,24 +161,24 @@ function Actor2D:addHitboxFromFrameData(framedata, animationID, frameID, hitboxI
end
if (type == "main") then
self.mainHitbox:modify(ox, oy, w, h)
self.mainHitbox:setFromData({ox, oy, w, h})
else
local hitboxName = anim .. frame .. type .. id
self:addHitbox(hitboxName, type, ox, oy, w, h, isSolid)
self:addHitbox(hitboxName, type, {ox, oy, w, h}, isSolid)
return hitboxName
end
end
function Actor2D:initMainHitbox()
self.mainHitbox = Hitbox(self, self.type, 0, 0, self.w, self.h, self.isSolid)
self.mainHitbox = Hitbox(self, self.type, {0, 0, self.w, self.h}, self.isSolid)
self.mainHitbox:advertiseAsMainHitbox()
end
function Actor2D:addHitbox(name, type, ox, oy, w, h, isSolid)
function Actor2D:addHitbox(name, type, data, isSolid)
if (self.hitboxes[name] ~= nil) then
core.debug:warning("actor2D", "the hitbox " .. name .. " already exists")
else
local hitbox = Hitbox(self, type, ox, oy, w, h, isSolid)
local hitbox = Hitbox(self, type, data, isSolid)
self.hitboxes[name] = hitbox
return hitbox
end

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

@ -186,24 +186,24 @@ function Actor3D:addHitboxFromFrameData(framedata, animationID, frameID, hitboxI
end
if (type == "main") then
self.mainHitbox:modify(ox, oy, oz, w, h, d)
self.mainHitbox:setFromData({ox, oy, oz, w, h, d})
else
local hitboxName = anim .. frame .. type .. id
self:addHitbox(hitboxName, type, ox, oy, oz, w, h, d, isSolid)
self:addHitbox(hitboxName, type, {ox, oy, oz, w, h, d}, isSolid)
return hitboxName
end
end
function Actor3D:initMainHitbox()
self.mainHitbox = Hitbox(self, self.type, 0, 0, 0, self.w, self.h, self.d, self.isSolid)
self.mainHitbox = Hitbox(self, self.type, {0, 0, 0, self.w, self.h, self.d}, self.isSolid)
self.mainHitbox:advertiseAsMainHitbox()
end
function Actor3D:addHitbox(name, type, ox, oy, oz, w, h, d, isSolid)
function Actor3D:addHitbox(name, type, data, isSolid)
if (self.hitboxes[name] ~= nil) then
core.debug:warning("actor3D", "the hitbox " .. name .. " already exists")
else
local hitbox = Hitbox(self, type, ox, oy, oz, w, h, d, isSolid)
local hitbox = Hitbox(self, type, data, isSolid)
self.hitboxes[name] = hitbox
return hitbox
end

3
sonic-radiance.love/birb/modules/world/actors/mixins/base.lua
View file

@ -27,9 +27,8 @@ local BaseActor = Object:extend()
-- INIT FUNCTIONS
-- Initialise the actor and its base functions
function BaseActor:init(world, type, x, y, z, w, h, d, isSolid)
function BaseActor:init(world, type)
self.type = type or ""
self.isSolid = isSolid or false
self.depth = 0
self.updateFunctions = {}

14
sonic-radiance.love/birb/modules/world/actors/utils/hitbox2D.lua
View file

@ -27,16 +27,13 @@ local Hitbox2D = Object:extend()
-- INIT FUNCTIONS
-- Initialise the actor and its base functions
function Hitbox2D:new(owner, type, ox, oy, w, h, isSolid)
function Hitbox2D:new(owner, type, data, isSolid)
self.owner = owner
self.world = owner.world
self.type = type
self.ox = ox
self.oy = oy
self:setFromData(data)
self.x, self.y = self:getPosition()
self.w = w
self.h = h
self.isSolid = isSolid
self.isMainHitBox = false
@ -57,6 +54,13 @@ function Hitbox2D:modify(ox, oy, w, h)
self.h = h
end
function Hitbox2D:setFromData(data)
self.ox = data[1]
self.oy = data[2]
self.w = data[3]
self.h = data[4]
end
function Hitbox2D:setDebugColor(r,g,b)
self.debug = {}
self.debug.r = r

18
sonic-radiance.love/birb/modules/world/actors/utils/hitbox3D.lua
View file

@ -27,18 +27,13 @@ local Hitbox3D = Object:extend()
-- INIT FUNCTIONS
-- Initialise the actor and its base functions
function Hitbox3D:new(owner, type, ox, oy, oz, w, h, d, isSolid)
function Hitbox3D:new(owner, type, data, isSolid)
self.owner = owner
self.world = owner.world
self.type = type
self.ox = ox
self.oy = oy
self.oz = oz
self:setFromData(data)
self.x, self.y, self.z = self:getPosition()
self.w = w
self.h = h
self.d = d
self.isSolid = isSolid
self.isMainHitBox = false
@ -61,6 +56,15 @@ function Hitbox3D:modify(ox, oy, oz, w, h, d)
self.d = d
end
function Hitbox3D:setFromData(data)
self.ox = data[1]
self.oy = data[2]
self.oz = data[3]
self.w = data[4]
self.h = data[5]
self.d = data[6]
end
function Hitbox3D:setDebugColor(r,g,b)
self.debug = {}
self.debug.r = r

2
sonic-radiance.love/scenes/overworld/actors/gizmo.lua
View file

@ -33,7 +33,7 @@ function Gizmo:applyProperties()
self.isSolid = self.properties.isSolid
self.mainHitbox.isSolid = self.properties.isSolid
if (self.isSolid) then
self:addHitbox("btnInput", "btnInput", -1, -1, self.w + 2, self.h + 2, false)
self:addHitbox("btnInput", "btnInput", {-1, -1, self.w + 2, self.h + 2}, false)
end
self.needButton = self.properties.needButton
self.charId = self.properties.charId or 1