dedalus 0.2.13 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5327f7648864b0cc5217c8e671b9bb243c7998c
-  data.tar.gz: 75ac3ec22cde7033cc871d8883c98618027d5348
+  metadata.gz: eb3ab91813d799396d435838e747c35b4a9e9d78
+  data.tar.gz: 2b89f9dd88e5a751bd16a3becf59dec71d10dfdf
 SHA512:
-  metadata.gz: 35ea6e689b593def29f75b5d72df05957336f46eabb074b22444459b41ddfff463afb6eed5be7ad423649812d98cdf04c2cc09c78f255f2577de06c94b988fda
-  data.tar.gz: f7c0968138edf819dd5f1d89ec8cdefda8fc22ec09a5ff54d3e7043ba128d01d00e4d9aa200774e257d9f834e31e4bbcfac9736edf96f28b62a7240c20bf4c56
+  metadata.gz: 008fea49b63d69e38faea15140312426dccc95e47b89ff650050f36232031c81baff799a181a9aacec77b52afa791c6d73d8584bb954af41ed02b1fdd546a9a4
+  data.tar.gz: 149540db900560b7ee20b80553a529c20f821dd9567fbfa39264676411f37180efa744ad1553475b2ab5e291223d11a441bae4a0bedec1bb9e172c7e85ebcf05

data/lib/dedalus/elements/image.rb

@@ -4,16 +4,18 @@ module Dedalus
       attr_accessor :path, :padding, :z_order, :invert_x, :invert_y, :overlay_color
 
       def render
-        x,y = *position
+        x0,y0 = *position
+        ox,oy = *offset
+
         x_scale = invert_x ? -scale : scale
         y_scale = invert_y ? -scale : scale
 
-        ox,oy = *offset
+        x,y = x0 + padding + ox, y0 + padding + oy
 
         if overlay_color
-          asset.draw(x + padding + ox*scale, y + padding + oy*scale, z_order, x_scale, y_scale, overlay_gosu_color)
+          asset.draw(x,y, z_order, x_scale, y_scale, overlay_gosu_color)
         else
-          asset.draw(x + padding + ox*scale, y + padding + oy*scale, z_order, x_scale, y_scale) #, overlay_color)
+          asset.draw(x,y, z_order, x_scale, y_scale)
         end
       end
 

data/lib/dedalus/elements/image_grid.rb

@@ -1,38 +1,13 @@
 module Dedalus
   module Elements
-    # 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
+      attr_accessor :scale
 
       def show
         if grid
-          grid.map do |row|
-            row.map do |grid_value|
+          grid.map do |row_elements|
+            row_elements.map do |grid_value|
               if grid_value
                 sprite_for(grid_value)
               else
@@ -45,20 +20,42 @@ module Dedalus
         end
       end
 
+      def name
+        @name ||= 'an-image-grid' # a uniq id for recording
+      end
+
+      def record?
+        !grid.empty?
+      end
+
+      def width
+        if grid && grid.first
+          grid.first.length * tile_height * scale
+        else
+          0
+        end
+      end
+
       def height
         if grid
-          grid.length * tile_height
+          grid.length * tile_height * scale
         else
           0
         end
       end
 
       def sprite_for(frame)
-        Sprite.new(frame: frame, width: tile_width, height: tile_height, path: tiles_path)
+        Sprite.new(
+          frame: frame,
+          asset_width: tile_width,
+          asset_height: tile_height,
+          path: tiles_path,
+          scale: scale
+        )
       end
 
       def no_image
-        Void.new(height: tile_height, width: tile_width)
+        Void.new(height: tile_height * scale, width: tile_width * scale)
       end
 
       def self.description
@@ -70,11 +67,12 @@ module Dedalus
           tiles_path: "media/images/tiles.png",
           tile_width: 64,
           tile_height: 64,
+          scale: 0.2,
           grid: [
-            [ nil, 0, 2, 0 ],
-            [ 0, nil, 1, 0 ],
-            [ 0, 0, nil, 0 ],
-            [ 0, 1, 2, nil ],
+            [ nil, 0, 2, 0, 1 ],
+            [ 0, nil, 1, 0, 1 ],
+            [ 0, 0, nil, 0, 1 ],
+            [ 0, 1, 2, nil, 1 ],
           ]
         }
       end

data/lib/dedalus/elements/sprite.rb

@@ -1,18 +1,26 @@
 module Dedalus
   module Elements
     class Sprite < Image
-      attr_accessor :width, :height, :frame
+      attr_accessor :asset_width, :asset_height, :frame
 
       def asset
