re-format palette to power-of-2 resolution

make some vars more readable
consolidate/cache fdir usage

README.md

@@ -8,7 +8,7 @@ Simply place a panel, right-click it, and set a channel.
 
 Then send a character, a string, or one of several control words to that channel from a Mesecons Lua Controller and the mod will try to display it.  The panels use the standard 7-bit ASCII character set (with a few alterations).
 
-A single character will be displayed on the connected panel.
+A single character will be displayed on the connected panel.  A numeric message (i.e. not a string) will display the first digit on the connected panel.
 
 Strings will be displayed using all panels in a lineup, so long as they all face the same way, starting from the panel the Lua Controller is connected to, going left to right.  The other panels in the line do not need to be connected to anything - think of them as being connected together internally.  Only the panel at the far left need be connected to the Lua Controller.
 
@@ -20,14 +20,23 @@ You can put multiple lines of panels end to end to form independent displays, so
 
 The string is padded with spaces and then trimmed to 64 characters.
 
-Any unrecognized symbol or character outside the ASCII 32 - 129 range, whether part of a string or singularly is ignored, except as noted below.
+Any unrecognized symbol or character, whether part of a string or singularly is ignored, except as noted below.
+
+This mod uses the full ISO-8859-1 character set (see https://en.wikipedia.org/wiki/ISO/IEC_8859-1 for details), plus a bunch of symbols stuffed into the empty 128-159 range that should be useful on a marquee:
+    
+* 128,129: musical notes
+* 130-140: box drawing glyphs
+* 141-144: block shades
+* 145-152: arrows
+* 153-156: explosion/splat
+* 157-159: smileys
 
 The panels also respond to these control messages:
 
-* the words "off", "colon" and "period" translate to a blank space, ":", and ".", respectively.
-* "del" or character code 127 displays a square with an X in it
-* "allon" or character code 128 will turn on all LEDs on the panel.
-* "cursor" or character code 129 will display a short, thick line at the bottom of the panel.
+* the keywords "off", "colon" and "period" translate to a blank space, ":", and ".", respectively (they're leftover from the nixie tubes fork, but might be useful anyway)
+* "del" is mapped to character #127, a square with an X in it.
+* "allon" is mapped to character #144, the full/all-on block graphic.
+* "cursor" or character code 31 will display a short, thick, flashing line at the bottom of the panel.
 * "off_multi" turns all panels in a lineup off
 * "allon_multi" turns on all LEDs of all panels in a lineup.
 

init.lua

@@ -1,20 +1,13 @@
 -- simple LED marquee mod
 -- by Vanessa Dannenberg
 
-led_marquee = {}
-
 local S
 if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
+	S = intllib.make_gettext_pair()
 else
 	S = function(s) return s end
 end
 
-local marquee_cbox = {
-	type = "fixed",
-	fixed = { -16/32, -8/16, -16/32, 16/32, 8/16, -15/32 }
-}
-
 -- the following functions based on the so-named ones in Jeija's digilines mod
 
 local reset_meta = function(pos)
@@ -34,17 +27,26 @@ end
 -- the nodes:
 
 local fdir_to_right = {
-	{  1,  0 },
 	{  0, -1 },
-	{ -1,  0 },
+	{  0, -1 },
+	{  0, -1 },
 	{  0,  1 },
+	{  1,  0 },
+	{ -1,  0 },
+}
+
+local cbox = {
+	type = "wallmounted",
+	wall_top = { -8/16, 7/16, -8/16, 8/16, 8/16, 8/16 },
+	wall_bottom = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
+	wall_side = { -8/16, -8/16, -8/16, -7/16, 8/16, 8/16 }
 }
 
 local padding = " "
 local allon = string.char(128)
 for i = 1, 64 do
 	padding = padding.." "
-	allon = allon..string.char(128)
+	allon = allon..string.char(144)
 end
 
 local display_string = function(pos, channel, string)
@@ -54,28 +56,29 @@ local display_string = function(pos, channel, string)
 		string = allon
 	end
 	local padded_string = string.sub(string..padding, 1, 64)
-	local fdir = minetest.get_node(pos).param2 % 8
+	local master_fdir = minetest.get_node(pos).param2 % 8
+	local master_meta = minetest.get_meta(pos)
+	local last_color = master_meta:get_int("last_color")
 	local pos2 = pos
-	local mastermeta = minetest.get_meta(pos)
-	local lastcolor = mastermeta:get_int("lastcolor")
-	if not lastcolor or lastcolor < 0 or lastcolor > 7 then
-		lastcolor = 0
-		mastermeta:set_int("lastcolor", 0)
+
+	if not last_color or last_color < 0 or last_color > 30 then
+		last_color = 0
+		master_meta:set_int("last_color", 0)
 	end
 	for i = 1, 64 do
 		local node = minetest.get_node(pos2)
+		local fdir = node.param2 % 8
 		local meta = minetest.get_meta(pos2)
 		local setchan = meta:get_string("channel")
-
 		if not string.match(node.name, "led_marquee:char_") or (setchan ~= nil and setchan ~= "" and setchan ~= channel) then break end
 		local asc = string.byte(padded_string, i, i)
-		if (node.param2 % 8) == fdir and asc > 31 and asc < 130 then
-			minetest.swap_node(pos2, { name = "led_marquee:char_"..asc, param2 = (node.param2 % 8) + (lastcolor*8)})
+		if master_fdir == fdir and asc > 30 and asc < 256 then
+			minetest.swap_node(pos2, { name = "led_marquee:char_"..asc, param2 = master_fdir + (last_color*8)})
 			pos2.x = pos2.x + fdir_to_right[fdir+1][1]
 			pos2.z = pos2.z + fdir_to_right[fdir+1][2]
 		elseif asc < 31 then
-			lastcolor = asc
-			mastermeta:set_int("lastcolor", asc)
+			last_color = asc
+			master_meta:set_int("last_color", asc)
 		end
 	end
 end
@@ -83,37 +86,38 @@ end
 local on_digiline_receive_string = function(pos, node, channel, msg)
 	local meta = minetest.get_meta(pos)
 	local setchan = meta:get_string("channel")
-	local lastcolor = meta:get_int("lastcolor")
-	if not lastcolor or lastcolor < 0 or lastcolor > 7 then
-		lastcolor = 0
-		meta:set_int("lastcolor", 0)
+	local last_color = meta:get_int("last_color")
+	if not last_color or last_color < 0 or last_color > 30 then
+		last_color = 0
+		meta:set_int("last_color", 0)
 	end
+	local fdir = node.param2 % 8
 
 	if setchan ~= channel then return end
 	if msg and msg ~= "" and type(msg) == "string" then
 		if string.len(msg) > 1 then
 			if msg == "off" then
-				minetest.swap_node(pos, { name = "led_marquee:char_32", param2 = (node.param2 % 8) + (lastcolor*8)})
+				minetest.swap_node(pos, { name = "led_marquee:char_32", param2 = fdir + (last_color*8)})
 			elseif msg == "colon" then
-				minetest.swap_node(pos, { name = "led_marquee:char_58", param2 = (node.param2 % 8) + (lastcolor*8)})
+				minetest.swap_node(pos, { name = "led_marquee:char_58", param2 = fdir + (last_color*8)})
 			elseif msg == "period" then
-				minetest.swap_node(pos, { name = "led_marquee:char_46", param2 = (node.param2 % 8) + (lastcolor*8)})
+				minetest.swap_node(pos, { name = "led_marquee:char_46", param2 = fdir + (last_color*8)})
 			elseif msg == "del" then
-				minetest.swap_node(pos, { name = "led_marquee:char_127", param2 = (node.param2 % 8) + (lastcolor*8)})
+				minetest.swap_node(pos, { name = "led_marquee:char_127", param2 = fdir + (last_color*8)})
 			elseif msg == "allon" then
-				minetest.swap_node(pos, { name = "led_marquee:char_128", param2 = (node.param2 % 8) + (lastcolor*8)})
+				minetest.swap_node(pos, { name = "led_marquee:char_144", param2 = fdir + (last_color*8)})
 			elseif msg == "cursor" then
-				minetest.swap_node(pos, { name = "led_marquee:char_129", param2 = (node.param2 % 8) + (lastcolor*8)})
+				minetest.swap_node(pos, { name = "led_marquee:char_31", param2 = fdir + (last_color*8)})
 			else
 				display_string(pos, channel, msg)
 			end
 		else
 			local asc = string.byte(msg)
-			if asc > 31 and asc < 130 then
-				minetest.swap_node(pos, { name = "led_marquee:char_"..asc, param2 = (node.param2 % 8) + (lastcolor*8)})
+			if asc > 30 and asc < 256 then
+				minetest.swap_node(pos, { name = "led_marquee:char_"..asc, param2 = fdir + (last_color*8)})
 			elseif asc < 31 then
-				lastcolor = asc
-				meta:set_int("lastcolor", asc)
+				last_color = asc
+				meta:set_int("last_color", asc)
 			elseif msg == "get" then -- get value as ASCII numerical value
 				digiline:receptor_send(pos, digiline.rules.default, channel, tonumber(string.match(minetest.get_node(pos).name,"led_marquee:char_(.+)"))) -- wonderfully horrible string manipulaiton
 			elseif msg == "getstr" then -- get actual char
@@ -122,14 +126,14 @@ local on_digiline_receive_string = function(pos, node, channel, msg)
 		end
 	elseif msg and type(msg) == "number" then
 		if msg == 0 then
-			minetest.swap_node(pos, { name = "led_marquee:char_32", param2 = (node.param2 % 8) + (lastcolor*8)})
-		elseif msg > 31 and alnum_chars[msg - 31] ~= nil then
-			minetest.swap_node(pos, { name = "led_marquee:char_"..tostring(msg), param2 = (node.param2 % 8) + (lastcolor*8)})
+			minetest.swap_node(pos, { name = "led_marquee:char_32", param2 = fdir + (last_color*8)})
+		elseif msg > 30 then
+			minetest.swap_node(pos, { name = "led_marquee:char_"..tostring(msg), param2 = fdir + (last_color*8)})
 		end
 	end
 end
 
-for i = 32, 129 do
+for i = 31, 255 do
 	local groups = { cracky = 2, not_in_creative_inventory = 1}
 	local light = LIGHT_MAX-2
 	local description = S("Alphanumeric LED marquee panel ("..i..")")
@@ -139,36 +143,36 @@ for i = 32, 129 do
 				"led_marquee_char_"..i..".png",
 			}
 
-	if i == 32 then
-		groups = {cracky = 2}
-		light = nil
-		description = S("Alphanumeric LED marquee panel")
-	end
-
-	if i == 129 then
+	if i == 31 then
 		tiles = {
 			{ name="led_marquee_base.png", color="white"},
 			{ name="led_marquee_leds_off.png", color="white"},
 				{
-				name = "led_marquee_char_129.png",
+				name = "led_marquee_char_31.png",
 				animation = {type = "vertical_frames", aspect_w = 32, aspect_h = 32, length = 0.75}
 				}
 		}
 	end
 
+	if i == 32 then
+		groups = {cracky = 2}
+		light = nil
+		description = S("Alphanumeric LED marquee panel")
+	end
+
 	minetest.register_node("led_marquee:char_"..i, {
 		description = description,
 		drawtype = "mesh",
 		mesh = "led_marquee.obj",
 		tiles = tiles,
-		palette="palette.png",
+		palette="led_marquee_palette.png",
 		use_texture_alpha = true,
 		groups = groups,
 		paramtype = "light",
 		paramtype2 = "colorwallmounted",
 		light_source = light,
-		selection_box = marquee_cbox,
-		collision_box = marquee_cbox,
+		selection_box = cbox,
+		node_box = cbox,
 		on_construct = function(pos)
 			reset_meta(pos)
 		end,

models/led_marquee.obj

@@ -1,30 +1,30 @@
 # Blender v2.79 (sub 0) OBJ File: 'LED marquee.blend'
 # www.blender.org
 o Cube_Cube_LEDs
-v -0.453125 -0.500000 -0.468750
-v -0.453125 0.500000 -0.468750
-v -0.453125 0.500000 0.468750
-v -0.453125 -0.500000 0.468750
-v -0.437500 -0.500000 -0.500000
-v -0.437500 -0.500000 -0.484375
-v -0.453125 -0.500000 -0.468750
-v -0.453125 -0.500000 0.468750
-v -0.437500 -0.500000 0.484375
-v -0.437500 -0.500000 0.500000
+v 0.500000 -0.453125 -0.468750
+v -0.500000 -0.453125 -0.468750
+v -0.500000 -0.453125 0.468750
+v 0.500000 -0.453125 0.468750
+v 0.500000 -0.437500 -0.500000
+v 0.500000 -0.437500 -0.484375
+v 0.500000 -0.453125 -0.468750
+v 0.500000 -0.453125 0.468750
+v 0.500000 -0.437500 0.484375
+v 0.500000 -0.437500 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
 v -0.500000 -0.500000 0.500000
 v -0.500000 -0.500000 -0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 0.500000 -0.500000
-v -0.437500 0.500000 0.500000
-v -0.437500 0.500000 0.484375
-v -0.453125 0.500000 0.468750
-v -0.453125 0.500000 -0.468750
-v -0.437500 0.500000 -0.484375
-v -0.437500 0.500000 -0.500000
-v -0.449125 -0.500000 -0.468750
-v -0.449125 0.500000 -0.468750
-v -0.449125 0.500000 0.468750
-v -0.449125 -0.500000 0.468750
+v -0.500000 -0.437500 0.500000
+v -0.500000 -0.437500 0.484375
+v -0.500000 -0.453125 0.468750
+v -0.500000 -0.453125 -0.468750
+v -0.500000 -0.437500 -0.484375
+v -0.500000 -0.437500 -0.500000
+v 0.500000 -0.449125 -0.468750
+v -0.500000 -0.449125 -0.468750
+v -0.500000 -0.449125 0.468750
+v 0.500000 -0.449125 0.468750
 vt 0.667843 0.000000
 vt 0.667843 0.015513
 vt 0.681855 0.031026
@@ -73,14 +73,14 @@ vt 0.000000 0.000000
 vt 1.000000 0.000000
 vt 1.000000 1.000000
 vt 0.000000 1.000000
+vn 1.0000 0.0000 -0.0000
 vn 0.0000 -1.0000 0.0000
-vn -1.0000 -0.0000 -0.0000
-vn -0.0000 1.0000 0.0000
-vn 0.0000 0.0000 -1.0000
+vn -1.0000 0.0000 0.0000
+vn -0.0000 -0.0000 -1.0000
 vn 0.0000 0.0000 1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.7071 0.0000 -0.7071
-vn 0.7071 0.0000 0.7071
+vn -0.0000 1.0000 0.0000
+vn -0.0000 0.7071 -0.7071
+vn -0.0000 0.7071 0.7071
 g Cube_Cube_LEDs_Cube_Cube_LEDs_base
 s off
 f 5/1/1 6/2/1 7/3/1 8/4/1 9/5/1 10/6/1 11/7/1 12/8/1