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 540 541 542 543 544 545 546 547 548 549 550 551 552 553 |
table.insert(del, i)
else
local xc = (idx*48 + 400)*ofs
if l.elt and next(del) then
l.elt:update('offset', {x=xc, y=1})
else
local tex = leds[l.kind].icon:blit(hudAdjustBacklight(leds[l.kind].bg))
if tx then tex = tex:transform(tx) end
if not l.elt then
l.elt = self:attachImage {
tex = tex:render();
align = {x=ofs, y=-1};
pos = {x=.5, y=1};
scale = {x=1,y=1};
ofs = {x=xc, y=0};
|
| |
539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 |
table.insert(del, i)
else
local xc = (idx*48 + 400)*ofs
if l.elt and next(del) then
l.elt:update('offset', {x=xc, y=1})
else
local tex = leds[l.kind].icon:blit(hudAdjustBacklight(leds[l.kind].bg))
if tx then tex = lib.image(tex:render()):transform(tx) end
if not l.elt then
l.elt = self:attachImage {
tex = tex:render();
align = {x=ofs, y=-1};
pos = {x=.5, y=1};
scale = {x=1,y=1};
ofs = {x=xc, y=0};
|
Modified mods/vtlib/image.lua from [a9a0d17ab5] to [62097bb5e5].
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
...
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
|
local bracket = false
if self.combine then
str = string.format('[combine:%sx%s', self.w, self.h)
for _,i in pairs(self.atop) do
str = str .. string.format(':%s,%s=(%s)', i.at.x, i.at.y, i.img:render())
end
else
if str ~= '' then
str = str .. '('
bracket = true
end
for _,i in pairs(self.atop) do
str = '(' .. i.img:render() .. ')^' .. str
end
str = str .. self.string
end
for _,e in pairs(self.fx) do
str = str .. '^[' .. e
-- be sure to escape ones that take arguments
-- correctly!
end
................................................................................
fx = lib.tbl.append(self.fx, {'transform' .. tostring(kind)})
})
end;
glow = function(self,color) return self:blit(self:multiply(color)) end;
};
construct = function(file, w, h) return {
string = file;
atop = {};
fx = {};
combine = w and h and true or nil;
} end;
}
return image
|
>
>
>
<
<
<
|
>
|
|
|
|
>
|
|
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
...
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
local bracket = false
if self.combine then
str = string.format('[combine:%sx%s', self.w, self.h)
for _,i in pairs(self.atop) do
str = str .. string.format(':%s,%s=(%s)', i.at.x, i.at.y, i.img:render())
end
else
for _,i in pairs(self.atop) do
str = '(' .. i.img:render() .. ')^' .. str
end
if str ~= '' then
str = str .. '('
bracket = true
end
str = str .. self.string
end
for _,e in pairs(self.fx) do
str = str .. '^[' .. e
-- be sure to escape ones that take arguments
-- correctly!
end
................................................................................
fx = lib.tbl.append(self.fx, {'transform' .. tostring(kind)})
})
end;
glow = function(self,color) return self:blit(self:multiply(color)) end;
};
construct = function(file, w, h)
return {
string = file;
atop = {};
fx = {};
combine = w and h and true or nil;
}
end;
}
return image
|