Fixed #906: All performers now present a Batch[SceneNode]

Author: davesmith00000

indigo/indigo-extras/src/main/scala/indigoextras/actors/Actor.scala

@@ -5,6 +5,12 @@ import indigo.Outcome
 import indigo.shared.collections.Batch
 import indigo.shared.scenegraph.SceneNode
 
+/** An Actor is a standalone entity that can update and present itself, and communicates with the world by reading
+  * shared immutable data (`ReferenceData`) from the game model, and by receiving and emitting events.
+  *
+  * The Actor typeclass allows you to define an Actor for any type, so long as you can meaningfully provide an update
+  * and a present function for it.
+  */
 trait Actor[ReferenceData, ActorType]:
 
   /** Update this actor.

indigo/indigo-extras/src/main/scala/indigoextras/performers/Performer.scala

@@ -10,9 +10,6 @@ import indigo.shared.scenegraph.SceneNode
   * different levels of performer complexity. It’s meant to be fun, but also to suggest how much responsibility each
   * type takes on in the simulation. From Leads who take the starring roles, to silent Extras filling the background, to
   * Narrators who influence events without being seen — each has a role to play.
-  *
-  * @tparam ReferenceData
-  *   The type of reference data used by the performer.
   */
 sealed trait Performer[ReferenceData]:
 
@@ -42,7 +39,7 @@ object Performer:
 
     /** Draw the performer
       */
-    def present(context: PerformerContext[ReferenceData]): SceneNode
+    def present(context: PerformerContext[ReferenceData]): Batch[SceneNode]
 
     val hasCollider: Boolean = false
 
@@ -65,7 +62,7 @@ object Performer:
 
     /** Draw the performer
       */
-    def present(context: PerformerContext[ReferenceData], collider: Collider[PerformerId]): SceneNode
+    def present(context: PerformerContext[ReferenceData], collider: Collider[PerformerId]): Batch[SceneNode]
 
     val hasCollider: Boolean = true
 

indigo/indigo-extras/src/main/scala/indigoextras/performers/PerformerPool.scala

@@ -91,15 +91,15 @@ final case class PerformerPool[ReferenceData](
   ): Outcome[Batch[SceneNode]] =
     performer match
       case p: Performer.Extra[ReferenceData] =>
-        Outcome(Batch(p.present(context)))
+        Outcome(p.present(context))
 
       case p: Performer.Stunt[ReferenceData] =>
         colliderLookup(p.id) match
           case None =>
             Outcome(Batch.empty)
 
           case Some(c) =>
-            Outcome(Batch(p.present(context, c)))
+            Outcome(p.present(context, c))
 
       case p: Performer.Support[ReferenceData] =>
         p.present(context)

indigo/sandbox/src/main/scala/com/example/sandbox/SandboxGame.scala

@@ -22,7 +22,7 @@ object SandboxGame extends IndigoGame[SandboxBootData, SandboxStartupData, Sandb
   val viewportHeight: Int     = gameHeight * magnificationLevel // 256
 
   def initialScene(bootData: SandboxBootData): Option[SceneName] =
-    Some(WindowsScene.name)
+    Some(PerformerScene.name)
 
   def scenes(bootData: SandboxBootData): NonEmptyList[Scene[SandboxStartupData, SandboxGameModel, SandboxViewModel]] =
     NonEmptyList(

indigo/sandbox/src/main/scala/com/example/sandbox/scenes/PerformerPhysicsScene.scala

@@ -125,14 +125,16 @@ final case class ZombiePerformer(
 
     collider.withVelocity(collider.velocity + (toTarget * acceleration))
 
-  def present(context: PerformerContext[Point], collider: Collider[PerformerId]): SceneNode =
+  def present(context: PerformerContext[Point], collider: Collider[PerformerId]): Batch[SceneNode] =
     val color =
       index % 3 match
         case 0 => RGBA.Cyan
         case 1 => RGBA.Yellow
         case _ => RGBA.SlateGray
 
-    Shape.Circle(Circle(collider.position.toPoint, radius), Fill.Color(color), Stroke(1, RGBA.White))
+    Batch(
+      Shape.Circle(Circle(collider.position.toPoint, radius), Fill.Color(color), Stroke(1, RGBA.White))
+    )
 
 final case class ZombieTargetPerformer() extends Performer.Lead[Point]:
   def id: PerformerId       = ZombieTargetPerformer.id

indigo/sandbox/src/main/scala/com/example/sandbox/scenes/PerformerScene.scala

@@ -229,5 +229,7 @@ final case class Follower(
 
     this.copy(position = newPosition)
 
-  def present(context: PerformerContext[Point]): SceneNode =
-    Shape.Circle(Circle(position.toPoint, size), Fill.Color(RGBA.Green.withAlpha(alpha)), Stroke(2, RGBA.Black))
+  def present(context: PerformerContext[Point]): Batch[SceneNode] =
+    Batch(
+      Shape.Circle(Circle(position.toPoint, size), Fill.Color(RGBA.Green.withAlpha(alpha)), Stroke(2, RGBA.Black))
+    )