Some minor refactoring

igr · May 5, 2024 · 57d6892 · 57d6892
1 parent b9db910
commit 57d6892
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/arts/falllines/src/main/kotlin/dev/oblac/gart/Falllines.kt b/arts/falllines/src/main/kotlin/dev/oblac/gart/Falllines.kt
@@ -5,7 +5,7 @@ import dev.oblac.gart.color.alpha
 import dev.oblac.gart.color.rgb
 import dev.oblac.gart.gfx.fillOf
 import dev.oblac.gart.math.GOLDEN_RATIO
-import dev.oblac.gart.pixels.scrollPixelsUp
+import dev.oblac.gart.pixels.scrollUp
 import org.jetbrains.skia.Canvas
 import org.jetbrains.skia.Rect
 import kotlin.random.Random
@@ -104,7 +104,7 @@ private fun <T> Array<T>.switch(a: Int, b: Int): Array<T> {
 
 fun draw(canvas: Canvas) {
     b.updatePixelsFromCanvas()
-    scrollPixelsUp(b, 1)
+    b.scrollUp(1)
 
     for (x in 0 until w) {
         val g = Random.nextInt(30)

diff --git a/gart/src/main/kotlin/dev/oblac/gart/gfx/points.kt b/gart/src/main/kotlin/dev/oblac/gart/gfx/points.kt
@@ -2,6 +2,7 @@ package dev.oblac.gart.gfx
 
 import dev.oblac.gart.Dimension
 import dev.oblac.gart.math.Vector
+import dev.oblac.gart.math.dist
 import org.jetbrains.skia.Point
 
 fun Point.isInside(dimension: Dimension) =
@@ -16,3 +17,11 @@ fun Point.fromCenter(d: Dimension, fl: Float = 1f): Point {
     val y = d.cy + y * fl
     return Point(x, y)
 }
+
+/**
+ * Returns the distance between two points.
+ * @see dist
+ */
+fun Point.distanceTo(p: Point): Float {
+    return dist(this, p)
+}
diff --git a/...in/kotlin/dev/oblac/gart/math/Distance.kt → ...in/kotlin/dev/oblac/gart/math/distance.kt b/...in/kotlin/dev/oblac/gart/math/Distance.kt → ...in/kotlin/dev/oblac/gart/math/distance.kt
@@ -15,10 +15,3 @@ fun dist(p1: Point, p2: Point): Float {
     return dist(p1.x, p1.y, p2.x, p2.y)
 }
 
-/**
- * Returns the distance between two points.
- * @see dist
- */
-fun Point.distanceTo(p: Point): Float {
-    return dist(this, p)
-}
diff --git a/gart/src/main/kotlin/dev/oblac/gart/pixels/pixelsScroller.kt b/gart/src/main/kotlin/dev/oblac/gart/pixels/pixelsScroller.kt
@@ -2,10 +2,13 @@ package dev.oblac.gart.pixels
 
 import dev.oblac.gart.Pixels
 
-fun scrollPixelsUp(p: Pixels, delta: Int) {
-    for (y in delta until p.d.h) {
-        for (x in 0 until p.d.w) {
-            p[x, y - delta] = p[x, y]
+/**
+ * Scrolls the pixels up by the given delta.
+ */
+fun Pixels.scrollUp(delta: Int) {
+    for (y in delta until this.d.h) {
+        for (x in 0 until this.d.w) {
+            this[x, y - delta] = this[x, y]
         }
     }
 }