feat: update section rendering logic to include border words (#68)

* feat: update section rendering logic to include border words * chore: remove comment
VGVentures · Mar 13, 2024 · a7fcad7 · a7fcad7
1 parent 579f1f4
commit a7fcad7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 34 deletions.
diff --git a/api/packages/board_renderer/lib/src/board_renderer.dart b/api/packages/board_renderer/lib/src/board_renderer.dart
@@ -1,5 +1,6 @@
 import 'dart:math' as math;
 import 'dart:typed_data';
+
 import 'package:game_domain/game_domain.dart';
 import 'package:http/http.dart' as http;
 import 'package:image/image.dart' as img;
@@ -191,26 +192,12 @@ class BoardRenderer {
 
   /// Renders a section of the board in an image.
   Future<Uint8List> renderSection(BoardSection section) async {
-    final words = section.words;
+    final words = [...section.words, ...section.borderWords];
 
     const cellSize = 40;
 
-    var maxPositionX = 0;
-    var maxPositionY = 0;
-
-    for (final word in words) {
-      final x = word.position.x - section.position.x * section.size;
-      final y = word.position.y - section.position.y * section.size;
-
-      final sizeX = word.axis == Axis.horizontal ? word.answer.length : 1;
-      final sizeY = word.axis == Axis.vertical ? word.answer.length : 1;
-
-      maxPositionX = math.max(maxPositionX, x + sizeX);
-      maxPositionY = math.max(maxPositionY, y + sizeY);
-    }
-
-    final totalWidth = maxPositionX * cellSize;
-    final totalHeight = maxPositionY * cellSize;
+    final totalWidth = section.size * cellSize;
+    final totalHeight = section.size * cellSize;
 
     final image = _createImage(
       width: totalWidth,
@@ -237,22 +224,28 @@ class BoardRenderer {
         final char = wordCharacters.elementAt(c).toUpperCase();
         final charIndex = char.codeUnitAt(0) - 65;
 
-        _compositeImage(
-          image,
-          texture,
-          dstX: word.axis == Axis.horizontal
+        final (dstX, dstY) = (
+          word.axis == Axis.horizontal
               ? (position.$1 + c) * cellSize
               : position.$1 * cellSize,
-          dstY: word.axis == Axis.vertical
+          word.axis == Axis.vertical
               ? (position.$2 + c) * cellSize
-              : position.$2 * cellSize,
-          dstW: cellSize,
-          dstH: cellSize,
-          srcX: charIndex * cellSize,
-          srcY: 0,
-          srcW: cellSize,
-          srcH: cellSize,
+              : position.$2 * cellSize
         );
+        if (dstX < totalWidth && dstY < totalHeight && dstX >= 0 && dstY >= 0) {
+          _compositeImage(
+            image,
+            texture,
+            dstX: dstX,
+            dstY: dstY,
+            dstW: cellSize,
+            dstH: cellSize,
+            srcX: charIndex * cellSize,
+            srcY: 0,
+            srcW: cellSize,
+            srcH: cellSize,
+          );
+        }
       }
     }
 

diff --git a/api/packages/board_renderer/test/src/board_renderer_test.dart b/api/packages/board_renderer/test/src/board_renderer_test.dart
@@ -132,15 +132,15 @@ void main() {
     group('renderSection', () {
       final words = [
         Word(
-          position: Point(1, 1),
+          position: Point(18, 12),
           axis: Axis.horizontal,
           answer: 'hello',
           clue: '',
           hints: const [],
           solvedTimestamp: null,
         ),
         Word(
-          position: Point(2, 7),
+          position: Point(10, 11),
           axis: Axis.vertical,
           answer: 'there',
           clue: '',
@@ -154,10 +154,10 @@ void main() {
         position: Point(1, 1),
         size: 10,
         words: words,
-        borderWords: const [],
+        borderWords: words,
       );
 
-      test('render the received section', () async {
+      test('render the received section words', () async {
         final command = _MockCommand();
         final image = _MockImage();
 
@@ -216,7 +216,7 @@ void main() {
 
         await renderer.renderSection(section);
 
-        expect(calls, 10);
+        expect(calls, 14);
       });
 
       test("throws when can't get the texture", () async {