add interpolation between mouse movement points for smooth drawing

Author: otomist

Utils.jl

@@ -0,0 +1,47 @@
+module Utils
+
+
+
+export applyBetween
+
+# for now assume p1 and p2 are 2d [x,y]
+
+
+function applyBetween(p1::Vector, p2::Vector, f)
+    if (p1 == p2)
+        f(p1)
+        return
+    end
+    x1, y1 = p1
+    x2, y2 = p2
+
+    dx = x2 - x1
+    dy = y2 - y1
+    dxIsLarger = abs(dx) > abs(dy)
+
+    xModifier = dx < 0 ? -1 : 1
+    yModifier = dy < 0 ? -1 : 1
+
+    longerSideLength = dxIsLarger ? abs(dx) : abs(dy)
+    shorterSideLength = dxIsLarger ? abs(dy) : abs(dx)
+    slope = shorterSideLength == 0 || longerSideLength == 0 ? 0 : shorterSideLength / longerSideLength
+
+    for i in 0:longerSideLength
+        if (dxIsLarger)
+            f([x1 + i * xModifier, y1 + round(Int, i * slope) * yModifier])
+        else
+            f([x1 + round(Int, i * slope) * xModifier, y1 + i * yModifier])
+        end
+    end
+end
+
+
+# function getVoxelColor(type)
+#     type == Voxel.AIR ? Voxel.airColor :
+#     type == Voxel.STONE ? Voxel.stoneColor :
+#     type == Voxel.SAND ? Voxel.sandColor :
+#     _ => sfColor_fromRGBA(0, 0, 0, 255)
+
+# end
+
+end

constants.jl

@@ -0,0 +1,3 @@
+module 
+    
+end

main.jl

@@ -1,8 +1,10 @@
 using CSFML
 using CSFML.LibCSFML
 
+include("Utils.jl")
 include("Voxel.jl")
 using .Voxel: newVoxel
+using .Utils: applyBetween
 
 # enums of particle types, sand, stone, water, etc
 const AIR = 0
@@ -14,6 +16,7 @@ selectedBlock = SAND
 windowWidth = 640
 windowHeight = 480
 leftPressed = false
+prevPosition = nothing;
 
 # TODO figure out how I want to handle resizing and map size in general
 
@@ -68,24 +71,38 @@ function handleResize()
     return true
 end
 
-function updateClickedPixel()
+function updateClickedPixel(prevPosition)
     mousePos = sfMouse_getPositionRenderWindow(window)
     if mousePos.x < 0 || mousePos.x >= windowWidth || mousePos.y < 0 || mousePos.y >= windowHeight
         return
     end
 
-    # set boards voxel to new color
-    board[mousePos.y+1][mousePos.x+1] = newVoxel(selectedBlock)
-    if (selectedBlock == SAND)
-        moveableMap[[mousePos.y + 1, mousePos.x + 1]] = SAND
+    if prevPosition === nothing
+        global prevPosition = mousePos
+    else
+
+    end
+
+    function setPixel(point)
+        x = point[1]
+        y = point[2]
+        board[y+1][x+1] = newVoxel(selectedBlock)
+        if (selectedBlock == SAND)
+            moveableMap[[y + 1, x + 1]] = SAND
+        end
     end
+
+    applyBetween([prevPosition.x, prevPosition.y], [mousePos.x, mousePos.y], setPixel)
+
+    global prevPosition = mousePos
 end
 
 function physicsTick(board)
     # iterate over moveableMap and move particles down if air below them
     for (i, j) in keys(moveableMap)
         if i < windowHeight
             down1 = board[i+1][j]
+            # TODO check against swappable blocks instead of air
             if down1.type == AIR
                 board[i+1][j] = board[i][j]
                 board[i][j] = down1
@@ -110,16 +127,17 @@ function mouseHandler(event::sfEvent)
     isLeft = sfMouseLeft == event.mouseButton.button
     # rightPress = sfMouseRight == event.mouseButton.button
     if event.type == sfEvtMouseButtonPressed && isLeft
-        updateClickedPixel()
+        updateClickedPixel(prevPosition)
         global leftPressed = true
     end
 
     if event.type == sfEvtMouseMoved && leftPressed
-        updateClickedPixel()
+        updateClickedPixel(prevPosition)
     end
 
     if event.type == sfEvtMouseButtonReleased && isLeft
         global leftPressed = false
+        global prevPosition = nothing
     end
 end