draw_color_repeat 1.0.0

data/app/models/dcr/command/repeat.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Dcr
+  class Command
+    class Repeat < Command
+      command_alias 'p'
+      
+      def call
+        command_index_of_self = @program.expanded_commands.index(self)
+        return if command_index_of_self.nil?
+        commands_up_to_self = @program.expanded_commands[0...command_index_of_self]
+        last_empty_command = commands_up_to_self.reverse.detect {|command| command.is_a?(Empty)}
+        command_index_of_last_empty_command = @program.expanded_commands.index(last_empty_command).to_i # first index is 0 if no empty command is found
+        commands_after_empty_command_up_to_self = @program.expanded_commands[command_index_of_last_empty_command...command_index_of_self]
+        @program.expanded_commands[command_index_of_self..command_index_of_self] = commands_after_empty_command_up_to_self*value
+      end
+      
+      def value
+        super.to_i == 0 ? 1 : super.to_i
+      end
+    end
+  end
+end

data/app/models/dcr/command/right.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Dcr
+  class Command
+    class Right < Command
+      command_alias 'r'
+    
+      def call
+        @program.angle += value
+      end
+      
+      def value
+        super.to_f == 0 ? 90.0 : super.to_f
+      end
+    end
+  end
+end

data/app/models/dcr/polygon.rb

@@ -0,0 +1,37 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'equalizer'
+  
+class Dcr
+  class Polygon
+    ATTRIBUTES = [:point_array, :background]
+    
+    include Equalizer.new(*ATTRIBUTES)
+    
+    attr_accessor *ATTRIBUTES
+    
+    def initialize(*point_array)
+      point_array = point_array.first if point_array.size == 1 && point_array.first.is_a?(Array)
+      @point_array = point_array
+    end
+  end
+end

data/app/models/dcr/program.rb

@@ -0,0 +1,130 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_relative 'command'
+require_relative 'polygon'
+
+class Dcr
+  # A DCR program that takes text (representing commands) and board width/height for drawing polygons
+  # It has a current location (x/y) and angle. Angle is clockwise, with 0 being upward (north).
+  class Program
+    include Glimmer::DataBinding::ObservableModel
+    
+    STICK_FIGURE_SIZE = 30
+    
+    attr_accessor :text, :commands, :canvas_width, :canvas_height, :location_x, :location_y, :angle, :expanded_commands
+    
+    # array of polygon objects including array of point arrays and color to be drawn/filled in GUI
+    attr_accessor :polygons
+    
+    def initialize(text: '', canvas_width: 800, canvas_height: 600)
+      @commands = []
+      @canvas_width = canvas_width
+      @canvas_height = canvas_height
+      reset!
+      self.text = text
+    end
+    
+    def canvas_width=(new_width)
+      @canvas_width = new_width
+      @last_expanded_commands = nil
+      calculate_polygons
+    end
+    
+    def canvas_height=(new_height)
+      @canvas_height = new_height
+      @last_expanded_commands = nil
+      calculate_polygons
+    end
+    
+    
+    def text=(value)
+      @text = value
+      parse_commands
+    end
+    
+    def commands=(new_commands)
+      # TODO remove observers from old commands
+      @commands = new_commands
+      # TODO observe commands for fine grained changes and have this update "text" as a result (which indirectly fires a "commands" change)
+      calculate_polygons
+    end
+    
+    def reset!
+      reset_location!
+      reset_angle!
+      reset_next_color_index!
+      reset_polygons!
+    end
+    
+    def reset_location!
+      # also set stick_figure_location_x and stick_figure_location_y, which is slightly different
+      self.location_x = (canvas_width - STICK_FIGURE_SIZE) / 2.0
+      self.location_y = (canvas_height - STICK_FIGURE_SIZE) / 2.0
+    end
+    
+    # Resets angle (0 means upward / north). Angle value is clockwise.
+    def reset_angle!
+      self.angle = 0 # means pointing upward (north)
+    end
+    
+    def reset_polygons!
+      # reset quietly via instance variable without alerting observers with attribute writer method
+      @polygons = [Polygon.new(location_x, location_y)]
+    end
+    
+    def new_polygon!
+      @polygons << Polygon.new(location_x, location_y)
+    end
+    
+    def reset_next_color_index!
+      Command::Color.reset_next_color_index!
+    end
+    
+    def angle=(value)
+      @angle = value % 360
+    end
+    
+    private
+    
+    def parse_commands
+      self.commands = text.split("\n").map do |command_text|
+        Command.create(program: self, text: command_text)
+      end
+    end
+    
+    def calculate_polygons
+      reset!
+      expand_commands!
+      expanded_commands.each(&:call)
+      notify_observers(:polygons) # TODO do away with this using nested data-binding
+    end
+    
+    # Calls repeat commands to expand other types of commands (repeat them)
+    def expand_commands!
+      self.expanded_commands = commands.dup
+      commands.each do |command|
+        command.call if command.is_a?(Command::Repeat)
+      end
+      self.expanded_commands.compact!
+    end
+  end
+end

data/app/views/dcr/app_view.rb

