Update in vctrl system

This commit is contained in:
Squishy (C6H12O6+NaCl+H2O)
2024-04-14 12:14:34 +07:00
parent 9cfeb04176
commit 7e7c5301c5
4 changed files with 80 additions and 24 deletions

View File

@@ -29,9 +29,9 @@ function love.load()
require "load.bigint"
loadSave()
require "scene"
require "game.VirtualControl" -- VCTRL
require "game.vctrl" -- VCTRL
love.mouse.setVisible(false)
-- love.mouse.setVisible(false)
love.window.setMode(love.graphics.getWidth(), love.graphics.getHeight(), {resizable = true});
GLOBAL_TRANSFORM = love.math.newTransform()
@@ -39,17 +39,26 @@ function love.load()
-- init config
initConfig()
love.window.setFullscreen(config["fullscreen"])
VCTRL.new{
{type='button',x= 100,y=320,icon= 'up',r=30,iconSize=60,alpha=1},
{type='button',x= 160,y=380,icon= 'right',r=30,iconSize=60,alpha=1},
{type='button',x= 100,y=440,icon= 'down',r=30,iconSize=60,alpha=1},
{type='button',x= 40,y=380,icon= 'left',r=30,iconSize=60,alpha=1},
{type='button',x=640-100,y=320,icon='rotate_right2',r=30,iconSize=60,alpha=1},
{type='button',x=640-160,y=380,icon= 'rotate_left2',r=30,iconSize=60,alpha=1},
{type='button',x=640-100,y=440,icon= 'rotate_right',r=30,iconSize=60,alpha=1},
{type='button',x=640- 40,y=380,icon= 'rotate_left',r=30,iconSize=60,alpha=1},
}
end
function love.resize(w, h)
local scale_factor = math.min(w / 640, h / 480)
GLOBAL_TRANSFORM:setTransformation(
(w - scale_factor * 640) / 2, -- x
(h - scale_factor * 480) / 2, -- y
0, -- orientation
(w - scale_factor * 640) / 2,
(h - scale_factor * 480) / 2,
0,
scale_factor
)
end
@@ -62,6 +71,23 @@ function love.draw()
scene:render()
VCTRL.draw()
love.graphics.setLineWidth(3)
love.graphics.rectangle('line',0,0,640,480)
-- -- Grid system
-- love.graphics.replaceTransform(GLOBAL_TRANSFORM)
-- love.graphics.setColor(1,1,1,0.5)
-- love.graphics.setLineWidth(1)
-- -- From 0 to X
-- for ix=1,math.floor(64) do
-- love.graphics.line(10*ix,0,10*ix,480)
-- end
-- -- From 0 to Y
-- for iy=1,math.floor(48) do
-- love.graphics.line(0,10*iy,640,10*iy)
-- end
love.graphics.pop()
if DEBUG_showKey then
@@ -69,6 +95,14 @@ function love.draw()
end
end
function love.mousepressed(x,y,id)
local x,y=GLOBAL_TRANSFORM:inverseTransformPoint(x,y)
VCTRL.press(x,y,id)
end
function love.mousereleased(x,y,id)
VCTRL.release(id)
end
function love.keypressed(key, scancode)
local input_pressed=nil