Little refactoring

main.lua

@@ -1,17 +1,6 @@
-require "grid"
-require "point"
-require "line"
-
--- Returns local coords from global
-local function snapCoords( point )
-    local x = math.ceil( point.x / Config.cellSize )
-    local y = math.ceil( point.y / Config.cellSize )
-    return GridPoint:new( x, y )
-end
-
-local function vectorLength( startpoint, endpoint )
-    return math.sqrt( ( startpoint.x - endpoint.x ) ^ 2 +  ( startpoint.y - endpoint.y ) ^ 2 )
-end
+require 'grid'
+require 'point'
+require 'line'
 
 function love.load()
     love.graphics.setLineStyle( Config.lineStyle )
@@ -37,6 +26,9 @@ function love.load()
     )
     GameGrid:push( line2 )
 
+    ---@class Mouse
+    ---@field lastLine Line?
+    ---@field lastPoint Point?
     Mouse = {
         x = 0,
         y = 0,
@@ -60,11 +52,11 @@ function love.update( dt )
     Mouse.lastPoint = Mouse.point
     Mouse.lastPressed = Mouse.pressed
     Mouse.pressed = love.mouse.isDown( 1 )
-    Mouse.point = snapCoords( Point:new( Mouse.x, Mouse.y ) )
+    Mouse.point = GridPoint.snapCoords( Point:new( Mouse.x, Mouse.y ) )
     if Mouse.lastLine ~= nil then
         local pointsLen = #Mouse.lastLine.points
         local lastLinePoint = Mouse.lastLine.points[pointsLen]
-        if vectorLength( Mouse.point, lastLinePoint ) == 1
+        if Mouse.point:distanceTo( lastLinePoint ) == 1
             and GameGrid:inBounds( Mouse.point )
             and GameGrid:matchesLine( Mouse.point, true ) == nil
             and not lastLinePoint:equals( Mouse.lastLine.endpoint )
@@ -81,7 +73,7 @@ function love.update( dt )
 
     Mouse.dragged = Mouse.pressed
         and Mouse.startX > 0
-        and vectorLength(
+        and Point.distanceTo (
             Point:new( Mouse.x, Mouse.y ),
             Point:new( Mouse.startX, Mouse.startY )
         ) > Config.dragSensivity
@@ -114,5 +106,3 @@ function love.draw()
             love.graphics.print( tostring( Mouse.lastLine ), 128, 300 )
     end
 end
-
-