(ui) add hints for the user

AkselsLedins · Mar 6, 2018 · de0d98f · de0d98f
1 parent 5fe010c
commit de0d98f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/main.go b/main.go
@@ -85,10 +85,14 @@ func run() {
 
 		// reset the matrix
 		win.SetMatrix(pixel.IM)
+
+		// drall the UI
 		ui.DrawStepNumber(win, simulation.Step)
 		ui.DrawScore(win, simulation.Score)
 		ui.DrawNumberOfVehicles(win, len(simulation.Vehicles))
 		ui.DrawNumberOfTrips(win, len(simulation.Trips))
+		ui.DrawStartHint(win)
+
 		win.Update()
 	}
 

diff --git a/screenshots/preview.gif b/screenshots/preview.gif
diff --git a/ui/cam.go b/ui/cam.go
@@ -21,12 +21,13 @@ var (
 func init() {
 	camera = new(cam)
 
-	camera.CamPos = pixel.ZV
+	camera.CamPos = pixel.V(500, 350)
 	camera.CamSpeed = 500.0
 	camera.CamZoom = 1.0
 	camera.CamZoomSpeed = 1.2
 }
 
+// Cam return the singleton cam
 func Cam() *cam {
 	return camera
 }

diff --git a/ui/ui.go b/ui/ui.go
@@ -11,36 +11,47 @@ import (
 
 func DrawScore(win *pixelgl.Window, score int) {
 	basicAtlas := text.NewAtlas(basicfont.Face7x13, text.ASCII)
-	txt := text.New(pixel.V(920, 685), basicAtlas)
+	txt := text.New(pixel.V(900, 685), basicAtlas)
 
-	fmt.Fprintf(txt, "Score : %06d", score)
+	fmt.Fprintf(txt, "Score : %09d", score)
 
 	txt.Draw(win, pixel.IM)
 }
 
 func DrawStepNumber(win *pixelgl.Window, step int) {
 	basicAtlas := text.NewAtlas(basicfont.Face7x13, text.ASCII)
-	txt := text.New(pixel.V(920, 700), basicAtlas)
+	txt := text.New(pixel.V(900, 700), basicAtlas)
 
-	fmt.Fprintf(txt, "Step  : %06d", step)
+	fmt.Fprintf(txt, "Step  :    %06d", step)
 
 	txt.Draw(win, pixel.IM)
 }
 
 func DrawNumberOfVehicles(win *pixelgl.Window, numberOfVehicles int) {
 	basicAtlas := text.NewAtlas(basicfont.Face7x13, text.ASCII)
-	txt := text.New(pixel.V(850, 670), basicAtlas)
+	txt := text.New(pixel.V(830, 670), basicAtlas)
 
-	fmt.Fprintf(txt, "Number of cars  : %04d", numberOfVehicles)
+	fmt.Fprintf(txt, "Number of cars  :      %04d", numberOfVehicles)
 
 	txt.Draw(win, pixel.IM)
 }
 
 func DrawNumberOfTrips(win *pixelgl.Window, numberOfTrips int) {
 	basicAtlas := text.NewAtlas(basicfont.Face7x13, text.ASCII)
-	txt := text.New(pixel.V(850, 655), basicAtlas)
+	txt := text.New(pixel.V(830, 655), basicAtlas)
 
-	fmt.Fprintf(txt, "Number of trips : %04d", numberOfTrips)
+	fmt.Fprintf(txt, "Number of trips :      %04d", numberOfTrips)
+
+	txt.Draw(win, pixel.IM)
+}
+
+func DrawStartHint(win *pixelgl.Window) {
+	basicAtlas := text.NewAtlas(basicfont.Face7x13, text.ASCII)
+	txt := text.New(pixel.V(340, 30), basicAtlas)
+
+	fmt.Fprintf(txt, "  Press [T] to display all the trips (at your own risk)\n")
+	fmt.Fprintf(txt, " [Arrow Keys] to move around    [Scroll] to Zoom in/out \n")
+	fmt.Fprintf(txt, "        Press [SPACE] to start/pause simulation")
 
 	txt.Draw(win, pixel.IM)
 }