Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bone-keyed caches in bone extension #3181

Merged
merged 3 commits into from
Nov 17, 2024
Merged

Remove bone-keyed caches in bone extension #3181

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94a8993
Remove bone2entity
Denneisk Nov 15, 2024
c199688
Remove bone2index
Denneisk Nov 15, 2024
86459ff
Remove unnecessary return argument
Denneisk Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 16 additions & 34 deletions lua/entities/gmod_wire_expression2/core/bone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,12 @@ registerCallback("e2lib_replace_function", function(funcname, func, oldfunc)
end
end)

local bone2entity = {}
local bone2index = {}
local entity2bone = {}

hook.Add("EntityRemoved", "wire_expression2_bone", function(ent)
if not entity2bone[ent] then return end
for index,bone in pairs(entity2bone[ent]) do
bone2entity[bone] = nil
bone2index[bone] = nil
if entity2bone[ent] then
entity2bone[ent] = nil
end
entity2bone[ent] = nil
end)

-- faster access to some math library functions
Expand All @@ -37,9 +32,6 @@ local function getBone(entity, index)
bone = entity:GetPhysicsObjectNum(index)
if not bone then return nil end
entity2bone[entity][index] = bone

bone2entity[bone] = entity
bone2index[bone] = index
end

return IsValid(bone) and bone or nil
Expand All @@ -55,20 +47,14 @@ local function GetBones(entity)
end
E2Lib.GetBones = GetBones

local function removeBone(bone)
bone2entity[bone] = nil
bone2index[bone] = nil
end

-- checks whether the bone is valid. if yes, returns the bone's entity and bone index; otherwise, returns nil.
-- checks whether the bone is valid. if yes, returns the bone's entity; otherwise, returns nil.
local function isValidBone(b)
if type(b) ~= "PhysObj" or not IsValid(b) then return nil, 0 end
local ent = bone2entity[b]
if not IsValid(ent) then
removeBone(b)
return nil, 0
local ent = b:GetEntity()
if not ent:IsValid() then
return nil
end
return ent, bone2index[b]
return ent
end
E2Lib.isValidBone = isValidBone

Expand Down Expand Up @@ -129,15 +115,13 @@ end

--- Returns <this>'s index in the entity it belongs to. Returns -1 if the bone is invalid or an error occured.
e2function number bone:index()
if not isValidBone(this) then return -1 end
--[[local ent = this:GetEntity()
if not IsValid(ent) then return -1 end
local maxn = ent:GetPhysicsObjectCount()-1
for i = 0,maxn do
local ent = isValidBone(this)
if not ent then return -1 end
local n = ent:GetPhysicsObjectCount() - 1
for i = 0, n do
if this == ent:GetPhysicsObjectNum(i) then return i end
end
return -1]]
return bone2index[this] or -1
return -1
end

--[[************************************************************************]]--
Expand Down Expand Up @@ -404,15 +388,13 @@ end
-- helper function for invert(T) in table.lua
function e2_tostring_bone(b)
local ent = isValidBone(b)
if not ent then return "(null)" end
return string.format("%s:bone(%d)", tostring(ent), bone2index[b])
if not ent then return "(null bone)" end
return string.format("bone [%s][Entity %d]", b:GetName(), ent:EntIndex())
end
local e2_tostring_bone = e2_tostring_bone

--- Returns <b> formatted as a string. Returns "<code>(null)</code>" for invalid bones.
e2function string toString(bone b)
local ent = isValidBone(b)
if not ent then return "(null)" end
return string.format("%s:bone(%d)", tostring(ent), bone2index[b])
return e2_tostring_bone(b)
end

WireLib.registerDebuggerFormat("BONE", e2_tostring_bone)
Loading