img_to_script 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868a7487d0f8745e1507f2296e1edde72ea010a8ff7bbd4ceb7db1dfce16342d
-  data.tar.gz: 6a93d15efebbb4d8b2f227cda00c8ccb8a3bd4c71a517ffa694483874de6378c
+  metadata.gz: c994729915516c1b890ec338d85867ac2e8071d442f934c00f512645dbc42fa8
+  data.tar.gz: 9e396865898b8f4bb1644b9120b60163aa850d2e84118959f3a2e21fb914b982
 SHA512:
-  metadata.gz: a2c8edf4a89d077932aa567529977720a3b51b514a131ec22bb285e0a61bf1b37a29a5de4573ce8b20d9ddc61e35451690cda615d2dd1baa098ed7d1acbb7dec
-  data.tar.gz: 76a4d6dca726fe777652cfbb426e6860e61a62e7163f9062ecece2714b309d3d2a05b9fc2d01415e7bcfd2265acd4e29c9f9113f00c0842e56ff99256051acbe
+  metadata.gz: d200b4b5f8494e54096941652285689e6bb27f85217381f260b37992dacf02fc428d1d8a902083497701d014739cc7f74435893e91f9afb03121bc524aa14d00
+  data.tar.gz: bbba0740ea201d70e330bcac059ae9f6904488585f9794e5e66b8f6b02d444cce053b2dfff6e8e6625c0decd70856e7298e57b8cc6d6d5e1154f642c360b9ecb

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.1.0] - 2024-01-26
+
+- New generator: `HexMask::ForcedPointMove`.
+
+  Due to a found bug in the MK90 BASIC v.2.0, hex-mask based generators won't work on this systems. This generator is a workaround that should be used to generate scripts for the v.2.0 systems.
+
+- Improved MK90 BASIC v.2.0 compatibility
+
+  Due to yet another found bug in the MK90 BASIC v.2.0, the DRAW O statement won't work on this systems. The update introduces a workaround for this bug.
+
 ## [1.0.1] - 2023-12-29
 
 - Bug fix.

data/README.md

@@ -172,20 +172,28 @@ script = task.run(
 
 - **ImgToScript::Generators::HexMask::Default**
 
-   Specific for the Elektronika MK90 BASIC.
+   Specific for the Elektronika MK90 BASIC v.1.0 **only**.
 
    MK90's BASIC has a balanced build-in method to encode and render images. The Elektronika MK90's manual refers to it as the *hex-mask rendering* method. Each 8x1 px block of a binary image is being represented as a hex value (e.g. '00' for a tile of the 8 white pixels in a row, 'FF' for a tile of the 8 black pixels in a row, etc.). Then these hex values are being passed as arguments to the DRAM/M BASIC statement that renders the image according to the provided data.
 
    Due to the logic of the DRAM/M operator, only vertical scan lines are supported.
 
+   **Note**: due to a bug in the MK90 BASIC v.2.0 software, this generation method works only on the BASIC v.1.0 systems.
+
+- **ImgToScript::Generators::HexMask::ForcedPointMove**
+
+   Same as `HexMask::Default`, but with a workaround for the MK90 BASIC v.2.0.
+
 - **ImgToScript::Generators::HexMask::Enhanced**
 
-   Specific for the Elektronika MK90 BASIC.
+   Specific for the Elektronika MK90 BASIC v.1.0 **only**.
 
    Hex-mask encoding with modifications what make output BASIC code more compact.
 
    Due to the logic of the DRAM/M operator, only vertical scan lines are supported.
 
+   **Note**: due to a bug in the MK90 BASIC v.2.0 software, this generation method works only on the BASIC v.1.0 systems.
+
 - **ImgToScript::Generators::RunLengthEncoding::Horizontal**
 
    RLE, horizontal scan lines.

data/lib/img_to_script/generators/hex_mask/enhanced.rb

@@ -162,15 +162,6 @@ module ImgToScript
           )
         end
 
-        def _append_move_point(x, y)
-          @tokens.append(
-            AbstractToken::MovePointToAbsCoords.new(
-              x: x,
-              y: y
-            )
-          )
-        end
-
         #
         # Replace long sequences of white chunks (0x00) with a shorter manual shift of the (X, Y) point.
         #

