LineWidth field names adjusted

Names are now shorter and more consistent with the fill event.
Also, lines don't have a concrete start / end, so the names didn't
really make sense anyway.

Author: Bios-Marcel

internal/frontend/templates/lobby.html

@@ -1241,7 +1241,9 @@
                 } else if (parsed.type === "non-guessing-player-message") {
                     appendMessage("non-guessing-player-message", parsed.data.author, parsed.data.content);
                 } else if (parsed.type === "line") {
-                    drawLine(context, parsed.data.fromX, parsed.data.fromY, parsed.data.toX, parsed.data.toY, parsed.data.color, parsed.data.lineWidth);
+                    drawLine(context, parsed.data.x, parsed.data.y,
+                        parsed.data.x2, parsed.data.y2, parsed.data.color,
+                        parsed.data.width);
                 } else if (parsed.type === "fill") {
                     if (floodfillUint8ClampedArray(
                         imageData.data,
@@ -1773,10 +1775,10 @@
                             imageData.width, imageData.height);
                     } else if (drawElement.type === "line") {
                         _drawLine(
-                            drawData.fromX, drawData.fromY,
-                            drawData.toX, drawData.toY,
+                            drawData.x, drawData.y,
+                            drawData.x2, drawData.y2,
                             drawData.color,
-                            drawData.lineWidth);
+                            drawData.width);
                     } else {
                         console.log("Unknown draw element type: " + drawData.type);
                     }
@@ -2001,12 +2003,12 @@
             const drawInstruction = {
                 type: "line",
                 data: {
-                    fromX: x1Scaled,
-                    fromY: y1Scaled,
-                    toX: x2Scaled,
-                    toY: y2Scaled,
+                    x: x1Scaled,
+                    y: y1Scaled,
+                    x2: x2Scaled,
+                    y2: y2Scaled,
                     color: color,
-                    lineWidth: localLineWidth,
+                    width: localLineWidth,
                 }
             };
             socket.send(JSON.stringify(drawInstruction));

internal/game/lobby.go

@@ -117,10 +117,10 @@ func (lobby *Lobby) HandleEvent(eventType string, payload []byte, player *Player
 
 			// In case the line is too big, we overwrite the data of the event.
 			// This will prevent clients from lagging due to too thick lines.
-			if line.Data.LineWidth > MaxBrushSize {
-				line.Data.LineWidth = MaxBrushSize
-			} else if line.Data.LineWidth < MinBrushSize {
-				line.Data.LineWidth = MinBrushSize
+			if line.Data.Width > MaxBrushSize {
+				line.Data.Width = MaxBrushSize
+			} else if line.Data.Width < MinBrushSize {
+				line.Data.Width = MinBrushSize
 			}
 
 			now := time.Now()

internal/game/shared.go

@@ -104,12 +104,12 @@ type RGBColor struct {
 type LineEvent struct {
 	Type string `json:"type"`
 	Data struct {
-		FromX     int16    `json:"fromX"`
-		FromY     int16    `json:"fromY"`
-		ToX       int16    `json:"toX"`
-		ToY       int16    `json:"toY"`
-		Color     RGBColor `json:"color"`
-		LineWidth uint8    `json:"lineWidth"`
+		X     int16    `json:"x"`
+		Y     int16    `json:"y"`
+		X2    int16    `json:"x2"`
+		Y2    int16    `json:"y2"`
+		Color RGBColor `json:"color"`
+		Width uint8    `json:"width"`
 	} `json:"data"`
 }