dedalus 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8496091cfeac9a4675e9b6a639733f4e007e3c15
-  data.tar.gz: 9dae2b96b13fd38dd3208d1a3ec6d245a1920ec2
+  metadata.gz: 8686f3d6232edc32c9ead7d41abd9feedb983b9c
+  data.tar.gz: 727b37a3abf33fb14b046c004d7bd10c3737612a
 SHA512:
-  metadata.gz: 30778eb7fb4cd76d5625de3997f4df71e9974628a99d291681fa11b75ba8b3592b7e96f3b2c8de370d12ac11aef8c732eb446a893b6972607d48465af21dfce8
-  data.tar.gz: 2021ca4cebb4e30c8ea9cac4b6794af85b5cf193ad9d4f87d56d84752263165e93121acd5b8de181833bd8d862da4765b431ec8e0da6c88e94193a7e80951809
+  metadata.gz: 1b8d7f3f5c95f0b8e94a928531f0bc1be683b6b26420ae6f47881adfb09e10fc31f4211d614a115c1929ec00b249b3deac35d6f8344b39e4d7fc29e61d5854be
+  data.tar.gz: bf574d8b6c2001c97f364f7e3259ea01bb7a12d49a2c34079cf328524e933552b5c2211897d64b68cbdec821dcace92d5727eb9626de02f8fe327cef408a1c2d

data/bin/dedalus

@@ -9,7 +9,8 @@ if File.directory?(File.join(root,'.git'))
       Dedalus::PatternLibrary::Application.kickstart!({
         setup: {
           library_name: "Dedalus",
-          module_to_search: Dedalus::Elements
+          module_to_search: Dedalus::PatternLibrary
+          # Dedalus::Elements
         }
       })
     rescue LoadError => e

data/lib/dedalus/elements/image.rb

@@ -1,7 +1,7 @@
 module Dedalus
   module Elements
     class Image < Dedalus::Atom
-      attr_accessor :path, :padding, :z_order, :invert_x, :invert_y
+      attr_accessor :path, :padding, :z_order, :invert_x, :invert_y, :overlay_color
 
       def render
         x,y = *position
@@ -10,7 +10,17 @@ module Dedalus
 
         ox,oy = *offset
 
-        asset.draw(x + padding + ox, y + padding + oy, z_order, x_scale, y_scale)
+        if overlay_color
+          asset.draw(x + padding + ox, y + padding + oy, z_order, x_scale, y_scale, overlay_gosu_color)
+        else
+          asset.draw(x + padding + ox, y + padding + oy, z_order, x_scale, y_scale) #, overlay_color)
+        end
+      end
+
+      def overlay_gosu_color
+        clr = Palette.decode_color(overlay_color).to_gosu
+        clr.alpha = 255
+        clr
       end
 
       def offset

data/lib/dedalus/elements/image_grid.rb

@@ -4,19 +4,27 @@ module Dedalus
       attr_accessor :grid, :tiles_path, :tile_width, :tile_height
 
       def show
-        grid.map do |row|
-          row.map do |grid_value|
-            if grid_value
-              sprite_for(grid_value)
-            else
-              no_image
+        if grid
+          grid.map do |row|
+            row.map do |grid_value|
+              if grid_value
+                sprite_for(grid_value)
+              else
+                no_image
+              end
             end
           end
+        else
+          []
         end
       end
 
       def height
-        grid.length * tile_height
+        if grid
+          grid.length * tile_height
+        else
+          0
+        end
       end
 
       def sprite_for(frame)

data/lib/dedalus/elements/sprite_field.rb

@@ -13,16 +13,26 @@ module Dedalus
         layer_stack.push(Dedalus::Layer.new(background_image))
         layer_stack.push(Dedalus::Layer.new(image_grid))
 
+        # p [ canvas_layer: canvas_layer ] 
+        layer_stack.push(canvas_layer)
+        layer_stack
+      end
+
+      def canvas_layer
         # TODO one sprite *layer*
-        sprite_map.each do |location, sprite_list|
-          sprite_list.each do |sprite_attrs|
+        Dedalus::Layer.new(sprites, freeform: true)
+      end
+
+      def sprites
+        sprite_map.flat_map do |location, sprite_list|
+          sprite_list.map do |sprite|
             position = to_screen_coordinates(location: location)
-            sprite = Sprite.new(sprite_attrs.merge(position: position))
-            layer_stack.push(Dedalus::Layer.new(sprite, freeform: true))
+            sprite.position = position
+            p [ updated_sprite_position: sprite ]
+            sprite
+            # Sprite.new(sprite_attrs.merge(position: position))
           end
         end
-
-        layer_stack
       end
 
       def image_grid
@@ -55,7 +65,7 @@ module Dedalus
                  [1,1,1,1,1]],
           scale: 0.3,
           player_location: [2,2],
-          sprite_map: { [0,0] => [ Sprite.example_data ] }
+          sprite_map: { [1.2,2.4] => [ Sprite.new(Sprite.example_data) ] }
         }
       end
     end

data/lib/dedalus/pattern_library/organisms/app_header.rb

@@ -11,7 +11,7 @@ module Dedalus
       end
 
       def padding
-        20
+        16
       end
 
       def self.description

data/lib/dedalus/pattern_library/templates/app_template.rb

@@ -61,7 +61,7 @@ module Dedalus
         ApplicationHeader.new(
           title: library_name,
           subtitle: 'A Visual Pattern Library for Joyce',
-          height_percent: 0.15,
+          height_percent: 0.16,
           background_color: Palette.blue
         )
       end

data/lib/dedalus/version.rb

@@ -1,4 +1,4 @@
 module Dedalus
   # dedalus version
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/dedalus/view_traversal.rb

@@ -49,7 +49,19 @@ module Dedalus
         if structure.is_a?(LayerStack)
           layers = structure.layers
           layers.each do |layer|
-            walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: layer.freeform?)
+            # 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)
+                end
+              else
+                walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: true)
+              end
+            else
+              walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: false)
+            end
           end
         else
           walk!(structure.show, origin: pad_origin, dimensions: pad_dims, freeform: freeform)
@@ -69,7 +81,7 @@ module Dedalus
         dims = [width, current_row_height]
         if row.is_a?(Array)
           extra_columns = true
-          while extra_columns 
+          while extra_columns
             row = walk_columns!(row, origin: [x0, y], dimensions: dims)
             if row.empty?
               extra_columns = false

metadata

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