From 3442c952081836db32d0d5e27972fc1c2d6c1534 Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Fri, 24 Jan 2025 18:18:13 +0100
Subject: [PATCH] [orx-hash-grid] Replace Box3D with Box from
 org.openrndr.shape

---
 orx-hash-grid/src/commonMain/kotlin/Box.kt        | 11 -----------
 orx-hash-grid/src/commonMain/kotlin/HashGrid3D.kt | 11 ++++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 orx-hash-grid/src/commonMain/kotlin/Box.kt

diff --git a/orx-hash-grid/src/commonMain/kotlin/Box.kt b/orx-hash-grid/src/commonMain/kotlin/Box.kt
deleted file mode 100644
index 477962e1..00000000
--- a/orx-hash-grid/src/commonMain/kotlin/Box.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.openrndr.extra.hashgrid
-
-import org.openrndr.math.Vector3
-import kotlin.jvm.JvmRecord
-
-@JvmRecord
-data class Box3D(val corner: Vector3, val width: Double, val height: Double, val depth: Double) {
-    companion object {
-        val EMPTY = Box3D(Vector3.ZERO, 0.0, 0.0, 0.0)
-    }
-}
\ No newline at end of file
diff --git a/orx-hash-grid/src/commonMain/kotlin/HashGrid3D.kt b/orx-hash-grid/src/commonMain/kotlin/HashGrid3D.kt
index 14368b55..60dd34fe 100644
--- a/orx-hash-grid/src/commonMain/kotlin/HashGrid3D.kt
+++ b/orx-hash-grid/src/commonMain/kotlin/HashGrid3D.kt
@@ -1,5 +1,6 @@
 package org.openrndr.extra.hashgrid
 import org.openrndr.math.Vector3
+import org.openrndr.shape.Box
 import kotlin.jvm.JvmRecord
 import kotlin.math.abs
 import kotlin.math.max
@@ -30,17 +31,17 @@ class Cell3D(val x: Int, val y: Int, val z: Int, val cellSize: Double) {
     var zMax: Double = Double.NEGATIVE_INFINITY
         private set
 
-    val bounds: Box3D
+    val bounds: Box
         get() {
-            return Box3D(Vector3(x * cellSize, y * cellSize, z * cellSize), cellSize, cellSize, cellSize)
+            return Box(Vector3(x * cellSize, y * cellSize, z * cellSize), cellSize, cellSize, cellSize)
         }
 
-    val contentBounds: Box3D
+    val contentBounds: Box
         get() {
             return if (points.isEmpty()) {
-                Box3D.EMPTY
+                Box.EMPTY
             } else {
-                Box3D(Vector3(xMin, yMin, zMin), xMax - xMin, yMax - yMin, zMax - zMin)
+                Box(Vector3(xMin, yMin, zMin), xMax - xMin, yMax - yMin, zMax - zMin)
             }
         }