Another change

main.lua

@@ -1,6 +1,6 @@
 if os.getenv("LOCAL_LUA_DEBUGGER_VSCODE")=="1" then
-    LLDEBUGGER=require('lldebugger')
-    LLDEBUGGER.start()
+	LLDEBUGGER=require('lldebugger')
+	LLDEBUGGER.start()
 end
 
 function love.load()
@@ -17,7 +17,7 @@ function love.load()
 	require "load.version"
 
 	require "funcs"
-	TOUCH_SETTINGS = require 'mobile_libs.settings'
+	TOUCH_SETTINGS = require 'mobile_libs.touch_settings'
 	BUTTON = require 'mobile_libs.simple-button'
 	BUTTON.setDefaultOption{
 		draw = function(self)
@@ -62,6 +62,8 @@ function love.load()
 		font=font_3x5_2,
 	}
 	require 'mobile_libs.vctrl'
+	VCTRL.new(TOUCH_SETTINGS.bind[1])
+	VCTRL.toggle(true)
 
 	loadSave()
 	require "scene"
@@ -136,6 +138,7 @@ function love.draw()
 	love.graphics.scale(scale_factor)
 
 	scene:render()
+	if scene.title ~= TouchConfigScene.title then VCTRL.draw() end
 
 	if config.gamesettings.display_gamemode == 1 or scene.title == "Title" then
 		love.graphics.setFont(font_3x5_2)
@@ -335,10 +338,51 @@ function love.joystickhat(joystick, hat, direction)
 	end
 end
 
+function love.mousepressed(x, y, b, isTouch, presses)
+	if isTouch then return end
+	local x,y=GLOBAL_TRANSFORM:inverseTransformPoint(x,y)
+	if scene.title ~= 'Touchscreen configuration' and VCTRL.press(x, y, 1) then
+		return -- Avoid duplicate
+	end
+	scene:onInputPress{type = "mouse", x = x, y = y, presses = presses}
+end
+function love.mousereleased(x, y, b, isTouch, presses)
+	if isTouch then return end
+	local x,y=GLOBAL_TRANSFORM:inverseTransformPoint(x,y)
+	if scene.title ~= 'Touchscreen configuration' and VCTRL.release(1) then
+		return -- Avoid duplicate
+	end
+	scene:onInputRelease{type = "mouse", x = x, y = y, presses = presses}
+end
+function love.mousemoved(x, y, dx, dy, isTouch)
+	if isTouch then return end
+	local x,y=GLOBAL_TRANSFORM:inverseTransformPoint(x,y)
+	local dx,dy=dx/SCREEN_SCALE_FACTOR,dy/SCREEN_SCALE_FACTOR
+	scene:onInputMove{type = "mouse", x = x, y = y, dx = dx, dy = dy}
+end
 function love.wheelmoved(x, y)
 	scene:onInputPress({input=nil, type="wheel", x=x, y=y})
 end
 
+function love.touchpressed(id,x,y)
+	local x,y=GLOBAL_TRANSFORM:inverseTransformPoint(x,y)
+	if scene.title ~= 'Touchscreen configuration' and VCTRL.press(x, y, id) then
+		return -- Avoid duplicate
+	end
+	scene:onInputPress{type = "touch", x = x, y = y, dx = 0, dy = 0, id = id}
+end
+function love.touchreleased(id,x,y)
+	local x,y=GLOBAL_TRANSFORM:inverseTransformPoint(x,y)
+	if scene.title ~= 'Touchscreen configuration' and VCTRL.release(id) then
+		return -- Avoid duplicate
+	end
+	scene:onInputRelease{type = "touch", x = x, y = y, dx = 0, dy = 0, id = id}
+end
+function love.touchmoved(id,x,y,dx,dy)
+	local x,y=GLOBAL_TRANSFORM:inverseTransformPoint(x,y)
+	scene:onInputMove{type = "touch", x = x, y = y, dx = dx, dy = dy, id = id}
+end
+
 function love.resize(w, h)
 	GLOBAL_CANVAS:release()
 	GLOBAL_CANVAS = love.graphics.newCanvas(w, h)

mobile_libs/bitser.lua

