From 5af34740f43b346a1a6d480a8eb264db9fe3b312 Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Wed, 1 Jul 2020 23:43:03 -0700 Subject: [PATCH] Fix up compilation to try and test --- .../scala/tf/bug/fancadetagless/Fancade.scala | 3 ++- .../tf/bug/fancadetagless/Fanscript.scala | 18 ------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/core/src/main/scala/tf/bug/fancadetagless/Fancade.scala b/core/src/main/scala/tf/bug/fancadetagless/Fancade.scala index 653da09..292e977 100644 --- a/core/src/main/scala/tf/bug/fancadetagless/Fancade.scala +++ b/core/src/main/scala/tf/bug/fancadetagless/Fancade.scala @@ -6,6 +6,7 @@ import tf.bug.fancadegraph.PinDefinition import tf.bug.fancadegraph.Block import tf.bug.fancadescodec.Position import scalax.collection.Graph +import tf.bug.fancadegraph.Argument sealed trait Fancade { val pins: Vector[PinDefinition] @@ -15,7 +16,7 @@ sealed trait Fancade { object Fancade { - final case class Capture[T](newBlock: BlockDefinition[T], args: T, pins: Vector[PinDefinition]) extends Fancade { + final case class Capture[T](newBlock: BlockDefinition[T], args: T, pins: Vector[PinDefinition])(implicit arg: Argument[T]) extends Fancade { override def render: Level = { Level( Set( diff --git a/core/src/main/scala/tf/bug/fancadetagless/Fanscript.scala b/core/src/main/scala/tf/bug/fancadetagless/Fanscript.scala index 23a99f5..8e5f89c 100644 --- a/core/src/main/scala/tf/bug/fancadetagless/Fanscript.scala +++ b/core/src/main/scala/tf/bug/fancadetagless/Fanscript.scala @@ -71,24 +71,6 @@ trait Fanscript[F[_]] { object Fanscript { - implicit object FanscriptFancade extends Fanscript[FancadeW] { - - override def lift(value: Float): FancadeW[Float] = - Fancade.Capture( - BlockDefinition.NumberValue, - value, - BlockDefinition.NumberValue.output - ) - - override def win(stop: Boolean): FancadeW[Unit] = - Fancade.Capture( - BlockDefinition.Win, - stop, - BlockDefinition.Win.after - ) - - } - case class ScreenSize(width: Float, height: Float) case class Position(position: Vector3, rotation: Rotation) case class Raycast(hit: Boolean, position: Vector3, obj: Obj)