refactor, add fx package with alt fx impl

Author: bjornregnell

src/main/scala/introprog/examples/TestPixelWindow.scala

@@ -5,11 +5,10 @@ package introprog.examples
   * PixelWindow for easy 2D game programming.
   */
 object TestPixelWindow {
-  import introprog._
+  import introprog.PixelWindow
 
   /** A reference to an instance of class `PixelWindow`. */
-  // val w = new PixelWindow(400, 400, "Hello PixelWindow!")
-  val w = new FxPixelWindow(400, 400, "Hello FxPixelWindow!")
+  val w = new PixelWindow(400, 400, "Hello FxPixelWindow!")
 
   /** The color used by `square`. */
   var color = java.awt.Color.red

src/main/scala/introprog/Fx.scala renamed to src/main/scala/introprog/fx/Fx.scala

@@ -1,10 +1,10 @@
-package introprog
+package introprog.fx
 
 /** A wrapper with utils for simpler access to javafx. The main feature is the
   * ability to create stages without having to treat the first stage as special:
   * Simply do: `val myStage = Fx.newStage { s => ... }` and initialize a stage `s`
   * The underlying javafx app ceremony is hidden. */
-object Fx {
+private[fx] object Fx {
 
   def toFxColor(c: java.awt.Color): javafx.scene.paint.Color =
     javafx.scene.paint.Color.rgb(c.getRed, c.getGreen, c.getBlue, c.getAlpha / 255.0)

src/main/scala/introprog/FxPixelWindow.scala renamed to src/main/scala/introprog/fx/FxPixelWindow.scala

@@ -1,6 +1,6 @@
-package introprog
+package introprog.fx
 
-/** A module ready to use in the Scala REPL or in a main Scala program */
+/** A window for pixel-based drawing in an underlying javafx window. */
 object FxPixelWindow  {
   def exit(): Unit = System.exit(0)
 
@@ -103,8 +103,9 @@ class FxPixelWindow(
   /** Draw a line from (`x1`, `y1`) to (`x2`, `y2`) using `color` and `lineWidth`. */
   def line(x1: Int, y1: Int, x2: Int, y2: Int, color: java.awt.Color = foreground, lineWidth: Int = 1): Unit = withGC { gc =>
     gc.setStroke(Fx.toFxColor(color))
-    gc.setLineWidth(lineWidth)
-    gc.strokeLine(x1,y1,x2,y2)
+    gc.setLineWidth(lineWidth.toDouble)
+    gc.strokeLine(x1.toDouble,y1.toDouble,x2.toDouble,y2.toDouble)
+    gc.strokeLine(x1.toDouble,y1.toDouble,x2.toDouble,y2.toDouble)
   }
 
   // def setLineWidth(width: Double): Unit = withGC(_.setLineWidth(width))
@@ -118,7 +119,7 @@ class FxPixelWindow(
   def fill(x: Int, y: Int, width: Int, height: Int, color: java.awt.Color = foreground): Unit = withGC { gc =>
     //gc.setStroke(Fx.toFxColor(color))
     gc.setFill(Fx.toFxColor(color))
-    gc.fillRect(x,y,width,height)
+    gc.fillRect(x.toDouble,y.toDouble,width.toDouble,height.toDouble)
   }
 
   def setPixel(x: Int, y: Int, color: java.awt.Color = foreground): Unit =
@@ -144,9 +145,9 @@ class FxPixelWindow(
     fontName: String = "Monospaced Bold"
   ) = withGC { gc =>
     gc.setFill(Fx.toFxColor(color))
-    gc.setFont(new javafx.scene.text.Font(fontName, size))
+    gc.setFont(new javafx.scene.text.Font(fontName, size.toDouble))
     gc.setFontSmoothingType(javafx.scene.text.FontSmoothingType.LCD)
-    gc.fillText(text, x, y + size)
+    gc.fillText(text, x.toDouble, y.toDouble + size.toDouble)
   }
 
 
@@ -169,12 +170,12 @@ class FxPixelWindow(
       s.setTitle(title)
       root.setBackground(javafx.scene.layout.Background.EMPTY)
       canvas.getGraphicsContext2D.setFill(Fx.toFxColor(background))
-      canvas.getGraphicsContext2D.fillRect(0,0,width,height)
+      canvas.getGraphicsContext2D.fillRect(0.0,0.0,width.toDouble,height.toDouble)
       canvas.getGraphicsContext2D.setStroke(Fx.toFxColor(foreground))
       s.setScene(scene)
       root.setCenter(canvas)
-      s.setMinWidth(width)
-      s.setMinHeight(height)
+      s.setMinWidth(width.toDouble)
+      s.setMinHeight(height.toDouble)
       s.show
 
       //if (initBasicMenu) root.getChildren.add(0, basicMenuBar)