Added support for all colors.

xStrom · Apr 16, 2017 · 52e3ff8 · 52e3ff8
1 parent 6198494
commit 52e3ff8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 17 deletions.
diff --git a/art/art.go b/art/art.go
@@ -44,16 +44,31 @@ const (
 	DarkPurple
 )
 
+var colorToRGBA = map[int]color.RGBA64{
+	White:       color.RGBA64{65535, 65535, 65535, 65535},
+	LightGray:   color.RGBA64{58596, 58596, 58596, 65535},
+	Gray:        color.RGBA64{34952, 34952, 34952, 65535},
+	Black:       color.RGBA64{8738, 8738, 8738, 65535},
+	Pink:        color.RGBA64{65535, 42919, 53713, 65535},
+	Red:         color.RGBA64{58853, 0, 2313, 65535},
+	Orange:      color.RGBA64{58853, 38293, 0, 65535},
+	Brown:       color.RGBA64{41120, 27242, 16962, 65535},
+	Yellow:      color.RGBA64{58853, 55769, 0, 65535},
+	LightGreen:  color.RGBA64{38036, 57568, 17476, 65535},
+	Green:       color.RGBA64{514, 48830, 257, 65535},
+	Cyan:        color.RGBA64{0, 54227, 56797, 65535},
+	MediumBlue:  color.RGBA64{0, 33667, 51143, 65535},
+	DarkBlue:    color.RGBA64{0, 0, 60138, 65535},
+	LightPurple: color.RGBA64{53199, 28270, 58596, 65535},
+	DarkPurple:  color.RGBA64{33410, 0, 32896, 65535},
+}
+
 type Pixel struct {
 	X int
 	Y int
 	C int
 }
 
-var blue = color.RGBA64{0, 0, 60138, 65535}
-var black = color.RGBA64{8738, 8738, 8738, 65535}
-var white = color.RGBA64{65535, 65535, 65535, 65535}
-
 type Image struct {
 	lock    sync.RWMutex
 	version int
@@ -94,15 +109,17 @@ func (i *Image) ParseKeyframe(version int, data []byte) error {
 		for y := minY; y < maxY; y++ {
 			coords := x | (y << 16)
 			c := img.At(x, y)
-
-			if sameColor(c, blue) {
-				colors[coords] = DarkBlue
-			} else if sameColor(c, black) {
-				colors[coords] = Black
-			} else if sameColor(c, white) {
-				colors[coords] = White
-			} else {
-				colors[coords] = -1 // TODO: Implement all colors
+			color := -1
+			for cc, rgba := range colorToRGBA {
+				if sameColor(c, rgba) {
+					color = cc
+					break
+				}
+			}
+			colors[coords] = color
+			if color == -1 {
+				r, g, b, a := c.RGBA()
+				log.Infof("Unknown color in keyframe: %v:%v - %v:%v:%v:%v", x, y, r, g, b, a)
 			}
 		}
 	}

diff --git a/painter/painter.go b/painter/painter.go
@@ -55,8 +55,6 @@ func Work(wg *sync.WaitGroup, image *art.Image) {
 			go func(p *art.Pixel) {
 				if err := sp.DrawPixel(p.X, p.Y, p.C); err != nil {
 					log.Infof("Failed drawing %v:%v to %v, because: %v", p.X, p.Y, p.C, err)
-				} else {
-					// TODO: Find out if we need to update the image ourselves in case of a successful situation
 				}
 				time.Sleep(5 * time.Second) // Allow another additional 5 seconds for realtime to update after the request is done
 				inFlightLock.Lock()

diff --git a/realtime/realtime.go b/realtime/realtime.go
@@ -61,8 +61,12 @@ connect:
 		if len(message) >= 7 {
 			version := int(binary.LittleEndian.Uint32(message[0:4]))
 			for i := 4; i < len(message); i += 3 {
-				x, y, color := decodeEdit(message[i : i+3]) // TODO: Out of bounds check
-				image.UpdatePixel(x, y, color, version)
+				if len(message) >= i+3 {
+					x, y, color := decodeEdit(message[i : i+3])
+					image.UpdatePixel(x, y, color, version)
+				} else {
+					log.Infof("recv unknown suffix on edits: %v", message[i:])
+				}
 			}
 		} else {
 			log.Infof("recv unknown: %v", message)