dedalus 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccd682d80ad90e1cf10020d057c1d58ec41e7b63
-  data.tar.gz: 8795a8e23edaee430a5299675a49719c56bc8749
+  metadata.gz: a5327f7648864b0cc5217c8e671b9bb243c7998c
+  data.tar.gz: 75ac3ec22cde7033cc871d8883c98618027d5348
 SHA512:
-  metadata.gz: 6af7458172873ddc245a291d2bcbee55dda5a157113915f8c0af9009ab0000d63f3ad4dd1de2cc9f6a30dcc9c2b6b6cfddf1a319058dcaca7a80a8ad6b674ee7
-  data.tar.gz: 05d2f7bac3b56a1912e035d76eebd13b4dbcb6c671bd035abb4bd116541da79371d7d6b2247c6d7d4927bf16f7e8f253a377001ec2db952d6cda8fa8f0e72d86
+  metadata.gz: 35ea6e689b593def29f75b5d72df05957336f46eabb074b22444459b41ddfff463afb6eed5be7ad423649812d98cdf04c2cc09c78f255f2577de06c94b988fda
+  data.tar.gz: f7c0968138edf819dd5f1d89ec8cdefda8fc22ec09a5ff54d3e7043ba128d01d00e4d9aa200774e257d9f834e31e4bbcfac9736edf96f28b62a7240c20bf4c56

data/lib/dedalus/app_view_composer.rb

@@ -3,13 +3,13 @@ module Dedalus
     include Geometer::PointHelpers
     include Geometer::DimensionHelpers
 
-    def traverse(structure, origin: [0,0], dimensions:, &blk)
+    def traverse(structure, origin: [0,0], dimensions:, render: false, &blk)
       traversal = ViewTraversal.new(&blk)
-      traversal.walk!(structure, origin: origin, dimensions: dimensions)
+      traversal.walk!(structure, origin: origin, dimensions: dimensions, render: render)
       structure
     end
 
-    def send_molecule(structure, window_dims, mouse_position:, message:) #, origin: [0,0], dimensions:, mouse_position:)
+    def send_molecule(structure, window_dims, mouse_position:, message:)
       mouse_coord = coord(*mouse_position)
 
       traverse(structure, origin: [0,0], dimensions: window_dims) do
@@ -32,7 +32,7 @@ module Dedalus
     end
 
     def render!(structure, dims)
-      traverse(structure, origin: [0,0], dimensions: dims) do
+      traverse(structure, origin: [0,0], dimensions: dims, render: true) do
         on_atom do |atom, origin:, dimensions:, freeform:|
           if atom.background_color
             atom.draw_bounding_box(
@@ -50,7 +50,6 @@ module Dedalus
             atom.position = origin
           end
 
-          # atom.position = origin unless freeform
           atom.render
         end
 
@@ -62,7 +61,8 @@ module Dedalus
               dimensions: dimensions
             )
           end
-          element.position = origin # ...
+
+          element.position = origin
         end
       end
     end

data/lib/dedalus/elements/image_grid.rb

@@ -3,6 +3,31 @@ module Dedalus
     # TODO image grid should learn to use window#record http://www.rubydoc.info/github/jlnr/gosu/Gosu%2FWindow%3Arecord
     class ImageGrid < Dedalus::Molecule
       attr_accessor :grid, :tiles_path, :tile_width, :tile_height
+      attr_accessor :recorded_image
+
+      def name
+        'an-image-grid' # we record these, so... we need a unique identifier that will persist across invocations -- in general we'll only be using one, but if they're layered you may need to differentiate...
+      end
+
+      def record?
+        !grid.empty?
+      end
+
+      def width
+        if grid && grid.first
+          grid.first.length * tile_width
+        else
+          0
+        end
+      end
+
+      def height
+        if grid
+          grid.length * tile_height
+        else
+          0
+        end
+      end
 
       def show
         if grid

data/lib/dedalus/elements/sprite_field.rb

@@ -3,7 +3,7 @@ module Dedalus
     class SpriteField < Dedalus::Organism
       attr_accessor :grid, :sprite_map, :scale, :camera_location
       # TODO tiles path and width/height as attrs
-
+      
       def show
         layers
       end
@@ -41,13 +41,12 @@ module Dedalus
       end
 
       def image_grid
-        # cx,cy = *camera_offset
         ImageGrid.new(
           tiles_path: 'media/images/tiles.png',
           grid: grid,
           tile_width: 64,
           tile_height: 64,
-          offset: camera_offset #[-cx*64, -cy*64]
+          offset: camera_offset
         )
       end
 
