Fix line endings and spaces in *.lua scripts
This commit is contained in:
parent
6d08223660
commit
673d3836d2
@ -1,33 +1,31 @@
|
||||
-- Test LUA inputbox
|
||||
-- this script tests the inputbox
|
||||
|
||||
w, h = getbrushsize()
|
||||
--[[
|
||||
messagebox(
|
||||
"Forecolor: " .. getforecolor() .. "\n" ..
|
||||
"Backcolor: " .. getbackcolor() .. "\n" ..
|
||||
"Transparent color: " .. gettranscolor() .. "\n" ..
|
||||
"Brush dimensions: " .. w .. "x" .. h
|
||||
)
|
||||
]]
|
||||
|
||||
|
||||
ok, w, h = inputbox("Modify brush",
|
||||
"RGB", 1, 0, 1, -1,
|
||||
"HSV", 0, 0, 1, -1,
|
||||
"HSL", 0, 0, 1, -1,
|
||||
"Width", w, -900.0,900.0, 3,
|
||||
"Height", h, -900.0,900.0, 4,
|
||||
"X Flip", 0, 0, 1, 0,
|
||||
"Y Flip", 0, 0, 1, 0,
|
||||
"Degrees",1, 0, 1, -2,
|
||||
"Radians",0, 0, 1, -2
|
||||
);
|
||||
if ok == true then
|
||||
messagebox(
|
||||
"w: " .. w .. "\n" ..
|
||||
"h: " .. h .. "\n"
|
||||
)
|
||||
end
|
||||
|
||||
|
||||
-- Test LUA inputbox
|
||||
-- this script tests the inputbox
|
||||
|
||||
w, h = getbrushsize()
|
||||
--[[
|
||||
messagebox(
|
||||
"Forecolor: " .. getforecolor() .. "\n" ..
|
||||
"Backcolor: " .. getbackcolor() .. "\n" ..
|
||||
"Transparent color: " .. gettranscolor() .. "\n" ..
|
||||
"Brush dimensions: " .. w .. "x" .. h
|
||||
)
|
||||
]]
|
||||
|
||||
|
||||
ok, w, h = inputbox("Modify brush",
|
||||
"RGB", 1, 0, 1, -1,
|
||||
"HSV", 0, 0, 1, -1,
|
||||
"HSL", 0, 0, 1, -1,
|
||||
"Width", w, -900.0,900.0, 3,
|
||||
"Height", h, -900.0,900.0, 4,
|
||||
"X Flip", 0, 0, 1, 0,
|
||||
"Y Flip", 0, 0, 1, 0,
|
||||
"Degrees",1, 0, 1, -2,
|
||||
"Radians",0, 0, 1, -2
|
||||
);
|
||||
if ok == true then
|
||||
messagebox(
|
||||
"w: " .. w .. "\n" ..
|
||||
"h: " .. h .. "\n"
|
||||
)
|
||||
end
|
||||
|
||||
@ -1,66 +1,65 @@
|
||||
local counter=0;
|
||||
local printcounter = function ()
|
||||
windowprint(10,54, string.format("% .3d", counter));
|
||||
end;
|
||||
|
||||
windowopen(100,150, "Dialogtest");
|
||||
windowbutton(6, 18, 54, 14, "Close", 27); -- 1, shortcut=ESC
|
||||
windowrepeatbutton(6, 38, 14, 14, "+"); -- 2
|
||||
windowrepeatbutton(26, 38, 14, 14, "-"); -- 3
|
||||
windowbutton(6, 70, 54, 14, "Help"); -- 4
|
||||
windowinput(6, 88, 10);
|
||||
printcounter();
|
||||
|
||||
repeat
|
||||
local button, button2, key = windowdodialog();
|
||||
|
||||
if button == 2 then -- "+"
|
||||
counter=counter+1;
|
||||
printcounter();
|
||||
end
|
||||
if button == 3 then -- "-"
|
||||
counter=counter-1;
|
||||
printcounter();
|
||||
end
|
||||
if button == 4 then -- "Help"
|
||||
messagebox("Help screen");
|
||||
end
|
||||
until key == 27 or button == 1;
|
||||
windowclose();
|
||||
|
||||
|
||||
-- messagebox(tostring(button) .. " " .. tostring(button2));
|
||||
|
||||
|
||||
---- Open_window(149,118,"Grid");
|
||||
-- Display_cursor();
|
||||
-- Hide_cursor();
|
||||
---- Close_window();
|
||||
---- Update_window_area(0,0,Window_width, Window_height);
|
||||
---- clicked_button=Window_clicked_button();
|
||||
--
|
||||
-- -- standard button
|
||||
---- Window_set_normal_button(12,92,51,14,"Cancel",0,1,KEY_ESC); -- 1
|
||||
-- -- repeatable button (while held)
|
||||
---- Window_set_repeatable_button(202,43,13,11,"-",0,1,SDLK_LAST); -- 8
|
||||
-- -- text input
|
||||
-- Window_set_input_button(29,24,3); -- 3
|
||||
-- Window_input_content(input_x_button,str);
|
||||
-- Readline(31,26,str,3,INPUT_TYPE_INTEGER);
|
||||
--
|
||||
-- -- dropdown
|
||||
-- Window_set_dropdown_button(216, 158, 84,14,84,"Preset...", 0,0,1,RIGHT_SIDE|LEFT_SIDE,1);
|
||||
-- Window_dropdown_clear_items(Button);
|
||||
-- Window_dropdown_add_item(Button,0,"Set");
|
||||
--
|
||||
-- -- vertical scroller
|
||||
-- mix_scroller = Window_set_scroller_button(31,20,84,256,1,Main_backups->Pages->Gradients->Range[Current_gradient].Mix);
|
||||
-- Window_draw_slider(mix_scroller);
|
||||
--
|
||||
-- -- display
|
||||
---- Print_in_window(11,26, "X:",MC_Dark,MC_Light);
|
||||
---- Print_in_window_limited(Button->Pos_X+3+10,Button->Pos_Y+2,Config.Bookmark_label[bookmark_number],8,MC_Black,MC_Light);
|
||||
-- Window_display_frame_in( 6, 21,110, 52);
|
||||
-- Window_display_frame(6,17,130,37);
|
||||
-- Window_rectangle(panel->Pos_X, panel->Pos_Y, panel->Width, panel->Height+1, MC_Light);
|
||||
|
||||
local counter=0;
|
||||
local printcounter = function ()
|
||||
windowprint(10,54, string.format("% .3d", counter));
|
||||
end;
|
||||
|
||||
windowopen(100,150, "Dialogtest");
|
||||
windowbutton(6, 18, 54, 14, "Close", 27); -- 1, shortcut=ESC
|
||||
windowrepeatbutton(6, 38, 14, 14, "+"); -- 2
|
||||
windowrepeatbutton(26, 38, 14, 14, "-"); -- 3
|
||||
windowbutton(6, 70, 54, 14, "Help"); -- 4
|
||||
windowinput(6, 88, 10);
|
||||
printcounter();
|
||||
|
||||
repeat
|
||||
local button, button2, key = windowdodialog();
|
||||
|
||||
if button == 2 then -- "+"
|
||||
counter=counter+1;
|
||||
printcounter();
|
||||
end
|
||||
if button == 3 then -- "-"
|
||||
counter=counter-1;
|
||||
printcounter();
|
||||
end
|
||||
if button == 4 then -- "Help"
|
||||
messagebox("Help screen");
|
||||
end
|
||||
until key == 27 or button == 1;
|
||||
windowclose();
|
||||
|
||||
|
||||
-- messagebox(tostring(button) .. " " .. tostring(button2));
|
||||
|
||||
|
||||
---- Open_window(149,118,"Grid");
|
||||
-- Display_cursor();
|
||||
-- Hide_cursor();
|
||||
---- Close_window();
|
||||
---- Update_window_area(0,0,Window_width, Window_height);
|
||||
---- clicked_button=Window_clicked_button();
|
||||
--
|
||||
-- -- standard button
|
||||
---- Window_set_normal_button(12,92,51,14,"Cancel",0,1,KEY_ESC); -- 1
|
||||
-- -- repeatable button (while held)
|
||||
---- Window_set_repeatable_button(202,43,13,11,"-",0,1,SDLK_LAST); -- 8
|
||||
-- -- text input
|
||||
-- Window_set_input_button(29,24,3); -- 3
|
||||
-- Window_input_content(input_x_button,str);
|
||||
-- Readline(31,26,str,3,INPUT_TYPE_INTEGER);
|
||||
--
|
||||
-- -- dropdown
|
||||
-- Window_set_dropdown_button(216, 158, 84,14,84,"Preset...", 0,0,1,RIGHT_SIDE|LEFT_SIDE,1);
|
||||
-- Window_dropdown_clear_items(Button);
|
||||
-- Window_dropdown_add_item(Button,0,"Set");
|
||||
--
|
||||
-- -- vertical scroller
|
||||
-- mix_scroller = Window_set_scroller_button(31,20,84,256,1,Main_backups->Pages->Gradients->Range[Current_gradient].Mix);
|
||||
-- Window_draw_slider(mix_scroller);
|
||||
--
|
||||
-- -- display
|
||||
---- Print_in_window(11,26, "X:",MC_Dark,MC_Light);
|
||||
---- Print_in_window_limited(Button->Pos_X+3+10,Button->Pos_Y+2,Config.Bookmark_label[bookmark_number],8,MC_Black,MC_Light);
|
||||
-- Window_display_frame_in( 6, 21,110, 52);
|
||||
-- Window_display_frame(6,17,130,37);
|
||||
-- Window_rectangle(panel->Pos_X, panel->Pos_Y, panel->Width, panel->Height+1, MC_Light);
|
||||
|
||||
@ -1,48 +1,47 @@
|
||||
--
|
||||
-- test of GUI library
|
||||
--
|
||||
run("libs/gui.lua")
|
||||
|
||||
local counter = gui.label{x=10, y=54, value=0, format="% .3d"}
|
||||
local form = gui.dialog{
|
||||
title="Dialogtest",
|
||||
w=100,
|
||||
h=150,
|
||||
counter,
|
||||
gui.button{ label="+",
|
||||
x=6, y=38, w=14, h=14, repeatable=true, click=function()
|
||||
counter.value=counter.value+1;
|
||||
end},
|
||||
gui.button{ label="-",
|
||||
x=26, y=38, w=14, h=14, repeatable=true, click=function()
|
||||
counter.value=counter.value-1;
|
||||
end},
|
||||
gui.button{ label="Help",
|
||||
x=6, y=70, w=54, h=14, click=function()
|
||||
messagebox("Help screen");
|
||||
end},
|
||||
gui.button{ label="Close",
|
||||
x=6, y=18, w=54, h=14, key=27, click=function()
|
||||
return true; -- causes closing
|
||||
end},
|
||||
gui.textbox{
|
||||
x=6, y=90, nbchar=8, decimal=1,
|
||||
min=450, max=1450, maxchar=8, value = 1234,
|
||||
change=function()
|
||||
-- do nothing
|
||||
end
|
||||
},
|
||||
gui.textbox{
|
||||
x=6, y=104, nbchar=10, maxchar=20, value = "test"
|
||||
},
|
||||
gui.textbox{
|
||||
x=6, y=118, nbchar=8, decimal=0, min=0,
|
||||
maxchar=8, value = 456,
|
||||
change=function()
|
||||
-- do nothing
|
||||
end
|
||||
},
|
||||
}
|
||||
|
||||
form:run()
|
||||
|
||||
--
|
||||
-- test of GUI library
|
||||
--
|
||||
run("libs/gui.lua")
|
||||
|
||||
local counter = gui.label{x=10, y=54, value=0, format="% .3d"}
|
||||
local form = gui.dialog{
|
||||
title="Dialogtest",
|
||||
w=100,
|
||||
h=150,
|
||||
counter,
|
||||
gui.button{ label="+",
|
||||
x=6, y=38, w=14, h=14, repeatable=true, click=function()
|
||||
counter.value=counter.value+1;
|
||||
end},
|
||||
gui.button{ label="-",
|
||||
x=26, y=38, w=14, h=14, repeatable=true, click=function()
|
||||
counter.value=counter.value-1;
|
||||
end},
|
||||
gui.button{ label="Help",
|
||||
x=6, y=70, w=54, h=14, click=function()
|
||||
messagebox("Help screen");
|
||||
end},
|
||||
gui.button{ label="Close",
|
||||
x=6, y=18, w=54, h=14, key=27, click=function()
|
||||
return true; -- causes closing
|
||||
end},
|
||||
gui.textbox{
|
||||
x=6, y=90, nbchar=8, decimal=1,
|
||||
min=450, max=1450, maxchar=8, value = 1234,
|
||||
change=function()
|
||||
-- do nothing
|
||||
end
|
||||
},
|
||||
gui.textbox{
|
||||
x=6, y=104, nbchar=10, maxchar=20, value = "test"
|
||||
},
|
||||
gui.textbox{
|
||||
x=6, y=118, nbchar=8, decimal=0, min=0,
|
||||
maxchar=8, value = 456,
|
||||
change=function()
|
||||
-- do nothing
|
||||
end
|
||||
},
|
||||
}
|
||||
|
||||
form:run()
|
||||
|
||||
@ -1,225 +1,225 @@
|
||||
--
|
||||
-- Event-driven GUI library
|
||||
--
|
||||
--
|
||||
|
||||
gui = {
|
||||
|
||||
--
|
||||
-- colors
|
||||
--
|
||||
black = 0,
|
||||
dark = 1,
|
||||
light = 2,
|
||||
white = 3,
|
||||
|
||||
-- "do nothing" function. Used as default callback
|
||||
donothing = function(self)
|
||||
end,
|
||||
|
||||
-- Metatable that hides the field "value" behind a property,
|
||||
-- and calls render() after it's set.
|
||||
propvalue = {
|
||||
__newindex = function(self, index, value)
|
||||
if index == "value" then
|
||||
self._value = value
|
||||
-- extra processing
|
||||
self:render()
|
||||
else
|
||||
rawset(self, index, value)
|
||||
end
|
||||
end,
|
||||
__index = function(self, index )
|
||||
if index == "value" then
|
||||
return self._value
|
||||
else
|
||||
return rawget( self, index )
|
||||
end
|
||||
end
|
||||
},
|
||||
|
||||
--
|
||||
-- dialog()
|
||||
--
|
||||
dialog = function(args)
|
||||
local dia = {
|
||||
title = args.title,
|
||||
w = args.w,
|
||||
h = args.h,
|
||||
--
|
||||
widgets = {},
|
||||
-- an indexed array, starting at 1. Used for calling the relevant
|
||||
-- callback when a numbered control is clicked.
|
||||
callbacks = {},
|
||||
|
||||
--
|
||||
-- dialog.run() --
|
||||
--
|
||||
run = function(self)
|
||||
windowopen(self.w,self.h, self.title or "");
|
||||
-- examine all elements
|
||||
for _,widget in ipairs(self.widgets) do
|
||||
widget:create()
|
||||
end
|
||||
|
||||
repeat
|
||||
local button, button2, key = windowdodialog();
|
||||
|
||||
if button > 0 then
|
||||
local c = self.callbacks[button]
|
||||
if c ~= nil then
|
||||
-- run the callback
|
||||
local retvalue = c:click()
|
||||
-- stop the form if it returns non-nil
|
||||
if retvalue ~= nil then
|
||||
windowclose();
|
||||
return retvalue;
|
||||
end
|
||||
end
|
||||
end
|
||||
until key == 27;
|
||||
windowclose();
|
||||
end
|
||||
}
|
||||
local id = 1;
|
||||
-- examine all elements
|
||||
for _,value in ipairs(args) do
|
||||
-- all arguments that are tables are assumed to be widgets
|
||||
if type(value)=="table" then
|
||||
table.insert(dia.widgets, value)
|
||||
-- clickable widgets take up an auto-numbered id
|
||||
if (value.click) then
|
||||
dia.callbacks[id] = value
|
||||
id=id+1
|
||||
end
|
||||
end
|
||||
end
|
||||
return dia;
|
||||
end,
|
||||
|
||||
--
|
||||
-- button()
|
||||
--
|
||||
button = function(args)
|
||||
local but = {
|
||||
x = args.x,
|
||||
y = args.y,
|
||||
w = args.w,
|
||||
h = args.h,
|
||||
key = args.key,
|
||||
label = args.label,
|
||||
click = args.click or gui.donothing,
|
||||
create = args.repeatable and function(self)
|
||||
windowrepeatbutton(self.x, self.y, self.w, self.h, self.label, self.key or -1);
|
||||
end
|
||||
or function(self)
|
||||
windowbutton(self.x, self.y, self.w, self.h, self.label, self.key or -1);
|
||||
end
|
||||
}
|
||||
return but;
|
||||
end,
|
||||
|
||||
--
|
||||
-- label()
|
||||
--
|
||||
label = function(args)
|
||||
local lbl = {
|
||||
x = args.x,
|
||||
y = args.y,
|
||||
_value = args.value,
|
||||
format = args.format,
|
||||
fg = args.fg or gui.black,
|
||||
bg = args.bg or gui.light,
|
||||
render = function(self)
|
||||
if type(self.format) then
|
||||
windowprint(self.x, self.y, string.format(self.format, self._value), self.fg, self.bg);
|
||||
else
|
||||
windowprint(self.x, self.y, self._value, self.fg, self.bg);
|
||||
end
|
||||
end,
|
||||
}
|
||||
lbl.create = lbl.render
|
||||
setmetatable(lbl, gui.propvalue)
|
||||
return lbl;
|
||||
end,
|
||||
|
||||
--
|
||||
-- textbox
|
||||
--
|
||||
textbox = function(args)
|
||||
local txtbox = {
|
||||
x = args.x,
|
||||
y = args.y,
|
||||
nbchar = args.nbchar, -- visible size in characters
|
||||
--format = args.format, -- numeric, decimal, path
|
||||
decimal = args.decimal or 0,
|
||||
min = args.min,
|
||||
max = args.max,
|
||||
maxchar = args.maxchar, -- internal size
|
||||
_value = args.value,
|
||||
change = args.change or gui.donothing,
|
||||
--fg = args.fg or gui.black,
|
||||
--bg = args.bg or gui.light,
|
||||
create = function(self)
|
||||
windowinput(self.x, self.y, self.nbchar)
|
||||
self:render()
|
||||
end,
|
||||
render = function(self)
|
||||
local val = tostring(self._value)
|
||||
if string.len(val) < self.nbchar then
|
||||
val = string.rep(" ",self.nbchar - string.len(val)) .. val;
|
||||
elseif string.len(val) > self.nbchar then
|
||||
val = string.sub(val, 1, self.nbchar-1) .. gui.char.ellipsis
|
||||
end
|
||||
windowprint(self.x, self.y, val, gui.black, gui.light);
|
||||
end,
|
||||
click = function(self)
|
||||
local inputtype
|
||||
if (type(self._value) == "number" and ((self.min ~= nil and self.min<0) or self.decimal > 0)) then
|
||||
inputtype = 3 -- entry as double
|
||||
elseif (type(self._value) == "number") then
|
||||
inputtype = 1 -- entry as unsigned int
|
||||
else
|
||||
inputtype = 0 -- entry as string
|
||||
end
|
||||
local accept, val = windowreadline(self.x, self.y, self._value, self.nbchar, self.maxchar, self.decimal, inputtype);
|
||||
|
||||
if accept then
|
||||
if (inputtype == 1 or inputtype == 3) then
|
||||
val = tonumber(val)
|
||||
-- round the decimal places
|
||||
val = gui.round(val, self.decimal)
|
||||
end
|
||||
if (self.min ~= nil and val < self.min) then
|
||||
val = self.min
|
||||
end
|
||||
if (self.max ~= nil and val > self.max) then
|
||||
val = self.max
|
||||
end
|
||||
|
||||
self._value = val
|
||||
end
|
||||
self:render()
|
||||
end
|
||||
}
|
||||
setmetatable(txtbox, gui.propvalue)
|
||||
return txtbox;
|
||||
end
|
||||
|
||||
}
|
||||
|
||||
gui.round = function(val, ipt)
|
||||
local mult = 10^ipt
|
||||
return math.floor(val * mult + 0.5) / mult
|
||||
end
|
||||
|
||||
-- Character constants. May be useful in screens
|
||||
gui.char = {
|
||||
ellipsis = string.char(133), -- ...
|
||||
arrowup = string.char(24),
|
||||
arrowdown = string.char(25),
|
||||
arrowleft = string.char(27),
|
||||
arrowright = string.char(26),
|
||||
vertical = string.char(18), -- double-ended arrow
|
||||
horizontal = string.char(29) -- double-ended arrow
|
||||
}
|
||||
--
|
||||
-- Event-driven GUI library
|
||||
--
|
||||
--
|
||||
|
||||
gui = {
|
||||
|
||||
--
|
||||
-- colors
|
||||
--
|
||||
black = 0,
|
||||
dark = 1,
|
||||
light = 2,
|
||||
white = 3,
|
||||
|
||||
-- "do nothing" function. Used as default callback
|
||||
donothing = function(self)
|
||||
end,
|
||||
|
||||
-- Metatable that hides the field "value" behind a property,
|
||||
-- and calls render() after it's set.
|
||||
propvalue = {
|
||||
__newindex = function(self, index, value)
|
||||
if index == "value" then
|
||||
self._value = value
|
||||
-- extra processing
|
||||
self:render()
|
||||
else
|
||||
rawset(self, index, value)
|
||||
end
|
||||
end,
|
||||
__index = function(self, index )
|
||||
if index == "value" then
|
||||
return self._value
|
||||
else
|
||||
return rawget( self, index )
|
||||
end
|
||||
end
|
||||
},
|
||||
|
||||
--
|
||||
-- dialog()
|
||||
--
|
||||
dialog = function(args)
|
||||
local dia = {
|
||||
title = args.title,
|
||||
w = args.w,
|
||||
h = args.h,
|
||||
--
|
||||
widgets = {},
|
||||
-- an indexed array, starting at 1. Used for calling the relevant
|
||||
-- callback when a numbered control is clicked.
|
||||
callbacks = {},
|
||||
|
||||
--
|
||||
-- dialog.run() --
|
||||
--
|
||||
run = function(self)
|
||||
windowopen(self.w,self.h, self.title or "");
|
||||
-- examine all elements
|
||||
for _,widget in ipairs(self.widgets) do
|
||||
widget:create()
|
||||
end
|
||||
|
||||
repeat
|
||||
local button, button2, key = windowdodialog();
|
||||
|
||||
if button > 0 then
|
||||
local c = self.callbacks[button]
|
||||
if c ~= nil then
|
||||
-- run the callback
|
||||
local retvalue = c:click()
|
||||
-- stop the form if it returns non-nil
|
||||
if retvalue ~= nil then
|
||||
windowclose();
|
||||
return retvalue;
|
||||
end
|
||||
end
|
||||
end
|
||||
until key == 27;
|
||||
windowclose();
|
||||
end
|
||||
}
|
||||
local id = 1;
|
||||
-- examine all elements
|
||||
for _,value in ipairs(args) do
|
||||
-- all arguments that are tables are assumed to be widgets
|
||||
if type(value)=="table" then
|
||||
table.insert(dia.widgets, value)
|
||||
-- clickable widgets take up an auto-numbered id
|
||||
if (value.click) then
|
||||
dia.callbacks[id] = value
|
||||
id=id+1
|
||||
end
|
||||
end
|
||||
end
|
||||
return dia;
|
||||
end,
|
||||
|
||||
--
|
||||
-- button()
|
||||
--
|
||||
button = function(args)
|
||||
local but = {
|
||||
x = args.x,
|
||||
y = args.y,
|
||||
w = args.w,
|
||||
h = args.h,
|
||||
key = args.key,
|
||||
label = args.label,
|
||||
click = args.click or gui.donothing,
|
||||
create = args.repeatable and function(self)
|
||||
windowrepeatbutton(self.x, self.y, self.w, self.h, self.label, self.key or -1);
|
||||
end
|
||||
or function(self)
|
||||
windowbutton(self.x, self.y, self.w, self.h, self.label, self.key or -1);
|
||||
end
|
||||
}
|
||||
return but;
|
||||
end,
|
||||
|
||||
--
|
||||
-- label()
|
||||
--
|
||||
label = function(args)
|
||||
local lbl = {
|
||||
x = args.x,
|
||||
y = args.y,
|
||||
_value = args.value,
|
||||
format = args.format,
|
||||
fg = args.fg or gui.black,
|
||||
bg = args.bg or gui.light,
|
||||
render = function(self)
|
||||
if type(self.format) then
|
||||
windowprint(self.x, self.y, string.format(self.format, self._value), self.fg, self.bg);
|
||||
else
|
||||
windowprint(self.x, self.y, self._value, self.fg, self.bg);
|
||||
end
|
||||
end,
|
||||
}
|
||||
lbl.create = lbl.render
|
||||
setmetatable(lbl, gui.propvalue)
|
||||
return lbl;
|
||||
end,
|
||||
|
||||
--
|
||||
-- textbox
|
||||
--
|
||||
textbox = function(args)
|
||||
local txtbox = {
|
||||
x = args.x,
|
||||
y = args.y,
|
||||
nbchar = args.nbchar, -- visible size in characters
|
||||
--format = args.format, -- numeric, decimal, path
|
||||
decimal = args.decimal or 0,
|
||||
min = args.min,
|
||||
max = args.max,
|
||||
maxchar = args.maxchar, -- internal size
|
||||
_value = args.value,
|
||||
change = args.change or gui.donothing,
|
||||
--fg = args.fg or gui.black,
|
||||
--bg = args.bg or gui.light,
|
||||
create = function(self)
|
||||
windowinput(self.x, self.y, self.nbchar)
|
||||
self:render()
|
||||
end,
|
||||
render = function(self)
|
||||
local val = tostring(self._value)
|
||||
if string.len(val) < self.nbchar then
|
||||
val = string.rep(" ",self.nbchar - string.len(val)) .. val;
|
||||
elseif string.len(val) > self.nbchar then
|
||||
val = string.sub(val, 1, self.nbchar-1) .. gui.char.ellipsis
|
||||
end
|
||||
windowprint(self.x, self.y, val, gui.black, gui.light);
|
||||
end,
|
||||
click = function(self)
|
||||
local inputtype
|
||||
if (type(self._value) == "number" and ((self.min ~= nil and self.min<0) or self.decimal > 0)) then
|
||||
inputtype = 3 -- entry as double
|
||||
elseif (type(self._value) == "number") then
|
||||
inputtype = 1 -- entry as unsigned int
|
||||
else
|
||||
inputtype = 0 -- entry as string
|
||||
end
|
||||
local accept, val = windowreadline(self.x, self.y, self._value, self.nbchar, self.maxchar, self.decimal, inputtype);
|
||||
|
||||
if accept then
|
||||
if (inputtype == 1 or inputtype == 3) then
|
||||
val = tonumber(val)
|
||||
-- round the decimal places
|
||||
val = gui.round(val, self.decimal)
|
||||
end
|
||||
if (self.min ~= nil and val < self.min) then
|
||||
val = self.min
|
||||
end
|
||||
if (self.max ~= nil and val > self.max) then
|
||||
val = self.max
|
||||
end
|
||||
|
||||
self._value = val
|
||||
end
|
||||
self:render()
|
||||
end
|
||||
}
|
||||
setmetatable(txtbox, gui.propvalue)
|
||||
return txtbox;
|
||||
end
|
||||
|
||||
}
|
||||
|
||||
gui.round = function(val, ipt)
|
||||
local mult = 10^ipt
|
||||
return math.floor(val * mult + 0.5) / mult
|
||||
end
|
||||
|
||||
-- Character constants. May be useful in screens
|
||||
gui.char = {
|
||||
ellipsis = string.char(133), -- ...
|
||||
arrowup = string.char(24),
|
||||
arrowdown = string.char(25),
|
||||
arrowleft = string.char(27),
|
||||
arrowright = string.char(26),
|
||||
vertical = string.char(18), -- double-ended arrow
|
||||
horizontal = string.char(29) -- double-ended arrow
|
||||
}
|
||||
|
||||
@ -1,46 +1,45 @@
|
||||
--ANIM: Sprite Animator v0.15
|
||||
--Spare page holds data - Plays on current
|
||||
--by Richard Fhager
|
||||
|
||||
run("../libs/memory.lua")
|
||||
|
||||
arg=memory.load({XS=16,YS=16,SPACE=1,FRAMES=8,XOFF=0,YOFF=0,FPS=10})
|
||||
|
||||
OK, XS, YS, SPACE, FRAMES, XOFF, YOFF, FPS = inputbox("Sprite-Sheet Animator",
|
||||
"Sprite X-size", arg.XS, 1, 256,0,
|
||||
"Sprite Y-size", arg.YS, 1, 256,0,
|
||||
"Spacing", arg.SPACE, 0, 32,0,
|
||||
"# of Frames", arg.FRAMES,2, 100,0,
|
||||
"X-offset", arg.XOFF, 0, 800,0,
|
||||
"Y-offset", arg.YOFF, 0, 800,0,
|
||||
"Play Speed (FPS)",arg.FPS, 1, 60,0
|
||||
);
|
||||
|
||||
|
||||
if OK == true then
|
||||
|
||||
memory.save({XS=XS,YS=YS,SPACE=SPACE,FRAMES=FRAMES,XOFF=XOFF,YOFF=YOFF,FPS=FPS})
|
||||
|
||||
MAXPLAYS = 100
|
||||
|
||||
w,h = getpicturesize()
|
||||
OX = w / 2 - XS/2
|
||||
OY = h / 2 - YS/2
|
||||
|
||||
for play = 1, MAXPLAYS, 1 do
|
||||
|
||||
for f = 0, FRAMES-1, 1 do
|
||||
for y = 0, YS-1, 1 do
|
||||
for x = 0, XS-1, 1 do
|
||||
sx = x + XOFF + f * (XS + SPACE)
|
||||
sy = y + YOFF
|
||||
putpicturepixel(OX+x, OY+y, getsparepicturepixel(sx, sy))
|
||||
end
|
||||
end
|
||||
updatescreen(); if (waitbreak(1/FPS)==1) then return; end
|
||||
end
|
||||
|
||||
end -- plays
|
||||
|
||||
end --OK
|
||||
|
||||
--ANIM: Sprite Animator v0.15
|
||||
--Spare page holds data - Plays on current
|
||||
--by Richard Fhager
|
||||
|
||||
run("../libs/memory.lua")
|
||||
|
||||
arg=memory.load({XS=16,YS=16,SPACE=1,FRAMES=8,XOFF=0,YOFF=0,FPS=10})
|
||||
|
||||
OK, XS, YS, SPACE, FRAMES, XOFF, YOFF, FPS = inputbox("Sprite-Sheet Animator",
|
||||
"Sprite X-size", arg.XS, 1, 256,0,
|
||||
"Sprite Y-size", arg.YS, 1, 256,0,
|
||||
"Spacing", arg.SPACE, 0, 32,0,
|
||||
"# of Frames", arg.FRAMES,2, 100,0,
|
||||
"X-offset", arg.XOFF, 0, 800,0,
|
||||
"Y-offset", arg.YOFF, 0, 800,0,
|
||||
"Play Speed (FPS)",arg.FPS, 1, 60,0
|
||||
);
|
||||
|
||||
|
||||
if OK == true then
|
||||
|
||||
memory.save({XS=XS,YS=YS,SPACE=SPACE,FRAMES=FRAMES,XOFF=XOFF,YOFF=YOFF,FPS=FPS})
|
||||
|
||||
MAXPLAYS = 100
|
||||
|
||||
w,h = getpicturesize()
|
||||
OX = w / 2 - XS/2
|
||||
OY = h / 2 - YS/2
|
||||
|
||||
for play = 1, MAXPLAYS, 1 do
|
||||
|
||||
for f = 0, FRAMES-1, 1 do
|
||||
for y = 0, YS-1, 1 do
|
||||
for x = 0, XS-1, 1 do
|
||||
sx = x + XOFF + f * (XS + SPACE)
|
||||
sy = y + YOFF
|
||||
putpicturepixel(OX+x, OY+y, getsparepicturepixel(sx, sy))
|
||||
end
|
||||
end
|
||||
updatescreen(); if (waitbreak(1/FPS)==1) then return; end
|
||||
end
|
||||
|
||||
end -- plays
|
||||
|
||||
end --OK
|
||||
|
||||
@ -1,138 +1,138 @@
|
||||
-- Persistence library:
|
||||
-- Memorize data for current function
|
||||
-- memory.save(tab) and tab=memory.load()
|
||||
--
|
||||
-- The data will be stored in file called
|
||||
-- <calling_function_name>.dat
|
||||
-- in the lua directory
|
||||
--
|
||||
-- Example 1:
|
||||
--
|
||||
-- -- Load initial values or set defaults
|
||||
-- arg = memory.load({picX=320,picY=200,scale=0})
|
||||
-- -- Run an inputbox
|
||||
-- OK,arg.picX,arg.picY,arg.scale = inputbox("Image Size")",
|
||||
-- "Width", arg.picX, 1,2048,0,
|
||||
-- "Height", arg.picY, 1,2048,0,
|
||||
-- "Scale", arg.scale, 0,1,0);
|
||||
-- if OK == true then
|
||||
-- -- Save the selected values
|
||||
-- memory.save(arg)
|
||||
-- end
|
||||
|
||||
-- Example 2:
|
||||
--
|
||||
-- -- Load initial values or set defaults
|
||||
-- arg = memory.load({x=320,y=200,scale=0})
|
||||
-- picX=arg.x
|
||||
-- picY=arg.y
|
||||
-- scale=arg.scale
|
||||
-- -- Run an inputbox
|
||||
-- OK,picX,picY,scale = inputbox("Image Size")",
|
||||
-- "Width", picX, 1,2048,0,
|
||||
-- "Height", picY, 1,2048,0,
|
||||
-- "Scale", scale, 0,1,0);
|
||||
-- if OK == true then
|
||||
-- -- Save the selected values
|
||||
-- memory.save({x=picX,y=picY,scale=scale})
|
||||
-- end
|
||||
|
||||
|
||||
memory =
|
||||
{
|
||||
serialize = function(o)
|
||||
if type(o) == "number" then
|
||||
return tostring(o)
|
||||
elseif type(o) == "string" then
|
||||
return string.format("%q", o)
|
||||
--elseif type(o) == "table" then
|
||||
-- io.write("{\n")
|
||||
-- for k,v in pairs(o) do
|
||||
-- io.write(" ", k, " = ")
|
||||
-- memory.serialize(v)
|
||||
-- io.write(",\n")
|
||||
-- end
|
||||
-- io.write("}\n")
|
||||
else
|
||||
error("cannot serialize a " .. type(o))
|
||||
end
|
||||
end;
|
||||
|
||||
-- Return a string identifying the calling function.
|
||||
-- Pass 1 for parent, 2 for grandparent etc.
|
||||
callername = function(level)
|
||||
local w
|
||||
local last_slash
|
||||
local info = debug.getinfo(level+1,"Sn")
|
||||
local caller=tostring(info.name)
|
||||
-- Function name if possible
|
||||
if (caller~="nil") then
|
||||
return caller
|
||||
end
|
||||
-- Otherwise, get file name, without extension
|
||||
|
||||
-- Get part after directory name
|
||||
last_slash=0
|
||||
while true do
|
||||
local pos = string.find(info.source, "/", last_slash+1)
|
||||
if (pos==nil) then break end
|
||||
last_slash=pos
|
||||
end
|
||||
while true do
|
||||
local pos = string.find(info.source, "\\", last_slash+1)
|
||||
if (pos==nil) then break end
|
||||
last_slash=pos
|
||||
end
|
||||
|
||||
caller=string.sub(info.source, last_slash+1)
|
||||
|
||||
-- Remove file extension
|
||||
if (string.sub(caller,-4, -1)==".lua") then
|
||||
caller=string.sub(caller, 1, -5)
|
||||
end
|
||||
return caller
|
||||
end;
|
||||
|
||||
-- Memorize some parameters.
|
||||
save = function(o)
|
||||
local caller=memory.callername(2)
|
||||
--for k, v in pairs(o) do
|
||||
-- messagebox(tostring(k))
|
||||
-- messagebox(tostring(v))
|
||||
--end
|
||||
local f, e = io.open(caller..".dat", "w");
|
||||
if (f ~= nil) then
|
||||
f:write("Entry {\n")
|
||||
for k, v in pairs(o) do
|
||||
if (type(v)=="number") then
|
||||
f:write(" "..k.."="..memory["serialize"](v)..",\n")
|
||||
end
|
||||
end
|
||||
f:write("}\n")
|
||||
f:close()
|
||||
end
|
||||
end;
|
||||
|
||||
|
||||
-- Recover some saved parameters.
|
||||
load = function(o)
|
||||
local caller=memory.callername(2)
|
||||
local i
|
||||
|
||||
function Entry (b)
|
||||
-- Adds (or replaces) values in arg with those from b
|
||||
for k, v in pairs(b) do
|
||||
o[k]=v
|
||||
end
|
||||
end
|
||||
local f = (loadfile(caller..".dat"))
|
||||
if (f ~= nil) then
|
||||
f()
|
||||
end
|
||||
|
||||
return o
|
||||
end;
|
||||
|
||||
}
|
||||
|
||||
return memory
|
||||
-- Persistence library:
|
||||
-- Memorize data for current function
|
||||
-- memory.save(tab) and tab=memory.load()
|
||||
--
|
||||
-- The data will be stored in file called
|
||||
-- <calling_function_name>.dat
|
||||
-- in the lua directory
|
||||
--
|
||||
-- Example 1:
|
||||
--
|
||||
-- -- Load initial values or set defaults
|
||||
-- arg = memory.load({picX=320,picY=200,scale=0})
|
||||
-- -- Run an inputbox
|
||||
-- OK,arg.picX,arg.picY,arg.scale = inputbox("Image Size")",
|
||||
-- "Width", arg.picX, 1,2048,0,
|
||||
-- "Height", arg.picY, 1,2048,0,
|
||||
-- "Scale", arg.scale, 0,1,0);
|
||||
-- if OK == true then
|
||||
-- -- Save the selected values
|
||||
-- memory.save(arg)
|
||||
-- end
|
||||
|
||||
-- Example 2:
|
||||
--
|
||||
-- -- Load initial values or set defaults
|
||||
-- arg = memory.load({x=320,y=200,scale=0})
|
||||
-- picX=arg.x
|
||||
-- picY=arg.y
|
||||
-- scale=arg.scale
|
||||
-- -- Run an inputbox
|
||||
-- OK,picX,picY,scale = inputbox("Image Size")",
|
||||
-- "Width", picX, 1,2048,0,
|
||||
-- "Height", picY, 1,2048,0,
|
||||
-- "Scale", scale, 0,1,0);
|
||||
-- if OK == true then
|
||||
-- -- Save the selected values
|
||||
-- memory.save({x=picX,y=picY,scale=scale})
|
||||
-- end
|
||||
|
||||
|
||||
memory =
|
||||
{
|
||||
serialize = function(o)
|
||||
if type(o) == "number" then
|
||||
return tostring(o)
|
||||
elseif type(o) == "string" then
|
||||
return string.format("%q", o)
|
||||
--elseif type(o) == "table" then
|
||||
-- io.write("{\n")
|
||||
-- for k,v in pairs(o) do
|
||||
-- io.write(" ", k, " = ")
|
||||
-- memory.serialize(v)
|
||||
-- io.write(",\n")
|
||||
-- end
|
||||
-- io.write("}\n")
|
||||
else
|
||||
error("cannot serialize a " .. type(o))
|
||||
end
|
||||
end;
|
||||
|
||||
-- Return a string identifying the calling function.
|
||||
-- Pass 1 for parent, 2 for grandparent etc.
|
||||
callername = function(level)
|
||||
local w
|
||||
local last_slash
|
||||
local info = debug.getinfo(level+1,"Sn")
|
||||
local caller=tostring(info.name)
|
||||
-- Function name if possible
|
||||
if (caller~="nil") then
|
||||
return caller
|
||||
end
|
||||
-- Otherwise, get file name, without extension
|
||||
|
||||
-- Get part after directory name
|
||||
last_slash=0
|
||||
while true do
|
||||
local pos = string.find(info.source, "/", last_slash+1)
|
||||
if (pos==nil) then break end
|
||||
last_slash=pos
|
||||
end
|
||||
while true do
|
||||
local pos = string.find(info.source, "\\", last_slash+1)
|
||||
if (pos==nil) then break end
|
||||
last_slash=pos
|
||||
end
|
||||
|
||||
caller=string.sub(info.source, last_slash+1)
|
||||
|
||||
-- Remove file extension
|
||||
if (string.sub(caller,-4, -1)==".lua") then
|
||||
caller=string.sub(caller, 1, -5)
|
||||
end
|
||||
return caller
|
||||
end;
|
||||
|
||||
-- Memorize some parameters.
|
||||
save = function(o)
|
||||
local caller=memory.callername(2)
|
||||
--for k, v in pairs(o) do
|
||||
-- messagebox(tostring(k))
|
||||
-- messagebox(tostring(v))
|
||||
--end
|
||||
local f, e = io.open(caller..".dat", "w");
|
||||
if (f ~= nil) then
|
||||
f:write("Entry {\n")
|
||||
for k, v in pairs(o) do
|
||||
if (type(v)=="number") then
|
||||
f:write(" "..k.."="..memory["serialize"](v)..",\n")
|
||||
end
|
||||
end
|
||||
f:write("}\n")
|
||||
f:close()
|
||||
end
|
||||
end;
|
||||
|
||||
|
||||
-- Recover some saved parameters.
|
||||
load = function(o)
|
||||
local caller=memory.callername(2)
|
||||
local i
|
||||
|
||||
function Entry (b)
|
||||
-- Adds (or replaces) values in arg with those from b
|
||||
for k, v in pairs(b) do
|
||||
o[k]=v
|
||||
end
|
||||
end
|
||||
local f = (loadfile(caller..".dat"))
|
||||
if (f ~= nil) then
|
||||
f()
|
||||
end
|
||||
|
||||
return o
|
||||
end;
|
||||
|
||||
}
|
||||
|
||||
return memory
|
||||
|
||||
@ -1,141 +1,141 @@
|
||||
-- ostro_zx.lua : converts a color image into a
|
||||
-- ZX-like image (8+8 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 03/21/2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('../../thomson/lib/ostromoukhov.lua')
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
OtherDither = {}
|
||||
function OtherDither:new(a)
|
||||
local o = { -- default ZX values
|
||||
-- width of the screen
|
||||
width=a and a.width or 256,
|
||||
-- height of the screen
|
||||
height=a and a.height or 192,
|
||||
-- size of Nx1 clash size
|
||||
clash_size=a and a.clash_size or 8,
|
||||
-- normalize the picture levels (like in imagemagick)
|
||||
normalize=a and a.normalize or 0.005,
|
||||
-- put a pixel
|
||||
pset=a and a.pset or function(self,x,y,c)
|
||||
if c<0 then c=-c-1 end
|
||||
self.screen[x+y*self.width] = c
|
||||
end,
|
||||
-- init gfx data
|
||||
setGfx=a and a.setGfx or function(self)
|
||||
self.screen={}
|
||||
end,
|
||||
-- update gfx to screen
|
||||
updatescreen=a and a.updatescreen or function(self)
|
||||
for i=0,255 do setcolor(i,0,0,0) end
|
||||
for y=0,self.height-1 do
|
||||
for x=0,self.width-1 do
|
||||
putpicturepixel(x,y,self.screen[x+y*self.width] or 0)
|
||||
end
|
||||
end
|
||||
-- refresh palette
|
||||
for i,v in ipairs(self.pal) do
|
||||
local r=v % 16
|
||||
local g=math.floor(v/16) % 16
|
||||
local b=math.floor(v/256) % 16
|
||||
setcolor(i+thomson._palette.offset-1,
|
||||
thomson.levels.pc[r+1],
|
||||
thomson.levels.pc[g+1],
|
||||
thomson.levels.pc[b+1])
|
||||
end
|
||||
updatescreen()
|
||||
end,
|
||||
-- palette with thomson ordering (to use thomson's
|
||||
-- lib support)
|
||||
pal= a and a.pal or {
|
||||
0x000,0xF00,0x00F,0xF0F,0x0F0,0xFF0,0x0FF,0xFFF,
|
||||
0x000,0x200,0x002,0x202,0x020,0x220,0x022,0x222
|
||||
}
|
||||
}
|
||||
setmetatable(o, self)
|
||||
self.__index = self
|
||||
return o
|
||||
end
|
||||
|
||||
-- Converts ZX coordinates (0-255,0-191) into screen coordinates
|
||||
function OtherDither:to_screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < self.width/self.height then
|
||||
i = x*screen_h/self.height
|
||||
j = y*screen_h/self.height
|
||||
else
|
||||
i = x*screen_w/self.width
|
||||
j = y*screen_w/self.width
|
||||
end
|
||||
return math.floor(i), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the Color @(x,y) in linear space (0-255)
|
||||
-- corresonding to the other platform screen
|
||||
OtherDither._getLinearPixel = {} -- cache
|
||||
function OtherDither:getLinearPixel(x,y)
|
||||
local k=x+y*self.width
|
||||
local p = self._getLinearPixel and self._getLinearPixel[k]
|
||||
if not p then
|
||||
local x1,y1 = self:to_screen(x,y)
|
||||
local x2,y2 = self:to_screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
p = Color:new(0,0,0)
|
||||
for j=y1,y2-1 do
|
||||
for i=x1,x2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
p:div((y2-y1)*(x2-x1)) --:floor()
|
||||
|
||||
if self._getLinearPixel then
|
||||
self._getLinearPixel[k]=p
|
||||
end
|
||||
end
|
||||
|
||||
return self._getLinearPixel and p:clone() or p
|
||||
end
|
||||
|
||||
function OtherDither:ccAcceptCouple(c1,c2)
|
||||
-- bright colors can't mix with dimmed ones
|
||||
return c1~=c2 and ((c1<=8 and c2<=8) or (c1>8 and c2>8))
|
||||
end
|
||||
|
||||
function OtherDither:dither()
|
||||
local NORMALIZE=Color.NORMALIZE
|
||||
Color.NORMALIZE=self.normalize
|
||||
|
||||
local dither=OstroDither:new(self.pal)
|
||||
dither.ccAcceptCouple = function(dither,c1,c2) return self:ccAcceptCouple(c1,c2) end
|
||||
dither.clash_size = self.clash_size
|
||||
dither.attenuation = .9
|
||||
|
||||
self:setGfx()
|
||||
dither:ccDither(self.width,self.height,
|
||||
function(x,y) return self:getLinearPixel(x,y) end,
|
||||
function(x,y,c) self:pset(x,y,c) end,
|
||||
true,
|
||||
function(y)
|
||||
thomson.info("Converting...",
|
||||
math.floor(y*100/self.height),"%")
|
||||
end,true)
|
||||
-- refresh screen
|
||||
setpicturesize(self.width,self.height)
|
||||
self:updatescreen()
|
||||
finalizepicture()
|
||||
Color.NORMALIZE=NORMALIZE
|
||||
end
|
||||
-- ostro_zx.lua : converts a color image into a
|
||||
-- ZX-like image (8+8 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 03/21/2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('../../thomson/lib/ostromoukhov.lua')
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
OtherDither = {}
|
||||
function OtherDither:new(a)
|
||||
local o = { -- default ZX values
|
||||
-- width of the screen
|
||||
width=a and a.width or 256,
|
||||
-- height of the screen
|
||||
height=a and a.height or 192,
|
||||
-- size of Nx1 clash size
|
||||
clash_size=a and a.clash_size or 8,
|
||||
-- normalize the picture levels (like in imagemagick)
|
||||
normalize=a and a.normalize or 0.005,
|
||||
-- put a pixel
|
||||
pset=a and a.pset or function(self,x,y,c)
|
||||
if c<0 then c=-c-1 end
|
||||
self.screen[x+y*self.width] = c
|
||||
end,
|
||||
-- init gfx data
|
||||
setGfx=a and a.setGfx or function(self)
|
||||
self.screen={}
|
||||
end,
|
||||
-- update gfx to screen
|
||||
updatescreen=a and a.updatescreen or function(self)
|
||||
for i=0,255 do setcolor(i,0,0,0) end
|
||||
for y=0,self.height-1 do
|
||||
for x=0,self.width-1 do
|
||||
putpicturepixel(x,y,self.screen[x+y*self.width] or 0)
|
||||
end
|
||||
end
|
||||
-- refresh palette
|
||||
for i,v in ipairs(self.pal) do
|
||||
local r=v % 16
|
||||
local g=math.floor(v/16) % 16
|
||||
local b=math.floor(v/256) % 16
|
||||
setcolor(i+thomson._palette.offset-1,
|
||||
thomson.levels.pc[r+1],
|
||||
thomson.levels.pc[g+1],
|
||||
thomson.levels.pc[b+1])
|
||||
end
|
||||
updatescreen()
|
||||
end,
|
||||
-- palette with thomson ordering (to use thomson's
|
||||
-- lib support)
|
||||
pal= a and a.pal or {
|
||||
0x000,0xF00,0x00F,0xF0F,0x0F0,0xFF0,0x0FF,0xFFF,
|
||||
0x000,0x200,0x002,0x202,0x020,0x220,0x022,0x222
|
||||
}
|
||||
}
|
||||
setmetatable(o, self)
|
||||
self.__index = self
|
||||
return o
|
||||
end
|
||||
|
||||
-- Converts ZX coordinates (0-255,0-191) into screen coordinates
|
||||
function OtherDither:to_screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < self.width/self.height then
|
||||
i = x*screen_h/self.height
|
||||
j = y*screen_h/self.height
|
||||
else
|
||||
i = x*screen_w/self.width
|
||||
j = y*screen_w/self.width
|
||||
end
|
||||
return math.floor(i), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the Color @(x,y) in linear space (0-255)
|
||||
-- corresonding to the other platform screen
|
||||
OtherDither._getLinearPixel = {} -- cache
|
||||
function OtherDither:getLinearPixel(x,y)
|
||||
local k=x+y*self.width
|
||||
local p = self._getLinearPixel and self._getLinearPixel[k]
|
||||
if not p then
|
||||
local x1,y1 = self:to_screen(x,y)
|
||||
local x2,y2 = self:to_screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
p = Color:new(0,0,0)
|
||||
for j=y1,y2-1 do
|
||||
for i=x1,x2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
p:div((y2-y1)*(x2-x1)) --:floor()
|
||||
|
||||
if self._getLinearPixel then
|
||||
self._getLinearPixel[k]=p
|
||||
end
|
||||
end
|
||||
|
||||
return self._getLinearPixel and p:clone() or p
|
||||
end
|
||||
|
||||
function OtherDither:ccAcceptCouple(c1,c2)
|
||||
-- bright colors can't mix with dimmed ones
|
||||
return c1~=c2 and ((c1<=8 and c2<=8) or (c1>8 and c2>8))
|
||||
end
|
||||
|
||||
function OtherDither:dither()
|
||||
local NORMALIZE=Color.NORMALIZE
|
||||
Color.NORMALIZE=self.normalize
|
||||
|
||||
local dither=OstroDither:new(self.pal)
|
||||
dither.ccAcceptCouple = function(dither,c1,c2) return self:ccAcceptCouple(c1,c2) end
|
||||
dither.clash_size = self.clash_size
|
||||
dither.attenuation = .9
|
||||
|
||||
self:setGfx()
|
||||
dither:ccDither(self.width,self.height,
|
||||
function(x,y) return self:getLinearPixel(x,y) end,
|
||||
function(x,y,c) self:pset(x,y,c) end,
|
||||
true,
|
||||
function(y)
|
||||
thomson.info("Converting...",
|
||||
math.floor(y*100/self.height),"%")
|
||||
end,true)
|
||||
-- refresh screen
|
||||
setpicturesize(self.width,self.height)
|
||||
self:updatescreen()
|
||||
finalizepicture()
|
||||
Color.NORMALIZE=NORMALIZE
|
||||
end
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
-- ostro_zx.lua : converts a color image into a
|
||||
-- Oric image (8+8 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 03/21/2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostro_other.lua')
|
||||
|
||||
OtherDither:new{
|
||||
width=240,
|
||||
height=200,
|
||||
clash_size=6,
|
||||
pal={0x000,0x00F,0x0F0,0x0FF,0xF00,0xF0F,0xFF0,0xFFF},
|
||||
pset=function(self,x,y,c)
|
||||
if x<6 then c=0 end
|
||||
if c<0 then c=-c-1 end
|
||||
self.screen[x+y*self.width] = c
|
||||
end
|
||||
}:dither()
|
||||
-- ostro_zx.lua : converts a color image into a
|
||||
-- Oric image (8+8 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 03/21/2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostro_other.lua')
|
||||
|
||||
OtherDither:new{
|
||||
width=240,
|
||||
height=200,
|
||||
clash_size=6,
|
||||
pal={0x000,0x00F,0x0F0,0x0FF,0xF00,0xF0F,0xFF0,0xFFF},
|
||||
pset=function(self,x,y,c)
|
||||
if x<6 then c=0 end
|
||||
if c<0 then c=-c-1 end
|
||||
self.screen[x+y*self.width] = c
|
||||
end
|
||||
}:dither()
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
-- ostro_zx.lua : converts a color image into a
|
||||
-- ZX image (8+8 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 03/21/2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostro_other.lua')
|
||||
|
||||
OtherDither:new{width=256,height=192,clash_size=8}:dither()
|
||||
-- ostro_zx.lua : converts a color image into a
|
||||
-- ZX image (8+8 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 03/21/2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostro_other.lua')
|
||||
|
||||
OtherDither:new{width=256,height=192,clash_size=8}:dither()
|
||||
|
||||
@ -1,220 +1,219 @@
|
||||
-- bayer4_mo5.lua : converts an image into TO7/70-MO5
|
||||
-- mode for thomson machines (MO6,TO8,TO9,TO9+)
|
||||
-- using special bayer matrix that fits well with
|
||||
-- color clashes.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
run("lib/thomson.lua")
|
||||
run("lib/color.lua")
|
||||
run("lib/bayer.lua")
|
||||
|
||||
-- Converts thomson coordinates (0-319,0-199) into screen coordinates
|
||||
local function thom2screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < 1.6 then
|
||||
i = x*screen_h/200
|
||||
j = y*screen_h/200
|
||||
else
|
||||
i = x*screen_w/320
|
||||
j = y*screen_w/320
|
||||
end
|
||||
return math.floor(i), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the pixel @(x,y) in normalized linear space (0-1)
|
||||
-- corresonding to the thomson screen (x in 0-319, y in 0-199)
|
||||
local function getLinearPixel(x,y)
|
||||
local x1,y1 = thom2screen(x,y)
|
||||
local x2,y2 = thom2screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
local p,i,j = Color:new(0,0,0);
|
||||
for i=x1,x2-1 do
|
||||
for j=y1,y2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
p:div((y2-y1)*(x2-x1)*Color.ONE)
|
||||
|
||||
return p
|
||||
end
|
||||
|
||||
local dither = bayer.norm(bayer.double(bayer.double({{1,2},{3,4}})))
|
||||
local dx,dy=#dither,#dither[1]
|
||||
|
||||
-- get thomson palette pixel (linear, 0-1 range)
|
||||
local linearPalette = {}
|
||||
function linearPalette.get(i)
|
||||
local p = linearPalette[i]
|
||||
if not p then
|
||||
local pal = thomson.palette(i-1)
|
||||
local b=math.floor(pal/256)
|
||||
local g=math.floor(pal/16)%16
|
||||
local r=pal%16
|
||||
p = Color:new(thomson.levels.linear[r+1],
|
||||
thomson.levels.linear[g+1],
|
||||
thomson.levels.linear[b+1]):div(Color.ONE)
|
||||
linearPalette[i] = p
|
||||
end
|
||||
return p:clone()
|
||||
end
|
||||
|
||||
-- distance between two colors
|
||||
local distance = {}
|
||||
function distance.between(c1,c2)
|
||||
local k = c1..','..c2
|
||||
local d = distance[k]
|
||||
if false and not d then
|
||||
d = linearPalette.get(c1):euclid_dist2(linearPalette.get(c2))
|
||||
distance[k] = d
|
||||
end
|
||||
if not d then
|
||||
local x = linearPalette.get(c1):sub(linearPalette.get(c2))
|
||||
local c,c1,c2,c3=1.8,8,11,8
|
||||
local f = function(c,x) return math.abs(x)*c end
|
||||
d = f(c1,x.r)^c + f(c2,x.g)^c + f(c3,x.b)^c
|
||||
distance[k] = d
|
||||
end
|
||||
return d
|
||||
end
|
||||
|
||||
-- compute a set of best couples for a given histogram
|
||||
local best_couple = {n=0}
|
||||
function best_couple.get(h)
|
||||
local k = (((h[1]or 0)*8+(h[2]or 0))*8+(h[3]or 0))*8+(h[4]or 0)
|
||||
.. ',' .. (((h[5]or 0)*8+(h[6]or 0))*8+(h[7]or 0))*8+(h[8]or 0)
|
||||
local best_found = best_couple[k]
|
||||
if not best_found then
|
||||
local dm=1000000
|
||||
for i=1,15 do
|
||||
for j=i+1,16 do
|
||||
local d=0
|
||||
for p,n in pairs(h) do
|
||||
local d1,d2=distance.between(p,i),distance.between(p,j)
|
||||
d = d + n*(d1<d2 and d1 or d2)
|
||||
if d>dm then break; end
|
||||
end
|
||||
if d< dm then dm,best_found=d,{} end
|
||||
if d<=dm then table.insert(best_found, {c1=i,c2=j}) end
|
||||
end
|
||||
end
|
||||
|
||||
if best_couple.n>10000 then
|
||||
-- keep memory usage low
|
||||
best_couple = {n=0, get=best_couple.get}
|
||||
end
|
||||
best_couple[k] = best_found
|
||||
best_couple.n = best_couple.n+1
|
||||
end
|
||||
return best_found
|
||||
end
|
||||
|
||||
-- TO7/70 MO5 mode
|
||||
thomson.setMO5()
|
||||
|
||||
-- convert picture
|
||||
local err1,err2 = {},{}
|
||||
local coefs = {0,0.6,0}
|
||||
for x=-1,320 do
|
||||
err1[x] = Color:new(0,0,0)
|
||||
err2[x] = Color:new(0,0,0)
|
||||
end
|
||||
for y = 0,199 do
|
||||
err1,err2 = err2,err1
|
||||
for x=-1,320 do err2[x]:mul(0) end
|
||||
|
||||
for x = 0,319,8 do
|
||||
local h,q = {},{} -- histo, expected color
|
||||
for z=x,x+7 do
|
||||
local d=dither[1+(y%dx)][1+(z%dx)]
|
||||
local p=getLinearPixel(z,y):add(err1[z])
|
||||
local c=((p.r>d) and 1 or 0) +
|
||||
((p.g>d) and 2 or 0) +
|
||||
((p.b>d) and 4 or 0) + 1 -- theorical color
|
||||
|
||||
table.insert(q,c)
|
||||
h[c] = (h[c] or 0)+1
|
||||
end
|
||||
|
||||
local c1,c2
|
||||
for c,_ in pairs(h) do
|
||||
if c1==nil then c1=c
|
||||
elseif c2==nil then c2=c
|
||||
else c1=nil; break; end
|
||||
end
|
||||
if c1~=nil then
|
||||
c2 = c2 or c1
|
||||
else
|
||||
-- get best possible couples of colors
|
||||
local best_found = best_couple.get(h)
|
||||
if #best_found==1 then
|
||||
c1,c2 = best_found[1].c1,best_found[1].c2
|
||||
else
|
||||
-- keep the best of the best depending on max solvable color clashes
|
||||
function clamp(v) return v<0 and -v or v>1 and v-1 or 0 end
|
||||
local dm=10000000
|
||||
for _,couple in ipairs(best_found) do
|
||||
local d=0
|
||||
for k=1,8 do
|
||||
local q=q[k]
|
||||
local p=distance.between(q,couple.c1)<distance.between(q,couple.c2) and couple.c1 or couple.c2
|
||||
-- error between expected and best
|
||||
local e=linearPalette.get(q):sub(linearPalette.get(p)):mul(coefs[1])
|
||||
local z=getLinearPixel(x+k-1,y+1):add(e)
|
||||
d = d + clamp(z.r) + clamp(z.g) + clamp(z.b)
|
||||
end
|
||||
if d<=dm then dm,c1,c2=d,couple.c1,couple.c2 end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- thomson.pset(x,y,c1-1)
|
||||
-- thomson.pset(x,y,-c2)
|
||||
|
||||
for k=0,7 do
|
||||
local z=x+k
|
||||
local q=q[k+1]
|
||||
local p=distance.between(q,c1)<distance.between(q,c2) and c1 or c2
|
||||
local d=linearPalette.get(q):sub(linearPalette.get(p))
|
||||
err2[z]:add(d:mul(coefs[1]))
|
||||
|
||||
thomson.pset(z,y,p==c1 and c1-1 or -c2)
|
||||
end
|
||||
end
|
||||
thomson.info("Converting...",math.floor(y/2),"%")
|
||||
end
|
||||
|
||||
-- refresh screen
|
||||
setpicturesize(320,200)
|
||||
thomson.updatescreen()
|
||||
finalizepicture()
|
||||
|
||||
-- save picture
|
||||
do
|
||||
local function exist(file)
|
||||
local f=io.open(file,'rb')
|
||||
if not f then return false else io.close(f); return true; end
|
||||
end
|
||||
local name,path = getfilename()
|
||||
local mapname = string.gsub(name,"%.%w*$","") .. ".map"
|
||||
local fullname = path .. '/' .. mapname
|
||||
local ok = not exist(fullname)
|
||||
if not ok then
|
||||
selectbox("Ovr " .. mapname .. "?", "Yes", function() ok = true; end, "No", function() ok = false; end)
|
||||
end
|
||||
if ok then thomson.savep(fullname) end
|
||||
end
|
||||
|
||||
-- bayer4_mo5.lua : converts an image into TO7/70-MO5
|
||||
-- mode for thomson machines (MO6,TO8,TO9,TO9+)
|
||||
-- using special bayer matrix that fits well with
|
||||
-- color clashes.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
run("lib/thomson.lua")
|
||||
run("lib/color.lua")
|
||||
run("lib/bayer.lua")
|
||||
|
||||
-- Converts thomson coordinates (0-319,0-199) into screen coordinates
|
||||
local function thom2screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < 1.6 then
|
||||
i = x*screen_h/200
|
||||
j = y*screen_h/200
|
||||
else
|
||||
i = x*screen_w/320
|
||||
j = y*screen_w/320
|
||||
end
|
||||
return math.floor(i), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the pixel @(x,y) in normalized linear space (0-1)
|
||||
-- corresonding to the thomson screen (x in 0-319, y in 0-199)
|
||||
local function getLinearPixel(x,y)
|
||||
local x1,y1 = thom2screen(x,y)
|
||||
local x2,y2 = thom2screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
local p,i,j = Color:new(0,0,0);
|
||||
for i=x1,x2-1 do
|
||||
for j=y1,y2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
p:div((y2-y1)*(x2-x1)*Color.ONE)
|
||||
|
||||
return p
|
||||
end
|
||||
|
||||
local dither = bayer.norm(bayer.double(bayer.double({{1,2},{3,4}})))
|
||||
local dx,dy=#dither,#dither[1]
|
||||
|
||||
-- get thomson palette pixel (linear, 0-1 range)
|
||||
local linearPalette = {}
|
||||
function linearPalette.get(i)
|
||||
local p = linearPalette[i]
|
||||
if not p then
|
||||
local pal = thomson.palette(i-1)
|
||||
local b=math.floor(pal/256)
|
||||
local g=math.floor(pal/16)%16
|
||||
local r=pal%16
|
||||
p = Color:new(thomson.levels.linear[r+1],
|
||||
thomson.levels.linear[g+1],
|
||||
thomson.levels.linear[b+1]):div(Color.ONE)
|
||||
linearPalette[i] = p
|
||||
end
|
||||
return p:clone()
|
||||
end
|
||||
|
||||
-- distance between two colors
|
||||
local distance = {}
|
||||
function distance.between(c1,c2)
|
||||
local k = c1..','..c2
|
||||
local d = distance[k]
|
||||
if false and not d then
|
||||
d = linearPalette.get(c1):euclid_dist2(linearPalette.get(c2))
|
||||
distance[k] = d
|
||||
end
|
||||
if not d then
|
||||
local x = linearPalette.get(c1):sub(linearPalette.get(c2))
|
||||
local c,c1,c2,c3=1.8,8,11,8
|
||||
local f = function(c,x) return math.abs(x)*c end
|
||||
d = f(c1,x.r)^c + f(c2,x.g)^c + f(c3,x.b)^c
|
||||
distance[k] = d
|
||||
end
|
||||
return d
|
||||
end
|
||||
|
||||
-- compute a set of best couples for a given histogram
|
||||
local best_couple = {n=0}
|
||||
function best_couple.get(h)
|
||||
local k = (((h[1]or 0)*8+(h[2]or 0))*8+(h[3]or 0))*8+(h[4]or 0)
|
||||
.. ',' .. (((h[5]or 0)*8+(h[6]or 0))*8+(h[7]or 0))*8+(h[8]or 0)
|
||||
local best_found = best_couple[k]
|
||||
if not best_found then
|
||||
local dm=1000000
|
||||
for i=1,15 do
|
||||
for j=i+1,16 do
|
||||
local d=0
|
||||
for p,n in pairs(h) do
|
||||
local d1,d2=distance.between(p,i),distance.between(p,j)
|
||||
d = d + n*(d1<d2 and d1 or d2)
|
||||
if d>dm then break; end
|
||||
end
|
||||
if d< dm then dm,best_found=d,{} end
|
||||
if d<=dm then table.insert(best_found, {c1=i,c2=j}) end
|
||||
end
|
||||
end
|
||||
|
||||
if best_couple.n>10000 then
|
||||
-- keep memory usage low
|
||||
best_couple = {n=0, get=best_couple.get}
|
||||
end
|
||||
best_couple[k] = best_found
|
||||
best_couple.n = best_couple.n+1
|
||||
end
|
||||
return best_found
|
||||
end
|
||||
|
||||
-- TO7/70 MO5 mode
|
||||
thomson.setMO5()
|
||||
|
||||
-- convert picture
|
||||
local err1,err2 = {},{}
|
||||
local coefs = {0,0.6,0}
|
||||
for x=-1,320 do
|
||||
err1[x] = Color:new(0,0,0)
|
||||
err2[x] = Color:new(0,0,0)
|
||||
end
|
||||
for y = 0,199 do
|
||||
err1,err2 = err2,err1
|
||||
for x=-1,320 do err2[x]:mul(0) end
|
||||
|
||||
for x = 0,319,8 do
|
||||
local h,q = {},{} -- histo, expected color
|
||||
for z=x,x+7 do
|
||||
local d=dither[1+(y%dx)][1+(z%dx)]
|
||||
local p=getLinearPixel(z,y):add(err1[z])
|
||||
local c=((p.r>d) and 1 or 0) +
|
||||
((p.g>d) and 2 or 0) +
|
||||
((p.b>d) and 4 or 0) + 1 -- theorical color
|
||||
|
||||
table.insert(q,c)
|
||||
h[c] = (h[c] or 0)+1
|
||||
end
|
||||
|
||||
local c1,c2
|
||||
for c,_ in pairs(h) do
|
||||
if c1==nil then c1=c
|
||||
elseif c2==nil then c2=c
|
||||
else c1=nil; break; end
|
||||
end
|
||||
if c1~=nil then
|
||||
c2 = c2 or c1
|
||||
else
|
||||
-- get best possible couples of colors
|
||||
local best_found = best_couple.get(h)
|
||||
if #best_found==1 then
|
||||
c1,c2 = best_found[1].c1,best_found[1].c2
|
||||
else
|
||||
-- keep the best of the best depending on max solvable color clashes
|
||||
function clamp(v) return v<0 and -v or v>1 and v-1 or 0 end
|
||||
local dm=10000000
|
||||
for _,couple in ipairs(best_found) do
|
||||
local d=0
|
||||
for k=1,8 do
|
||||
local q=q[k]
|
||||
local p=distance.between(q,couple.c1)<distance.between(q,couple.c2) and couple.c1 or couple.c2
|
||||
-- error between expected and best
|
||||
local e=linearPalette.get(q):sub(linearPalette.get(p)):mul(coefs[1])
|
||||
local z=getLinearPixel(x+k-1,y+1):add(e)
|
||||
d = d + clamp(z.r) + clamp(z.g) + clamp(z.b)
|
||||
end
|
||||
if d<=dm then dm,c1,c2=d,couple.c1,couple.c2 end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- thomson.pset(x,y,c1-1)
|
||||
-- thomson.pset(x,y,-c2)
|
||||
|
||||
for k=0,7 do
|
||||
local z=x+k
|
||||
local q=q[k+1]
|
||||
local p=distance.between(q,c1)<distance.between(q,c2) and c1 or c2
|
||||
local d=linearPalette.get(q):sub(linearPalette.get(p))
|
||||
err2[z]:add(d:mul(coefs[1]))
|
||||
|
||||
thomson.pset(z,y,p==c1 and c1-1 or -c2)
|
||||
end
|
||||
end
|
||||
thomson.info("Converting...",math.floor(y/2),"%")
|
||||
end
|
||||
|
||||
-- refresh screen
|
||||
setpicturesize(320,200)
|
||||
thomson.updatescreen()
|
||||
finalizepicture()
|
||||
|
||||
-- save picture
|
||||
do
|
||||
local function exist(file)
|
||||
local f=io.open(file,'rb')
|
||||
if not f then return false else io.close(f); return true; end
|
||||
end
|
||||
local name,path = getfilename()
|
||||
local mapname = string.gsub(name,"%.%w*$","") .. ".map"
|
||||
local fullname = path .. '/' .. mapname
|
||||
local ok = not exist(fullname)
|
||||
if not ok then
|
||||
selectbox("Ovr " .. mapname .. "?", "Yes", function() ok = true; end, "No", function() ok = false; end)
|
||||
end
|
||||
if ok then thomson.savep(fullname) end
|
||||
end
|
||||
|
||||
@ -1,299 +1,299 @@
|
||||
-- bayer4_to8.lua : converts an image into BM16
|
||||
-- mode for thomson machines (MO6,TO8,TO9,TO9+)
|
||||
-- using bayer matrix and a special palette.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
-- This is my first code in lua, so excuse any bad
|
||||
-- coding practice.
|
||||
|
||||
-- use a zig zag. If false (recommended value), this gives
|
||||
-- a raster look and feel
|
||||
local with_zig_zag = with_zig_zag or false
|
||||
|
||||
-- debug: displays histograms
|
||||
local debug = false
|
||||
|
||||
-- enhance luminosity since our mode divide it by two
|
||||
local enhance_lum = enhance_lum or true
|
||||
|
||||
-- use fixed levels (default=false, give better result)
|
||||
local fixed_levels = fixed_levels or false
|
||||
|
||||
-- use void-and-cluster 8x8 matrix (default=false)
|
||||
local use_vac = use_vac or false
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
run("lib/thomson.lua")
|
||||
run("lib/color.lua")
|
||||
run("lib/bayer.lua")
|
||||
|
||||
-- Converts thomson coordinates (0-159,0-99) into screen coordinates
|
||||
local function thom2screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < 1.6 then
|
||||
i = x*screen_h/100
|
||||
j = y*screen_h/100
|
||||
else
|
||||
i = x*screen_w/160
|
||||
j = y*screen_w/160
|
||||
end
|
||||
return math.floor(i), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the pixel @(x,y) in linear space corresonding to the thomson screen (x in 0-159, y in 0-99)
|
||||
local function getLinearPixel(x,y)
|
||||
local x1,y1 = thom2screen(x,y)
|
||||
local x2,y2 = thom2screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
local p,i,j = Color:new(0,0,0);
|
||||
for i=x1,x2-1 do
|
||||
for j=y1,y2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
|
||||
return p:div((y2-y1)*(x2-x1)):floor()
|
||||
end
|
||||
|
||||
--[[ make a bayer matrix
|
||||
function bayer(matrix)
|
||||
local m,n=#matrix,#matrix[1]
|
||||
local r,i,j = {}
|
||||
for j=1,m*2 do
|
||||
local t = {}
|
||||
for i=1,n*2 do t[i]=0; end
|
||||
r[j] = t;
|
||||
end
|
||||
|
||||
-- 0 3
|
||||
-- 2 1
|
||||
for j=1,m do
|
||||
for i=1,n do
|
||||
local v = 4*matrix[j][i]
|
||||
r[m*0+j][n*0+i] = v-3
|
||||
r[m*1+j][n*1+i] = v-2
|
||||
r[m*1+j][n*0+i] = v-1
|
||||
r[m*0+j][n*1+i] = v-0
|
||||
end
|
||||
end
|
||||
|
||||
return r;
|
||||
end
|
||||
--]]
|
||||
|
||||
-- dither matrix
|
||||
local dither = bayer.make(4)
|
||||
|
||||
if use_vac then
|
||||
-- vac8: looks like FS
|
||||
dither = bayer.norm{
|
||||
{35,57,19,55,7,51,4,21},
|
||||
{29,6,41,27,37,17,59,45},
|
||||
{61,15,53,12,62,25,33,9},
|
||||
{23,39,31,49,2,47,13,43},
|
||||
{3,52,8,22,36,58,20,56},
|
||||
{38,18,60,46,30,5,42,28},
|
||||
{63,26,34,11,64,16,54,10},
|
||||
{14,48,1,44,24,40,32,50}
|
||||
}
|
||||
end
|
||||
|
||||
-- get color statistics
|
||||
local stat = {};
|
||||
function stat:clear()
|
||||
self.r = {}
|
||||
self.g = {}
|
||||
self.b = {}
|
||||
for i=1,16 do self.r[i] = 0; self.g[i] = 0; self.b[i] = 0; end
|
||||
end
|
||||
function stat:update(px)
|
||||
local pc2to = thomson.levels.pc2to
|
||||
local r,g,b=pc2to[px.r], pc2to[px.g], pc2to[px.b];
|
||||
self.r[r] = self.r[r] + 1;
|
||||
self.g[g] = self.g[g] + 1;
|
||||
self.b[b] = self.b[b] + 1;
|
||||
end
|
||||
function stat:coversThr(perc)
|
||||
local function f(stat)
|
||||
local t=-stat[1]
|
||||
for i,n in ipairs(stat) do t=t+n end
|
||||
local thr = t*perc; t=-stat[1]
|
||||
for i,n in ipairs(stat) do
|
||||
t=t+n
|
||||
if t>=thr then return i end
|
||||
end
|
||||
return 0
|
||||
end
|
||||
return f(self.r),f(self.g),f(self.b)
|
||||
end
|
||||
stat:clear();
|
||||
for y = 0,99 do
|
||||
for x = 0,159 do
|
||||
stat:update(getLinearPixel(x,y))
|
||||
end
|
||||
thomson.info("Collecting stats...",y,"%")
|
||||
end
|
||||
|
||||
-- enhance luminosity since our mode divide it by two
|
||||
local gain = 1
|
||||
if enhance_lum then
|
||||
-- findout level that covers 98% of all non-black pixels
|
||||
local max = math.max(stat:coversThr(.98))
|
||||
|
||||
gain = math.min(2,255/thomson.levels.linear[max])
|
||||
|
||||
if gain>1 then
|
||||
-- redo stat with enhanced levels
|
||||
-- messagebox('gain '..gain..' '..table.concat({stat:coversThr(.98)},','))
|
||||
stat:clear();
|
||||
for y = 0,99 do
|
||||
for x = 0,159 do
|
||||
stat:update(getLinearPixel(x,y):mul(gain):floor())
|
||||
end
|
||||
thomson.info("Enhancing levels..",y,"%")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- find regularly spaced levels in thomson space
|
||||
local levels = {}
|
||||
function levels.compute(name, stat, num)
|
||||
local tot, max = -stat[1],0;
|
||||
for _,t in ipairs(stat) do
|
||||
max = math.max(t,max)
|
||||
tot = tot + t
|
||||
end
|
||||
local acc,full=-stat[1],0
|
||||
for i,t in ipairs(stat) do
|
||||
acc = acc + t
|
||||
if acc>tot*.98 then
|
||||
full=thomson.levels.linear[i]
|
||||
break
|
||||
end
|
||||
end
|
||||
-- sanity
|
||||
if fixed_levels or full==0 then full=255 end
|
||||
local res = {1}; num = num-1
|
||||
for i=1,num do
|
||||
local p = math.floor(full*i/num)
|
||||
local q = thomson.levels.linear2to[p]
|
||||
if q==res[i] and q<16 then q=q+1 end
|
||||
if not fixed_levels and i<num then
|
||||
if q>res[i]+1 and stat[q-1]>stat[q] then q=q-1 end
|
||||
if q>res[i]+1 and stat[q-1]>stat[q] then q=q-1 end
|
||||
-- 3 corrections? no need...
|
||||
-- if q>res[i]+1 and stat[q-1]>stat[q] then q=q-1 end
|
||||
end
|
||||
res[1+i] = q
|
||||
end
|
||||
|
||||
-- debug
|
||||
if debug then
|
||||
local txt = ""
|
||||
for _,i in ipairs(res) do
|
||||
txt = txt .. i .. " "
|
||||
end
|
||||
for i,t in ipairs(stat) do
|
||||
txt = txt .. "\n" .. string.format("%s%2d:%3d%% ", name, i, math.floor(100*t/(tot+stat[1]))) .. string.rep('X', math.floor(23*t/max))
|
||||
end
|
||||
messagebox(txt)
|
||||
end
|
||||
|
||||
return res
|
||||
end
|
||||
function levels.computeAll(stat)
|
||||
levels.grn = levels.compute("GRN",stat.g,5)
|
||||
levels.red = levels.compute("RED",stat.r,4)
|
||||
levels.blu = levels.compute("BLU",stat.b,3)
|
||||
end
|
||||
levels.computeAll(stat)
|
||||
|
||||
-- put a pixel at (x,y) with dithering
|
||||
local function pset(x,y,px)
|
||||
local thr = dither[1+(y % #dither)][1+(x % #dither[1])]
|
||||
local function dither(val,thr,lvls)
|
||||
local i=#lvls
|
||||
local a,b = thomson.levels.linear[lvls[i]],1e30
|
||||
while i>1 and val<a do
|
||||
i=i-1;
|
||||
a,b=thomson.levels.linear[lvls[i]],a;
|
||||
end
|
||||
return i + ((val-a)>=thr*(b-a) and 0 or -1)
|
||||
end
|
||||
|
||||
local r = dither(px.r, thr, levels.red);
|
||||
local g = dither(px.g, thr, levels.grn);
|
||||
local b = dither(px.b, thr, levels.blu);
|
||||
|
||||
local i = r + b*4
|
||||
local j = g==0 and 0 or (11 + g)
|
||||
|
||||
if with_zig_zag and x%2==1 then
|
||||
thomson.pset(x,y*2+0,j)
|
||||
thomson.pset(x,y*2+1,i)
|
||||
else
|
||||
thomson.pset(x,y*2+0,i)
|
||||
thomson.pset(x,y*2+1,j)
|
||||
end
|
||||
end
|
||||
|
||||
-- BM16 mode
|
||||
thomson.setBM16()
|
||||
|
||||
-- define palette
|
||||
for i=0,15 do
|
||||
local r,g,b=0,0,0
|
||||
if i<12 then
|
||||
-- r = bit32.band(i,3)
|
||||
-- b = bit32.rshift(i,2)
|
||||
b = math.floor(i/4)
|
||||
r = i-4*b
|
||||
else
|
||||
g = i-11
|
||||
end
|
||||
r,g,b=levels.red[r+1],levels.grn[g+1],levels.blu[b+1]
|
||||
thomson.palette(i,b*256+g*16+r-273)
|
||||
end
|
||||
|
||||
-- convert picture
|
||||
for y = 0,99 do
|
||||
for x = 0,159 do
|
||||
pset(x,y, getLinearPixel(x,y):mul(gain):floor())
|
||||
end
|
||||
thomson.info("Converting...",y,"%")
|
||||
end
|
||||
|
||||
-- refresh screen
|
||||
setpicturesize(320,200)
|
||||
thomson.updatescreen()
|
||||
finalizepicture()
|
||||
|
||||
-- save picture
|
||||
do
|
||||
local function exist(file)
|
||||
local f=io.open(file,'rb')
|
||||
if not f then return false else io.close(f); return true; end
|
||||
end
|
||||
local name,path = getfilename()
|
||||
local mapname = string.gsub(name,"%.%w*$","") .. ".map"
|
||||
local fullname = path .. '/' .. mapname
|
||||
-- fullname = 'D:/tmp/toto.map'
|
||||
local ok = not exist(fullname)
|
||||
if not ok then
|
||||
selectbox("Ovr " .. mapname .. "?", "Yes", function() ok = true; end, "No", function() ok = false; end)
|
||||
end
|
||||
if ok then thomson.savep(fullname) end
|
||||
end
|
||||
-- bayer4_to8.lua : converts an image into BM16
|
||||
-- mode for thomson machines (MO6,TO8,TO9,TO9+)
|
||||
-- using bayer matrix and a special palette.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
-- This is my first code in lua, so excuse any bad
|
||||
-- coding practice.
|
||||
|
||||
-- use a zig zag. If false (recommended value), this gives
|
||||
-- a raster look and feel
|
||||
local with_zig_zag = with_zig_zag or false
|
||||
|
||||
-- debug: displays histograms
|
||||
local debug = false
|
||||
|
||||
-- enhance luminosity since our mode divide it by two
|
||||
local enhance_lum = enhance_lum or true
|
||||
|
||||
-- use fixed levels (default=false, give better result)
|
||||
local fixed_levels = fixed_levels or false
|
||||
|
||||
-- use void-and-cluster 8x8 matrix (default=false)
|
||||
local use_vac = use_vac or false
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
run("lib/thomson.lua")
|
||||
run("lib/color.lua")
|
||||
run("lib/bayer.lua")
|
||||
|
||||
-- Converts thomson coordinates (0-159,0-99) into screen coordinates
|
||||
local function thom2screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < 1.6 then
|
||||
i = x*screen_h/100
|
||||
j = y*screen_h/100
|
||||
else
|
||||
i = x*screen_w/160
|
||||
j = y*screen_w/160
|
||||
end
|
||||
return math.floor(i), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the pixel @(x,y) in linear space corresonding to the thomson screen (x in 0-159, y in 0-99)
|
||||
local function getLinearPixel(x,y)
|
||||
local x1,y1 = thom2screen(x,y)
|
||||
local x2,y2 = thom2screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
local p,i,j = Color:new(0,0,0);
|
||||
for i=x1,x2-1 do
|
||||
for j=y1,y2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
|
||||
return p:div((y2-y1)*(x2-x1)):floor()
|
||||
end
|
||||
|
||||
--[[ make a bayer matrix
|
||||
function bayer(matrix)
|
||||
local m,n=#matrix,#matrix[1]
|
||||
local r,i,j = {}
|
||||
for j=1,m*2 do
|
||||
local t = {}
|
||||
for i=1,n*2 do t[i]=0; end
|
||||
r[j] = t;
|
||||
end
|
||||
|
||||
-- 0 3
|
||||
-- 2 1
|
||||
for j=1,m do
|
||||
for i=1,n do
|
||||
local v = 4*matrix[j][i]
|
||||
r[m*0+j][n*0+i] = v-3
|
||||
r[m*1+j][n*1+i] = v-2
|
||||
r[m*1+j][n*0+i] = v-1
|
||||
r[m*0+j][n*1+i] = v-0
|
||||
end
|
||||
end
|
||||
|
||||
return r;
|
||||
end
|
||||
--]]
|
||||
|
||||
-- dither matrix
|
||||
local dither = bayer.make(4)
|
||||
|
||||
if use_vac then
|
||||
-- vac8: looks like FS
|
||||
dither = bayer.norm{
|
||||
{35,57,19,55,7,51,4,21},
|
||||
{29,6,41,27,37,17,59,45},
|
||||
{61,15,53,12,62,25,33,9},
|
||||
{23,39,31,49,2,47,13,43},
|
||||
{3,52,8,22,36,58,20,56},
|
||||
{38,18,60,46,30,5,42,28},
|
||||
{63,26,34,11,64,16,54,10},
|
||||
{14,48,1,44,24,40,32,50}
|
||||
}
|
||||
end
|
||||
|
||||
-- get color statistics
|
||||
local stat = {};
|
||||
function stat:clear()
|
||||
self.r = {}
|
||||
self.g = {}
|
||||
self.b = {}
|
||||
for i=1,16 do self.r[i] = 0; self.g[i] = 0; self.b[i] = 0; end
|
||||
end
|
||||
function stat:update(px)
|
||||
local pc2to = thomson.levels.pc2to
|
||||
local r,g,b=pc2to[px.r], pc2to[px.g], pc2to[px.b];
|
||||
self.r[r] = self.r[r] + 1;
|
||||
self.g[g] = self.g[g] + 1;
|
||||
self.b[b] = self.b[b] + 1;
|
||||
end
|
||||
function stat:coversThr(perc)
|
||||
local function f(stat)
|
||||
local t=-stat[1]
|
||||
for i,n in ipairs(stat) do t=t+n end
|
||||
local thr = t*perc; t=-stat[1]
|
||||
for i,n in ipairs(stat) do
|
||||
t=t+n
|
||||
if t>=thr then return i end
|
||||
end
|
||||
return 0
|
||||
end
|
||||
return f(self.r),f(self.g),f(self.b)
|
||||
end
|
||||
stat:clear();
|
||||
for y = 0,99 do
|
||||
for x = 0,159 do
|
||||
stat:update(getLinearPixel(x,y))
|
||||
end
|
||||
thomson.info("Collecting stats...",y,"%")
|
||||
end
|
||||
|
||||
-- enhance luminosity since our mode divide it by two
|
||||
local gain = 1
|
||||
if enhance_lum then
|
||||
-- findout level that covers 98% of all non-black pixels
|
||||
local max = math.max(stat:coversThr(.98))
|
||||
|
||||
gain = math.min(2,255/thomson.levels.linear[max])
|
||||
|
||||
if gain>1 then
|
||||
-- redo stat with enhanced levels
|
||||
-- messagebox('gain '..gain..' '..table.concat({stat:coversThr(.98)},','))
|
||||
stat:clear();
|
||||
for y = 0,99 do
|
||||
for x = 0,159 do
|
||||
stat:update(getLinearPixel(x,y):mul(gain):floor())
|
||||
end
|
||||
thomson.info("Enhancing levels..",y,"%")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- find regularly spaced levels in thomson space
|
||||
local levels = {}
|
||||
function levels.compute(name, stat, num)
|
||||
local tot, max = -stat[1],0;
|
||||
for _,t in ipairs(stat) do
|
||||
max = math.max(t,max)
|
||||
tot = tot + t
|
||||
end
|
||||
local acc,full=-stat[1],0
|
||||
for i,t in ipairs(stat) do
|
||||
acc = acc + t
|
||||
if acc>tot*.98 then
|
||||
full=thomson.levels.linear[i]
|
||||
break
|
||||
end
|
||||
end
|
||||
-- sanity
|
||||
if fixed_levels or full==0 then full=255 end
|
||||
local res = {1}; num = num-1
|
||||
for i=1,num do
|
||||
local p = math.floor(full*i/num)
|
||||
local q = thomson.levels.linear2to[p]
|
||||
if q==res[i] and q<16 then q=q+1 end
|
||||
if not fixed_levels and i<num then
|
||||
if q>res[i]+1 and stat[q-1]>stat[q] then q=q-1 end
|
||||
if q>res[i]+1 and stat[q-1]>stat[q] then q=q-1 end
|
||||
-- 3 corrections? no need...
|
||||
-- if q>res[i]+1 and stat[q-1]>stat[q] then q=q-1 end
|
||||
end
|
||||
res[1+i] = q
|
||||
end
|
||||
|
||||
-- debug
|
||||
if debug then
|
||||
local txt = ""
|
||||
for _,i in ipairs(res) do
|
||||
txt = txt .. i .. " "
|
||||
end
|
||||
for i,t in ipairs(stat) do
|
||||
txt = txt .. "\n" .. string.format("%s%2d:%3d%% ", name, i, math.floor(100*t/(tot+stat[1]))) .. string.rep('X', math.floor(23*t/max))
|
||||
end
|
||||
messagebox(txt)
|
||||
end
|
||||
|
||||
return res
|
||||
end
|
||||
function levels.computeAll(stat)
|
||||
levels.grn = levels.compute("GRN",stat.g,5)
|
||||
levels.red = levels.compute("RED",stat.r,4)
|
||||
levels.blu = levels.compute("BLU",stat.b,3)
|
||||
end
|
||||
levels.computeAll(stat)
|
||||
|
||||
-- put a pixel at (x,y) with dithering
|
||||
local function pset(x,y,px)
|
||||
local thr = dither[1+(y % #dither)][1+(x % #dither[1])]
|
||||
local function dither(val,thr,lvls)
|
||||
local i=#lvls
|
||||
local a,b = thomson.levels.linear[lvls[i]],1e30
|
||||
while i>1 and val<a do
|
||||
i=i-1;
|
||||
a,b=thomson.levels.linear[lvls[i]],a;
|
||||
end
|
||||
return i + ((val-a)>=thr*(b-a) and 0 or -1)
|
||||
end
|
||||
|
||||
local r = dither(px.r, thr, levels.red);
|
||||
local g = dither(px.g, thr, levels.grn);
|
||||
local b = dither(px.b, thr, levels.blu);
|
||||
|
||||
local i = r + b*4
|
||||
local j = g==0 and 0 or (11 + g)
|
||||
|
||||
if with_zig_zag and x%2==1 then
|
||||
thomson.pset(x,y*2+0,j)
|
||||
thomson.pset(x,y*2+1,i)
|
||||
else
|
||||
thomson.pset(x,y*2+0,i)
|
||||
thomson.pset(x,y*2+1,j)
|
||||
end
|
||||
end
|
||||
|
||||
-- BM16 mode
|
||||
thomson.setBM16()
|
||||
|
||||
-- define palette
|
||||
for i=0,15 do
|
||||
local r,g,b=0,0,0
|
||||
if i<12 then
|
||||
-- r = bit32.band(i,3)
|
||||
-- b = bit32.rshift(i,2)
|
||||
b = math.floor(i/4)
|
||||
r = i-4*b
|
||||
else
|
||||
g = i-11
|
||||
end
|
||||
r,g,b=levels.red[r+1],levels.grn[g+1],levels.blu[b+1]
|
||||
thomson.palette(i,b*256+g*16+r-273)
|
||||
end
|
||||
|
||||
-- convert picture
|
||||
for y = 0,99 do
|
||||
for x = 0,159 do
|
||||
pset(x,y, getLinearPixel(x,y):mul(gain):floor())
|
||||
end
|
||||
thomson.info("Converting...",y,"%")
|
||||
end
|
||||
|
||||
-- refresh screen
|
||||
setpicturesize(320,200)
|
||||
thomson.updatescreen()
|
||||
finalizepicture()
|
||||
|
||||
-- save picture
|
||||
do
|
||||
local function exist(file)
|
||||
local f=io.open(file,'rb')
|
||||
if not f then return false else io.close(f); return true; end
|
||||
end
|
||||
local name,path = getfilename()
|
||||
local mapname = string.gsub(name,"%.%w*$","") .. ".map"
|
||||
local fullname = path .. '/' .. mapname
|
||||
-- fullname = 'D:/tmp/toto.map'
|
||||
local ok = not exist(fullname)
|
||||
if not ok then
|
||||
selectbox("Ovr " .. mapname .. "?", "Yes", function() ok = true; end, "No", function() ok = false; end)
|
||||
end
|
||||
if ok then thomson.savep(fullname) end
|
||||
end
|
||||
|
||||
@ -1,68 +1,68 @@
|
||||
-- bayer.lua : bayer matrix suppport.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
if not bayer then
|
||||
bayer = {}
|
||||
|
||||
-- doubles a matrix rows and columns
|
||||
function bayer.double(matrix)
|
||||
local m,n=#matrix,#matrix[1]
|
||||
local r = {}
|
||||
for j=1,m*2 do
|
||||
local t = {}
|
||||
for i=1,n*2 do t[i]=0; end
|
||||
r[j] = t;
|
||||
end
|
||||
|
||||
-- 0 3
|
||||
-- 2 1
|
||||
for j=1,m do
|
||||
for i=1,n do
|
||||
local v = 4*matrix[j][i]
|
||||
r[m*0+j][n*0+i] = v-3
|
||||
r[m*1+j][n*1+i] = v-2
|
||||
r[m*1+j][n*0+i] = v-1
|
||||
r[m*0+j][n*1+i] = v-0
|
||||
end
|
||||
end
|
||||
|
||||
return r;
|
||||
end
|
||||
|
||||
-- returns a version of the matrix normalized into
|
||||
-- the 0-1 range
|
||||
function bayer.norm(matrix)
|
||||
local m,n=#matrix,#matrix[1]
|
||||
local max,ret = 0,{}
|
||||
for j=1,m do
|
||||
for i=1,n do
|
||||
max = math.max(max,matrix[j][i])
|
||||
end
|
||||
end
|
||||
-- max=max+1
|
||||
for j=1,m do
|
||||
ret[j] = {}
|
||||
for i=1,n do
|
||||
ret[j][i]=matrix[j][i]/max
|
||||
end
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- returns a normalized order-n bayer matrix
|
||||
function bayer.make(n)
|
||||
local m = {{1}}
|
||||
while n>1 do n,m = n/2,bayer.double(m) end
|
||||
return bayer.norm(m)
|
||||
end
|
||||
|
||||
end -- Bayer
|
||||
-- bayer.lua : bayer matrix suppport.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
if not bayer then
|
||||
bayer = {}
|
||||
|
||||
-- doubles a matrix rows and columns
|
||||
function bayer.double(matrix)
|
||||
local m,n=#matrix,#matrix[1]
|
||||
local r = {}
|
||||
for j=1,m*2 do
|
||||
local t = {}
|
||||
for i=1,n*2 do t[i]=0; end
|
||||
r[j] = t;
|
||||
end
|
||||
|
||||
-- 0 3
|
||||
-- 2 1
|
||||
for j=1,m do
|
||||
for i=1,n do
|
||||
local v = 4*matrix[j][i]
|
||||
r[m*0+j][n*0+i] = v-3
|
||||
r[m*1+j][n*1+i] = v-2
|
||||
r[m*1+j][n*0+i] = v-1
|
||||
r[m*0+j][n*1+i] = v-0
|
||||
end
|
||||
end
|
||||
|
||||
return r;
|
||||
end
|
||||
|
||||
-- returns a version of the matrix normalized into
|
||||
-- the 0-1 range
|
||||
function bayer.norm(matrix)
|
||||
local m,n=#matrix,#matrix[1]
|
||||
local max,ret = 0,{}
|
||||
for j=1,m do
|
||||
for i=1,n do
|
||||
max = math.max(max,matrix[j][i])
|
||||
end
|
||||
end
|
||||
-- max=max+1
|
||||
for j=1,m do
|
||||
ret[j] = {}
|
||||
for i=1,n do
|
||||
ret[j][i]=matrix[j][i]/max
|
||||
end
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
-- returns a normalized order-n bayer matrix
|
||||
function bayer.make(n)
|
||||
local m = {{1}}
|
||||
while n>1 do n,m = n/2,bayer.double(m) end
|
||||
return bayer.norm(m)
|
||||
end
|
||||
|
||||
end -- Bayer
|
||||
|
||||
@ -1,345 +1,345 @@
|
||||
-- color.lua : a color class capable of representing
|
||||
-- and manipulating colors in PC-space (gamma=2.2) or
|
||||
-- in linear space (gamma=1).
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
|
||||
if not Color then
|
||||
Color = {ONE=255,NORMALIZE=.005}
|
||||
function Color:new(r,g,b)
|
||||
local o = {};
|
||||
o.r = type(r)=='number' and r or r and r.r or 0;
|
||||
o.g = type(g)=='number' and g or r and r.g or 0;
|
||||
o.b = type(b)=='number' and b or r and r.b or 0;
|
||||
setmetatable(o, self)
|
||||
self.__index = self
|
||||
return o
|
||||
end
|
||||
Color.black = Color:new(0,0,0)
|
||||
|
||||
function Color.clamp(v,...)
|
||||
if v then
|
||||
return v<0 and 0 or
|
||||
v>Color.ONE and Color.ONE or
|
||||
v,Color.clamp(...)
|
||||
end
|
||||
end
|
||||
|
||||
function Color:clone()
|
||||
return Color:new(self.r, self.g, self.b)
|
||||
end
|
||||
|
||||
function Color:tostring()
|
||||
return "(r=" .. self.r .. " g=" .. self.g .. " b=" .. self.b .. ")"
|
||||
end
|
||||
|
||||
function Color:HSV()
|
||||
local max=math.floor(.5+math.max(self.r,self.g,self.b))
|
||||
local min=math.floor(.5+math.min(self.r,self.g,self.b))
|
||||
|
||||
local H=(max<=min and 0 or
|
||||
max<=self.r and (self.g-self.b)/(max-min)+6 or
|
||||
max<=self.g and (self.b-self.r)/(max-min)+2 or
|
||||
max<=self.b and (self.r-self.g)/(max-min)+4)/6 % 1.0
|
||||
local S=(max==0 or max<=min) and 0 or 1-min/max
|
||||
local V=max/Color.ONE
|
||||
|
||||
return H,S,V
|
||||
end
|
||||
|
||||
function Color:intensity()
|
||||
return .3*self.r + .59*self.g + .11*self.b
|
||||
end
|
||||
|
||||
function Color:mul(val)
|
||||
self.r = self.r * val;
|
||||
self.g = self.g * val;
|
||||
self.b = self.b * val;
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:div(val)
|
||||
return self:mul(1/val);
|
||||
end
|
||||
|
||||
function Color:add(other)
|
||||
self.r = self.r + other.r;
|
||||
self.g = self.g + other.g;
|
||||
self.b = self.b + other.b;
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:sub(other)
|
||||
self.r = self.r - other.r;
|
||||
self.g = self.g - other.g;
|
||||
self.b = self.b - other.b;
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:dist2(other)
|
||||
return self:euclid_dist2(other)
|
||||
-- return Color.dE2000(self,other)^2
|
||||
-- return Color.dE2fast(self,other)
|
||||
end
|
||||
|
||||
function Color:euclid_dist2(other)
|
||||
return (self.r - other.r)^2 +
|
||||
(self.g - other.g)^2 +
|
||||
(self.b - other.b)^2
|
||||
end
|
||||
|
||||
function Color:floor()
|
||||
self.r = math.min(math.floor(self.r),Color.ONE);
|
||||
self.g = math.min(math.floor(self.g),Color.ONE);
|
||||
self.b = math.min(math.floor(self.b),Color.ONE);
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:toPC()
|
||||
local function f(val)
|
||||
val = val/Color.ONE
|
||||
-- if val<=0.018 then val = 4.5*val; else val = 1.099*(val ^ (1/2.2))-0.099; end
|
||||
|
||||
-- works much metter: https://fr.wikipedia.org/wiki/SRGB
|
||||
if val<=0.0031308 then val=12.92*val else val = 1.055*(val ^ (1/2.4))-0.055 end
|
||||
return val*Color.ONE
|
||||
end;
|
||||
self.r = f(self.r);
|
||||
self.g = f(self.g);
|
||||
self.b = f(self.b);
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:toLinear()
|
||||
local function f(val)
|
||||
val = val/Color.ONE
|
||||
-- if val<=0.081 then val = val/4.5; else val = ((val+0.099)/1.099)^2.2; end
|
||||
|
||||
-- works much metter: https://fr.wikipedia.org/wiki/SRGB#Transformation_inverse
|
||||
if val<=0.04045 then val = val/12.92 else val = ((val+0.055)/1.055)^2.4 end
|
||||
return val*Color.ONE
|
||||
end;
|
||||
self.r = f(self.r);
|
||||
self.g = f(self.g);
|
||||
self.b = f(self.b);
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:toRGB()
|
||||
return self.r, self.g, self.b
|
||||
end
|
||||
|
||||
-- return the Color @(x,y) on the original screen in linear space
|
||||
local screen_w, screen_h, _getLinearPictureColor = getpicturesize()
|
||||
function getLinearPictureColor(x,y)
|
||||
if _getLinearPictureColor==nil then
|
||||
_getLinearPictureColor = {}
|
||||
for i=0,255 do _getLinearPictureColor[i] = Color:new(getbackupcolor(i)):toLinear(); end
|
||||
if Color.NORMALIZE>0 then
|
||||
local histo = {}
|
||||
for i=0,255 do histo[i] = 0 end
|
||||
for y=0,screen_h-1 do
|
||||
for x=0,screen_w-1 do
|
||||
local r,g,b = getbackupcolor(getbackuppixel(x,y))
|
||||
histo[r] = histo[r]+1
|
||||
histo[g] = histo[g]+1
|
||||
histo[b] = histo[b]+1
|
||||
end
|
||||
end
|
||||
local acc,thr=0,Color.NORMALIZE*screen_h*screen_w*3
|
||||
local max
|
||||
for i=255,0,-1 do
|
||||
acc = acc + histo[i]
|
||||
if not max and acc>=thr then
|
||||
max = Color:new(i,i,i):toLinear().r
|
||||
end
|
||||
end
|
||||
for _,c in ipairs(_getLinearPictureColor) do
|
||||
c:mul(Color.ONE/max)
|
||||
c.r,c.g,c.b = Color.clamp(c.r,c.g,c.b)
|
||||
end
|
||||
end
|
||||
end
|
||||
return (x<0 or y<0 or x>=screen_w or y>=screen_h) and Color.black or _getLinearPictureColor[getbackuppixel(x,y)]
|
||||
end
|
||||
|
||||
-- http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
|
||||
function Color.RGBtoXYZ(R,G,B)
|
||||
return 0.4887180*R +0.3106803*G +0.2006017*B,
|
||||
0.1762044*R +0.8129847*G +0.0108109*B,
|
||||
0.0102048*G +0.9897952*B
|
||||
end
|
||||
|
||||
function Color.XYZtoRGB(X,Y,Z)
|
||||
return 2.3706743*X -0.9000405*Y -0.4706338*Z,
|
||||
-0.5138850*X +1.4253036*Y +0.0885814*Z,
|
||||
0.0052982*X -0.0146949*Y +1.0093968*Z
|
||||
end
|
||||
|
||||
-- https://fr.wikipedia.org/wiki/CIE_L*a*b*
|
||||
function Color.XYZtoCIELab(X,Y,Z)
|
||||
local function f(t)
|
||||
return t>0.00885645167 and t^(1/3)
|
||||
or 7.78703703704*t+0.13793103448
|
||||
end
|
||||
X,Y,Z=X/Color.ONE,Y/Color.ONE,Z/Color.ONE
|
||||
return 116*f(Y)-16,
|
||||
500*(f(X)-f(Y)),
|
||||
200*(f(Y)-f(Z))
|
||||
end
|
||||
function Color.CIEALabtoXYZ(L,a,b)
|
||||
local function f(t)
|
||||
return t>0.20689655172 and t^3
|
||||
or 0.12841854934*(t-0.13793103448)
|
||||
end
|
||||
local l=(L+16)/116
|
||||
return Color.ONE*f(l),
|
||||
Color.ONE*f(l+a/500),
|
||||
Color.ONE*f(l-b/200)
|
||||
end
|
||||
function Color:toLab()
|
||||
return Color.XYZtoCIELab(Color.RGBtoXYZ(self:toRGB()))
|
||||
end
|
||||
|
||||
-- http://www.brucelindbloom.com/Eqn_DeltaE_CIE2000.html
|
||||
function Color.dE1976(col1,col2)
|
||||
local L1,a1,b1 = col1:toLab()
|
||||
local L2,a2,b2 = col2:toLab()
|
||||
return ((L1-L2)^2+(a1-a2)^2+(b1-b2)^2)^.5
|
||||
end
|
||||
function Color.dE1994(col1,col2)
|
||||
local L1,a1,b1 = col1:toLab()
|
||||
local L2,a2,b2 = col2:toLab()
|
||||
|
||||
local k1,k2 = 0.045,0.015
|
||||
local kL,kC,kH = 1,1,1
|
||||
|
||||
local c1 = (a1^2 + b1^2)^.5
|
||||
local c2 = (a2^2 + b2^2)^.5
|
||||
|
||||
local dA = a1 - a2
|
||||
local dB = b1 - b2
|
||||
local dC = c1 - c2
|
||||
|
||||
local dH2 = dA^2 + dB^2 - dC^2
|
||||
local dH = dH2>0 and dH2^.5 or 0
|
||||
local dL = L1 - L2
|
||||
|
||||
local sL = 1
|
||||
local sC = 1 + k1*c1
|
||||
local sH = 1 + k2*c1
|
||||
|
||||
local vL = dL/(kL*sL)
|
||||
local vC = dC/(kC*sC)
|
||||
local vH = dH/(kH*sH)
|
||||
|
||||
return (vL^2 + vC^2 + vH^2)^.5
|
||||
end
|
||||
-- http://www.color.org/events/colorimetry/Melgosa_CIEDE2000_Workshop-July4.pdf
|
||||
-- https://en.wikipedia.org/wiki/Color_difference#CIEDE2000
|
||||
function Color.dE2000(col1,col2)
|
||||
local L1,a1,b1 = col1:toLab()
|
||||
local L2,a2,b2 = col2:toLab()
|
||||
|
||||
local kL,kC,kH = 1,1,1
|
||||
|
||||
local l_p = (L1 + L2)/2
|
||||
|
||||
function sqrt(x)
|
||||
return x^.5
|
||||
end
|
||||
function norm(x,y)
|
||||
return sqrt(x^2+y^2)
|
||||
end
|
||||
function mean(x,y)
|
||||
return (x+y)/2
|
||||
end
|
||||
local function atan2(a,b)
|
||||
local t=math.atan2(a,b)*180/math.pi
|
||||
return t<0 and t+360 or t
|
||||
end
|
||||
local function sin(x)
|
||||
return math.sin(x*math.pi/180)
|
||||
end
|
||||
local function cos(x)
|
||||
return math.cos(x*math.pi/180)
|
||||
end
|
||||
|
||||
local c1 = norm(a1,b1)
|
||||
local c2 = norm(a2,b2)
|
||||
local c_ = mean(c1,c2)
|
||||
|
||||
local G = 0.5*(1-sqrt(c_^7/(c_^7+25^7)))
|
||||
local a1p = a1*(1+G)
|
||||
local a2p = a2*(1+G)
|
||||
|
||||
local c1p = norm(a1p,b1)
|
||||
local c2p = norm(a2p,b2)
|
||||
local c_p = mean(c1p,c2p)
|
||||
|
||||
local h1p = atan2(b1,a1p)
|
||||
local h2p = atan2(b2,a2p)
|
||||
|
||||
local h_p = mean(h1p,h2p) +
|
||||
(math.abs(h1p - h2p)<=180 and 0 or
|
||||
h1p+h2p<360 and 180 or -180)
|
||||
|
||||
local T = 1 -
|
||||
0.17 * cos( h_p - 30) +
|
||||
0.24 * cos(2 * h_p ) +
|
||||
0.32 * cos(3 * h_p + 6) -
|
||||
0.20 * cos(4 * h_p - 63)
|
||||
|
||||
local dhp = h2p - h1p + (math.abs(h1p - h2p)<=180 and 0 or
|
||||
h2p<=h1p and 360 or
|
||||
-360)
|
||||
local dLp = L2 - L1
|
||||
local dCp = c2p - c1p
|
||||
local dHp = 2*sqrt(c1p*c2p)*sin(dhp/2)
|
||||
|
||||
|
||||
local sL = 1 + 0.015*(l_p - 50)^2/sqrt(20+(l_p-50)^2)
|
||||
local sC = 1 + 0.045*c_p
|
||||
local sH = 1 + 0.015*c_p*T
|
||||
|
||||
local d0 = 30*math.exp(-((h_p-275)/25)^2)
|
||||
|
||||
local rC = 2*sqrt(c_p^7/(c_p^7+25^7))
|
||||
local rT = -rC * sin(2*d0)
|
||||
|
||||
return sqrt( (dLp / (kL*sL))^2 +
|
||||
(dCp / (kC*sC))^2 +
|
||||
(dHp / (kH*sH))^2 +
|
||||
(dCp / (kC*sC))*(dHp / (kH*sH))*rT )
|
||||
end
|
||||
|
||||
function Color.dE2fast(col1,col2)
|
||||
-- http://www.compuphase.com/cmetric.htm#GAMMA
|
||||
local r1,g1,b1 = Color.clamp(col1:toRGB())
|
||||
local r2,g2,b2 = Color.clamp(col2:toRGB())
|
||||
|
||||
local rM = (r1+r2)/(Color.ONE*2)
|
||||
|
||||
return ((r1-r2)^2)*(2+rM) +
|
||||
((g1-g2)^2)*(4+1) +
|
||||
((b1-b2)^2)*(3-rM)
|
||||
end
|
||||
|
||||
function Color:hash(M)
|
||||
M=M or 256
|
||||
local m=(M-1)/Color.ONE
|
||||
local function f(x)
|
||||
return math.floor(.5+(x<0 and 0 or x>Color.ONE and Color.ONE or x)*m)
|
||||
end
|
||||
return f(self.r)+M*(f(self.g)+M*f(self.b))
|
||||
end
|
||||
end -- Color defined
|
||||
-- color.lua : a color class capable of representing
|
||||
-- and manipulating colors in PC-space (gamma=2.2) or
|
||||
-- in linear space (gamma=1).
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
|
||||
if not Color then
|
||||
Color = {ONE=255,NORMALIZE=.005}
|
||||
function Color:new(r,g,b)
|
||||
local o = {};
|
||||
o.r = type(r)=='number' and r or r and r.r or 0;
|
||||
o.g = type(g)=='number' and g or r and r.g or 0;
|
||||
o.b = type(b)=='number' and b or r and r.b or 0;
|
||||
setmetatable(o, self)
|
||||
self.__index = self
|
||||
return o
|
||||
end
|
||||
Color.black = Color:new(0,0,0)
|
||||
|
||||
function Color.clamp(v,...)
|
||||
if v then
|
||||
return v<0 and 0 or
|
||||
v>Color.ONE and Color.ONE or
|
||||
v,Color.clamp(...)
|
||||
end
|
||||
end
|
||||
|
||||
function Color:clone()
|
||||
return Color:new(self.r, self.g, self.b)
|
||||
end
|
||||
|
||||
function Color:tostring()
|
||||
return "(r=" .. self.r .. " g=" .. self.g .. " b=" .. self.b .. ")"
|
||||
end
|
||||
|
||||
function Color:HSV()
|
||||
local max=math.floor(.5+math.max(self.r,self.g,self.b))
|
||||
local min=math.floor(.5+math.min(self.r,self.g,self.b))
|
||||
|
||||
local H=(max<=min and 0 or
|
||||
max<=self.r and (self.g-self.b)/(max-min)+6 or
|
||||
max<=self.g and (self.b-self.r)/(max-min)+2 or
|
||||
max<=self.b and (self.r-self.g)/(max-min)+4)/6 % 1.0
|
||||
local S=(max==0 or max<=min) and 0 or 1-min/max
|
||||
local V=max/Color.ONE
|
||||
|
||||
return H,S,V
|
||||
end
|
||||
|
||||
function Color:intensity()
|
||||
return .3*self.r + .59*self.g + .11*self.b
|
||||
end
|
||||
|
||||
function Color:mul(val)
|
||||
self.r = self.r * val;
|
||||
self.g = self.g * val;
|
||||
self.b = self.b * val;
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:div(val)
|
||||
return self:mul(1/val);
|
||||
end
|
||||
|
||||
function Color:add(other)
|
||||
self.r = self.r + other.r;
|
||||
self.g = self.g + other.g;
|
||||
self.b = self.b + other.b;
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:sub(other)
|
||||
self.r = self.r - other.r;
|
||||
self.g = self.g - other.g;
|
||||
self.b = self.b - other.b;
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:dist2(other)
|
||||
return self:euclid_dist2(other)
|
||||
-- return Color.dE2000(self,other)^2
|
||||
-- return Color.dE2fast(self,other)
|
||||
end
|
||||
|
||||
function Color:euclid_dist2(other)
|
||||
return (self.r - other.r)^2 +
|
||||
(self.g - other.g)^2 +
|
||||
(self.b - other.b)^2
|
||||
end
|
||||
|
||||
function Color:floor()
|
||||
self.r = math.min(math.floor(self.r),Color.ONE);
|
||||
self.g = math.min(math.floor(self.g),Color.ONE);
|
||||
self.b = math.min(math.floor(self.b),Color.ONE);
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:toPC()
|
||||
local function f(val)
|
||||
val = val/Color.ONE
|
||||
-- if val<=0.018 then val = 4.5*val; else val = 1.099*(val ^ (1/2.2))-0.099; end
|
||||
|
||||
-- works much metter: https://fr.wikipedia.org/wiki/SRGB
|
||||
if val<=0.0031308 then val=12.92*val else val = 1.055*(val ^ (1/2.4))-0.055 end
|
||||
return val*Color.ONE
|
||||
end;
|
||||
self.r = f(self.r);
|
||||
self.g = f(self.g);
|
||||
self.b = f(self.b);
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:toLinear()
|
||||
local function f(val)
|
||||
val = val/Color.ONE
|
||||
-- if val<=0.081 then val = val/4.5; else val = ((val+0.099)/1.099)^2.2; end
|
||||
|
||||
-- works much metter: https://fr.wikipedia.org/wiki/SRGB#Transformation_inverse
|
||||
if val<=0.04045 then val = val/12.92 else val = ((val+0.055)/1.055)^2.4 end
|
||||
return val*Color.ONE
|
||||
end;
|
||||
self.r = f(self.r);
|
||||
self.g = f(self.g);
|
||||
self.b = f(self.b);
|
||||
return self;
|
||||
end
|
||||
|
||||
function Color:toRGB()
|
||||
return self.r, self.g, self.b
|
||||
end
|
||||
|
||||
-- return the Color @(x,y) on the original screen in linear space
|
||||
local screen_w, screen_h, _getLinearPictureColor = getpicturesize()
|
||||
function getLinearPictureColor(x,y)
|
||||
if _getLinearPictureColor==nil then
|
||||
_getLinearPictureColor = {}
|
||||
for i=0,255 do _getLinearPictureColor[i] = Color:new(getbackupcolor(i)):toLinear(); end
|
||||
if Color.NORMALIZE>0 then
|
||||
local histo = {}
|
||||
for i=0,255 do histo[i] = 0 end
|
||||
for y=0,screen_h-1 do
|
||||
for x=0,screen_w-1 do
|
||||
local r,g,b = getbackupcolor(getbackuppixel(x,y))
|
||||
histo[r] = histo[r]+1
|
||||
histo[g] = histo[g]+1
|
||||
histo[b] = histo[b]+1
|
||||
end
|
||||
end
|
||||
local acc,thr=0,Color.NORMALIZE*screen_h*screen_w*3
|
||||
local max
|
||||
for i=255,0,-1 do
|
||||
acc = acc + histo[i]
|
||||
if not max and acc>=thr then
|
||||
max = Color:new(i,i,i):toLinear().r
|
||||
end
|
||||
end
|
||||
for _,c in ipairs(_getLinearPictureColor) do
|
||||
c:mul(Color.ONE/max)
|
||||
c.r,c.g,c.b = Color.clamp(c.r,c.g,c.b)
|
||||
end
|
||||
end
|
||||
end
|
||||
return (x<0 or y<0 or x>=screen_w or y>=screen_h) and Color.black or _getLinearPictureColor[getbackuppixel(x,y)]
|
||||
end
|
||||
|
||||
-- http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
|
||||
function Color.RGBtoXYZ(R,G,B)
|
||||
return 0.4887180*R +0.3106803*G +0.2006017*B,
|
||||
0.1762044*R +0.8129847*G +0.0108109*B,
|
||||
0.0102048*G +0.9897952*B
|
||||
end
|
||||
|
||||
function Color.XYZtoRGB(X,Y,Z)
|
||||
return 2.3706743*X -0.9000405*Y -0.4706338*Z,
|
||||
-0.5138850*X +1.4253036*Y +0.0885814*Z,
|
||||
0.0052982*X -0.0146949*Y +1.0093968*Z
|
||||
end
|
||||
|
||||
-- https://fr.wikipedia.org/wiki/CIE_L*a*b*
|
||||
function Color.XYZtoCIELab(X,Y,Z)
|
||||
local function f(t)
|
||||
return t>0.00885645167 and t^(1/3)
|
||||
or 7.78703703704*t+0.13793103448
|
||||
end
|
||||
X,Y,Z=X/Color.ONE,Y/Color.ONE,Z/Color.ONE
|
||||
return 116*f(Y)-16,
|
||||
500*(f(X)-f(Y)),
|
||||
200*(f(Y)-f(Z))
|
||||
end
|
||||
function Color.CIEALabtoXYZ(L,a,b)
|
||||
local function f(t)
|
||||
return t>0.20689655172 and t^3
|
||||
or 0.12841854934*(t-0.13793103448)
|
||||
end
|
||||
local l=(L+16)/116
|
||||
return Color.ONE*f(l),
|
||||
Color.ONE*f(l+a/500),
|
||||
Color.ONE*f(l-b/200)
|
||||
end
|
||||
function Color:toLab()
|
||||
return Color.XYZtoCIELab(Color.RGBtoXYZ(self:toRGB()))
|
||||
end
|
||||
|
||||
-- http://www.brucelindbloom.com/Eqn_DeltaE_CIE2000.html
|
||||
function Color.dE1976(col1,col2)
|
||||
local L1,a1,b1 = col1:toLab()
|
||||
local L2,a2,b2 = col2:toLab()
|
||||
return ((L1-L2)^2+(a1-a2)^2+(b1-b2)^2)^.5
|
||||
end
|
||||
function Color.dE1994(col1,col2)
|
||||
local L1,a1,b1 = col1:toLab()
|
||||
local L2,a2,b2 = col2:toLab()
|
||||
|
||||
local k1,k2 = 0.045,0.015
|
||||
local kL,kC,kH = 1,1,1
|
||||
|
||||
local c1 = (a1^2 + b1^2)^.5
|
||||
local c2 = (a2^2 + b2^2)^.5
|
||||
|
||||
local dA = a1 - a2
|
||||
local dB = b1 - b2
|
||||
local dC = c1 - c2
|
||||
|
||||
local dH2 = dA^2 + dB^2 - dC^2
|
||||
local dH = dH2>0 and dH2^.5 or 0
|
||||
local dL = L1 - L2
|
||||
|
||||
local sL = 1
|
||||
local sC = 1 + k1*c1
|
||||
local sH = 1 + k2*c1
|
||||
|
||||
local vL = dL/(kL*sL)
|
||||
local vC = dC/(kC*sC)
|
||||
local vH = dH/(kH*sH)
|
||||
|
||||
return (vL^2 + vC^2 + vH^2)^.5
|
||||
end
|
||||
-- http://www.color.org/events/colorimetry/Melgosa_CIEDE2000_Workshop-July4.pdf
|
||||
-- https://en.wikipedia.org/wiki/Color_difference#CIEDE2000
|
||||
function Color.dE2000(col1,col2)
|
||||
local L1,a1,b1 = col1:toLab()
|
||||
local L2,a2,b2 = col2:toLab()
|
||||
|
||||
local kL,kC,kH = 1,1,1
|
||||
|
||||
local l_p = (L1 + L2)/2
|
||||
|
||||
function sqrt(x)
|
||||
return x^.5
|
||||
end
|
||||
function norm(x,y)
|
||||
return sqrt(x^2+y^2)
|
||||
end
|
||||
function mean(x,y)
|
||||
return (x+y)/2
|
||||
end
|
||||
local function atan2(a,b)
|
||||
local t=math.atan2(a,b)*180/math.pi
|
||||
return t<0 and t+360 or t
|
||||
end
|
||||
local function sin(x)
|
||||
return math.sin(x*math.pi/180)
|
||||
end
|
||||
local function cos(x)
|
||||
return math.cos(x*math.pi/180)
|
||||
end
|
||||
|
||||
local c1 = norm(a1,b1)
|
||||
local c2 = norm(a2,b2)
|
||||
local c_ = mean(c1,c2)
|
||||
|
||||
local G = 0.5*(1-sqrt(c_^7/(c_^7+25^7)))
|
||||
local a1p = a1*(1+G)
|
||||
local a2p = a2*(1+G)
|
||||
|
||||
local c1p = norm(a1p,b1)
|
||||
local c2p = norm(a2p,b2)
|
||||
local c_p = mean(c1p,c2p)
|
||||
|
||||
local h1p = atan2(b1,a1p)
|
||||
local h2p = atan2(b2,a2p)
|
||||
|
||||
local h_p = mean(h1p,h2p) +
|
||||
(math.abs(h1p - h2p)<=180 and 0 or
|
||||
h1p+h2p<360 and 180 or -180)
|
||||
|
||||
local T = 1 -
|
||||
0.17 * cos( h_p - 30) +
|
||||
0.24 * cos(2 * h_p ) +
|
||||
0.32 * cos(3 * h_p + 6) -
|
||||
0.20 * cos(4 * h_p - 63)
|
||||
|
||||
local dhp = h2p - h1p + (math.abs(h1p - h2p)<=180 and 0 or
|
||||
h2p<=h1p and 360 or
|
||||
-360)
|
||||
local dLp = L2 - L1
|
||||
local dCp = c2p - c1p
|
||||
local dHp = 2*sqrt(c1p*c2p)*sin(dhp/2)
|
||||
|
||||
|
||||
local sL = 1 + 0.015*(l_p - 50)^2/sqrt(20+(l_p-50)^2)
|
||||
local sC = 1 + 0.045*c_p
|
||||
local sH = 1 + 0.015*c_p*T
|
||||
|
||||
local d0 = 30*math.exp(-((h_p-275)/25)^2)
|
||||
|
||||
local rC = 2*sqrt(c_p^7/(c_p^7+25^7))
|
||||
local rT = -rC * sin(2*d0)
|
||||
|
||||
return sqrt( (dLp / (kL*sL))^2 +
|
||||
(dCp / (kC*sC))^2 +
|
||||
(dHp / (kH*sH))^2 +
|
||||
(dCp / (kC*sC))*(dHp / (kH*sH))*rT )
|
||||
end
|
||||
|
||||
function Color.dE2fast(col1,col2)
|
||||
-- http://www.compuphase.com/cmetric.htm#GAMMA
|
||||
local r1,g1,b1 = Color.clamp(col1:toRGB())
|
||||
local r2,g2,b2 = Color.clamp(col2:toRGB())
|
||||
|
||||
local rM = (r1+r2)/(Color.ONE*2)
|
||||
|
||||
return ((r1-r2)^2)*(2+rM) +
|
||||
((g1-g2)^2)*(4+1) +
|
||||
((b1-b2)^2)*(3-rM)
|
||||
end
|
||||
|
||||
function Color:hash(M)
|
||||
M=M or 256
|
||||
local m=(M-1)/Color.ONE
|
||||
local function f(x)
|
||||
return math.floor(.5+(x<0 and 0 or x>Color.ONE and Color.ONE or x)*m)
|
||||
end
|
||||
return f(self.r)+M*(f(self.g)+M*f(self.b))
|
||||
end
|
||||
end -- Color defined
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,219 +1,219 @@
|
||||
-- convxhull.lua : support for computing the convex
|
||||
-- hull of a set of points.
|
||||
--
|
||||
-- inspired from: https://gist.github.com/anonymous/5184ba0bcab21d3dd19781efd3aae543
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
if not ConvexHull then
|
||||
|
||||
local function sub(u,v)
|
||||
return {u[1]-v[1],u[2]-v[2],u[3]-v[3]}
|
||||
end
|
||||
|
||||
local function mul(k,u)
|
||||
return {k*u[1],k*u[2],k*u[3]}
|
||||
end
|
||||
|
||||
local function cross(u,v)
|
||||
return {u[2]*v[3] - u[3]*v[2],
|
||||
u[3]*v[1] - u[1]*v[3],
|
||||
u[1]*v[2] - u[2]*v[1]}
|
||||
end
|
||||
|
||||
local function dot(u,v)
|
||||
return u[1]*v[1] + u[2]*v[2] + u[3]*v[3]
|
||||
end
|
||||
|
||||
local function unit(u)
|
||||
local d=dot(u,u)
|
||||
return d==0 and u or mul(1/d^.5, u)
|
||||
end
|
||||
|
||||
ConvexHull = {}
|
||||
|
||||
function ConvexHull:new(coordFct)
|
||||
local o = {
|
||||
points={},
|
||||
coord=coordFct
|
||||
}
|
||||
setmetatable(o, self)
|
||||
self.__index = self
|
||||
return o
|
||||
end
|
||||
|
||||
function ConvexHull.coord(elt)
|
||||
return {elt[1],elt[2],elt[3]}
|
||||
end
|
||||
|
||||
function ConvexHull:vect(a,b)
|
||||
return sub(self.coord(b),self.coord(a))
|
||||
end
|
||||
|
||||
function ConvexHull:normal(face)
|
||||
local u=self:vect(face[1],face[2])
|
||||
local v=self:vect(face[1],face[3])
|
||||
return cross(u,v)
|
||||
end
|
||||
|
||||
function ConvexHull:printPoint(p)
|
||||
return '('..table.concat(self.coord(p),',')..')'
|
||||
end
|
||||
|
||||
function ConvexHull:printFace(F)
|
||||
return '['..self:printPoint(F[1])..' '..
|
||||
self:printPoint(F[2])..' '..
|
||||
self:printPoint(F[3])..']'
|
||||
end
|
||||
|
||||
function ConvexHull:seen(face,p)
|
||||
local N=self:normal(face)
|
||||
local P=self:vect(face[1],p)
|
||||
return dot(N,P)>=0
|
||||
end
|
||||
|
||||
function ConvexHull:bdry(faces)
|
||||
local code={n=0}
|
||||
function code.encode(pt,...)
|
||||
if pt then
|
||||
local k = code[pt]
|
||||
if not k then
|
||||
k = code.n+1
|
||||
code[k] = pt
|
||||
code[pt] = k
|
||||
code.n = k
|
||||
end
|
||||
local rest = code.encode(...)
|
||||
return rest and (k..','..rest) or ""..k
|
||||
end
|
||||
end
|
||||
function code.decode(str)
|
||||
local i = str:find(',')
|
||||
if i then
|
||||
local k = str:sub(1,i-1)
|
||||
return code[tonumber(k)],code.decode(str:sub(i+1))
|
||||
else
|
||||
return code[tonumber(str)]
|
||||
end
|
||||
end
|
||||
local set = {}
|
||||
local function add(...)
|
||||
set[code.encode(...)] = true
|
||||
end
|
||||
local function rem(...)
|
||||
set[code.encode(...)] = nil
|
||||
end
|
||||
local function keys()
|
||||
local r = {}
|
||||
for k in pairs(set) do
|
||||
r[{code.decode(k)}] = true
|
||||
end
|
||||
return r
|
||||
end
|
||||
for F in pairs(faces) do
|
||||
add(F[1],F[2])
|
||||
add(F[2],F[3])
|
||||
add(F[3],F[1])
|
||||
end
|
||||
for F in pairs(faces) do
|
||||
rem(F[1],F[3])
|
||||
rem(F[3],F[2])
|
||||
rem(F[2],F[1])
|
||||
end
|
||||
return keys()
|
||||
end
|
||||
|
||||
function ConvexHull:addPoint(p)
|
||||
-- first 3 points
|
||||
if self.points then
|
||||
if p==self.points[1] or p==self.points[2] then return end
|
||||
table.insert(self.points,p)
|
||||
|
||||
if #self.points==3 then
|
||||
self.hull={
|
||||
{self.points[1],self.points[2],self.points[3]},
|
||||
{self.points[1],self.points[3],self.points[2]}
|
||||
}
|
||||
self.points=nil
|
||||
end
|
||||
else
|
||||
local seenF,n = {},0
|
||||
for _,F in ipairs(self.hull) do
|
||||
if F[1]==p or F[2]==p or F[3]==p then return end
|
||||
if self:seen(F,p) then seenF[F]=true;n=n+1 end
|
||||
end
|
||||
|
||||
if n==#self.hull then
|
||||
-- if can see all faces, unsee ones looking "down"
|
||||
local N
|
||||
for F in pairs(seenF) do N=self:normal(F); break; end
|
||||
for F in pairs(seenF) do
|
||||
if dot(self:normal(F),N)<=0 then
|
||||
seenF[F] = nil
|
||||
n=n-1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- remove (old) seen faces
|
||||
local z=#self.hull
|
||||
for i=#self.hull,1,-1 do
|
||||
if seenF[self.hull[i]] then
|
||||
table.remove(self.hull,i)
|
||||
end
|
||||
end
|
||||
|
||||
-- insert new boundaries with seen faces
|
||||
for E in pairs(self:bdry(seenF)) do
|
||||
table.insert(self.hull,{E[1],E[2],p})
|
||||
end
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
function ConvexHull:verticesSet()
|
||||
local v = {}
|
||||
if self.hull then
|
||||
for _,F in ipairs(self.hull) do
|
||||
v[F[1]] = true
|
||||
v[F[2]] = true
|
||||
v[F[3]] = true
|
||||
end
|
||||
end
|
||||
return v
|
||||
end
|
||||
|
||||
function ConvexHull:verticesSize()
|
||||
local n = 0
|
||||
for _ in pairs(self:verticesSet()) do n=n+1 end
|
||||
return n
|
||||
end
|
||||
|
||||
function ConvexHull:distToFace(F,pt)
|
||||
local N=unit(self:normal(F))
|
||||
local P=self:vect(F[1],pt)
|
||||
return dot(N,P)
|
||||
end
|
||||
|
||||
function ConvexHull:distToHull(pt)
|
||||
local d
|
||||
for _,F in ipairs(self.hull) do
|
||||
local t = self:distToFace(F,pt)
|
||||
d = d==nil and t or
|
||||
(0<=t and t<d or
|
||||
0>=t and t>d) and t or
|
||||
d
|
||||
if d==0 then break end
|
||||
end
|
||||
return d
|
||||
end
|
||||
|
||||
end -- ConvexHull
|
||||
-- convxhull.lua : support for computing the convex
|
||||
-- hull of a set of points.
|
||||
--
|
||||
-- inspired from: https://gist.github.com/anonymous/5184ba0bcab21d3dd19781efd3aae543
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
if not ConvexHull then
|
||||
|
||||
local function sub(u,v)
|
||||
return {u[1]-v[1],u[2]-v[2],u[3]-v[3]}
|
||||
end
|
||||
|
||||
local function mul(k,u)
|
||||
return {k*u[1],k*u[2],k*u[3]}
|
||||
end
|
||||
|
||||
local function cross(u,v)
|
||||
return {u[2]*v[3] - u[3]*v[2],
|
||||
u[3]*v[1] - u[1]*v[3],
|
||||
u[1]*v[2] - u[2]*v[1]}
|
||||
end
|
||||
|
||||
local function dot(u,v)
|
||||
return u[1]*v[1] + u[2]*v[2] + u[3]*v[3]
|
||||
end
|
||||
|
||||
local function unit(u)
|
||||
local d=dot(u,u)
|
||||
return d==0 and u or mul(1/d^.5, u)
|
||||
end
|
||||
|
||||
ConvexHull = {}
|
||||
|
||||
function ConvexHull:new(coordFct)
|
||||
local o = {
|
||||
points={},
|
||||
coord=coordFct
|
||||
}
|
||||
setmetatable(o, self)
|
||||
self.__index = self
|
||||
return o
|
||||
end
|
||||
|
||||
function ConvexHull.coord(elt)
|
||||
return {elt[1],elt[2],elt[3]}
|
||||
end
|
||||
|
||||
function ConvexHull:vect(a,b)
|
||||
return sub(self.coord(b),self.coord(a))
|
||||
end
|
||||
|
||||
function ConvexHull:normal(face)
|
||||
local u=self:vect(face[1],face[2])
|
||||
local v=self:vect(face[1],face[3])
|
||||
return cross(u,v)
|
||||
end
|
||||
|
||||
function ConvexHull:printPoint(p)
|
||||
return '('..table.concat(self.coord(p),',')..')'
|
||||
end
|
||||
|
||||
function ConvexHull:printFace(F)
|
||||
return '['..self:printPoint(F[1])..' '..
|
||||
self:printPoint(F[2])..' '..
|
||||
self:printPoint(F[3])..']'
|
||||
end
|
||||
|
||||
function ConvexHull:seen(face,p)
|
||||
local N=self:normal(face)
|
||||
local P=self:vect(face[1],p)
|
||||
return dot(N,P)>=0
|
||||
end
|
||||
|
||||
function ConvexHull:bdry(faces)
|
||||
local code={n=0}
|
||||
function code.encode(pt,...)
|
||||
if pt then
|
||||
local k = code[pt]
|
||||
if not k then
|
||||
k = code.n+1
|
||||
code[k] = pt
|
||||
code[pt] = k
|
||||
code.n = k
|
||||
end
|
||||
local rest = code.encode(...)
|
||||
return rest and (k..','..rest) or ""..k
|
||||
end
|
||||
end
|
||||
function code.decode(str)
|
||||
local i = str:find(',')
|
||||
if i then
|
||||
local k = str:sub(1,i-1)
|
||||
return code[tonumber(k)],code.decode(str:sub(i+1))
|
||||
else
|
||||
return code[tonumber(str)]
|
||||
end
|
||||
end
|
||||
local set = {}
|
||||
local function add(...)
|
||||
set[code.encode(...)] = true
|
||||
end
|
||||
local function rem(...)
|
||||
set[code.encode(...)] = nil
|
||||
end
|
||||
local function keys()
|
||||
local r = {}
|
||||
for k in pairs(set) do
|
||||
r[{code.decode(k)}] = true
|
||||
end
|
||||
return r
|
||||
end
|
||||
for F in pairs(faces) do
|
||||
add(F[1],F[2])
|
||||
add(F[2],F[3])
|
||||
add(F[3],F[1])
|
||||
end
|
||||
for F in pairs(faces) do
|
||||
rem(F[1],F[3])
|
||||
rem(F[3],F[2])
|
||||
rem(F[2],F[1])
|
||||
end
|
||||
return keys()
|
||||
end
|
||||
|
||||
function ConvexHull:addPoint(p)
|
||||
-- first 3 points
|
||||
if self.points then
|
||||
if p==self.points[1] or p==self.points[2] then return end
|
||||
table.insert(self.points,p)
|
||||
|
||||
if #self.points==3 then
|
||||
self.hull={
|
||||
{self.points[1],self.points[2],self.points[3]},
|
||||
{self.points[1],self.points[3],self.points[2]}
|
||||
}
|
||||
self.points=nil
|
||||
end
|
||||
else
|
||||
local seenF,n = {},0
|
||||
for _,F in ipairs(self.hull) do
|
||||
if F[1]==p or F[2]==p or F[3]==p then return end
|
||||
if self:seen(F,p) then seenF[F]=true;n=n+1 end
|
||||
end
|
||||
|
||||
if n==#self.hull then
|
||||
-- if can see all faces, unsee ones looking "down"
|
||||
local N
|
||||
for F in pairs(seenF) do N=self:normal(F); break; end
|
||||
for F in pairs(seenF) do
|
||||
if dot(self:normal(F),N)<=0 then
|
||||
seenF[F] = nil
|
||||
n=n-1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- remove (old) seen faces
|
||||
local z=#self.hull
|
||||
for i=#self.hull,1,-1 do
|
||||
if seenF[self.hull[i]] then
|
||||
table.remove(self.hull,i)
|
||||
end
|
||||
end
|
||||
|
||||
-- insert new boundaries with seen faces
|
||||
for E in pairs(self:bdry(seenF)) do
|
||||
table.insert(self.hull,{E[1],E[2],p})
|
||||
end
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
function ConvexHull:verticesSet()
|
||||
local v = {}
|
||||
if self.hull then
|
||||
for _,F in ipairs(self.hull) do
|
||||
v[F[1]] = true
|
||||
v[F[2]] = true
|
||||
v[F[3]] = true
|
||||
end
|
||||
end
|
||||
return v
|
||||
end
|
||||
|
||||
function ConvexHull:verticesSize()
|
||||
local n = 0
|
||||
for _ in pairs(self:verticesSet()) do n=n+1 end
|
||||
return n
|
||||
end
|
||||
|
||||
function ConvexHull:distToFace(F,pt)
|
||||
local N=unit(self:normal(F))
|
||||
local P=self:vect(F[1],pt)
|
||||
return dot(N,P)
|
||||
end
|
||||
|
||||
function ConvexHull:distToHull(pt)
|
||||
local d
|
||||
for _,F in ipairs(self.hull) do
|
||||
local t = self:distToFace(F,pt)
|
||||
d = d==nil and t or
|
||||
(0<=t and t<d or
|
||||
0>=t and t>d) and t or
|
||||
d
|
||||
if d==0 then break end
|
||||
end
|
||||
return d
|
||||
end
|
||||
|
||||
end -- ConvexHull
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,454 +1,454 @@
|
||||
-- thomson.lua : lots of utility for handling
|
||||
-- thomson screen.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
if not thomson then
|
||||
|
||||
run("color.lua") -- optionnal
|
||||
|
||||
thomson = {optiMAP=true}
|
||||
|
||||
-- RAM banks
|
||||
thomson.ramA = {}
|
||||
thomson.ramB = {}
|
||||
|
||||
function thomson.clear()
|
||||
for i=1,8000 do
|
||||
thomson.ramA[i] = 0
|
||||
thomson.ramB[i] = 0
|
||||
end
|
||||
end
|
||||
|
||||
-- color levels
|
||||
thomson.levels = {
|
||||
-- in pc-space (0-255):
|
||||
pc = {0,100,127,142,163,179,191,203,215,223,231,239,
|
||||
243,247,251,255},
|
||||
-- in linear space (0-255):
|
||||
linear = {},
|
||||
-- maps pc-levels (0-255) to thomson levels (1-16)
|
||||
pc2to={},
|
||||
-- maps linear-levels (0-255) to thomson levels (1-16)
|
||||
linear2to={}
|
||||
};
|
||||
|
||||
-- pc space to linear space
|
||||
local function toLinear(val)
|
||||
-- use the version from Color library
|
||||
if not Color then
|
||||
val = val/255
|
||||
if val<=0.081 then
|
||||
val = val/4.5;
|
||||
else
|
||||
val = ((val+0.099)/1.099)^2.2;
|
||||
end
|
||||
val = val*255
|
||||
return val;
|
||||
else
|
||||
return Color:new(val,0,0):toLinear().r
|
||||
end
|
||||
end
|
||||
|
||||
for i=1,16 do
|
||||
thomson.levels.linear[i] = toLinear(thomson.levels.pc[i])
|
||||
end
|
||||
for i=0,255 do
|
||||
local r,cm,dm;
|
||||
r,cm,dm = toLinear(i),0,1e30
|
||||
for c,v in ipairs(thomson.levels.linear) do
|
||||
local d = math.abs(v-r);
|
||||
if d<dm then cm,dm = c,d; end
|
||||
end
|
||||
thomson.levels.pc2to[i] = cm;
|
||||
r,cm,dm = i,0,1e30
|
||||
for c,v in ipairs(thomson.levels.linear) do
|
||||
local d = math.abs(v-r);
|
||||
if d<dm then cm,dm = c,d; end
|
||||
end
|
||||
thomson.levels.linear2to[i] = cm;
|
||||
end
|
||||
|
||||
-- palette stuff
|
||||
function thomson.palette(i, pal)
|
||||
-- returns palette #i if pal is missing (nil)
|
||||
-- if pal is a number, sets palette #i
|
||||
-- if pal is an array, sets the palette #i, #i+1, ...
|
||||
if type(pal)=='table' then
|
||||
for j,v in ipairs(pal) do
|
||||
thomson.palette(i+j-1,v)
|
||||
end
|
||||
elseif pal and i>=0 and i<thomson._palette.max then
|
||||
thomson._palette[i+1] = pal
|
||||
elseif not pal and i>=0 and i<thomson._palette.max then
|
||||
return thomson._palette[i+1]
|
||||
end
|
||||
end;
|
||||
thomson._palette = {offset = 0, max=16}
|
||||
thomson.default_palette = {0,15,240,255,3840,3855,4080,4095,
|
||||
1911,826,931,938,2611,2618,3815,123}
|
||||
|
||||
-- border color
|
||||
function thomson.border(c)
|
||||
if c then
|
||||
thomson._border = c;
|
||||
else
|
||||
return thomson._border
|
||||
end
|
||||
end
|
||||
thomson.border(0)
|
||||
|
||||
-- helper to appen tables to tables
|
||||
function thomson._append(result, ...)
|
||||
for _,tab in ipairs({...}) do
|
||||
for _,v in ipairs(tab) do
|
||||
table.insert(result,v)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- RLE compression of data into result
|
||||
function thomson._compress(result,data)
|
||||
local partial,p,pmax={},1,#data
|
||||
local function addCarToPartial(car)
|
||||
partial[2] = partial[2]+1
|
||||
partial[2+partial[2]] = car
|
||||
end
|
||||
while p<=pmax do
|
||||
local num,car = 1,data[p]
|
||||
while num<255 and p<pmax and data[p+1]==car do
|
||||
num,p = num+1,p+1
|
||||
end
|
||||
local default=true
|
||||
if partial[1] then
|
||||
-- 01 aa 01 bb ==> 00 02 aa bb
|
||||
if default and num==1 and partial[1]==1 then
|
||||
partial = {0,2,partial[2],car}
|
||||
default = false
|
||||
end
|
||||
-- 00 n xx xx xx 01 bb ==> 00 n+1 xx xx xx bb
|
||||
if default and num==1 and partial[1]==0 and partial[2]<255 then
|
||||
addCarToPartial(car)
|
||||
default = false
|
||||
end
|
||||
-- 00 n xx xx xx 02 bb ==> 00 n+2 xx xx xx bb bb (pas utile mais sert quand combiné à la regle ci-dessus)
|
||||
if default and num==2 and partial[1]==0 and partial[2]<254 then
|
||||
addCarToPartial(car)
|
||||
addCarToPartial(car)
|
||||
default = false
|
||||
end
|
||||
end
|
||||
if default then
|
||||
thomson._append(result, partial)
|
||||
partial = {num,car}
|
||||
end
|
||||
p=p+1
|
||||
end
|
||||
thomson._append(result, partial)
|
||||
return result
|
||||
end
|
||||
|
||||
-- save a map file corresponging to the current file
|
||||
-- if a map file already exist, a confirmation is
|
||||
-- prompted to the user
|
||||
local function save_current_file()
|
||||
local function exist(file)
|
||||
local f=io.open(file,'rb')
|
||||
if not f then return false else io.close(f); return true; end
|
||||
end
|
||||
local name,path = getfilename()
|
||||
local mapname = string.gsub(name,"%.%w*$","") .. ".map"
|
||||
local fullname = path .. '/' .. mapname
|
||||
local ok = not exist(fullname)
|
||||
if not ok then
|
||||
selectbox("Ovr " .. mapname .. "?", "Yes", function() ok = true; end, "No", function() ok = false; end)
|
||||
end
|
||||
if ok then thomson.savep(fullname) end
|
||||
end
|
||||
|
||||
-- saves the thomson screen into a MAP file
|
||||
function thomson.savep(name)
|
||||
if not name then return save_current_file() end
|
||||
|
||||
wait(0) -- allow for key handling
|
||||
local data = thomson._get_map_data()
|
||||
local tmp = {0, math.floor(#data/256), #data%256,0,0}
|
||||
thomson._append(tmp,data,{255,0,0,0,0})
|
||||
local function save(name, buf)
|
||||
local out = io.open(name,"wb")
|
||||
out:write(buf)
|
||||
out:close()
|
||||
end
|
||||
save(name, string.char(unpack(tmp)))
|
||||
|
||||
-- save raw data as well ?
|
||||
local moved, key, mx, my, mb = waitinput(0.01)
|
||||
if key==4123 then -- shift-ESC ==> save raw files as well
|
||||
save(name .. ".rama", string.char(unpack(thomson.ramA)))
|
||||
save(name .. ".ramb", string.char(unpack(thomson.ramB)))
|
||||
local pal = ""
|
||||
for i=0,15 do
|
||||
local val = thomson.palette(i)
|
||||
pal=pal..string.char(math.floor(val/256),val%256)
|
||||
end
|
||||
save(name .. ".pal", pal)
|
||||
messagebox('Saved MAP + RAMA/RAMB/PAL files.')
|
||||
end
|
||||
end
|
||||
waitbreak(0.01)
|
||||
|
||||
function thomson.info(...)
|
||||
local txt = ""
|
||||
for _,t in ipairs({...}) do txt = txt .. t end
|
||||
statusmessage(txt);
|
||||
if waitbreak(0)==1 then
|
||||
local ok=false
|
||||
selectbox("Abort ?", "Yes", function() ok = true end, "No", function() ok = false end)
|
||||
if ok then error('Operation aborted') end
|
||||
end
|
||||
end
|
||||
|
||||
-- copy ramA/B onto GrafX2 screen
|
||||
function thomson.updatescreen()
|
||||
-- back out
|
||||
for i=0,255 do
|
||||
setcolor(i,0,0,0)
|
||||
end
|
||||
-- refresh screen content
|
||||
clearpicture(thomson._palette.offset + thomson.border())
|
||||
for y=0,thomson.h-1 do
|
||||
for x=0,thomson.w-1 do
|
||||
local p = thomson.point(x,y)
|
||||
if p<0 then p=-p-1 end
|
||||
thomson._putpixel(x,y,thomson._palette.offset + p)
|
||||
end
|
||||
end
|
||||
-- refresh palette
|
||||
for i=1,thomson._palette.max do
|
||||
local v=thomson._palette[i]
|
||||
local r=v % 16
|
||||
local g=math.floor(v/16) % 16
|
||||
local b=math.floor(v/256) % 16
|
||||
setcolor(i+thomson._palette.offset-1,
|
||||
thomson.levels.pc[r+1],
|
||||
thomson.levels.pc[g+1],
|
||||
thomson.levels.pc[b+1])
|
||||
end
|
||||
updatescreen()
|
||||
end
|
||||
|
||||
-- bitmap 16 mode
|
||||
function thomson.setBM16()
|
||||
-- put a pixel onto real screen
|
||||
function thomson._putpixel(x,y,c)
|
||||
putpicturepixel(x*2+0,y,c)
|
||||
putpicturepixel(x*2+1,y,c)
|
||||
end
|
||||
-- put a pixel in thomson screen
|
||||
function thomson.pset(x,y,c)
|
||||
local bank = x%4<2 and thomson.ramA or thomson.ramB
|
||||
local offs = math.floor(x/4)+y*40+1
|
||||
if x%2==0 then
|
||||
bank[offs] = (bank[offs]%16)+c*16
|
||||
else
|
||||
bank[offs] = math.floor(bank[offs]/16)*16+c
|
||||
end
|
||||
-- c=c+thomson._palette.offset
|
||||
-- putpicturepixel(x*2+0,y,c)
|
||||
-- putpicturepixel(x*2+1,y,c)
|
||||
end
|
||||
-- get thomson pixel at (x,y)
|
||||
function thomson.point(x,y)
|
||||
local bank = x%4<2 and thomson.ramA or thomson.ramB
|
||||
local offs = math.floor(x/4)+y*40+1
|
||||
if x%2==0 then
|
||||
return math.floor(bank[offs]/16)
|
||||
else
|
||||
return bank[offs]%16
|
||||
end
|
||||
end
|
||||
-- return internal MAP file
|
||||
function thomson._get_map_data()
|
||||
local tmp = {}
|
||||
for x=1,40 do
|
||||
for y=x,x+7960,40 do
|
||||
table.insert(tmp, thomson.ramA[y])
|
||||
end
|
||||
for y=x,x+7960,40 do
|
||||
table.insert(tmp, thomson.ramB[y])
|
||||
end
|
||||
wait(0) -- allow for key handling
|
||||
end
|
||||
local pal = {}
|
||||
for i=1,16 do
|
||||
pal[2*i-1] = math.floor(thomson._palette[i]/256)
|
||||
pal[2*i+0] = thomson._palette[i]%256
|
||||
end
|
||||
-- build data
|
||||
local data={
|
||||
-- BM16
|
||||
0x40,
|
||||
-- ncols-1
|
||||
79,
|
||||
-- nlines-1
|
||||
24
|
||||
};
|
||||
thomson._compress(data, tmp)
|
||||
thomson._append(data,{0,0})
|
||||
-- padd to word
|
||||
if #data%2==1 then table.insert(data,0); end
|
||||
-- tosnap
|
||||
thomson._append(data,{0,128,0,thomson.border(),0,3})
|
||||
thomson._append(data, pal)
|
||||
thomson._append(data,{0xa5,0x5a})
|
||||
return data
|
||||
end
|
||||
|
||||
thomson.w = 160
|
||||
thomson.h = 200
|
||||
thomson.palette(0,thomson.default_palette)
|
||||
thomson.border(0)
|
||||
thomson.clear()
|
||||
end
|
||||
|
||||
-- mode MO5
|
||||
function thomson.setMO5()
|
||||
-- put a pixel onto real screen
|
||||
thomson._putpixel = putpicturepixel
|
||||
-- helpers
|
||||
local function bittst(val,mask)
|
||||
-- return bit32.btest(val,mask)
|
||||
return (val % (2*mask))>=mask;
|
||||
end
|
||||
local function bitset(val,mask)
|
||||
-- return bit32.bor(val, mask)
|
||||
return bittst(val,mask) and val or (val+mask)
|
||||
end
|
||||
local function bitclr(val,mask)
|
||||
-- return bit32.band(val,255-mask)
|
||||
return bittst(val,mask) and (val-mask) or val
|
||||
end
|
||||
-- put a pixel in thomson screen
|
||||
function thomson.pset(x,y,c)
|
||||
local offs = math.floor(x/8)+y*40+1
|
||||
local mask = 2^(7-(x%8))
|
||||
if c>=0 then
|
||||
thomson.ramB[offs] = (thomson.ramB[offs]%16)+c*16
|
||||
thomson.ramA[offs] = bitset(thomson.ramA[offs],mask)
|
||||
else
|
||||
c=-c-1
|
||||
thomson.ramB[offs] = math.floor(thomson.ramB[offs]/16)*16+c
|
||||
thomson.ramA[offs] = bitclr(thomson.ramA[offs],mask)
|
||||
end
|
||||
end
|
||||
-- get thomson pixel at (x,y)
|
||||
function thomson.point(x,y)
|
||||
local offs = math.floor(x/8)+y*40+1
|
||||
local mask = 2^(7-(x%8))
|
||||
if bittst(thomson.ramA[offs],mask) then
|
||||
return math.floor(thomson.ramB[offs]/16)
|
||||
else
|
||||
return -(thomson.ramB[offs]%16)-1
|
||||
end
|
||||
end
|
||||
-- convert color from MO5 to TO7 (MAP requires TO7 encoding)
|
||||
local function mo5to7(val)
|
||||
-- MO5: DCBA 4321
|
||||
-- __
|
||||
-- TO7: 4DCB A321
|
||||
local t=((val%16)>=8) and 0 or 128
|
||||
val = math.floor(val/16)*8 + (val%8)
|
||||
val = (val>=64 and val-64 or val+64) + t
|
||||
return val
|
||||
end
|
||||
-- return internal MAP file
|
||||
function thomson._get_map_data()
|
||||
-- create columnwise data
|
||||
local tmpA,tmpB={},{};
|
||||
for x=1,40 do
|
||||
for y=x,x+7960,40 do
|
||||
table.insert(tmpA, thomson.ramA[y])
|
||||
table.insert(tmpB, thomson.ramB[y])
|
||||
end
|
||||
wait(0) -- allow for key handling
|
||||
end
|
||||
if thomson.optiMAP then
|
||||
-- optimize
|
||||
for i=2,8000 do
|
||||
local c1,c2 = math.floor(tmpB[i-0]/16),tmpB[i-0]%16
|
||||
local d1,d2 = math.floor(tmpB[i-1]/16),tmpB[i-1]%16
|
||||
|
||||
if tmpA[i-1]==255-tmpA[i] or c1==d2 and c2==c1 then
|
||||
tmpA[i] = 255-tmpA[i]
|
||||
tmpB[i] = c2*16+c1
|
||||
elseif tmpA[i]==255 and c1==d1 or tmpA[i]==0 and c2==d2 then
|
||||
tmpB[i] = tmpB[i-1]
|
||||
end
|
||||
end
|
||||
else
|
||||
for i=1,8000 do
|
||||
local c1,c2 = math.floor(tmpB[i]/16),tmpB[i]%16
|
||||
|
||||
if tmpA[i]==255 or c1<c2 then
|
||||
tmpA[i] = 255-tmpA[i]
|
||||
tmpB[i] = c2*16+c1
|
||||
end
|
||||
end
|
||||
end
|
||||
-- convert into to7 encoding
|
||||
for i=1,#tmpB do tmpB[i] = mo5to7(tmpB[i]); end
|
||||
-- build data
|
||||
local data={
|
||||
-- BM40
|
||||
0x00,
|
||||
-- ncols-1
|
||||
39,
|
||||
-- nlines-1
|
||||
24
|
||||
};
|
||||
thomson._compress(data, tmpA); tmpA=nil;
|
||||
thomson._append(data,{0,0})
|
||||
thomson._compress(data, tmpB); tmpB=nil;
|
||||
thomson._append(data,{0,0})
|
||||
-- padd to word (for compatibility with basic)
|
||||
if #data%2==1 then table.insert(data,0); end
|
||||
|
||||
-- tosnap
|
||||
local orig_palette = true
|
||||
for i=0,15 do
|
||||
if thomson.default_palette[i+1]~=thomson.palette(i) then
|
||||
orig_palette = false
|
||||
break
|
||||
end
|
||||
end
|
||||
if not orig_palette then
|
||||
local pal = {}
|
||||
for i=0,15 do
|
||||
local v = thomson.palette(i)
|
||||
pal[2*i+1] = math.floor(v/256)
|
||||
pal[2*i+2] = v%256
|
||||
end
|
||||
thomson._append(data,{0,0,0,thomson.border(),0,0})
|
||||
thomson._append(data, pal)
|
||||
thomson._append(data,{0xa5,0x5a})
|
||||
end
|
||||
|
||||
return data
|
||||
end
|
||||
|
||||
thomson.w = 320
|
||||
thomson.h = 200
|
||||
thomson.palette(0,thomson.default_palette)
|
||||
thomson.border(0)
|
||||
thomson.clear()
|
||||
end
|
||||
|
||||
end -- thomson
|
||||
-- thomson.lua : lots of utility for handling
|
||||
-- thomson screen.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
if not thomson then
|
||||
|
||||
run("color.lua") -- optionnal
|
||||
|
||||
thomson = {optiMAP=true}
|
||||
|
||||
-- RAM banks
|
||||
thomson.ramA = {}
|
||||
thomson.ramB = {}
|
||||
|
||||
function thomson.clear()
|
||||
for i=1,8000 do
|
||||
thomson.ramA[i] = 0
|
||||
thomson.ramB[i] = 0
|
||||
end
|
||||
end
|
||||
|
||||
-- color levels
|
||||
thomson.levels = {
|
||||
-- in pc-space (0-255):
|
||||
pc = {0,100,127,142,163,179,191,203,215,223,231,239,
|
||||
243,247,251,255},
|
||||
-- in linear space (0-255):
|
||||
linear = {},
|
||||
-- maps pc-levels (0-255) to thomson levels (1-16)
|
||||
pc2to={},
|
||||
-- maps linear-levels (0-255) to thomson levels (1-16)
|
||||
linear2to={}
|
||||
};
|
||||
|
||||
-- pc space to linear space
|
||||
local function toLinear(val)
|
||||
-- use the version from Color library
|
||||
if not Color then
|
||||
val = val/255
|
||||
if val<=0.081 then
|
||||
val = val/4.5;
|
||||
else
|
||||
val = ((val+0.099)/1.099)^2.2;
|
||||
end
|
||||
val = val*255
|
||||
return val;
|
||||
else
|
||||
return Color:new(val,0,0):toLinear().r
|
||||
end
|
||||
end
|
||||
|
||||
for i=1,16 do
|
||||
thomson.levels.linear[i] = toLinear(thomson.levels.pc[i])
|
||||
end
|
||||
for i=0,255 do
|
||||
local r,cm,dm;
|
||||
r,cm,dm = toLinear(i),0,1e30
|
||||
for c,v in ipairs(thomson.levels.linear) do
|
||||
local d = math.abs(v-r);
|
||||
if d<dm then cm,dm = c,d; end
|
||||
end
|
||||
thomson.levels.pc2to[i] = cm;
|
||||
r,cm,dm = i,0,1e30
|
||||
for c,v in ipairs(thomson.levels.linear) do
|
||||
local d = math.abs(v-r);
|
||||
if d<dm then cm,dm = c,d; end
|
||||
end
|
||||
thomson.levels.linear2to[i] = cm;
|
||||
end
|
||||
|
||||
-- palette stuff
|
||||
function thomson.palette(i, pal)
|
||||
-- returns palette #i if pal is missing (nil)
|
||||
-- if pal is a number, sets palette #i
|
||||
-- if pal is an array, sets the palette #i, #i+1, ...
|
||||
if type(pal)=='table' then
|
||||
for j,v in ipairs(pal) do
|
||||
thomson.palette(i+j-1,v)
|
||||
end
|
||||
elseif pal and i>=0 and i<thomson._palette.max then
|
||||
thomson._palette[i+1] = pal
|
||||
elseif not pal and i>=0 and i<thomson._palette.max then
|
||||
return thomson._palette[i+1]
|
||||
end
|
||||
end;
|
||||
thomson._palette = {offset = 0, max=16}
|
||||
thomson.default_palette = {0,15,240,255,3840,3855,4080,4095,
|
||||
1911,826,931,938,2611,2618,3815,123}
|
||||
|
||||
-- border color
|
||||
function thomson.border(c)
|
||||
if c then
|
||||
thomson._border = c;
|
||||
else
|
||||
return thomson._border
|
||||
end
|
||||
end
|
||||
thomson.border(0)
|
||||
|
||||
-- helper to appen tables to tables
|
||||
function thomson._append(result, ...)
|
||||
for _,tab in ipairs({...}) do
|
||||
for _,v in ipairs(tab) do
|
||||
table.insert(result,v)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- RLE compression of data into result
|
||||
function thomson._compress(result,data)
|
||||
local partial,p,pmax={},1,#data
|
||||
local function addCarToPartial(car)
|
||||
partial[2] = partial[2]+1
|
||||
partial[2+partial[2]] = car
|
||||
end
|
||||
while p<=pmax do
|
||||
local num,car = 1,data[p]
|
||||
while num<255 and p<pmax and data[p+1]==car do
|
||||
num,p = num+1,p+1
|
||||
end
|
||||
local default=true
|
||||
if partial[1] then
|
||||
-- 01 aa 01 bb ==> 00 02 aa bb
|
||||
if default and num==1 and partial[1]==1 then
|
||||
partial = {0,2,partial[2],car}
|
||||
default = false
|
||||
end
|
||||
-- 00 n xx xx xx 01 bb ==> 00 n+1 xx xx xx bb
|
||||
if default and num==1 and partial[1]==0 and partial[2]<255 then
|
||||
addCarToPartial(car)
|
||||
default = false
|
||||
end
|
||||
-- 00 n xx xx xx 02 bb ==> 00 n+2 xx xx xx bb bb (pas utile mais sert quand combiné à la regle ci-dessus)
|
||||
if default and num==2 and partial[1]==0 and partial[2]<254 then
|
||||
addCarToPartial(car)
|
||||
addCarToPartial(car)
|
||||
default = false
|
||||
end
|
||||
end
|
||||
if default then
|
||||
thomson._append(result, partial)
|
||||
partial = {num,car}
|
||||
end
|
||||
p=p+1
|
||||
end
|
||||
thomson._append(result, partial)
|
||||
return result
|
||||
end
|
||||
|
||||
-- save a map file corresponging to the current file
|
||||
-- if a map file already exist, a confirmation is
|
||||
-- prompted to the user
|
||||
local function save_current_file()
|
||||
local function exist(file)
|
||||
local f=io.open(file,'rb')
|
||||
if not f then return false else io.close(f); return true; end
|
||||
end
|
||||
local name,path = getfilename()
|
||||
local mapname = string.gsub(name,"%.%w*$","") .. ".map"
|
||||
local fullname = path .. '/' .. mapname
|
||||
local ok = not exist(fullname)
|
||||
if not ok then
|
||||
selectbox("Ovr " .. mapname .. "?", "Yes", function() ok = true; end, "No", function() ok = false; end)
|
||||
end
|
||||
if ok then thomson.savep(fullname) end
|
||||
end
|
||||
|
||||
-- saves the thomson screen into a MAP file
|
||||
function thomson.savep(name)
|
||||
if not name then return save_current_file() end
|
||||
|
||||
wait(0) -- allow for key handling
|
||||
local data = thomson._get_map_data()
|
||||
local tmp = {0, math.floor(#data/256), #data%256,0,0}
|
||||
thomson._append(tmp,data,{255,0,0,0,0})
|
||||
local function save(name, buf)
|
||||
local out = io.open(name,"wb")
|
||||
out:write(buf)
|
||||
out:close()
|
||||
end
|
||||
save(name, string.char(unpack(tmp)))
|
||||
|
||||
-- save raw data as well ?
|
||||
local moved, key, mx, my, mb = waitinput(0.01)
|
||||
if key==4123 then -- shift-ESC ==> save raw files as well
|
||||
save(name .. ".rama", string.char(unpack(thomson.ramA)))
|
||||
save(name .. ".ramb", string.char(unpack(thomson.ramB)))
|
||||
local pal = ""
|
||||
for i=0,15 do
|
||||
local val = thomson.palette(i)
|
||||
pal=pal..string.char(math.floor(val/256),val%256)
|
||||
end
|
||||
save(name .. ".pal", pal)
|
||||
messagebox('Saved MAP + RAMA/RAMB/PAL files.')
|
||||
end
|
||||
end
|
||||
waitbreak(0.01)
|
||||
|
||||
function thomson.info(...)
|
||||
local txt = ""
|
||||
for _,t in ipairs({...}) do txt = txt .. t end
|
||||
statusmessage(txt);
|
||||
if waitbreak(0)==1 then
|
||||
local ok=false
|
||||
selectbox("Abort ?", "Yes", function() ok = true end, "No", function() ok = false end)
|
||||
if ok then error('Operation aborted') end
|
||||
end
|
||||
end
|
||||
|
||||
-- copy ramA/B onto GrafX2 screen
|
||||
function thomson.updatescreen()
|
||||
-- back out
|
||||
for i=0,255 do
|
||||
setcolor(i,0,0,0)
|
||||
end
|
||||
-- refresh screen content
|
||||
clearpicture(thomson._palette.offset + thomson.border())
|
||||
for y=0,thomson.h-1 do
|
||||
for x=0,thomson.w-1 do
|
||||
local p = thomson.point(x,y)
|
||||
if p<0 then p=-p-1 end
|
||||
thomson._putpixel(x,y,thomson._palette.offset + p)
|
||||
end
|
||||
end
|
||||
-- refresh palette
|
||||
for i=1,thomson._palette.max do
|
||||
local v=thomson._palette[i]
|
||||
local r=v % 16
|
||||
local g=math.floor(v/16) % 16
|
||||
local b=math.floor(v/256) % 16
|
||||
setcolor(i+thomson._palette.offset-1,
|
||||
thomson.levels.pc[r+1],
|
||||
thomson.levels.pc[g+1],
|
||||
thomson.levels.pc[b+1])
|
||||
end
|
||||
updatescreen()
|
||||
end
|
||||
|
||||
-- bitmap 16 mode
|
||||
function thomson.setBM16()
|
||||
-- put a pixel onto real screen
|
||||
function thomson._putpixel(x,y,c)
|
||||
putpicturepixel(x*2+0,y,c)
|
||||
putpicturepixel(x*2+1,y,c)
|
||||
end
|
||||
-- put a pixel in thomson screen
|
||||
function thomson.pset(x,y,c)
|
||||
local bank = x%4<2 and thomson.ramA or thomson.ramB
|
||||
local offs = math.floor(x/4)+y*40+1
|
||||
if x%2==0 then
|
||||
bank[offs] = (bank[offs]%16)+c*16
|
||||
else
|
||||
bank[offs] = math.floor(bank[offs]/16)*16+c
|
||||
end
|
||||
-- c=c+thomson._palette.offset
|
||||
-- putpicturepixel(x*2+0,y,c)
|
||||
-- putpicturepixel(x*2+1,y,c)
|
||||
end
|
||||
-- get thomson pixel at (x,y)
|
||||
function thomson.point(x,y)
|
||||
local bank = x%4<2 and thomson.ramA or thomson.ramB
|
||||
local offs = math.floor(x/4)+y*40+1
|
||||
if x%2==0 then
|
||||
return math.floor(bank[offs]/16)
|
||||
else
|
||||
return bank[offs]%16
|
||||
end
|
||||
end
|
||||
-- return internal MAP file
|
||||
function thomson._get_map_data()
|
||||
local tmp = {}
|
||||
for x=1,40 do
|
||||
for y=x,x+7960,40 do
|
||||
table.insert(tmp, thomson.ramA[y])
|
||||
end
|
||||
for y=x,x+7960,40 do
|
||||
table.insert(tmp, thomson.ramB[y])
|
||||
end
|
||||
wait(0) -- allow for key handling
|
||||
end
|
||||
local pal = {}
|
||||
for i=1,16 do
|
||||
pal[2*i-1] = math.floor(thomson._palette[i]/256)
|
||||
pal[2*i+0] = thomson._palette[i]%256
|
||||
end
|
||||
-- build data
|
||||
local data={
|
||||
-- BM16
|
||||
0x40,
|
||||
-- ncols-1
|
||||
79,
|
||||
-- nlines-1
|
||||
24
|
||||
};
|
||||
thomson._compress(data, tmp)
|
||||
thomson._append(data,{0,0})
|
||||
-- padd to word
|
||||
if #data%2==1 then table.insert(data,0); end
|
||||
-- tosnap
|
||||
thomson._append(data,{0,128,0,thomson.border(),0,3})
|
||||
thomson._append(data, pal)
|
||||
thomson._append(data,{0xa5,0x5a})
|
||||
return data
|
||||
end
|
||||
|
||||
thomson.w = 160
|
||||
thomson.h = 200
|
||||
thomson.palette(0,thomson.default_palette)
|
||||
thomson.border(0)
|
||||
thomson.clear()
|
||||
end
|
||||
|
||||
-- mode MO5
|
||||
function thomson.setMO5()
|
||||
-- put a pixel onto real screen
|
||||
thomson._putpixel = putpicturepixel
|
||||
-- helpers
|
||||
local function bittst(val,mask)
|
||||
-- return bit32.btest(val,mask)
|
||||
return (val % (2*mask))>=mask;
|
||||
end
|
||||
local function bitset(val,mask)
|
||||
-- return bit32.bor(val, mask)
|
||||
return bittst(val,mask) and val or (val+mask)
|
||||
end
|
||||
local function bitclr(val,mask)
|
||||
-- return bit32.band(val,255-mask)
|
||||
return bittst(val,mask) and (val-mask) or val
|
||||
end
|
||||
-- put a pixel in thomson screen
|
||||
function thomson.pset(x,y,c)
|
||||
local offs = math.floor(x/8)+y*40+1
|
||||
local mask = 2^(7-(x%8))
|
||||
if c>=0 then
|
||||
thomson.ramB[offs] = (thomson.ramB[offs]%16)+c*16
|
||||
thomson.ramA[offs] = bitset(thomson.ramA[offs],mask)
|
||||
else
|
||||
c=-c-1
|
||||
thomson.ramB[offs] = math.floor(thomson.ramB[offs]/16)*16+c
|
||||
thomson.ramA[offs] = bitclr(thomson.ramA[offs],mask)
|
||||
end
|
||||
end
|
||||
-- get thomson pixel at (x,y)
|
||||
function thomson.point(x,y)
|
||||
local offs = math.floor(x/8)+y*40+1
|
||||
local mask = 2^(7-(x%8))
|
||||
if bittst(thomson.ramA[offs],mask) then
|
||||
return math.floor(thomson.ramB[offs]/16)
|
||||
else
|
||||
return -(thomson.ramB[offs]%16)-1
|
||||
end
|
||||
end
|
||||
-- convert color from MO5 to TO7 (MAP requires TO7 encoding)
|
||||
local function mo5to7(val)
|
||||
-- MO5: DCBA 4321
|
||||
-- __
|
||||
-- TO7: 4DCB A321
|
||||
local t=((val%16)>=8) and 0 or 128
|
||||
val = math.floor(val/16)*8 + (val%8)
|
||||
val = (val>=64 and val-64 or val+64) + t
|
||||
return val
|
||||
end
|
||||
-- return internal MAP file
|
||||
function thomson._get_map_data()
|
||||
-- create columnwise data
|
||||
local tmpA,tmpB={},{};
|
||||
for x=1,40 do
|
||||
for y=x,x+7960,40 do
|
||||
table.insert(tmpA, thomson.ramA[y])
|
||||
table.insert(tmpB, thomson.ramB[y])
|
||||
end
|
||||
wait(0) -- allow for key handling
|
||||
end
|
||||
if thomson.optiMAP then
|
||||
-- optimize
|
||||
for i=2,8000 do
|
||||
local c1,c2 = math.floor(tmpB[i-0]/16),tmpB[i-0]%16
|
||||
local d1,d2 = math.floor(tmpB[i-1]/16),tmpB[i-1]%16
|
||||
|
||||
if tmpA[i-1]==255-tmpA[i] or c1==d2 and c2==c1 then
|
||||
tmpA[i] = 255-tmpA[i]
|
||||
tmpB[i] = c2*16+c1
|
||||
elseif tmpA[i]==255 and c1==d1 or tmpA[i]==0 and c2==d2 then
|
||||
tmpB[i] = tmpB[i-1]
|
||||
end
|
||||
end
|
||||
else
|
||||
for i=1,8000 do
|
||||
local c1,c2 = math.floor(tmpB[i]/16),tmpB[i]%16
|
||||
|
||||
if tmpA[i]==255 or c1<c2 then
|
||||
tmpA[i] = 255-tmpA[i]
|
||||
tmpB[i] = c2*16+c1
|
||||
end
|
||||
end
|
||||
end
|
||||
-- convert into to7 encoding
|
||||
for i=1,#tmpB do tmpB[i] = mo5to7(tmpB[i]); end
|
||||
-- build data
|
||||
local data={
|
||||
-- BM40
|
||||
0x00,
|
||||
-- ncols-1
|
||||
39,
|
||||
-- nlines-1
|
||||
24
|
||||
};
|
||||
thomson._compress(data, tmpA); tmpA=nil;
|
||||
thomson._append(data,{0,0})
|
||||
thomson._compress(data, tmpB); tmpB=nil;
|
||||
thomson._append(data,{0,0})
|
||||
-- padd to word (for compatibility with basic)
|
||||
if #data%2==1 then table.insert(data,0); end
|
||||
|
||||
-- tosnap
|
||||
local orig_palette = true
|
||||
for i=0,15 do
|
||||
if thomson.default_palette[i+1]~=thomson.palette(i) then
|
||||
orig_palette = false
|
||||
break
|
||||
end
|
||||
end
|
||||
if not orig_palette then
|
||||
local pal = {}
|
||||
for i=0,15 do
|
||||
local v = thomson.palette(i)
|
||||
pal[2*i+1] = math.floor(v/256)
|
||||
pal[2*i+2] = v%256
|
||||
end
|
||||
thomson._append(data,{0,0,0,thomson.border(),0,0})
|
||||
thomson._append(data, pal)
|
||||
thomson._append(data,{0xa5,0x5a})
|
||||
end
|
||||
|
||||
return data
|
||||
end
|
||||
|
||||
thomson.w = 320
|
||||
thomson.h = 200
|
||||
thomson.palette(0,thomson.default_palette)
|
||||
thomson.border(0)
|
||||
thomson.clear()
|
||||
end
|
||||
|
||||
end -- thomson
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- MO5 image (16 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
|
||||
local dith=OstroDither:new()
|
||||
local tmp=dith.setLevelsFromPalette
|
||||
dith.setLevelsFromPalette = function(self)
|
||||
tmp(self)
|
||||
self.attenuation=0
|
||||
end
|
||||
dith:dither40cols(function(w,h,getLinearPixel)
|
||||
local pal={}
|
||||
for i=0,15 do pal[i+1] = thomson.palette(i) end
|
||||
return pal
|
||||
end)
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- MO5 image (16 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
|
||||
local dith=OstroDither:new()
|
||||
local tmp=dith.setLevelsFromPalette
|
||||
dith.setLevelsFromPalette = function(self)
|
||||
tmp(self)
|
||||
self.attenuation=0
|
||||
end
|
||||
dith:dither40cols(function(w,h,getLinearPixel)
|
||||
local pal={}
|
||||
for i=0,15 do pal[i+1] = thomson.palette(i) end
|
||||
return pal
|
||||
end)
|
||||
|
||||
@ -1,82 +1,82 @@
|
||||
-- ostro_to8.lua : convert a color image to a BM16
|
||||
-- (160x200x16) thomson image using the Ostromoukhov's
|
||||
-- error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/thomson.lua')
|
||||
run('lib/ostromoukhov.lua')
|
||||
run('lib/color_reduction.lua')
|
||||
-- run('lib/zzz.lua')
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
-- Converts thomson coordinates (0-159,0-199) into screen coordinates
|
||||
local function thom2screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < 1.6 then
|
||||
i = x*screen_h/200
|
||||
j = y*screen_h/200
|
||||
else
|
||||
i = x*screen_w/320
|
||||
j = y*screen_w/320
|
||||
end
|
||||
return math.floor(i*2), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the Color @(x,y) in normalized linear space (0-1)
|
||||
-- corresonding to the thomson screen (x in 0-319, y in 0-199)
|
||||
local function getLinearPixel(x,y)
|
||||
local x1,y1 = thom2screen(x,y)
|
||||
local x2,y2 = thom2screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
local p = Color:new(0,0,0);
|
||||
for j=y1,y2-1 do
|
||||
for i=x1,x2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
p:div((y2-y1)*(x2-x1)) --:floor()
|
||||
|
||||
return p
|
||||
end
|
||||
|
||||
local red = ColorReducer:new():analyzeWithDither(160,200,
|
||||
getLinearPixel,
|
||||
function(y)
|
||||
thomson.info("Collecting stats...",math.floor(y/2),"%")
|
||||
end)
|
||||
|
||||
-- BM16 mode
|
||||
thomson.setBM16()
|
||||
|
||||
-- define palette
|
||||
local palette = red:boostBorderColors():buildPalette(16)
|
||||
thomson.palette(0, palette)
|
||||
|
||||
-- convert picture
|
||||
OstroDither:new(palette, 0)
|
||||
:dither(thomson.h,thomson.w,
|
||||
function(y,x) return getLinearPixel(x,y) end,
|
||||
function(y,x,c) thomson.pset(x,y,c) end,
|
||||
true,
|
||||
function(x) thomson.info("Converting...",math.floor(x*100/160),"%") end)
|
||||
|
||||
-- refresh screen
|
||||
setpicturesize(320,200)
|
||||
thomson.updatescreen()
|
||||
finalizepicture()
|
||||
|
||||
-- save picture
|
||||
thomson.savep()
|
||||
-- ostro_to8.lua : convert a color image to a BM16
|
||||
-- (160x200x16) thomson image using the Ostromoukhov's
|
||||
-- error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/thomson.lua')
|
||||
run('lib/ostromoukhov.lua')
|
||||
run('lib/color_reduction.lua')
|
||||
-- run('lib/zzz.lua')
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
-- Converts thomson coordinates (0-159,0-199) into screen coordinates
|
||||
local function thom2screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < 1.6 then
|
||||
i = x*screen_h/200
|
||||
j = y*screen_h/200
|
||||
else
|
||||
i = x*screen_w/320
|
||||
j = y*screen_w/320
|
||||
end
|
||||
return math.floor(i*2), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the Color @(x,y) in normalized linear space (0-1)
|
||||
-- corresonding to the thomson screen (x in 0-319, y in 0-199)
|
||||
local function getLinearPixel(x,y)
|
||||
local x1,y1 = thom2screen(x,y)
|
||||
local x2,y2 = thom2screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
local p = Color:new(0,0,0);
|
||||
for j=y1,y2-1 do
|
||||
for i=x1,x2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
p:div((y2-y1)*(x2-x1)) --:floor()
|
||||
|
||||
return p
|
||||
end
|
||||
|
||||
local red = ColorReducer:new():analyzeWithDither(160,200,
|
||||
getLinearPixel,
|
||||
function(y)
|
||||
thomson.info("Collecting stats...",math.floor(y/2),"%")
|
||||
end)
|
||||
|
||||
-- BM16 mode
|
||||
thomson.setBM16()
|
||||
|
||||
-- define palette
|
||||
local palette = red:boostBorderColors():buildPalette(16)
|
||||
thomson.palette(0, palette)
|
||||
|
||||
-- convert picture
|
||||
OstroDither:new(palette, 0)
|
||||
:dither(thomson.h,thomson.w,
|
||||
function(y,x) return getLinearPixel(x,y) end,
|
||||
function(y,x,c) thomson.pset(x,y,c) end,
|
||||
true,
|
||||
function(x) thomson.info("Converting...",math.floor(x*100/160),"%") end)
|
||||
|
||||
-- refresh screen
|
||||
setpicturesize(320,200)
|
||||
thomson.updatescreen()
|
||||
finalizepicture()
|
||||
|
||||
-- save picture
|
||||
thomson.savep()
|
||||
|
||||
@ -1,55 +1,55 @@
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- TO9 image (320x200x16 with color clashes)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/thomson.lua')
|
||||
thomson.optiMAP = false
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
run('lib/color_reduction.lua')
|
||||
|
||||
local dith=OstroDither:new()
|
||||
local tmp=dith.setLevelsFromPalette
|
||||
dith.setLevelsFromPalette = function(self)
|
||||
tmp(self)
|
||||
self.attenuation=0
|
||||
end
|
||||
dith:dither40cols(function(w,h,getLinearPixel)
|
||||
local c16 = true
|
||||
for y=0,h-1 do
|
||||
for x=0,w-1 do
|
||||
if getbackuppixel(x,y)>15 then c16 = false end
|
||||
end
|
||||
end
|
||||
|
||||
local pal
|
||||
if c16 then
|
||||
pal = {}
|
||||
for i=0,15 do
|
||||
local r,g,b=getbackupcolor(i)
|
||||
r = thomson.levels.pc2to[r]
|
||||
g = thomson.levels.pc2to[g]
|
||||
b = thomson.levels.pc2to[b]
|
||||
pal[i+1] = r+g*16+b*256-273
|
||||
end
|
||||
else
|
||||
pal=ColorReducer:new():analyzeWithDither(w,h,
|
||||
getLinearPixel,
|
||||
function(y)
|
||||
thomson.info("Building palette...",math.floor(y*100/h),"%")
|
||||
end):buildPalette(16)
|
||||
end
|
||||
thomson.palette(0, pal)
|
||||
|
||||
return pal
|
||||
end)
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- TO9 image (320x200x16 with color clashes)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/thomson.lua')
|
||||
thomson.optiMAP = false
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
run('lib/color_reduction.lua')
|
||||
|
||||
local dith=OstroDither:new()
|
||||
local tmp=dith.setLevelsFromPalette
|
||||
dith.setLevelsFromPalette = function(self)
|
||||
tmp(self)
|
||||
self.attenuation=0
|
||||
end
|
||||
dith:dither40cols(function(w,h,getLinearPixel)
|
||||
local c16 = true
|
||||
for y=0,h-1 do
|
||||
for x=0,w-1 do
|
||||
if getbackuppixel(x,y)>15 then c16 = false end
|
||||
end
|
||||
end
|
||||
|
||||
local pal
|
||||
if c16 then
|
||||
pal = {}
|
||||
for i=0,15 do
|
||||
local r,g,b=getbackupcolor(i)
|
||||
r = thomson.levels.pc2to[r]
|
||||
g = thomson.levels.pc2to[g]
|
||||
b = thomson.levels.pc2to[b]
|
||||
pal[i+1] = r+g*16+b*256-273
|
||||
end
|
||||
else
|
||||
pal=ColorReducer:new():analyzeWithDither(w,h,
|
||||
getLinearPixel,
|
||||
function(y)
|
||||
thomson.info("Building palette...",math.floor(y*100/h),"%")
|
||||
end):buildPalette(16)
|
||||
end
|
||||
thomson.palette(0, pal)
|
||||
|
||||
return pal
|
||||
end)
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- MO5 image (16 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
|
||||
OstroDither:new():dither40cols(function(w,h,getLinearPixel)
|
||||
local pal={}
|
||||
for i=0,15 do pal[i+1] = thomson.palette(i) end
|
||||
return pal
|
||||
end)
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- MO5 image (16 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
|
||||
OstroDither:new():dither40cols(function(w,h,getLinearPixel)
|
||||
local pal={}
|
||||
for i=0,15 do pal[i+1] = thomson.palette(i) end
|
||||
return pal
|
||||
end)
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- TO7 image (8 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
|
||||
OstroDither:new():dither40cols(function(w,h,getLinearPixel)
|
||||
local pal={}
|
||||
for i=0,7 do pal[i+1] = thomson.palette(i) end
|
||||
return pal
|
||||
end)
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- TO7 image (8 fixed colors with color clash)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
|
||||
OstroDither:new():dither40cols(function(w,h,getLinearPixel)
|
||||
local pal={}
|
||||
for i=0,7 do pal[i+1] = thomson.palette(i) end
|
||||
return pal
|
||||
end)
|
||||
|
||||
@ -1,82 +1,82 @@
|
||||
-- ostro_to8.lua : convert a color image to a BM16
|
||||
-- (160x200x16) thomson image using the Ostromoukhov's
|
||||
-- error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/thomson.lua')
|
||||
run('lib/ostromoukhov.lua')
|
||||
run('lib/color_reduction.lua')
|
||||
-- run('lib/zzz.lua')
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
-- Converts thomson coordinates (0-159,0-199) into screen coordinates
|
||||
local function thom2screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < 1.6 then
|
||||
i = x*screen_h/200
|
||||
j = y*screen_h/200
|
||||
else
|
||||
i = x*screen_w/320
|
||||
j = y*screen_w/320
|
||||
end
|
||||
return math.floor(i*2), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the Color @(x,y) in normalized linear space (0-1)
|
||||
-- corresonding to the thomson screen (x in 0-319, y in 0-199)
|
||||
local function getLinearPixel(x,y)
|
||||
local x1,y1 = thom2screen(x,y)
|
||||
local x2,y2 = thom2screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
local p = Color:new(0,0,0);
|
||||
for j=y1,y2-1 do
|
||||
for i=x1,x2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
p:div((y2-y1)*(x2-x1)) --:floor()
|
||||
|
||||
return p
|
||||
end
|
||||
|
||||
local red = ColorReducer:new():analyzeWithDither(160,200,
|
||||
getLinearPixel,
|
||||
function(y)
|
||||
thomson.info("Collecting stats...",math.floor(y/2),"%")
|
||||
end)
|
||||
|
||||
-- BM16 mode
|
||||
thomson.setBM16()
|
||||
|
||||
-- define palette
|
||||
local palette = red:boostBorderColors():buildPalette(16)
|
||||
thomson.palette(0, palette)
|
||||
|
||||
-- convert picture
|
||||
OstroDither:new(palette)
|
||||
:dither(thomson.h,thomson.w,
|
||||
function(y,x) return getLinearPixel(x,y) end,
|
||||
function(y,x,c) thomson.pset(x,y,c) end,
|
||||
true,
|
||||
function(x) thomson.info("Converting...",math.floor(x*100/160),"%") end)
|
||||
|
||||
-- refresh screen
|
||||
setpicturesize(320,200)
|
||||
thomson.updatescreen()
|
||||
finalizepicture()
|
||||
|
||||
-- save picture
|
||||
thomson.savep()
|
||||
-- ostro_to8.lua : convert a color image to a BM16
|
||||
-- (160x200x16) thomson image using the Ostromoukhov's
|
||||
-- error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/thomson.lua')
|
||||
run('lib/ostromoukhov.lua')
|
||||
run('lib/color_reduction.lua')
|
||||
-- run('lib/zzz.lua')
|
||||
|
||||
-- get screen size
|
||||
local screen_w, screen_h = getpicturesize()
|
||||
|
||||
-- Converts thomson coordinates (0-159,0-199) into screen coordinates
|
||||
local function thom2screen(x,y)
|
||||
local i,j;
|
||||
if screen_w/screen_h < 1.6 then
|
||||
i = x*screen_h/200
|
||||
j = y*screen_h/200
|
||||
else
|
||||
i = x*screen_w/320
|
||||
j = y*screen_w/320
|
||||
end
|
||||
return math.floor(i*2), math.floor(j)
|
||||
end
|
||||
|
||||
-- return the Color @(x,y) in normalized linear space (0-1)
|
||||
-- corresonding to the thomson screen (x in 0-319, y in 0-199)
|
||||
local function getLinearPixel(x,y)
|
||||
local x1,y1 = thom2screen(x,y)
|
||||
local x2,y2 = thom2screen(x+1,y+1)
|
||||
if x2==x1 then x2=x1+1 end
|
||||
if y2==y1 then y2=y1+1 end
|
||||
|
||||
local p = Color:new(0,0,0);
|
||||
for j=y1,y2-1 do
|
||||
for i=x1,x2-1 do
|
||||
p:add(getLinearPictureColor(i,j))
|
||||
end
|
||||
end
|
||||
p:div((y2-y1)*(x2-x1)) --:floor()
|
||||
|
||||
return p
|
||||
end
|
||||
|
||||
local red = ColorReducer:new():analyzeWithDither(160,200,
|
||||
getLinearPixel,
|
||||
function(y)
|
||||
thomson.info("Collecting stats...",math.floor(y/2),"%")
|
||||
end)
|
||||
|
||||
-- BM16 mode
|
||||
thomson.setBM16()
|
||||
|
||||
-- define palette
|
||||
local palette = red:boostBorderColors():buildPalette(16)
|
||||
thomson.palette(0, palette)
|
||||
|
||||
-- convert picture
|
||||
OstroDither:new(palette)
|
||||
:dither(thomson.h,thomson.w,
|
||||
function(y,x) return getLinearPixel(x,y) end,
|
||||
function(y,x,c) thomson.pset(x,y,c) end,
|
||||
true,
|
||||
function(x) thomson.info("Converting...",math.floor(x*100/160),"%") end)
|
||||
|
||||
-- refresh screen
|
||||
setpicturesize(320,200)
|
||||
thomson.updatescreen()
|
||||
finalizepicture()
|
||||
|
||||
-- save picture
|
||||
thomson.savep()
|
||||
|
||||
@ -1,47 +1,47 @@
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- TO9 image (320x200x16 with color clashes)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
run('lib/color_reduction.lua')
|
||||
|
||||
OstroDither:new():dither40cols(function(w,h,getLinearPixel)
|
||||
local c16 = h==200 and w==320
|
||||
for y=0,h-1 do
|
||||
for x=0,w-1 do
|
||||
if getbackuppixel(x,y)>15 then c16 = false end
|
||||
end
|
||||
end
|
||||
|
||||
local pal
|
||||
if c16 then
|
||||
pal = {}
|
||||
for i=0,15 do
|
||||
local r,g,b=getbackupcolor(i)
|
||||
r = thomson.levels.pc2to[r]
|
||||
g = thomson.levels.pc2to[g]
|
||||
b = thomson.levels.pc2to[b]
|
||||
pal[i+1] = r+g*16+b*256-273
|
||||
end
|
||||
else
|
||||
pal=ColorReducer:new():analyzeWithDither(w,h,
|
||||
getLinearPixel,
|
||||
function(y)
|
||||
thomson.info("Building palette...",math.floor(y*100/h),"%")
|
||||
end):boostBorderColors():buildPalette(16)
|
||||
end
|
||||
|
||||
thomson.palette(0, pal)
|
||||
|
||||
return pal
|
||||
end)
|
||||
-- ostro_mo5.lua : converts a color image into a
|
||||
-- TO9 image (320x200x16 with color clashes)
|
||||
-- using Ostromoukhov's error diffusion algorithm.
|
||||
--
|
||||
-- Version: 02-jan-2017
|
||||
--
|
||||
-- Copyright 2016-2017 by Samuel Devulder
|
||||
--
|
||||
-- This program is free software; you can redistribute
|
||||
-- it and/or modify it under the terms of the GNU
|
||||
-- General Public License as published by the Free
|
||||
-- Software Foundation; version 2 of the License.
|
||||
-- See <http://www.gnu.org/licenses/>
|
||||
|
||||
run('lib/ostromoukhov.lua')
|
||||
run('lib/color_reduction.lua')
|
||||
|
||||
OstroDither:new():dither40cols(function(w,h,getLinearPixel)
|
||||
local c16 = h==200 and w==320
|
||||
for y=0,h-1 do
|
||||
for x=0,w-1 do
|
||||
if getbackuppixel(x,y)>15 then c16 = false end
|
||||
end
|
||||
end
|
||||
|
||||
local pal
|
||||
if c16 then
|
||||
pal = {}
|
||||
for i=0,15 do
|
||||
local r,g,b=getbackupcolor(i)
|
||||
r = thomson.levels.pc2to[r]
|
||||
g = thomson.levels.pc2to[g]
|
||||
b = thomson.levels.pc2to[b]
|
||||
pal[i+1] = r+g*16+b*256-273
|
||||
end
|
||||
else
|
||||
pal=ColorReducer:new():analyzeWithDither(w,h,
|
||||
getLinearPixel,
|
||||
function(y)
|
||||
thomson.info("Building palette...",math.floor(y*100/h),"%")
|
||||
end):boostBorderColors():buildPalette(16)
|
||||
end
|
||||
|
||||
thomson.palette(0, pal)
|
||||
|
||||
return pal
|
||||
end)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user