sprites working but gotta slow em down

vilmibm · vilmibm · commit dd307e886da2 · 2020-10-30T13:12:57.000-07:00
diff --git a/pkg/cmd/protip/protip.go b/pkg/cmd/protip/protip.go
@@ -94,9 +94,11 @@ loop:
 			break loop
 		case <-time.After(time.Millisecond * 50):
 		}
-		w, h := s.Size()
+		//w, h := s.Size()
+		//w, _ := s.Size()
 		s.Clear()
-		emitStr(s, w/2-7, h/2, tcell.StyleDefault, "TODO a protip and stuff")
+		//emitStr(s, w/2-7, h/2, tcell.StyleDefault, "TODO a protip and stuff")
+		drawSprite(s, 0, 0, tcell.StyleDefault, opts.Sprite)
 		s.Show()
 	}
 
@@ -119,5 +121,17 @@ func emitStr(s tcell.Screen, x, y int, style tcell.Style, str string) {
 	}
 }
 
+func drawSprite(s tcell.Screen, x, y int, st tcell.Style, sp *Sprite) {
+	// TODO worry about animation later
+	cells := sp.Cells()
+	for y := 0; y < len(cells); y++ {
+		row := cells[y]
+		for x := 0; x < len(row); x++ {
+			s.SetContent(x, y, cells[y][x], nil, st)
+		}
+	}
+	sp.IncrFrame()
+}
+
 // Want to be able to have a sprite that occupies a rectangle and can animate internally relative to
 // its own geometry.
diff --git a/pkg/cmd/protip/sprites.go b/pkg/cmd/protip/sprites.go
@@ -1,5 +1,7 @@
 package protip
 
+import "strings"
+
 type Sprite struct {
 	Width   int
 	Height  int
@@ -15,93 +17,103 @@ func (s *Sprite) IncrFrame() {
 	s.frameIx = (s.frameIx + 1) % len(s.Frames)
 }
 
+func (s *Sprite) Cells() [][]rune {
+	out := [][]rune{}
+	curFrame := s.Frames[s.frameIx]
+	lines := strings.Split(curFrame, "\n")
+	for _, line := range lines {
+		out = append(out, []rune(line))
+	}
+	return out
+}
+
 func Clippy() *Sprite {
 	s := &Sprite{
 		Width:  15,
 		Height: 15,
 	}
 	s.AddFrame(`
-		    ___
-			 ^   ^
-			 O   O
-			 |   |
+        ___
+       ^   ^
+       O   O
+       |   |
        ||  |
-			 ||_/  /
-			 |    |
-			 |   |
-			 \___/
+       ||_/  /
+       |    |
+       |   |
+       \___/
 
 `)
 	s.AddFrame(`
-		    ___
-			 ^   ^
-			 O   O
-			 |   |
+        ___
+       ^   ^
+       O   O
+       |   |
        ||  |
-			 ||_/  -
-			 |    |
-			 |   |
-			 \___/
+       ||_/  -
+       |    |
+       |   |
+       \___/
 
 `)
 	s.AddFrame(`
-		    ___
-			 ^   ^
-			 O   O
-			 |   |
+        ___
+       ^   ^
+       O   O
+       |   |
        ||  |
-			 ||_/  /
-			 |    |
-			 |   |
-			 \___/
+       ||_/  /
+       |    |
+       |   |
+       \___/
 
 `)
 	s.AddFrame(`
-		    ___
-			 ^   ^
-			 o   O
-			 |   |
+        ___
+       ^   ^
+       o   O
+       |   |
        ||  |
-			 ||_/  /
-			 |    |
-			 |   |
-			 \___/
+       ||_/  /
+       |    |
+       |   |
+       \___/
 
 `)
 	s.AddFrame(`
-		    ___
-			 ^   ^
-			 -   O
-			 |   |
+        ___
+       ^   ^
+       -   O
+       |   |
        ||  |
-			 ||_/  /
-			 |    |
-			 |   |
-			 \___/
+       ||_/  /
+       |    |
+       |   |
+       \___/
 
 `)
 	s.AddFrame(`
-		    ___
-			 ^   ^
-			 o   O
-			 |   |
+        ___
+       ^   ^
+       o   O
+       |   |
        ||  |
-			 ||_/  /
-			 |    |
-			 |   |
-			 \___/
+       ||_/  /
+       |    |
+       |   |
+       \___/
 
 `)
 	s.AddFrame(`
-		    ___
-			 ^   ^
-			 O   O
-			 |   |
+        ___
+       ^   ^
+       O   O
+       |   |
        ||  |
-			 ||_/  /
-			 |    |
-			 |   |
-			 \___/
+       ||_/  /
+       |    |
+       |   |
+       \___/
 
 `)
 
