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

Jump to bottom

refactor: further optimise imgur drawing methods #12

Merged
merged 2 commits into from
Jun 23, 2021
Merged

refactor: further optimise imgur drawing methods #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b91d84
refactor: further optimise imgur drawing methods
TomDotBat Jun 23, 2021
a43a2ed
refactor: put the getImgur callback on a new line
TomDotBat Jun 23, 2021
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
36 changes: 22 additions & 14 deletions lua/pixelui/drawing/cl_imgur.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,34 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
]]

local progressMat
local getImgur = PIXEL.GetImgur
getImgur("635PPvg", function(mat) progressMat = mat end)

local curTime = CurTime
local drawProgressWheel
local setMaterial = surface.SetMaterial
local setDrawColor = surface.SetDrawColor
local drawTexturedRectRotated = surface.DrawTexturedRectRotated
local drawTexturedRect = surface.DrawTexturedRect

local min = math.min
local function drawProgressWheel(x, y, w, h, col)
local progSize = min(w, h)
setMaterial(progressMat)
setDrawColor(col.r, col.g, col.b, col.a)
drawTexturedRectRotated(x + w / 2, y + h / 2, progSize, progSize, -curTime() * 100)
do
local min = math.min
local curTime = CurTime
local drawTexturedRectRotated = surface.DrawTexturedRectRotated

function PIXEL.DrawProgressWheel(x, y, w, h, col)
local progSize = min(w, h)
setMaterial(progressMat)
setDrawColor(col.r, col.g, col.b, col.a)
drawTexturedRectRotated(x + w * .5, y + h * .5, progSize, progSize, -curTime() * 100)
end
drawProgressWheel = PIXEL.DrawProgressWheel
end
PIXEL.DrawProgressWheel = drawProgressWheel

local materials = {}
local grabbingMaterials = {}

local getImgur = PIXEL.GetImgur
getImgur("635PPvg", function(mat)
progressMat = mat
end)

local drawTexturedRect = surface.DrawTexturedRect
function PIXEL.DrawImgur(x, y, w, h, imgurId, col)
if not materials[imgurId] then
drawProgressWheel(x, y, w, h, col)
Expand All @@ -58,9 +65,10 @@ function PIXEL.DrawImgur(x, y, w, h, imgurId, col)
drawTexturedRect(x, y, w, h)
end

local drawTexturedRectRotated = surface.DrawTexturedRectRotated
function PIXEL.DrawImgurRotated(x, y, w, h, rot, imgurId, col)
if not materials[imgurId] then
drawProgressWheel(x - w / 2, y - h / 2, w, h, col)
drawProgressWheel(x - w * .5, y - h * .5, w, h, col)

if grabbingMaterials[imgurId] then return end
grabbingMaterials[imgurId] = true
Expand All @@ -76,4 +84,4 @@ function PIXEL.DrawImgurRotated(x, y, w, h, rot, imgurId, col)
setMaterial(materials[imgurId])
setDrawColor(col.r, col.g, col.b, col.a)
drawTexturedRectRotated(x, y, w, h, rot)
end
end