dedalus 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f04ecde1ab6bae2875dc758bc221a5e2c7fa2d
-  data.tar.gz: 4cb2a1661186f0ac45350d9e8458473c00494595
+  metadata.gz: 2f4879b973c1147f12956e1662b1f9d45c5b2d1c
+  data.tar.gz: 0e4d0a4ecb3f7509d0a6f3ba1a1bc250031e5500
 SHA512:
-  metadata.gz: cb312e6ccc08fafe6bb29eae6b4ed17d08a07cce0ca5069c559045bb3cc2cedd084712389f3580c9391db37bc4822fabb1c41cf82674bf3bb5e0870ebd07ff17
-  data.tar.gz: c946655d7a74d356e193b224355c2249254b294fb165ebe857c948c34779edd8bf003b3f836243a98d79c1fa0c303e083d13843f75ae4d64602b77eec8eafb13
+  metadata.gz: ffb664d2e7632fc989db85de4dd98c36c727ec7c4faac2a6e01b76f1922afc49fe6d94b9172e5a5c807473cb2ebb2e3f24326398cf37e543bda775d4d0a43ed8
+  data.tar.gz: 3bd94eda18f255f79126803f36c2c291ba787b3f34bc15cf76f3856fcee7e3ac3a367e0e5471210112a078bea8ca5c84124e8e7a952b574a3dccfeca5cc8a425

data/lib/dedalus/app_view_composer.rb

@@ -5,14 +5,13 @@ module Dedalus
 
     def traverse(structure, origin: [0,0], dimensions:, render: false, &blk)
       traversal = ViewTraversal.new(&blk)
-      structure = traversal.walk!(structure, origin: origin, dimensions: dimensions, render: render)
-      structure
+      traversal.walk!(structure, origin: origin, dimensions: dimensions, render: render)
     end
 
     def send_molecule(structure, window_dims, mouse_position:, message:)
       mouse_coord = coord(*mouse_position)
 
-      updated_structure = traverse(structure, origin: [0,0], dimensions: window_dims) do
+      traverse(structure, origin: [0,0], dimensions: window_dims, render: false) do
         on_molecule do |molecule, origin:, dimensions:, z_index:|
           element_bounding_box = Geometer::Rectangle.new(coord(*origin), dim(*dimensions))
           mouse_overlap = element_bounding_box.contains?(mouse_coord) rescue false # could get bad coords...
@@ -20,12 +19,8 @@ module Dedalus
             molecule.position = origin
             molecule.send(message)
           end
-
-          molecule
         end
       end
-
-      updated_structure
     end
 
     def hover_molecule(structure, window_dims, mouse_position:)
@@ -47,7 +42,8 @@ module Dedalus
             )
           end
 
-          if freeform # then offset by origin
+          # TODO may need to do this to get click/hover events for sprites?
+          if freeform # then offset by origin 
             x0,y0 = *origin
             x,y = *atom.position
             atom.position = [x+x0,y+y0]

data/lib/dedalus/application_view.rb

@@ -10,7 +10,6 @@ module Dedalus
     end
 
     def click
-      p [ :app_view_click ]
       composer.click_molecule(
         app_screen,
         [window.width, window.height],
@@ -20,7 +19,7 @@ module Dedalus
 
     def compose(screen)
       composer.hover_molecule(screen, dimensions, mouse_position: mouse_position)
-      composer.render!(screen.shown, dimensions)
+      composer.render!(screen, dimensions)
     end
 
     def dimensions

data/lib/dedalus/elements/image_grid.rb

@@ -2,7 +2,7 @@ module Dedalus
   module Elements
     class ImageGrid < Dedalus::Molecule
       attr_accessor :grid, :tiles_path, :tile_width, :tile_height, :tile_class
-      attr_accessor :scale
+      attr_accessor :scale, :redraw_tiles
 
       def show
         if grid
@@ -29,7 +29,11 @@ module Dedalus
       end
 
       def record?
-        grid && !grid.empty?
+        (grid && !grid.empty?)
+      end
+
+      def rerecord?
+        redraw_tiles
       end
 
       def width

data/lib/dedalus/elements/sprite_field.rb

@@ -3,6 +3,7 @@ module Dedalus
     class SpriteField < Dedalus::Organism
       attr_accessor :grid, :sprite_map, :scale, :camera_location
       attr_accessor :tile_width, :tile_height, :tiles_path, :tile_class
+      attr_accessor :redraw_tiles
 
       def show
         layers
@@ -48,7 +49,8 @@ module Dedalus
           tile_class: tile_class,
           scale: scale,
           offset: camera_offset,
-          name: 'sprite-field-tiles'
+          name: 'sprite-field-tiles',
+          redraw_tiles: redraw_tiles
         )
       end
 

data/lib/dedalus/image_repository.rb

@@ -12,10 +12,14 @@ module Dedalus
       @tiles[path]
     end
 
-    def self.lookup_recording(id,width,height,window,&blk)
+    def self.lookup_recording(id,width,height,window,force:false,&blk)
       # p [ :lookup_recording, id: id ]
       @recordings ||= {}
-      @recordings[id] ||= window.record(width.to_i,height.to_i,&blk)
+      if force
+        @recordings[id] = window.record(width.to_i,height.to_i,&blk)
+      else
+        @recordings[id] ||= window.record(width.to_i,height.to_i,&blk)
+      end
       @recordings[id]
     end
 

data/lib/dedalus/pattern_library/application.rb

@@ -4,8 +4,8 @@ module Dedalus
       viewed_with ApplicationView
       include Models
 
+      # TODO move into joyce??
       def click
-        p [ :app_click ]
         view.click
       end
 

data/lib/dedalus/version.rb

@@ -1,4 +1,4 @@
 module Dedalus
   # dedalus version
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

data/lib/dedalus/view_traversal.rb

@@ -73,7 +73,7 @@ module Dedalus
           end
         else
           if structure.record? && render
-            recorded_image = ImageRepository.lookup_recording(structure.name, structure.width, structure.height, structure.window) do
+            recorded_image = ImageRepository.lookup_recording(structure.name, structure.width, structure.height, structure.window, force: structure.rerecord?) do
               walk!(structure.shown, origin: [0,0], dimensions: pad_dims, freeform: freeform, render: render)
             end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dedalus
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Joseph Weissman