revert to single loop when building grid

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,4 @@
+**v1.2.9** Grid method now in java (and corrected for step greater than 1)
 
 **v1.2.8** Properly implement post-initialize (it might be useful). Refactor Sketchbook and OS. Update to processing-3.2.4, if you have not updated samples for a while you should now.
 

lib/jruby_art/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.2.8'.freeze
+  VERSION = '1.2.9'.freeze
 end

pom.rb

@@ -2,7 +2,7 @@
 project 'rp5extras', 'https://github.com/ruby-processing/JRubyArt' do
 
   model_version '4.0.0'
-  id 'ruby-processing:rp5extras', '1.2.8'
+  id 'ruby-processing:rp5extras', '1.2.9'
   packaging 'jar'
 
   description 'rp5extras for JRubyArt'

src/monkstone/MathToolModule.java

@@ -224,12 +224,18 @@ public static IRubyObject createGrid(ThreadContext context, IRubyObject recv, IR
         colStep = (Integer) args[3].toJava(Integer.class);
         }
         if (block.isGiven()) {
-            for (int x = 0; x < row / rowStep; x++){
-                for (int y = 0; y < column / colStep; y++){
-                    block.yieldSpecific(context, context.runtime.newFixnum(x * rowStep), context.runtime.newFixnum(y * colStep));
-
-                }
-            }
+//            for (int x = 0; x < row / rowStep; x++){
+//                for (int y = 0; y < column / colStep; y++){
+//                    block.yieldSpecific(context, context.runtime.newFixnum(x * rowStep), context.runtime.newFixnum(y * colStep));
+//
+//                }
+//            }
+              int tempRow = row / rowStep;
+              for (int z = 0; z < (tempRow * (column / colStep)); z++){
+                  int x = z % tempRow;
+                  int y = z / tempRow;
+                  block.yieldSpecific(context, context.runtime.newFixnum(x * rowStep), context.runtime.newFixnum(y * colStep));
+              }
         }
         return context.nil;