Mesh demo

PurpleKingdomGames · Jan 20, 2025 · f117021 · f117021
1 parent dd09354
commit f117021
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 21 deletions.
diff --git a/indigo/indigo-extras/src/main/scala/indigoextras/mesh/BowyerWatson.scala b/indigo/indigo-extras/src/main/scala/indigoextras/mesh/BowyerWatson.scala
@@ -2,17 +2,14 @@ package indigoextras.mesh
 
 import indigo.shared.collections.Batch
 import indigo.shared.geometry.Vertex
-import indigoextras.mesh.datatypes.Edge
-import indigoextras.mesh.datatypes.Tri
-import indigoextras.mesh.datatypes.Triangle
 
 import scala.annotation.tailrec
 
 // Bowyer-Watson Delaunay Triangulation
 object BowyerWatson:
 
   def triangulation(pointList: Batch[Vertex]): Mesh =
-    val superTriangle = datatypes.Triangle.encompassing(pointList)
+    val superTriangle = Triangle.encompassing(pointList)
     triangulation(pointList, superTriangle)
 
   def triangulation(pointList: Batch[Vertex], superTriangle: Triangle): Mesh =
@@ -100,7 +97,7 @@ object BowyerWatson:
 
   def edgeToTriangle(edge: Edge, mesh: Mesh, point: Vertex): Batch[Triangle] =
     Batch.fromOption(
-      datatypes.Triangle.fromVertices(
+      Triangle.fromVertices(
         point :: mesh.vertices.filter(v => edge.indices.contains(v._1)).map(_._2)
       )
     )
diff --git a/...la/indigoextras/mesh/datatypes/Edge.scala → ...c/main/scala/indigoextras/mesh/Edge.scala b/...la/indigoextras/mesh/datatypes/Edge.scala → ...c/main/scala/indigoextras/mesh/Edge.scala
@@ -1,4 +1,4 @@
-package indigoextras.mesh.datatypes
+package indigoextras.mesh
 
 import indigo.shared.collections.Batch
 

diff --git a/indigo/indigo-extras/src/main/scala/indigoextras/mesh/Mesh.scala b/indigo/indigo-extras/src/main/scala/indigoextras/mesh/Mesh.scala
@@ -3,9 +3,6 @@ package indigoextras.mesh
 import indigo.shared.collections.Batch
 import indigo.shared.geometry.LineSegment
 import indigo.shared.geometry.Vertex
-import indigoextras.mesh.datatypes.Edge
-import indigoextras.mesh.datatypes.Tri
-import indigoextras.mesh.datatypes.Triangle
 
 import scala.annotation.tailrec
 
@@ -308,7 +305,7 @@ object Mesh:
       .flatMap(_._2.indices)
       .toSet
     if vSet.size == 3 then
-      datatypes.Triangle.fromVertices(
+      Triangle.fromVertices(
         vSet.toList.flatMap(i => mesh.vertices.find(_._1 == i).toList).map(_._2)
       )
     else None
diff --git a/...ala/indigoextras/mesh/datatypes/Tri.scala → ...rc/main/scala/indigoextras/mesh/Tri.scala b/...ala/indigoextras/mesh/datatypes/Tri.scala → ...rc/main/scala/indigoextras/mesh/Tri.scala
@@ -1,4 +1,4 @@
-package indigoextras.mesh.datatypes
+package indigoextras.mesh
 
 import indigo.shared.collections.Batch
 

diff --git a/...ndigoextras/mesh/datatypes/Triangle.scala → ...in/scala/indigoextras/mesh/Triangle.scala b/...ndigoextras/mesh/datatypes/Triangle.scala → ...in/scala/indigoextras/mesh/Triangle.scala
@@ -1,4 +1,4 @@
-package indigoextras.mesh.datatypes
+package indigoextras.mesh
 
 import indigo.shared.collections.Batch
 import indigo.shared.geometry.BoundingBox

diff --git a/indigo/indigo-extras/src/test/scala/indigoextras/mesh/BowyerWatsonTests.scala b/indigo/indigo-extras/src/test/scala/indigoextras/mesh/BowyerWatsonTests.scala
@@ -1,7 +1,6 @@
 package indigoextras.mesh
 
 import indigo.*
-import indigoextras.mesh.datatypes.*
 
 class BowyerWatsonTests extends munit.FunSuite:
 

diff --git a/indigo/indigo-extras/src/test/scala/indigoextras/mesh/MeshTests.scala b/indigo/indigo-extras/src/test/scala/indigoextras/mesh/MeshTests.scala
@@ -4,10 +4,6 @@ import indigo.Batch
 import indigo.Vertex
 import indigo.shared.geometry.LineSegment
 
-import datatypes.Triangle
-import datatypes.Tri
-import datatypes.Edge
-
 class MeshTests extends munit.FunSuite {
 
   /*

diff --git a/indigo/sandbox/src/main/scala/com/example/sandbox/SandboxGame.scala b/indigo/sandbox/src/main/scala/com/example/sandbox/SandboxGame.scala
@@ -23,7 +23,7 @@ object SandboxGame extends IndigoGame[SandboxBootData, SandboxStartupData, Sandb
   val viewportHeight: Int     = gameHeight * magnificationLevel // 256
 
   def initialScene(bootData: SandboxBootData): Option[SceneName] =
-    Some(ComponentUIScene.name)
+    Some(MeshScene.name)
 
   def scenes(bootData: SandboxBootData): NonEmptyList[Scene[SandboxStartupData, SandboxGameModel, SandboxViewModel]] =
     NonEmptyList(
@@ -53,7 +53,8 @@ object SandboxGame extends IndigoGame[SandboxBootData, SandboxStartupData, Sandb
       PathFindingScene,
       CaptureScreenScene,
       NineSliceScene,
-      ComponentUIScene
+      ComponentUIScene,
+      MeshScene
     )
 
   val eventFilters: EventFilters = EventFilters.Permissive

diff --git a/indigo/sandbox/src/main/scala/com/example/sandbox/SandboxModel.scala b/indigo/sandbox/src/main/scala/com/example/sandbox/SandboxModel.scala
@@ -6,14 +6,24 @@ import com.example.sandbox.scenes.PathFindingModel
 import com.example.sandbox.scenes.PointersModel
 import indigo.*
 import indigo.syntax.*
+import indigoextras.mesh.*
 import indigoextras.ui.*
 import indigoextras.ui.simple.InputFieldChange
 
 object SandboxModel {
 
   private given CanEqual[Option[String], Option[String]] = CanEqual.derived
 
+  def randomPoint(dice: Dice, offset: Point): Point =
+    Point(dice.rollFromZero(100), dice.rollFromZero(100)).moveBy(offset)
+
   def initialModel(startupData: SandboxStartupData): SandboxGameModel =
+    val dice          = Dice.fromSeed(1)
+    val offset        = Point(75, 75)
+    val points        = List.fill(10)(randomPoint(dice, offset)).toBatch
+    val superTriangle = Triangle.encompassing(points.map(_.toVertex), 10)
+    val mesh          = Mesh.fromVertices(points.map(_.toVertex), superTriangle)
+
     SandboxGameModel(
       DudeModel(startupData.dude, DudeIdle),
       SaveLoadPhases.NotStarted,
@@ -23,7 +33,12 @@ object SandboxModel {
       PathFindingModel.empty,
       Radians.zero,
       0,
-      components
+      components,
+      MeshData(
+        points,
+        superTriangle,
+        mesh
+      )
     )
 
   def components: ComponentGroup[Int] =
@@ -320,7 +335,14 @@ final case class SandboxGameModel(
     pathfinding: PathFindingModel,
     rotation: Radians,
     num: Int,
-    components: ComponentGroup[Int]
+    components: ComponentGroup[Int],
+    meshData: MeshData
+)
+
+final case class MeshData(
+    points: Batch[Point],
+    superTriangle: Triangle,
+    mesh: Mesh
 )
 
 final case class DudeModel(dude: Dude, walkDirection: DudeDirection) {

diff --git a/indigo/sandbox/src/main/scala/com/example/sandbox/scenes/MeshScene.scala b/indigo/sandbox/src/main/scala/com/example/sandbox/scenes/MeshScene.scala
@@ -0,0 +1,81 @@
+package com.example.sandbox.scenes
+
+import com.example.sandbox.SandboxGameModel
+import com.example.sandbox.SandboxStartupData
+import com.example.sandbox.SandboxViewModel
+import indigo.*
+import indigo.scenes.*
+import indigoextras.mesh.*
+
+object MeshScene extends Scene[SandboxStartupData, SandboxGameModel, SandboxViewModel]:
+
+  type SceneModel     = SandboxGameModel
+  type SceneViewModel = SandboxViewModel
+
+  def eventFilters: EventFilters =
+    EventFilters.Restricted
+
+  def modelLens: Lens[SandboxGameModel, SandboxGameModel] =
+    Lens.keepOriginal
+
+  def viewModelLens: Lens[SandboxViewModel, SandboxViewModel] =
+    Lens.keepOriginal
+
+  def name: SceneName =
+    SceneName("mesh scene")
+
+  def subSystems: Set[SubSystem[SandboxGameModel]] =
+    Set()
+
+  def updateModel(
+      context: SceneContext[SandboxStartupData],
+      model: SandboxGameModel
+  ): GlobalEvent => Outcome[SandboxGameModel] =
+    _ => Outcome(model)
+
+  def updateViewModel(
+      context: SceneContext[SandboxStartupData],
+      model: SandboxGameModel,
+      viewModel: SandboxViewModel
+  ): GlobalEvent => Outcome[SandboxViewModel] =
+    _ => Outcome(viewModel)
+
+  def present(
+      context: SceneContext[SandboxStartupData],
+      model: SandboxGameModel,
+      viewModel: SandboxViewModel
+  ): Outcome[SceneUpdateFragment] =
+
+    Outcome(
+      SceneUpdateFragment(
+        drawMesh(
+          model.meshData.points,
+          model.meshData.superTriangle,
+          model.meshData.mesh.toLineSegments
+        )
+      )
+    )
+
+  def drawMesh(
+      points: Batch[Point],
+      superTriangle: Triangle,
+      lines: Batch[LineSegment]
+  ): Batch[SceneNode] =
+    val pts: Batch[Shape.Circle] =
+      points.map { pt =>
+        Shape.Circle(
+          pt,
+          5,
+          Fill.Color(RGBA.Green)
+        )
+      }
+
+    val st = superTriangle.toLineSegments.map { ls =>
+      Shape.Line(ls.start.toPoint, ls.end.toPoint, Stroke(1, RGBA.Magenta))
+    }
+
+    val ml = lines.map { ls =>
+      Shape.Line(ls.start.toPoint, ls.end.toPoint, Stroke(1, RGBA.Cyan))
+    }
+
+    pts ++ st ++ ml