mirror of
https://github.com/LDDestroier/CC/
synced 2025-01-20 22:16:53 +00:00
Added nativePalette table
Some versions of CC do not contain a `term.nativePaletteColor()` function, so I included the base CC palette into a table. I don't quite get how term.nativePaletteColor takes in non-base2 numbers and spits out palettes, so I'll have to ask around or something.
This commit is contained in:
parent
e6fcda73b1
commit
1476a88691
@ -25,6 +25,89 @@ for i = 1, 16 do
|
|||||||
end
|
end
|
||||||
to_blit[0], to_colors["-"] = "-", 0
|
to_blit[0], to_colors["-"] = "-", 0
|
||||||
|
|
||||||
|
local nativePalette = { -- native palette colors, since some terminals are naughty and don't contain term.nativePaletteColor()
|
||||||
|
[ 1 ] = {
|
||||||
|
0.94117647409439,
|
||||||
|
0.94117647409439,
|
||||||
|
0.94117647409439,
|
||||||
|
},
|
||||||
|
[ 2 ] = {
|
||||||
|
0.94901961088181,
|
||||||
|
0.69803923368454,
|
||||||
|
0.20000000298023,
|
||||||
|
},
|
||||||
|
[ 4 ] = {
|
||||||
|
0.89803922176361,
|
||||||
|
0.49803921580315,
|
||||||
|
0.84705883264542,
|
||||||
|
},
|
||||||
|
[ 8 ] = {
|
||||||
|
0.60000002384186,
|
||||||
|
0.69803923368454,
|
||||||
|
0.94901961088181,
|
||||||
|
},
|
||||||
|
[ 16 ] = {
|
||||||
|
0.87058824300766,
|
||||||
|
0.87058824300766,
|
||||||
|
0.42352941632271,
|
||||||
|
},
|
||||||
|
[ 32 ] = {
|
||||||
|
0.49803921580315,
|
||||||
|
0.80000001192093,
|
||||||
|
0.098039217293262,
|
||||||
|
},
|
||||||
|
[ 64 ] = {
|
||||||
|
0.94901961088181,
|
||||||
|
0.69803923368454,
|
||||||
|
0.80000001192093,
|
||||||
|
},
|
||||||
|
[ 128 ] = {
|
||||||
|
0.29803922772408,
|
||||||
|
0.29803922772408,
|
||||||
|
0.29803922772408,
|
||||||
|
},
|
||||||
|
[ 256 ] = {
|
||||||
|
0.60000002384186,
|
||||||
|
0.60000002384186,
|
||||||
|
0.60000002384186,
|
||||||
|
},
|
||||||
|
[ 512 ] = {
|
||||||
|
0.29803922772408,
|
||||||
|
0.60000002384186,
|
||||||
|
0.69803923368454,
|
||||||
|
},
|
||||||
|
[ 1024 ] = {
|
||||||
|
0.69803923368454,
|
||||||
|
0.40000000596046,
|
||||||
|
0.89803922176361,
|
||||||
|
},
|
||||||
|
[ 2048 ] = {
|
||||||
|
0.20000000298023,
|
||||||
|
0.40000000596046,
|
||||||
|
0.80000001192093,
|
||||||
|
},
|
||||||
|
[ 4096 ] = {
|
||||||
|
0.49803921580315,
|
||||||
|
0.40000000596046,
|
||||||
|
0.29803922772408,
|
||||||
|
},
|
||||||
|
[ 8192 ] = {
|
||||||
|
0.34117648005486,
|
||||||
|
0.65098041296005,
|
||||||
|
0.30588236451149,
|
||||||
|
},
|
||||||
|
[ 16384 ] = {
|
||||||
|
0.80000001192093,
|
||||||
|
0.29803922772408,
|
||||||
|
0.29803922772408,
|
||||||
|
},
|
||||||
|
[ 32768 ] = {
|
||||||
|
0.066666670143604,
|
||||||
|
0.066666670143604,
|
||||||
|
0.066666670143604,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
-- check if space on screenBuffer is transparent
|
-- check if space on screenBuffer is transparent
|
||||||
local checkTransparent = function(buffer, x, y, blitLayer)
|
local checkTransparent = function(buffer, x, y, blitLayer)
|
||||||
if buffer[blitLayer or 1][y] then
|
if buffer[blitLayer or 1][y] then
|
||||||
@ -522,6 +605,16 @@ windont.newWindow = function( x, y, width, height, misc )
|
|||||||
output.getPaletteColor = bT.getPaletteColor
|
output.getPaletteColor = bT.getPaletteColor
|
||||||
output.getPaletteColour = bT.getPaletteColour
|
output.getPaletteColour = bT.getPaletteColour
|
||||||
|
|
||||||
|
if bT.getPaletteColor then
|
||||||
|
output.nativePaletteColor = bT.nativePaletteColor or function(col)
|
||||||
|
if nativePalette[col] then
|
||||||
|
return table.unpack(nativePalette[col])
|
||||||
|
else
|
||||||
|
return table.unpack(nativePalette[1]) -- I don't get how this function takes in non-base2 numbers...
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
output.redraw = function(x1, x2, y)
|
output.redraw = function(x1, x2, y)
|
||||||
if #meta.renderBuddies > 0 then
|
if #meta.renderBuddies > 0 then
|
||||||
windont.render({onlyX1 = x1, onlyX2 = x2, onlyY = y}, output, table.unpack(meta.renderBuddies))
|
windont.render({onlyX1 = x1, onlyX2 = x2, onlyY = y}, output, table.unpack(meta.renderBuddies))
|
||||||
|
Loading…
Reference in New Issue
Block a user