Skip to content

Fix/improve highspeed access in number/array plugs #3693

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

Open
Bilbard wants to merge 1 commit into
base: master
Choose a base branch
from
+78 −16
Open

Fix/improve highspeed access in number/array plugs #3693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 39 additions & 8 deletions lua/entities/gmod_wire_plug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function ENT:Initialize()

self:SetLinked( false )

self.Memory = {}
self.Memory = nil
end

function ENT:Setup( ArrayInput )
Expand All @@ -84,6 +84,13 @@ function ENT:TriggerInput( name, value )
if (self.Socket and self.Socket:IsValid()) then
self.Socket:SetValue( name, value )
end
if not self.ArrayInput then
if (self.Inputs['A'].Src and self.Inputs['A'].Src:IsValid()) then
self.Memory = self.Inputs['A'].Src
else
self.Memory = nil
end
end
self:ShowOutput()
end

Expand Down Expand Up @@ -121,10 +128,20 @@ end
-- Hi-speed support
------------------------------------------------------------
function ENT:WriteCell( Address, Value, WriteToMe )
Address = math.floor(Address)
Address = math.floor(Address or 0)
if (WriteToMe) then
self.Memory[Address or 1] = Value or 0
return true
--this would allow the plug to work almost like a dhdd, which seems silly.
--[[if self.ArrayInput then
-- 256 KiB limit
if Address < 0 or Address >= 262144 then return false end
self.Inputs.In.Value[Address] = Value or 0
return true
end]]--
if (self.Memory and self.Memory.WriteCell) then
self.Memory:WriteCell(Address, Value)
return true
end
return false
else
if (self.Socket and self.Socket:IsValid()) then
self.Socket:WriteCell( Address, Value, true )
Expand All @@ -139,9 +156,23 @@ end
-- ReadCell
-- Hi-speed support
------------------------------------------------------------
function ENT:ReadCell( Address )
Address = math.floor(Address)
return self.Memory[Address or 1] or 0
function ENT:ReadCell( Address, ReadFromMe )
Address = math.floor(Address or 0)
if (ReadFromMe) then
if self.ArrayInput then
return self.Inputs.In.Value[Address] or 0
end
if (self.Memory and self.Memory.ReadCell) then
return self.Memory:ReadCell(Address)
end
return 0
else
if (self.Socket and self.Socket:IsValid()) then
return self.Socket:ReadCell( Address, true )
else
return 0
end
end
end

function ENT:Think()
Expand All @@ -157,7 +188,7 @@ function ENT:ResetValues()
WireLib.TriggerOutput( self, LETTERS[i], 0 )
end
end
self.Memory = {}
self.Memory = nil
self:ShowOutput()
end

Expand Down
47 changes: 39 additions & 8 deletions lua/entities/gmod_wire_socket.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function ENT:Initialize()

self:SetLinked( false )

self.Memory = {}
self.Memory = nil

self.DoNextThink = CurTime() + 5 -- wait 5 seconds
end
Expand Down Expand Up @@ -140,6 +140,13 @@ function ENT:TriggerInput( name, value )
if (self.Plug and self.Plug:IsValid()) then
self.Plug:SetValue( name, value )
end
if not self.ArrayInput then
if (self.Inputs['A'].Src and self.Inputs['A'].Src:IsValid()) then
self.Memory = self.Inputs['A'].Src
else
self.Memory = nil
end
end
self:ShowOutput()
end

Expand Down Expand Up @@ -177,10 +184,20 @@ end
-- Hi-speed support
------------------------------------------------------------
function ENT:WriteCell( Address, Value, WriteToMe )
Address = math.floor(Address)
Address = math.floor(Address or 0)
if (WriteToMe) then
self.Memory[Address or 1] = Value or 0
return true
--this would allow the plug to work almost like a dhdd, which seems silly.
--[[if self.ArrayInput then
-- 256 KiB limit
if Address < 0 or Address >= 262144 then return false end
self.Inputs.In.Value[Address] = Value or 0
return true
end]]--
if (self.Memory and self.Memory.WriteCell) then
self.Memory:WriteCell(Address, Value)
return true
end
return false
else
if (self.Plug and self.Plug:IsValid()) then
self.Plug:WriteCell( Address, Value, true )
Expand All @@ -195,9 +212,23 @@ end
-- ReadCell
-- Hi-speed support
------------------------------------------------------------
function ENT:ReadCell( Address )
Address = math.floor(Address)
return self.Memory[Address or 1] or 0
function ENT:ReadCell( Address, ReadFromMe )
Address = math.floor(Address or 0)
if (ReadFromMe) then
if self.ArrayInput then
return self.Inputs.In.Value[Address] or 0
end
if (self.Memory and self.Memory.ReadCell) then
return self.Memory:ReadCell(Address)
end
return 0
else
if (self.Plug and self.Plug:IsValid()) then
return self.Plug:ReadCell( Address, true )
else
return 0
end
end
end

function ENT:ResetValues()
Expand All @@ -208,7 +239,7 @@ function ENT:ResetValues()
WireLib.TriggerOutput( self, LETTERS[i], 0 )
end
end
self.Memory = {}
self.Memory = nil
self:ShowOutput()
end

Expand Down
Loading