@@ -0,0 +1,128 @@
+require 'models/dcr/program'
+
+require 'views/dcr/compass'
+
+class Dcr
+  class AppView
+    include Glimmer::UI::CustomShell
+
+    TEXT_FONT_HEIGHT = 30
+    GUI_FONT_HEIGHT = TEXT_FONT_HEIGHT - 7
+    DEFAULT_CANVAS_WIDTH = 960
+    DEFAULT_CANVAS_HEIGHT = 464
+
+    option :program
+    
+    before_body {
+      @command_composites = []
+      self.program = Program.new(canvas_width: DEFAULT_CANVAS_WIDTH, canvas_height: DEFAULT_CANVAS_HEIGHT)
+      Display.app_name = 'Draw Color Repeat'
+      Display.app_version = VERSION
+      @display = display {
+        on_about {
+          display_about_dialog
+        }
+        on_preferences {
+          display_about_dialog
+        }
+      }
+    }
+    
+    after_body {
+      observe(self, 'program.polygons') do |new_polygons|
+        if new_polygons != @last_polygons
+          @polygon_container.shapes.dup.each(&:dispose)
+          @polygon_container.content {
+            new_polygons.each do |new_polygon|
+              if new_polygon.background.nil?
+                polyline(new_polygon.point_array) {
+                  foreground :black
+                }
+              else
+                polygon(new_polygon.point_array) {
+                  background new_polygon.background
+                }
+                polygon(new_polygon.point_array) {
+                  foreground :black
+                }
+              end
+            end
+          }
+          @last_polygons = new_polygons
+        end
+      end
+    }
+
+    ## Add widget content inside custom shell body
+    ## Top-most widget must be a shell or another custom shell
+    #
+    body {
+      shell(:fill_screen, :no_resize) {
+        minimum_size DEFAULT_CANVAS_WIDTH, DEFAULT_CANVAS_HEIGHT + 316
+        image File.join(APP_ROOT, 'package', 'windows', "Draw Color Repeat.ico")
+        text "Draw Color Repeat"
+        
+        sash_form(:horizontal) {
+          weights 2, 4
+          sash_width 10
+        
+          @program_text = code_text(lines: true) { |code_text_proxy|
+            font height: TEXT_FONT_HEIGHT, name: code_text_proxy.font.font_data[0].name
+            text <=> [self, 'program.text']
+            top_margin 0
+            bottom_margin 0
+          }
+
+          @canvas_container = scrolled_composite(:none) {
+            @canvas = canvas {
+              background :white
+              
+              on_control_resized {
+                program.canvas_width = @canvas.bounds.width
+                program.canvas_height = @canvas.bounds.height
+              }
+              
+           
+              # This is where drawn shapes are added
+              @polygon_container = shape(0, 0, :max, :max)
+              
+              # TODO show arrow pointing in the right direction (based on program.angle)
+              @stick_figure = stick_figure(
+                size: Program::STICK_FIGURE_SIZE,
+              ) {
+                location_x <= [self, 'program.location_x', on_read: ->(x) {x - 6}]
+                location_y <= [self, 'program.location_y', on_read: ->(y) {y - 6}]
+              }
+              
+              @compass = compass {
+                location_x <= [self, 'program.location_x']
+                location_y <= [self, 'program.location_y']
+                angle <= [self, 'program.angle']
+              }
+            }
+          }
+        }
+                
+        menu_bar {
+          menu {
+            text '&File'
+            menu_item {
+              text '&About...'
+              on_widget_selected {
+                display_about_dialog
+              }
+            }
+          }
+        }
+      }
+    }
+
+    def display_about_dialog
+      message_box(body_root) {
+        text 'About'
+        message "The DCR Programming Language (Draw Color Repeat) #{VERSION}\n\n#{LICENSE}"
+      }.open
+    end
+  end
+  
+end

data/app/views/dcr/compass.rb

@@ -0,0 +1,56 @@
+class Dcr
+  module View
+    class Compass
+      include Glimmer::UI::CustomShape
+  
+      option :location_x, default: 0
+      option :location_y, default: 0
+      option :angle, default: 0
+      
+      def location_x=(value)
+        options[:location_x] = value
+        apply_transform
+      end
+      
+      def location_y=(value)
+        options[:location_y] = value
+        apply_transform
+      end
+      
+      def angle=(value)
+        options[:angle] = value
+        apply_transform
+      end
+      
+      body {
+        shape(0, 0) {
+          # using polygons because transforms are not working properly at 45/135 degrees when used with unfilled shapes like lines
+          polygon(0, -1, 18, -1, 18, 1, 0, 1) {
+            background :black
+          }
+          polygon(14, -5, 14, 5, 19, 0) {
+            background :black
+          }
+          
+          current_transform
+        }
+      }
+      
+      def apply_transform
+        body_root.content {
+          current_transform
+        }
+      end
+      
+      def current_transform
+        transform {
+          translate location_x, location_y
+          rotate(angle - 90)
+        }
+      end
+  
+    end
+    
+  end
+  
+end

data/bin/dcr

@@ -0,0 +1,13 @@
+#!/usr/bin/env jruby
+
+runner = File.expand_path("../../app/dcr/launch.rb", __FILE__)
+
+# Detect if inside a JAR file or not
+if runner.include?('uri:classloader')
+  require runner
+else
+  require 'glimmer/launcher'
+  
+  launcher = Glimmer::Launcher.new([runner] + ARGV)
+  launcher.launch
+end