@@ -0,0 +1,496 @@
+--[[
+Copyright (c) 2020, Jasmijn Wellner
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+]]
+
+local VERSION = '1.1'
+
+local floor = math.floor
+local pairs = pairs
+local type = type
+local insert = table.insert
+local getmetatable = getmetatable
+local setmetatable = setmetatable
+
+local ffi = require("ffi")
+local buf_pos = 0
+local buf_size = -1
+local buf = nil
+local buf_is_writable = true
+local writable_buf = nil
+local writable_buf_size = nil
+local includeMetatables = true -- togglable with bitser.includeMetatables(false)
+local SEEN_LEN = {}
+
+local function Buffer_prereserve(min_size)
+	if buf_size < min_size then
+		buf_size = min_size
+		buf = ffi.new("uint8_t[?]", buf_size)
+		buf_is_writable = true
+	end
+end
+
+local function Buffer_clear()
+	buf_size = -1
+	buf = nil
+	buf_is_writable = true
+	writable_buf = nil
+	writable_buf_size = nil
+end
+
+local function Buffer_makeBuffer(size)
+	if not buf_is_writable then
+		buf = writable_buf
+		buf_size = writable_buf_size
+		writable_buf = nil
+		writable_buf_size = nil
+		buf_is_writable = true
+	end
+	buf_pos = 0
+	Buffer_prereserve(size)
+end
+
+local function Buffer_newReader(str)
+	Buffer_makeBuffer(#str)
+	ffi.copy(buf, str, #str)
+end
+
+local function Buffer_newDataReader(data, size)
+	if buf_is_writable then
+		writable_buf = buf
+		writable_buf_size = buf_size
+	end
+	buf_is_writable = false
+	buf_pos = 0
+	buf_size = size
+	buf = ffi.cast("uint8_t*", data)
+end
+
+local function Buffer_reserve(additional_size)
+	while buf_pos + additional_size > buf_size do
+		buf_size = buf_size * 2
+		local oldbuf = buf
+		buf = ffi.new("uint8_t[?]", buf_size)
+		buf_is_writable = true
+		ffi.copy(buf, oldbuf, buf_pos)
+	end
+end
+
+local function Buffer_write_byte(x)
+	Buffer_reserve(1)
+	buf[buf_pos] = x
+	buf_pos = buf_pos + 1
+end
+
+local function Buffer_write_raw(data, len)
+	Buffer_reserve(len)
+	ffi.copy(buf + buf_pos, data, len)
+	buf_pos = buf_pos + len
+end
+
+local function Buffer_write_string(s)
+	Buffer_write_raw(s, #s)
+end
+
+local function Buffer_write_data(ct, len, ...)
+	Buffer_write_raw(ffi.new(ct, ...), len)
+end
+
+local function Buffer_ensure(numbytes)
+	if buf_pos + numbytes > buf_size then
+		error("malformed serialized data")
+	end
+end
+
+local function Buffer_read_byte()
+	Buffer_ensure(1)
+	local x = buf[buf_pos]
+	buf_pos = buf_pos + 1
+	return x
+end
+
+local function Buffer_read_string(len)
+	Buffer_ensure(len)
+	local x = ffi.string(buf + buf_pos, len)
+	buf_pos = buf_pos + len
+	return x
+end
+
+local function Buffer_read_raw(data, len)
+	ffi.copy(data, buf + buf_pos, len)
+	buf_pos = buf_pos + len
+	return data
+end
+
+local function Buffer_read_data(ct, len)
+	return Buffer_read_raw(ffi.new(ct), len)
+end
+
+local resource_registry = {}
+local resource_name_registry = {}
+local class_registry = {}
+local class_name_registry = {}
+local classkey_registry = {}
+local class_deserialize_registry = {}
+
+local serialize_value
+
+local function write_number(value, _)
+	if floor(value) == value and value >= -2147483648 and value <= 2147483647 then
+		if value >= -27 and value <= 100 then
+			--small int
+			Buffer_write_byte(value + 27)
+		elseif value >= -32768 and value <= 32767 then
+			--short int
+			Buffer_write_byte(250)
+			Buffer_write_data("int16_t[1]", 2, value)
+		else
+			--long int
+			Buffer_write_byte(245)
+			Buffer_write_data("int32_t[1]", 4, value)
+		end
+	else
+		--double
+		Buffer_write_byte(246)
+		Buffer_write_data("double[1]", 8, value)
+	end
+end
+
+local function write_string(value, _)
+	if #value < 32 then
+		--short string
+		Buffer_write_byte(192 + #value)
+	else
+		--long string
+		Buffer_write_byte(244)
+		write_number(#value)
+	end
+	Buffer_write_string(value)
+end
+
+local function write_nil(_, _)
+	Buffer_write_byte(247)
+end
+
+local function write_boolean(value, _)
+	Buffer_write_byte(value and 249 or 248)
+end
+
+local function write_table(value, seen)
+	local classkey
+	local metatable = getmetatable(value)
+	local classname = (class_name_registry[value.class] -- MiddleClass
+		or class_name_registry[value.__baseclass] -- SECL
+		or class_name_registry[metatable] -- hump.class
+		or class_name_registry[value.__class__] -- Slither
+		or class_name_registry[value.__class]) -- Moonscript class
+	if classname then
+		classkey = classkey_registry[classname]
+		Buffer_write_byte(242)
+		serialize_value(classname, seen)
+	elseif includeMetatables and metatable then
+		Buffer_write_byte(253)
+	else
+		Buffer_write_byte(240)
+	end
+	local len = #value
+	write_number(len, seen)
+	for i = 1, len do
+		serialize_value(value[i], seen)
+	end
+	local klen = 0
+	for k in pairs(value) do
+		if (type(k) ~= 'number' or floor(k) ~= k or k > len or k < 1) and k ~= classkey then
+			klen = klen + 1
+		end
+	end
+	write_number(klen, seen)
+	for k, v in pairs(value) do
+		if (type(k) ~= 'number' or floor(k) ~= k or k > len or k < 1) and k ~= classkey then
+			serialize_value(k, seen)
+			serialize_value(v, seen)
+		end
+	end
+	if includeMetatables and metatable and not classname then
+		serialize_value(metatable, seen)
+	end
+end
+
+local function write_cdata(value, seen)
+	local ty = ffi.typeof(value)
+	if ty == value then
+		-- ctype
+		Buffer_write_byte(251)
+		serialize_value(tostring(ty):sub(7, -2), seen)
+		return
+	end
+	-- cdata
+	Buffer_write_byte(252)
+	serialize_value(ty, seen)
+	local len = ffi.sizeof(value)
+	write_number(len)
+	Buffer_write_raw(ffi.typeof('$[1]', ty)(value), len)
+end
+
+local types = {number = write_number, string = write_string, table = write_table, boolean = write_boolean, ["nil"] = write_nil, cdata = write_cdata}
+
+serialize_value = function(value, seen)
+	if seen[value] then
+		local ref = seen[value]
+		if ref < 64 then
+			--small reference
+			Buffer_write_byte(128 + ref)
+		else
+			--long reference
+			Buffer_write_byte(243)
+			write_number(ref, seen)
+		end
+		return
+	end
+	local t = type(value)
+	if t ~= 'number' and t ~= 'boolean' and t ~= 'nil' and t ~= 'cdata' then
+		seen[value] = seen[SEEN_LEN]
+		seen[SEEN_LEN] = seen[SEEN_LEN] + 1
+	end
+	if resource_name_registry[value] then
+		local name = resource_name_registry[value]
+		if #name < 16 then
+			--small resource
+			Buffer_write_byte(224 + #name)
+			Buffer_write_string(name)
+		else
+			--long resource
+			Buffer_write_byte(241)
+			write_string(name, seen)
+		end
+		return
+	end
+	(types[t] or
+		error("cannot serialize type " .. t)
+		)(value, seen)
+end
+
+local function serialize(value)
+	Buffer_makeBuffer(4096)
+	local seen = {[SEEN_LEN] = 0}
+	serialize_value(value, seen)
+end
+
+local function add_to_seen(value, seen)
+	insert(seen, value)
+	return value
+end
+
+local function reserve_seen(seen)
+	insert(seen, 42)
+	return #seen
+end
+
+local function deserialize_value(seen)
+	local t = Buffer_read_byte()
+	if t < 128 then
+		--small int
+		return t - 27
+	elseif t < 192 then
+		--small reference
+		return seen[t - 127]
+	elseif t < 224 then
+		--small string
+		return add_to_seen(Buffer_read_string(t - 192), seen)
+	elseif t < 240 then
+		--small resource
+		return add_to_seen(resource_registry[Buffer_read_string(t - 224)], seen)
+	elseif t == 240 or t == 253 then
+		--table
+		local v = add_to_seen({}, seen)
+		local len = deserialize_value(seen)
+		for i = 1, len do
+			v[i] = deserialize_value(seen)
+		end
+		len = deserialize_value(seen)
+		for _ = 1, len do
+			local key = deserialize_value(seen)
+			v[key] = deserialize_value(seen)
+		end
+		if t == 253 then
+			if includeMetatables then
+				setmetatable(v, deserialize_value(seen))
+			end
+		end
+		return v
+	elseif t == 241 then
+		--long resource
+		local idx = reserve_seen(seen)
+		local value = resource_registry[deserialize_value(seen)]
+		seen[idx] = value
+		return value
+	elseif t == 242 then
+		--instance
+		local instance = add_to_seen({}, seen)
+		local classname = deserialize_value(seen)
+		local class = class_registry[classname]
+		local classkey = classkey_registry[classname]
+		local deserializer = class_deserialize_registry[classname]
+		local len = deserialize_value(seen)
+		for i = 1, len do
+			instance[i] = deserialize_value(seen)
+		end
+		len = deserialize_value(seen)
+		for _ = 1, len do
+			local key = deserialize_value(seen)
+			instance[key] = deserialize_value(seen)
+		end
+		if classkey then
+			instance[classkey] = class
+		end
+		return deserializer(instance, class)
+	elseif t == 243 then
+		--reference
+		return seen[deserialize_value(seen) + 1]
+	elseif t == 244 then
+		--long string
+		return add_to_seen(Buffer_read_string(deserialize_value(seen)), seen)
+	elseif t == 245 then
+		--long int
+		return Buffer_read_data("int32_t[1]", 4)[0]
+	elseif t == 246 then
+		--double
+		return Buffer_read_data("double[1]", 8)[0]
+	elseif t == 247 then
+		--nil
+		return nil
+	elseif t == 248 then
+		--false
+		return false
+	elseif t == 249 then
+		--true
+		return true
+	elseif t == 250 then
+		--short int
+		return Buffer_read_data("int16_t[1]", 2)[0]
+	elseif t == 251 then
+		--ctype
+		return ffi.typeof(deserialize_value(seen))
+	elseif t == 252 then
+		local ctype = deserialize_value(seen)
+		local len = deserialize_value(seen)
+		local read_into = ffi.typeof('$[1]', ctype)()
+		Buffer_read_raw(read_into, len)
+		return ctype(read_into[0])
+	else
+		error("unsupported serialized type " .. t)
+	end
+end
+
+local function deserialize_MiddleClass(instance, class)
+	return setmetatable(instance, class.__instanceDict)
+end
+
+local function deserialize_SECL(instance, class)
+	return setmetatable(instance, getmetatable(class))
+end
+
+local deserialize_humpclass = setmetatable
+
+local function deserialize_Slither(instance, class)
+	return getmetatable(class).allocate(instance)
+end
+
+local function deserialize_Moonscript(instance, class)
+	return setmetatable(instance, class.__base)
+end
+
+return {dumps = function(value)
+	serialize(value)
+	return ffi.string(buf, buf_pos)
+end, dumpLoveFile = function(fname, value)
+	serialize(value)
+	assert(love.filesystem.write(fname, ffi.string(buf, buf_pos)))
+end, loadLoveFile = function(fname)
+	local serializedData, error = love.filesystem.newFileData(fname)
+	assert(serializedData, error)
+	Buffer_newDataReader(serializedData:getPointer(), serializedData:getSize())
+	local value = deserialize_value({})
+	-- serializedData needs to not be collected early in a tail-call
+	-- so make sure deserialize_value returns before loadLoveFile does
+	return value
+end, loadData = function(data, size)
+	if size == 0 then
+		error('cannot load value from empty data')
+	end
+	Buffer_newDataReader(data, size)
+	return deserialize_value({})
+end, loads = function(str)
+	if #str == 0 then
+		error('cannot load value from empty string')
+	end
+	Buffer_newReader(str)
+	return deserialize_value({})
+end, includeMetatables = function(bool)
+	includeMetatables = not not bool
+end, register = function(name, resource)
+	assert(not resource_registry[name], name .. " already registered")
+	resource_registry[name] = resource
+	resource_name_registry[resource] = name
+	return resource
+end, unregister = function(name)
+	resource_name_registry[resource_registry[name]] = nil
+	resource_registry[name] = nil
+end, registerClass = function(name, class, classkey, deserializer)
+	if not class then
+		class = name
+		name = class.__name__ or class.name or class.__name
+	end
+	if not classkey then
+		if class.__instanceDict then
+			-- assume MiddleClass
+			classkey = 'class'
+		elseif class.__baseclass then
+			-- assume SECL
+			classkey = '__baseclass'
+		end
+		-- assume hump.class, Slither, Moonscript class or something else that doesn't store the
+		-- class directly on the instance
+	end
+	if not deserializer then
+		if class.__instanceDict then
+			-- assume MiddleClass
+			deserializer = deserialize_MiddleClass
+		elseif class.__baseclass then
+			-- assume SECL
+			deserializer = deserialize_SECL
+		elseif class.__index == class then
+			-- assume hump.class
+			deserializer = deserialize_humpclass
+		elseif class.__name__ then
+			-- assume Slither
+			deserializer = deserialize_Slither
+		elseif class.__base then
+			-- assume Moonscript class
+			deserializer = deserialize_Moonscript
+		else
+			error("no deserializer given for unsupported class library")
+		end
+	end
+	class_registry[name] = class
+	classkey_registry[name] = classkey
+	class_deserialize_registry[name] = deserializer
+	class_name_registry[class] = name
+	return class
+end, unregisterClass = function(name)
+	class_name_registry[class_registry[name]] = nil
+	classkey_registry[name] = nil
+	class_deserialize_registry[name] = nil
+	class_registry[name] = nil
+end, reserveBuffer = Buffer_prereserve, clearBuffer = Buffer_clear, version = VERSION}

mobile_libs/file.lua

@@ -1,6 +1,6 @@
 local FILE = {}
 local binser = require "libs.binser"
--- local bitser = require "libs.bitser"
+local bitser = require "mobile_libs.bitser"
 
 local serializer_used
 
@@ -37,5 +37,5 @@ end
 return function(lib_name)
     assert(lib_name == 'bitser' or lib_name == 'binser', '[lib_name] must be "bitser" or "binser"')
     serializer_used = lib_name
-    _G.FILE = FILE
+    return FILE
 end

mobile_libs/settings.lua

@@ -1,38 +0,0 @@
-local fs = love.filesystem
-
-local CONFIG_FILE = '/mobile/touch_config.txt'
-local _settings = fs.read(CONFIG_FILE) ~= nil and FILE.read(CONFIG_FILE) or {}
-local _defaultSettings = {
-    firstTime = true,
-    __default__={
-        {type='button',x=     70,y=280,key=           'up',r=45,iconSize=60,alpha=0.4},
-        {type='button',x=     70,y=430,key=         'down',r=45,iconSize=60,alpha=0.4},
-        {type='button',x=     -5,y=355,key=         'left',r=45,iconSize=60,alpha=0.4},
-        {type='button',x=    145,y=355,key=        'right',r=45,iconSize=60,alpha=0.4},
-        {type='button',x=640- -5,y=355,key=  'rotate_left',r=45,iconSize=60,alpha=0.4},
-        {type='button',x=640-145,y=355,key= 'rotate_left2',r=45,iconSize=60,alpha=0.4},
-        {type='button',x=640- 70,y=430,key= 'rotate_right',r=45,iconSize=60,alpha=0.4},
-        {type='button',x=640- 70,y=280,key='rotate_right2',r=45,iconSize=60,alpha=0.4},
-        {type='button',x=320,    y=420,key=      'restart',r=35,iconSize=60,alpha=0.4},
-    },
-
-    ---@type table<string,string>[]
-    bind = {},
-}
-
-return setmetatable(
-    {__default__ = _defaultSettings},
-    {
-        __index = function(_, k)
-            if _settings[k] == nil then
-                _settings[k] = _defaultSettings[k]
-                FILE.write(CONFIG_FILE,_settings)
-            end
-            return _settings[k]
-        end,
-        __newindex = function(_, k, v)
-            _settings[k] = v
-            FILE.write(CONFIG_FILE,_settings)
-        end
-    }
-)

mobile_libs/touch_settings.lua

@@ -0,0 +1,67 @@
+local fs = love.filesystem
+local FILE=require'mobile_libs.file''binser'
+
+local CONFIG_FILE = 'mobile/touch_config.txt'
+love.filesystem.createDirectory('mobile')
+local _settings = fs.read(CONFIG_FILE) ~= nil and FILE.read(CONFIG_FILE) or {}
+local _defaultSettings = {
+    firstTime = true,
+
+    ---@type table<string,string>[]
+    bind = {
+        {
+            {type='button',x=  1 *  70 + 120,y =  1 * 70 + 120, r = 30, key=            'up',iconSize=50},
+            {type='button',x=  2 *  70 + 120,y =  1 * 70 + 120, r = 30, key=          'down',iconSize=50},
+            {type='button',x=  3 *  70 + 120,y =  1 * 70 + 120, r = 30, key=          'left',iconSize=50},
+            {type='button',x=  4 *  70 + 120,y =  1 * 70 + 120, r = 30, key=         'right',iconSize=50},
+            {type='button',x=  5 *  70 + 120,y =  1 * 70 + 120, r = 30, key=   'menu_decide',iconSize=50},
+
+            {type='button',x=  1 *  70 + 120,y =  2 * 70 + 120, r = 30, key=   'rotate_left',iconSize=50},
+            {type='button',x=  2 *  70 + 120,y =  2 * 70 + 120, r = 30, key=  'rotate_left2',iconSize=50},
+            {type='button',x=  3 *  70 + 120,y =  2 * 70 + 120, r = 30, key=  'rotate_right',iconSize=50},
+            {type='button',x=  4 *  70 + 120,y =  2 * 70 + 120, r = 30, key= 'rotate_right2',iconSize=50},
+            {type='button',x=  5 *  70 + 120,y =  2 * 70 + 120, r = 30, key=         'retry',iconSize=50},
+
+            {type='button',x=  1 *  70 + 120,y =  3 * 70 + 120, r = 30, key=             '1',iconSize=50},
+            {type='button',x=  2 *  70 + 120,y =  3 * 70 + 120, r = 30, key=             '2',iconSize=50},
+            {type='button',x=  3 *  70 + 120,y =  3 * 70 + 120, r = 30, key=             '3',iconSize=50},
+            {type='button',x=  4 *  70 + 120,y =  3 * 70 + 120, r = 30, key=             '4',iconSize=50},
+            {type='button',x=  5 *  70 + 120,y =  3 * 70 + 120, r = 30, key=             '5',iconSize=50},
+
+        --  {type='button',x=  1 *  70 + 120,y =  4 * 70 + 120, r = 30, key=            'up',iconSize=50},
+            {type='button',x=  2 *  70 + 120,y =  4 * 70 + 120, r = 30, key='touch_settings',iconSize=50},
+            {type='button',x=  3 *  70 + 120,y =  4 * 70 + 120, r = 30, key=    'align_view',iconSize=50},
+            {type='button',x=  4 *  70 + 120,y =  4 * 70 + 120, r = 30, key=     'menu_back',iconSize=50},
+        --  {type='button',x=  5 *  70 + 120,y =  4 * 70 + 120, r = 30, key=            'up',iconSize=50},
+
+        }, -- 1
+        {
+            {type='button',x=     70,y=280,key=           'up',r=45,iconSize=60,alpha=0.4,shape='circle'},
+            {type='button',x=     70,y=430,key=         'down',r=45,iconSize=60,alpha=0.4,shape='circle'},
+            {type='button',x=     -5,y=355,key=         'left',r=45,iconSize=60,alpha=0.4,shape='circle'},
+            {type='button',x=    145,y=355,key=        'right',r=45,iconSize=60,alpha=0.4,shape='circle'},
+            {type='button',x=640- -5,y=355,key=  'rotate_left',r=45,iconSize=60,alpha=0.4,shape='circle'},
+            {type='button',x=640-145,y=355,key= 'rotate_left2',r=45,iconSize=60,alpha=0.4,shape='circle'},
+            {type='button',x=640- 70,y=430,key= 'rotate_right',r=45,iconSize=60,alpha=0.4,shape='circle'},
+            {type='button',x=640- 70,y=280,key='rotate_right2',r=45,iconSize=60,alpha=0.4,shape='circle'},
+            {type='button',x=320,    y=420,key=        'retry',r=35,iconSize=60,alpha=0.4,shape='circle'},
+        }  -- 2
+    },
+}
+
+return setmetatable(
+    {__default__ = _defaultSettings},
+    {
+        __index = function(_, k)
+            if _settings[k] == nil then
+                _settings[k] = _defaultSettings[k]
+                FILE.write(CONFIG_FILE,_settings)
+            end
+            return _settings[k]
+        end,
+        __newindex = function(_, k, v)
+            _settings[k] = v
+            FILE.write(CONFIG_FILE,_settings)
+        end
+    }
+)

mobile_libs/vctrl.lua

@@ -15,34 +15,34 @@ local function mDrawQ(obj,quad,x,y,a,k)
     love.graphics.draw(obj,quad,x,y,a,k,nil,w*.5,h*.5)
 end
 
-local empty_quad
+local alternativePfunction={}
+local alternativeRfunction={
+    touch_settings=function()
+        if (
+            scene.title ~= 'Game' and
+            scene.title ~= TouchConfigScene.title
+        ) then
+            scene = TouchConfigScene()
+        end
+    end
+}
+
+local empty_quad=gc_newQuad(1,1,1,1,1,1)
 -- A table containing quads used to draw icons for virtual control system.
--- local virtual_quad=setmetatable((function()
---     local t={}
---     local w=180
---     empty_quad=gc_newQuad(0,0,1,1,5*w,7*w)
---     for i,name in next,{
---         'left','right','up','down','',
---         'rotate_right','rotate_left','','','',
---         '','','','','',
---         '','','','','',
---         '','','menu_back','','',
---         '','','','','',
---         '','','','','menu_decide',
---     } do if #name>0 then t[name]=gc_newQuad((i-1)%5*w,math.floor((i-1)/5)*w,w,w,5*w,7*w) end end
---     t.rotate_right2, t.rotate_left2 = t.rotate_right, t.rotate_left
---     return t
--- end)(),{
---     __index=function() return empty_quad end
--- })
 local virtual_quad=setmetatable((function()
     local t={}
     local w=180
-    empty_quad=gc_newQuad(0,0,1,1,5*w,2*w)
+    empty_quad=gc_newQuad(0,0,1,1,5*w,7*w)
     for i,name in next,{
-        'left','right','up','down','restart',
-        'rotate_right','rotate_left','rotate_right2','rotate_left2'
-    } do if #name>0 then t[name]=gc_newQuad((i-1)%5*w,math.floor((i-1)/5)*w,w,w,5*w,2*w) end end
+        'left','right','up','down','',
+        'rotate_right','rotate_left','rotate_180','hold','align_view',
+        '','','','','',
+        '1','2','3','4','5',
+        '','retry','','menu_back','',
+        'touch_settings','','','','',
+        '','','','','menu_decide',
+    } do if #name>0 then t[name]=gc_newQuad((i-1)%5*w,math.floor((i-1)/5)*w,w,w,5*w,7*w) end end
+    t.rotate_right2, t.rotate_left2 = t.rotate_right, t.rotate_left
     return t
 end)(),{
     __index=function() return empty_quad end
@@ -61,11 +61,11 @@ function control_type.button:new(data)
         x=data.x or 320,
         y=data.y or 240,
         r=data.r or 80, -- size
-        shape=data.shape or 'circle',
+        shape=data.shape or 'square',
         key=data.key or 'X',
         iconSize=data.iconSize or 60,
         alpha=data.alpha or 0.75,
-        quad=virtual_quad[data.key]
+        quad=virtual_quad[data.key],
     },self)
 end
 function control_type.button:export()
@@ -78,7 +78,7 @@ function control_type.button:export()
         shape = self.shape,
         key = self.key,
         iconSize = self.iconSize,
-        alpha = self.alpha
+        alpha = self.alpha,
     }
 end
 function control_type.button:reset()
@@ -91,13 +91,21 @@ function control_type.button:press(_,_,id)
     self.lastPressTime=love.timer.getTime()
     self.pressingID=id
     -- love.keypressed(self.key, love.keyboard.getScancodeFromKey(self.key))
-    SCENE:onInputPress{input=self.key,type="virtual"}
+    if alternativePfunction[self.key] then
+        alternativePfunction[self.key]()
+    else
+        scene:onInputPress{input=self.key,type="virtual"}
+    end
 end
 function control_type.button:release()
     self.pressed=false
     self.pressingID=false
     -- love.keyreleased(self.key,love.keyboard.getScancodeFromKey(self.key))
-    SCENE:onInputRelease{input=self.key,type="virtual"}
+    if alternativeRfunction[self.key] then
+        alternativeRfunction[self.key]()
+    else
+        scene:onInputRelease{input=self.key,type="virtual"}
+    end
 end
 function control_type.button:drag(dx,dy)
     self.x,self.y=self.x+dx,self.y+dy
@@ -158,6 +166,8 @@ VCTRL.hasChanged = false
 ---@field iconSize? number
 ---@field alpha? number
 ---@field show? boolean
+---@field pressFunc function|nil
+---@field releaseFunc function|nil
 
 ---@param ... VCTRL.data[]
 ---Adding (multiple) virtual button(s)
@@ -165,6 +175,14 @@ function VCTRL.new(...)
     for _,d in pairs(...) do table.insert(VCTRL,control_type[d.type]:new(d)) end
 end
 
+---@param key string
+---@param pfunc function|nil
+---@param rfunc function|nil
+function VCTRL.setAltFunction(key,pfunc,rfunc)
+    alternativePfunction[key] = pfunc
+    alternativeRfunction[key] = rfunc
+end
+
 ---@param toggle boolean|false
 ---Enabling virtual control or not
 function VCTRL.toggle(toggle)

mobile_scene/touch_config.lua

@@ -1,6 +1,6 @@
 ---@diagnostic disable: cast-local-type
 local TouchConfigScene = Scene:extend()
-TouchConfigScene.title = "Touchscreen config"
+TouchConfigScene.title = "Touchscreen configuration"
 
 local function roundUnit(n,u)
 	local u = u or 1
@@ -12,6 +12,12 @@ local function drawText(text, x, y, size, orientation, color)
 	love.graphics.setColor(color)
 	love.graphics.printf(text, x, y, size*2, orientation, nil, 0.5)
 end
+local function math_clamp(x, min, max)
+    if max < min then
+        min, max = max, min
+    end
+    return x < min and min or (x > max and max or x)
+end
 
 local buttonList
 local sliderList = {}
@@ -25,9 +31,9 @@ local function exitSceneFunc(saved)
 	VCTRL.release()
 	BUTTON.release(buttonList)
 	if TOUCH_SETTINGS.firstTime and not saved then
-		SCENE = InputConfigScene(true)
+		scene = InputConfigScene(true)
 	else
-		SCENE = TitleScene()
+		scene = TitleScene()
 		TOUCH_SETTINGS.firstTime = false
 	end
 end
@@ -56,7 +62,7 @@ buttonList = {
 	--     codeWhenReleased = function()
 	--         VCTRL.release()
 	--         BUTTON.release(buttonList)
-	--         SCENE = TouchConfigPreviewScene()
+	--         scene = TouchConfigPreviewScene()
 	--     end
 	-- },
 	resetAll = BUTTON.new{
@@ -72,8 +78,8 @@ buttonList = {
 				VCTRL.focus = nil; focusingButton = nil
 				VCTRL.hasChanged = false
 				VCTRL.clearAll()
-				VCTRL.new(TOUCH_SETTINGS.__default__)
-				TOUCH_SETTINGS.bind[1] = TOUCH_SETTINGS.__default__
+				VCTRL.new(TOUCH_SETTINGS.__default__.bind[1])
+				TOUCH_SETTINGS.bind[1] = TOUCH_SETTINGS.__default__.bind[1]
 			end
 		end
 	},
@@ -94,7 +100,7 @@ buttonList = {
 					exitSceneFunc(true)
 				elseif selection == 2 then
 					VCTRL.clearAll()
-					VCTRL.new(TOUCH_SETTINGS.bind[1])
+					VCTRL.new(TOUCH_SETTINGS.bind[1] or {})
 					-- love.window.showMessageBox("Discarded!", "Your changes was discarded!")
 
 					exitSceneFunc()
@@ -239,16 +245,12 @@ function TouchConfigScene:render()
 
 	for _, v in ipairs(VCTRL) do
 		if v ~= focusingButton then
-			v:draw(
-				focusingButton and
-				(v.show and 0.5 or 0.1) or
-				(v.show and 1 or 0.5)
-			)
+			v:draw(v.alpha * (focusingButton and 0.25 or 1))
 		end
 	end
 	if focusingButton then
 		focusingButton:draw(
-			math.clamp(
+			math_clamp(
 				math.sin(love.timer.getTime()*4)*.5+0.1,
 				focusingButton.show and 1 or 0.1, 1
 			)
@@ -259,7 +261,7 @@ function TouchConfigScene:render()
 	BUTTON.draw(buttonList)
 end
 
----@param e SCENE_onInput
+
 function TouchConfigScene:onInputMove(e)
 	if e.type == "touch" or (e.type == "mouse" and love.mouse.isDown(1)) then
 		if VCTRL.drag(e.dx, e.dy, e.id or 1) then VCTRL.hasChanged = true end
@@ -267,7 +269,7 @@ function TouchConfigScene:onInputMove(e)
 		BUTTON.checkHovering(buttonList, e.x, e.y)
 	end
 end
----@param e SCENE_onInput
+
 function TouchConfigScene:onInputPress(e)
 	if e.type == "mouse" or e.type == "touch" then
 		if not (
@@ -281,7 +283,7 @@ function TouchConfigScene:onInputPress(e)
 		end
 	end
 end
----@param e SCENE_onInput
+
 function TouchConfigScene:onInputRelease(e)
 	if e.type == "mouse" or e.type == "touch" then
 		if not BUTTON.release(buttonList, e.x, e.y, e.id) then

scene.lua

@@ -5,8 +5,9 @@ Scene = Object:extend()
 function Scene:new() end
 function Scene:update() end
 function Scene:render() end
-function Scene:onInputPress() end
-function Scene:onInputRelease() end
+function Scene:onInputMove(e) end
+function Scene:onInputPress(e) end
+function Scene:onInputRelease(e) end
 
 ExitScene = require "scene.exit"
 GameScene = require "scene.game"