Overview
| Comment: | fix image regression |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
108df84ed30f9736f8da208c8c4447f4 |
| User & Date: | lexi on 2024-05-06 21:29:01 |
| Other Links: | manifest | tags |
Context
|
2024-05-07
| ||
| 00:27 | add basic electrical parts, fix scrollbars to the greatest extent possible, fix error in marshal error msg, tweak inane compute stats check-in: 5267c0742d user: lexi tags: trunk | |
|
2024-05-06
| ||
| 21:29 | fix image regression check-in: 108df84ed3 user: lexi tags: trunk | |
| 20:58 | add storage crate & generic interface for, add LED for print completion, add program tooltips, disfuckulate some longstanding idiot bugs check-in: 4b3aa092f8 user: lexi tags: trunk | |
Changes
Modified mods/starlit/user.lua from [d58ed76b59] to [8fa84d176c].
539 539 table.insert(del, i) 540 540 else 541 541 local xc = (idx*48 + 400)*ofs 542 542 if l.elt and next(del) then 543 543 l.elt:update('offset', {x=xc, y=1}) 544 544 else 545 545 local tex = leds[l.kind].icon:blit(hudAdjustBacklight(leds[l.kind].bg)) 546 - if tx then tex = tex:transform(tx) end 546 + if tx then tex = lib.image(tex:render()):transform(tx) end 547 547 if not l.elt then 548 548 l.elt = self:attachImage { 549 549 tex = tex:render(); 550 550 align = {x=ofs, y=-1}; 551 551 pos = {x=.5, y=1}; 552 552 scale = {x=1,y=1}; 553 553 ofs = {x=xc, y=0};
Modified mods/vtlib/image.lua from [a9a0d17ab5] to [62097bb5e5].
11 11 local bracket = false 12 12 if self.combine then 13 13 str = string.format('[combine:%sx%s', self.w, self.h) 14 14 for _,i in pairs(self.atop) do 15 15 str = str .. string.format(':%s,%s=(%s)', i.at.x, i.at.y, i.img:render()) 16 16 end 17 17 else 18 + for _,i in pairs(self.atop) do 19 + str = '(' .. i.img:render() .. ')^' .. str 20 + end 18 21 if str ~= '' then 19 22 str = str .. '(' 20 23 bracket = true 21 24 end 22 - for _,i in pairs(self.atop) do 23 - str = '(' .. i.img:render() .. ')^' .. str 24 - end 25 25 str = str .. self.string 26 26 end 27 27 for _,e in pairs(self.fx) do 28 28 str = str .. '^[' .. e 29 29 -- be sure to escape ones that take arguments 30 30 -- correctly! 31 31 end ................................................................................ 120 120 fx = lib.tbl.append(self.fx, {'transform' .. tostring(kind)}) 121 121 }) 122 122 end; 123 123 124 124 glow = function(self,color) return self:blit(self:multiply(color)) end; 125 125 }; 126 126 127 - construct = function(file, w, h) return { 128 - string = file; 129 - atop = {}; 130 - fx = {}; 131 - combine = w and h and true or nil; 132 - } end; 127 + construct = function(file, w, h) 128 + return { 129 + string = file; 130 + atop = {}; 131 + fx = {}; 132 + combine = w and h and true or nil; 133 + } 134 + end; 133 135 } 134 136 return image