Winded/RagdollMover
1
0
Fork 0
mirror of https://github.com/Winded/RagdollMover.git synced 2025-03-04 03:13:36 -05:00
Code Issues Packages Projects Releases Activity

Removed caching bones and their parents in the skeleton drawing function as it didn't seem to save that much performance anyway

Browse Source
This commit is contained in:
penolakushari 2024-12-26 20:28:47 +03:00
parent aaf725a8b0
commit 3a490f5bb7
2 changed files with 36 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
lua/autorun/ragdollmover.lua
View File

@ -1484,106 +1484,49 @@ function DrawBoneConnections(ent, bone)
end
end
local SkeletonData = {}
function DrawSkeleton(ent, bonenodes)
local bonenodes = bonenodes[ent]
local function DrawRecursiveBones(ent, bone, bonenodes, poscache)
local mainpos = ent:GetBonePosition(bone)
poscache[bone] = mainpos
local num = ent:GetBoneCount() - 1
for v = 0, num do
local parent = ent:GetBoneParent(v)
if ( ent:GetBoneName(v) == "__INVALIDBONE__" ) or parent == -1 then continue end
mainpos = mainpos:ToScreen()
local nodecache = bonenodes[ent]
local nodeexist = nodecache and true or false
local mainvisible = mainpos.visible
for _, boneid in ipairs(ent:GetChildBones(bone)) do
SkeletonData[boneid] = bone
local pos = ent:GetBonePosition(boneid)
local pos = ent:GetBonePosition(v)
pos = pos:ToScreen()
local posvisible = pos.visible
if mainvisible or posvisible then
local parentpos = ent:GetBonePosition(parent)
if not parentpos then
parentpos = ent:GetPos()
end
parentpos = parentpos:ToScreen()
if pos.visible or parentpos.visible then
surface.SetDrawColor(COLOR_WHITE:Unpack())
surface.DrawLine(mainpos.x, mainpos.y, pos.x, pos.y)
surface.DrawLine(parentpos.x, parentpos.y, pos.x, pos.y)
end
DrawRecursiveBones(ent, boneid, bonenodes, poscache)
local color
if nodeexist and nodecache[boneid] then
color = BONETYPE_COLORS[nodecache[boneid].Type][1]
else
color = COLOR_RGMGREEN
end
for v = 0, num do
if ( ent:GetBoneName(v) == "__INVALIDBONE__" ) then continue end
local pos = ent:GetBonePosition(v)
if not pos then
pos = ent:GetPos()
end
if posvisible then
pos = pos:ToScreen()
if pos.visible then
local color
if bonenodes and bonenodes[v] and bonenodes[v].Type then
color = BONETYPE_COLORS[bonenodes[v].Type][1]
else
color = COLOR_RGMGREEN
end
surface.DrawCircle(pos.x, pos.y, 2.5, color)
end
end
end
function DrawSkeleton(ent, bonenodes, poscache, calc)
if SkeletonData.ent ~= ent then
SkeletonData = {}
poscache = {}
local num = ent:GetBoneCount() - 1
for v = 0, num do
if ent:GetBoneName(v) == "__INVALIDBONE__" then continue end
if ent:GetBoneParent(v) == -1 then
SkeletonData[v] = -1
local pos = ent:GetBonePosition(v)
if not pos then
pos = ent:GetPos()
end
DrawRecursiveBones(ent, v, bonenodes, poscache)
pos = pos:ToScreen()
local color
if bonenodes then
color = BONETYPE_COLORS[bonenodes[ent][v].Type][1]
else
color = COLOR_RGMGREEN
end
surface.DrawCircle(pos.x, pos.y, 2.5, color)
end
end
SkeletonData.ent = ent
else
if calc then poscache = {} end
for bone, parent in pairs(SkeletonData) do
if type(bone) ~= "number" or parent == -1 then continue end
local pos = calc and ent:GetBonePosition(bone) or poscache[bone]
pos = pos:ToScreen()
local parentpos = calc and ent:GetBonePosition(parent) or poscache[parent]
parentpos = parentpos:ToScreen()
if pos.visible or parentpos.visible then
surface.SetDrawColor(COLOR_WHITE:Unpack())
surface.DrawLine(parentpos.x, parentpos.y, pos.x, pos.y)
end
end
for bone, parent in pairs(SkeletonData) do
if type(bone) ~= "number" then continue end
local pos = calc and ent:GetBonePosition(bone) or poscache[bone]
if calc then poscache[bone] = pos end
pos = pos:ToScreen()
if pos.visible then
local color
if bonenodes and bonenodes[ent] and bonenodes[ent][bone] and bonenodes[ent][bone].Type then
color = BONETYPE_COLORS[bonenodes[ent][bone].Type][1]
else
color = COLOR_RGMGREEN
end
surface.DrawCircle(pos.x, pos.y, 2.5, color)
end
end
end
return poscache
end

11
lua/weapons/gmod_tool/stools/ragdollmover.lua
View File

@ -4892,8 +4892,8 @@ hook.Add("KeyPress", "rgmSwitchSelectionMode", function(pl, key)
end
end)
local BoneColors, BonePoses = nil, nil
local LastSelectThink, LastSkeletonThink, LastEnt = 0, 0, nil
local BoneColors = nil
local LastSelectThink, LastEnt = 0, nil
function TOOL:DrawHUD()
@ -4947,12 +4947,7 @@ function TOOL:DrawHUD()
})
local aimedbone = IsValid(tr.Entity) and (tr.Entity:GetClass() == "prop_ragdoll" and plTable.AimedBone or 0) or 0
if IsValid(ent) and EntityFilter(ent, self) and SkeletonDraw then
local timecheck = (thinktime - LastSkeletonThink) > 0.0303 -- 1/33
BonePoses = rgm.DrawSkeleton(ent, nodes, BonePoses, timecheck)
if timecheck then
LastSkeletonThink = thinktime
end
rgm.DrawSkeleton(ent, nodes)
end
if self:GetOperation() == 2 and IsValid(ent) then