@@ -67,9 +66,9 @@ module Dedalus
 
       def self.example_data
         {
-          grid: [[0,0,0,0,0],
+          grid: [[0,2,0,0,0],
                  [0,0,0,0,0],
-                 [1,1,1,1,1],
+                 [1,1,3,1,1],
                  [1,1,1,1,1]],
           scale: 0.3,
           camera_location: [1.2,2.4],

data/lib/dedalus/elements.rb

@@ -32,6 +32,10 @@ module Dedalus
       attrs.each { |(k,v)| instance_variable_set(:"@#{k}",v) } unless attrs.nil?
     end
 
+    def record?
+      false
+    end
+
     def draw_bounding_box(origin:, dimensions:, color: Palette.gray)
       x,y = *origin
       w,h = *dimensions

data/lib/dedalus/image_repository.rb

@@ -11,5 +11,12 @@ module Dedalus
       @tiles[path] ||= Gosu::Image::load_tiles(path, width, height)
       @tiles[path]
     end
+
+    def self.lookup_recording(id,width,height,window,&blk)
+      p [ :lookup_recording, id: id ]
+      @recordings ||= {}
+      @recordings[id] ||= window.record(width,height,&blk)
+      @recordings[id]
+    end
   end
 end

data/lib/dedalus/version.rb

@@ -1,4 +1,4 @@
 module Dedalus
   # dedalus version
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

data/lib/dedalus/view_traversal.rb

@@ -19,7 +19,8 @@ module Dedalus
       @element_callback = blk
     end
 
-    def walk!(structure, origin:, dimensions:, freeform: false)
+    def walk!(structure, origin:, dimensions:, freeform: false, render: false)
+      # p [ :walk, render: render ]
       width, height = *dimensions
       height = structure.height if !structure.is_a?(Array) && structure.height
       width = structure.width if !structure.is_a?(Array) && structure.width
@@ -58,25 +59,39 @@ module Dedalus
               if layer.show.is_a?(Array)
                 # need to run through each element individually?
                 layer.show.each do |layer_element|
-                  walk!(layer_element, origin: pad_origin, dimensions: pad_dims, freeform: true)
+                  walk!(layer_element, origin: pad_origin, dimensions: pad_dims, freeform: true, render: render)
                 end
               else
-                walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: true)
+                walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: true, render: render)
               end
             else
-              walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: false)
+              walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: false, render: render)
             end
           end
         else
-          walk!(structure.show, origin: pad_origin, dimensions: pad_dims, freeform: freeform)
+          # p [ :checking_for_recording, record: structure.record?, render: render ]
+          if structure.record? && render
+            # p [ :structure_indicates_recording! ]
+            recorded_image = ImageRepository.lookup_recording(structure.name, structure.width, structure.height, structure.window) do
+              p [ :recording! ]
+              walk!(structure.show, origin: [0,0], dimensions: pad_dims, freeform: freeform, render: render)
+            end
+
+            ox,oy = *pad_origin
+            # p [ :drawing_recorded_image, at: [ox,oy] ]
+            recorded_image.draw(ox,oy,10) #ox,oy,10)
+          else
+            walk!(structure.show, origin: pad_origin, dimensions: pad_dims, freeform: freeform, render: render)
+          end
         end
+
       elsif structure.is_a?(Array) # we have a set of rows
-        walk_rows!(structure, origin: origin, dimensions: dimensions)
+        walk_rows!(structure, origin: origin, dimensions: dimensions, render: render)
       end
     end
 
     private
-    def walk_rows!(rows, origin:, dimensions:)
+    def walk_rows!(rows, origin:, dimensions:, render: false)
       width, height = *dimensions
       x0, y0 = *origin
 
@@ -86,7 +101,7 @@ module Dedalus
         if row.is_a?(Array)
           extra_columns = true
           while extra_columns
-            row = walk_columns!(row, origin: [x0, y], dimensions: dims)
+            row = walk_columns!(row, origin: [x0, y], dimensions: dims, render: render)
             if row.empty?
               extra_columns = false
             else
@@ -95,19 +110,19 @@ module Dedalus
             end
           end
         else
-          walk!(row, origin: [x0,y], dimensions: dims)
+          walk!(row, origin: [x0,y], dimensions: dims, render: render)
         end
       end
     end
 
-    def walk_columns!(columns, origin:, dimensions:)
+    def walk_columns!(columns, origin:, dimensions:, render: false)
       width, height = *dimensions
       x0, y0 = *origin
 
       subdivide_line(columns, distance: width, attr: :width) do |column, current_column_width, width_cursor|
         x = x0 + width_cursor
         dims = [ current_column_width, height ]
-        walk!(column, origin: [x,y0], dimensions: dims)
+        walk!(column, origin: [x,y0], dimensions: dims, render: render)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dedalus
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: joyce