#194 Active tiles working for all flat grid systems on flat projection.

Rich2 · Aug 17, 2022 · a5f2727 · a5f2727
1 parent 658f007
commit a5f2727
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Tiling/ExsSrc/gOne/GOneGui.scala b/Tiling/ExsSrc/gOne/GOneGui.scala
@@ -27,7 +27,7 @@ case class GOneGui(canv: CanvasPlatform, scenStart: OneScen, viewIn: HGView) ext
   /** We could of used the mapHCen method and produced the units and the hexstrs graphics at the same time, but its easier to keep them separate. */
   def units: Arr[PolygonCompound] = players.someHCOptMap { (p, hc) => proj.transCoord(hc).map { pt =>
       val str = ptScale.scaledStr(170, p.toString + "\n" + hc.strComma, 150, p.charStr + "\n" + hc.strComma, 60, p.charStr)
-      urect.scale(120).slate(pt).fillDrawTextActive(p.colour, HPlayer(hc, p), str, 24, 2.0)
+      urect.scale(80).slate(pt).fillDrawTextActive(p.colour, HPlayer(hc, p), str, 24, 2.0)
     }
   }
 

diff --git a/Tiling/src/prid/phex/HSysProjectionFlat.scala b/Tiling/src/prid/phex/HSysProjectionFlat.scala
@@ -23,9 +23,10 @@ final case class HSysProjectionFlat(gridSys: HGridSys, panel: Panel) extends HSy
     case _ =>
   }
 
-  override def tiles: PolygonArr = gridSys.map(_.polygonReg).slate(-focus).scale(cPScale)
+  override def tiles: PolygonArr = gridSys.map(_.hVertPolygon.map(gridSys.hCoordToPt2(_)).slate(-focus).scale(cPScale))
 
-  override def tileActives: Arr[PolygonActive] = gridSys.map(hc => hc.polygonReg.slate(-focus).scale(cPScale).active(hc))
+  override def tileActives: Arr[PolygonActive] =
+    gridSys.map(hc => hc.hVertPolygon.map(gridSys.hCoordToPt2(_)).slate(-focus).scale(cPScale).active(hc))
   override def sides: LineSegArr = gridSys.sideLines.slate(-focus).scale(cPScale)
   override def innerSides: LineSegArr = gridSys.innerSideLines.slate(-focus).scale(cPScale)
   override def outerSides: LineSegArr = gridSys.outerSideLines.slate(-focus).scale(cPScale)