glimmer-dsl-libui 0.2.14 → 0.2.18

data/VERSION

@@ -1 +1 @@
-0.2.14
+0.2.18

data/examples/area_gallery.rb

@@ -18,31 +18,24 @@ window('Area Gallery', 400, 400) {
       fill x0: 10, y0: 10, x1: 350, y1: 350, stops: [{pos: 0.25, r: 204, g: 102, b: 204}, {pos: 0.75, r: 102, g: 102, b: 204}]
     }
     path { # declarative stable path
-      figure(100, 100) {
-        line(100, 400)
-        line(400, 100)
-        line(400, 400)
-
-        closed true
-      }
-
+      polygon(100, 100, 100, 400, 400, 100, 400, 400)
+      
       fill r: 202, g: 102, b: 104, a: 0.5
       stroke r: 0, g: 0, b: 0
     }
     path { # declarative stable path
-      figure(0, 0) {
-        bezier(200, 100, 100, 200, 400, 100)
-        bezier(300, 100, 100, 300, 100, 400)
-        bezier(100, 300, 300, 100, 400, 400)
-
-        closed true
-      }
+      polybezier(0, 0, 200, 100, 100, 200, 400, 100, 300, 100, 100, 300, 100, 400, 100, 300, 300, 100, 400, 400)
 
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
     path { # declarative stable path
-      arc(400, 220, 180, 90, 90, false)
+      polyline(100, 100, 400, 100, 100, 400, 400, 400, 0, 0)
+    
+      stroke r: 0, g: 0, b: 0, thickness: 2
+    }
+    path { # declarative stable path
+      arc(404, 216, 190, 90, 90, false)
 
       # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
       fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
@@ -54,9 +47,9 @@ window('Area Gallery', 400, 400) {
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2
     }
-    text(160, 40, 100) { # x, y, width
+    text(161, 40, 100) { # x, y, width
       string('Area Gallery') {
-        font family: 'Times', size: 14
+        font family: 'Arial', size: 14
         color :black
       }
     }

data/examples/area_gallery2.rb

@@ -88,18 +88,42 @@ window('Area Gallery', 400, 400) {
           end_x 400
           end_y 400
         }
-
-        closed true
       }
 
       fill r: 202, g: 102, b: 204, a: 0.5
       stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
     }
+    path { # declarative stable path
+      polyline(100, 100, 400, 100, 100, 400, 400, 400, 0, 0)
+      figure {
+        x 100
+        y 100
+        
+        line {
+          x 400
+          y 100
+        }
+        line {
+          x 100
+          y 400
+        }
+        line {
+          x 400
+          y 400
+        }
+        line {
+          x 0
+          y 0
+        }
+      }
+    
+      stroke r: 0, g: 0, b: 0, thickness: 2
+    }
     path { # declarative stable path
       arc {
-        x_center 400
-        y_center 220
-        radius 180
+        x_center 404
+        y_center 216
+        radius 190
         start_angle 90
         sweep 90
         is_negative false
@@ -120,12 +144,12 @@ window('Area Gallery', 400, 400) {
       stroke r: 0, g: 0, b: 0, thickness: 2
     }
     text {
-      x 160
+      x 161
       y 40
       width 100
       
       string {
-        font family: 'Times', size: 14
+        font family: 'Arial', size: 14
         color :black
         
         'Area Gallery'

data/examples/area_gallery3.rb

@@ -8,42 +8,35 @@ window('Area Gallery', 400, 400) {
       path { # a dynamic path is added semi-declaratively inside on_draw block
         square(0, 0, 100)
         square(100, 100, 400)
-        
+  
         fill r: 102, g: 102, b: 204
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         rectangle(0, 100, 100, 400)
         rectangle(100, 0, 400, 100)
-
+  
         # linear gradient (has x0, y0, x1, y1, and stops)
         fill x0: 10, y0: 10, x1: 350, y1: 350, stops: [{pos: 0.25, r: 204, g: 102, b: 204}, {pos: 0.75, r: 102, g: 102, b: 204}]
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
-        figure(100, 100) {
-          line(100, 400)
-          line(400, 100)
-          line(400, 400)
-
-          closed true
-        }
-
+        polygon(100, 100, 100, 400, 400, 100, 400, 400)
+        
         fill r: 202, g: 102, b: 104, a: 0.5
         stroke r: 0, g: 0, b: 0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
-        figure(0, 0) {
-          bezier(200, 100, 100, 200, 400, 100)
-          bezier(300, 100, 100, 300, 100, 400)
-          bezier(100, 300, 300, 100, 400, 400)
-
-          closed true
-        }
-
+        polybezier(0, 0, 200, 100, 100, 200, 400, 100, 300, 100, 100, 300, 100, 400, 100, 300, 300, 100, 400, 400)
+  
         fill r: 202, g: 102, b: 204, a: 0.5
         stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
       path { # a dynamic path is added semi-declaratively inside on_draw block
-        arc(400, 220, 180, 90, 90, false)
+        polyline(100, 100, 400, 100, 100, 400, 400, 400, 0, 0)
+      
+        stroke r: 0, g: 0, b: 0, thickness: 2
+      }
+      path { # a dynamic path is added semi-declaratively inside on_draw block
+        arc(404, 216, 190, 90, 90, false)
   
         # radial gradient (has an outer_radius in addition to x0, y0, x1, y1, and stops)
         fill outer_radius: 90, x0: 0, y0: 0, x1: 500, y1: 500, stops: [{pos: 0.25, r: 102, g: 102, b: 204, a: 0.5}, {pos: 0.75, r: 204, g: 102, b: 204}]
@@ -55,9 +48,9 @@ window('Area Gallery', 400, 400) {
         fill r: 202, g: 102, b: 204, a: 0.5
         stroke r: 0, g: 0, b: 0, thickness: 2
       }
-      text(160, 40, 100) { # x, y, width
+      text(161, 40, 100) { # x, y, width
         string('Area Gallery') {
-          font family: 'Times', size: 14
+          font family: 'Arial', size: 14
           color :black
         }
       }

data/examples/area_gallery4.rb

@@ -53,10 +53,10 @@ window('Area Gallery', 400, 400) {
             x 400
             y 400
           }
-
+  
           closed true
         }
-
+  
         fill r: 202, g: 102, b: 104, a: 0.5
         stroke r: 0, g: 0, b: 0
       }
@@ -89,18 +89,42 @@ window('Area Gallery', 400, 400) {
             end_x 400
             end_y 400
           }
-
-          closed true
         }
-
+  
         fill r: 202, g: 102, b: 204, a: 0.5
         stroke r: 0, g: 0, b: 0, thickness: 2, dashes: [50, 10, 10, 10], dash_phase: -50.0
       }
+      path { # a dynamic path is added semi-declaratively inside on_draw block
+        polyline(100, 100, 400, 100, 100, 400, 400, 400, 0, 0)
+        figure {
+          x 100
+          y 100
+          
+          line {
+            x 400
+            y 100
+          }
+          line {
+            x 100
+            y 400
+          }
+          line {
+            x 400
+            y 400
+          }
+          line {
+            x 0
+            y 0
+          }
+        }
+      
+        stroke r: 0, g: 0, b: 0, thickness: 2
+      }
       path { # a dynamic path is added semi-declaratively inside on_draw block
         arc {
-          x_center 400
-          y_center 220
-          radius 180
+          x_center 404
+          y_center 216
+          radius 190
           start_angle 90
           sweep 90
           is_negative false
@@ -121,12 +145,12 @@ window('Area Gallery', 400, 400) {
         stroke r: 0, g: 0, b: 0, thickness: 2
       }
       text {
-        x 160
+        x 161
         y 40
         width 100
         
         string {
-          font family: 'Times', size: 14
+          font family: 'Arial', size: 14
           color :black
           
           'Area Gallery'

data/examples/basic_transform.rb

@@ -16,10 +16,16 @@ window('Basic Transform', 350, 350) {
         fill r: [255 - n*5, 0].max, g: [n*5, 255].min, b: 0, a: 0.5
         stroke :black, thickness: 2
         transform {
-          skew 0.15, 0.15
-          translate 50, 50
+          unless OS.windows?
+            skew 0.15, 0.15
+            translate 50, 50
+          end
           rotate 100, 100, -9 * n
           scale 1.1, 1.1
+          if OS.windows?
+            skew 0.15, 0.15
+            translate 50, 50
+          end
         }
       }
     end

data/examples/color_button.rb

@@ -4,7 +4,7 @@ require 'glimmer-dsl-libui'
 
 include Glimmer
 
-window('color button', 230) {
+window('color button', 240) {
   color_button { |cb|
     color :blue
     

data/examples/color_the_circles.rb

@@ -27,15 +27,17 @@ class ColorTheCircles
   
   def register_observers
     observer = Glimmer::DataBinding::Observer.proc do |new_score|
-      @score_label.text = new_score.to_s
-      if new_score == -20
-        @game_over = true
-        msg_box('You Lost!', 'Sorry! Your score reached -20')
-        restart_game
-      elsif new_score == 0
-        @game_over = true
-        msg_box('You Won!', 'Congratulations! Your score reached 0')
-        restart_game
+      Glimmer::LibUI.queue_main do
+        @score_label.text = new_score.to_s
+        if new_score == -20
+          @game_over = true
+          msg_box('You Lost!', 'Sorry! Your score reached -20')
+          restart_game
+        elsif new_score == 0
+          @game_over = true
+          msg_box('You Won!', 'Congratulations! Your score reached 0')
+          restart_game
+        end
       end
     end
     observer.observe(self, :score) # automatically enhances self to become Glimmer::DataBinding::ObservableModel and notify observer on score attribute changes

data/examples/histogram.rb

@@ -31,20 +31,13 @@ end
 
 # method-based custom control representing a graph path
 def graph_path(width, height, should_extend, &block)
-  locations = point_locations(width, height)
+  locations = point_locations(width, height).flatten
   path {
-    first_location = locations[0] # x and y
-    figure(first_location[0], first_location[1]) {
-      locations.each do |loc|
-        line(loc[0], loc[1])
-      end
-      if should_extend
-        line(width, height)
-        line(0, height)
-        
-        closed true
-      end
-    }
+    if should_extend
+      polygon(locations + [width, height, 0, height])
+    else
+      polyline(locations)
+    end
     
     # apply a transform to the coordinate space for this path so (0, 0) is the top-left corner of the graph
     transform {

data/examples/meta_example.rb

@@ -11,7 +11,7 @@ class MetaExample
   
   def examples
     if @examples.nil?
-      example_files = Dir.glob(File.join(File.expand_path('.', __dir__), '**', '*.rb'))
+      example_files = Dir.glob(File.join(File.expand_path('.', __dir__), '*.rb'))
       example_file_names = example_files.map { |f| File.basename(f, '.rb') }
       example_file_names = example_file_names.reject { |f| f == 'meta_example' || f.match(/\d$/) }
       @examples = example_file_names.map { |f| f.underscore.titlecase }
@@ -46,12 +46,12 @@ class MetaExample
       command = "ruby -r #{glimmer_dsl_libui_file} #{example} 2>&1"
       result = ''
       IO.popen(command) do |f|
-        sleep(0.01) # yield to main thread
+        sleep(0.0001) # yield to main thread
         f.each_line do |line|
           result << line
           puts line
           $stdout.flush # for Windows
-          sleep(0.01) # yield to main thread
+          sleep(0.0001) # yield to main thread
         end
       end
       Glimmer::LibUI.queue_main { msg_box('Error Running Example', result) } if result.downcase.include?('error')
@@ -110,6 +110,8 @@ class MetaExample
                   FileUtils.mkdir_p(parent_dir)
                   example_file = File.join(parent_dir, "#{selected_example.underscore}.rb")
                   File.write(example_file, @code_entry.text)
+                  example_supporting_directory = File.expand_path(selected_example.underscore, __dir__)
+                  FileUtils.cp_r(example_supporting_directory, parent_dir) if Dir.exist?(example_supporting_directory)
                   FileUtils.cp_r(File.expand_path('../icons', __dir__), File.dirname(parent_dir))
                   FileUtils.cp_r(File.expand_path('../sounds', __dir__), File.dirname(parent_dir))
                   run_example(example_file)

data/examples/tetris/model/block.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2007-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 Tetris
+  module Model
+    class Block
+      COLOR_CLEAR = :white
+    
+      attr_accessor :color
+      
+      # Initializes with color. Default color (gray) signifies an empty block
+      def initialize(color = COLOR_CLEAR)
+        @color = color
+      end
+      
+      # Clears block color. `quietly` option indicates if it should not notify observers by setting value quietly via variable not attribute writer.
+      def clear
+        self.color = COLOR_CLEAR unless self.color == COLOR_CLEAR
+      end
+      
+      def clear?
+        self.color == COLOR_CLEAR
+      end
+      
+      def occupied?
+        !clear?
+      end
+    end
+  end
+end