-        @asset ||= Dedalus::ImageRepository.lookup_tiles(path, width, height)[frame]
+        @asset ||= Dedalus::ImageRepository.lookup_tiles(path, asset_width, asset_height)[frame]
+      end
+
+      def width
+        2*padding + (asset_width * scale)
+      end
+
+      def height
+        2*padding + (asset_height * scale)
       end
 
       def self.example_data
         {
           path: "media/images/tiles.png",
           frame: 3,
-          width: 64,
-          height: 64,
+          asset_width: 64,
+          asset_height: 64,
           invert_x: true,
           scale: 2.5
         }

data/lib/dedalus/elements/sprite_field.rb

@@ -2,8 +2,9 @@ module Dedalus
   module Elements
     class SpriteField < Dedalus::Organism
       attr_accessor :grid, :sprite_map, :scale, :camera_location
+      attr_accessor :tile_width, :tile_height, :tiles_path
       # TODO tiles path and width/height as attrs
-      
+
       def show
         layers
       end
@@ -21,7 +22,6 @@ module Dedalus
         layer_stack = Dedalus::LayerStack.new
         layer_stack.push(Dedalus::Layer.new(background_image))
         layer_stack.push(Dedalus::Layer.new(image_grid))
-
         layer_stack.push(canvas_layer)
         layer_stack
       end
@@ -42,18 +42,20 @@ module Dedalus
 
       def image_grid
         ImageGrid.new(
-          tiles_path: 'media/images/tiles.png',
+          tiles_path: tiles_path, #'media/images/tiles.png',
           grid: grid,
-          tile_width: 64,
-          tile_height: 64,
-          offset: camera_offset
+          tile_width: tile_width,
+          tile_height: tile_height,
+          scale: scale,
+          offset: camera_offset,
+          name: 'sprite-field-tiles'
         )
       end
 
       def to_screen_coordinates(location:)
         x,y = *location
         cx,cy = *camera_offset
-        [(x * image_grid.tile_width + cx), (y * image_grid.tile_height + cy)]
+        [(x * tile_width + cx), (y * tile_height + cy)]
       end
 
       def background_image
@@ -70,9 +72,14 @@ module Dedalus
                  [0,0,0,0,0],
                  [1,1,3,1,1],
                  [1,1,1,1,1]],
-          scale: 0.3,
+          scale: 2.0,
           camera_location: [1.2,2.4],
-          sprite_map: { [1.2,2.4] => [ Sprite.new(Sprite.example_data) ] }
+          tiles_path: "media/images/tiles.png",
+          tile_width: 64,
+          tile_height: 64,
+          sprite_map: {
+            [1.2,2.4] => [ Sprite.new(Sprite.example_data) ]
+          }
         }
       end
     end

data/lib/dedalus/elements.rb

@@ -117,7 +117,6 @@ module Dedalus
     end
   end
 
-  # it's like a gluon or something, not sure how to model in nuclear terms
   class LayerStack < Element
     attr_reader :layers
 

data/lib/dedalus/image_repository.rb

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

data/lib/dedalus/version.rb

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

data/lib/dedalus/view_traversal.rb

@@ -20,14 +20,20 @@ module Dedalus
     end
 
     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
+      width  = structure.width  if !structure.is_a?(Array) && structure.width
+
       x0, y0 = *origin
 
       if structure.is_a?(Dedalus::Atom)
         @atom_callback.call(structure, origin: origin, dimensions: dimensions, freeform: freeform) if @atom_callback
+
+      # implicitly array is rows, nested arrays are columns, doubly-nested arrays are rows, etc
+      elsif structure.is_a?(Array)
+        walk_rows!(structure, origin: origin, dimensions: dimensions, render: render)
+
       elsif structure.is_a?(Dedalus::Element)
         offset = structure.offset || [0,0]
         ox,oy = *offset
@@ -54,10 +60,8 @@ module Dedalus
         if structure.is_a?(LayerStack)
           layers = structure.layers
           layers.each do |layer|
-            # TODO cleanup a bit?
             if layer.freeform?
               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, render: render)
                 end
@@ -69,24 +73,18 @@ module Dedalus
             end
           end
         else
-          # 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)
+            recorded_image.draw(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, render: render)
       end
     end
 
@@ -167,7 +165,7 @@ module Dedalus
           end
         end
 
-        if distance_cursor > distance - current_element_distance # ??
+        if distance_cursor > distance - current_element_distance
           return elements.slice(index,elements.size)
         end
 
@@ -175,7 +173,6 @@ module Dedalus
         distance_cursor += current_element_distance
       end
 
-      # no overflowing elements...
       []
     end
   end

metadata

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