data/lib/img_to_script/generators/hex_mask/forced_point_move.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module ImgToScript
+  module Generators
+    module HexMask
+      #
+      # Workaround for the MK90 BASIC v.2.0.
+      #
+      class ForcedPointMove < HexMask
+        SEG_CHUNK_LENGTH = 28
+
+        private
+
+        def _generate
+          _process_seg_chunks(
+            _encode_img.each_slice(SEG_CHUNK_LENGTH).to_a
+          )
+        end
+
+        def _process_seg_chunks(seg_chunks)
+          x = 0
+          y = 0
+
+          seg_chunks.each do |chunk|
+            # Append only non-white segments:
+            _append_hex_values(chunk) unless _all_elements_equal?(chunk, "00")
+
+            if y + SEG_CHUNK_LENGTH > @scr_height - 1
+              y = (y + SEG_CHUNK_LENGTH) - @scr_height
+              x += CHUNK_WIDTH
+            else
+              y += SEG_CHUNK_LENGTH
+            end
+
+            _append_move_point(x, y)
+          end
+        end
+
+        def _all_elements_equal?(array, value)
+          array.all? { |element| element == value }
+        end
+
+        def _append_hex_values(hex_values)
+          @tokens.append(
+            AbstractToken::DrawChunkByHexValue.new(
+              hex_values: hex_values,
+              require_nl: true
+            )
+          )
+        end
+      end
+    end
+  end
+end

data/lib/img_to_script/generators/hex_mask/hex_mask.rb

@@ -11,6 +11,15 @@ module ImgToScript
 
         private
 
+        def _append_move_point(x, y)
+          @tokens.append(
+            AbstractToken::MovePointToAbsCoords.new(
+              x: x,
+              y: y
+            )
+          )
+        end
+
         #
         # Encode a binary image to a hex-mask encoded image.
         #

data/lib/img_to_script/languages/mk90_basic/translators/mixin.rb

@@ -96,19 +96,6 @@ module ImgToScript
             _math_operation(token, "*")
           end
 
-          def _move_point_to_abs_coords(token)
-            MK90BasicToken.new(
-              keyword: "DRAWO",
-              args: _translate_arguments([
-                                           token.x,
-                                           token.y
-                                         ]),
-              separator: ",",
-              require_nl: token.require_nl,
-              sliceable: false
-            )
-          end
-
           def _go_to(token)
             MK90BasicToken.new(
               keyword: "GOTO",

data/lib/img_to_script/languages/mk90_basic/translators/mk90_basic_10.rb

@@ -20,6 +20,20 @@ module ImgToScript
               sliceable: false
             )
           end
+
+          # MK90 BASIC v.1.0 does support the DRAW O statement.
+          def _move_point_to_abs_coords(token)
+            MK90BasicToken.new(
+              keyword: "DRAWO",
+              args: _translate_arguments([
+                                           token.x,
+                                           token.y
+                                         ]),
+              separator: ",",
+              require_nl: token.require_nl,
+              sliceable: false
+            )
+          end
         end
       end
     end

data/lib/img_to_script/languages/mk90_basic/translators/mk90_basic_20.rb

@@ -20,6 +20,21 @@ module ImgToScript
               sliceable: false
             )
           end
+
+          # MK90 BASIC v.2.0 does NOT support the DRAW O statement due to a bug,
+          # the LOCATE statement should be used instead.
+          def _move_point_to_abs_coords(token)
+            MK90BasicToken.new(
+              keyword: "LOCATE",
+              args: _translate_arguments([
+                                           token.x,
+                                           token.y
+                                         ]),
+              separator: ",",
+              require_nl: token.require_nl,
+              sliceable: false
+            )
+          end
         end
       end
     end

data/lib/img_to_script/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImgToScript
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: img_to_script
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - 8bit-mate
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-system
@@ -139,6 +139,7 @@ files:
 - lib/img_to_script/generators/hex_mask.rb
 - lib/img_to_script/generators/hex_mask/default.rb
 - lib/img_to_script/generators/hex_mask/enhanced.rb
+- lib/img_to_script/generators/hex_mask/forced_point_move.rb
 - lib/img_to_script/generators/hex_mask/hex_mask.rb
 - lib/img_to_script/generators/run_length_encoding.rb
 - lib/img_to_script/generators/run_length_encoding/horizontal.rb