dedalus 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a564e0fa9aed68458bbb167c6053a36c50b6e3a
-  data.tar.gz: cd0d299e22bf39581965ab93fb6b19a055969483
+  metadata.gz: 7aad84d5fe9bd686820573a33ecd092f9ba1c7ed
+  data.tar.gz: c352ebd5e3bcbcd9c03a43c3e258f63d9dbcafcd
 SHA512:
-  metadata.gz: a3b94e4f1c6477bd2c4e4cefc6111339bc5d1c356fa505720a9ce2a912d6f26dea3b7bb60fcf805dd968e52977d9bffc01e513b6d6b8f117285fa5b09dda303d
-  data.tar.gz: f6a38d03481e8055f54e0378302d47c2dfbcd71ddd59bed4653ab70e5d6764cfb936d4bf615aa3346e7ecdaa0ffe22589c8f4160990d9083c722402d068ccf2c
+  metadata.gz: ecd0ed76f0fe13bfa51d882764f024887ef098d326b61d3e671e73b9d2fa5d67bf84ca950d7d61ecc24dfe58c445c2dc6ba1a8d6ae716fde49636b122b47f5ce
+  data.tar.gz: fb1bd4de715afe17664f605619db2548ce63877f97cb66a364e951baedcc8fb1fd1559b0c50dbdaa19e34b3b35cde6fbc235f588be2d88cfc831f765e61b0f73

data/lib/dedalus/app_view_composer.rb

@@ -5,22 +5,27 @@ module Dedalus
 
     def traverse(structure, origin: [0,0], dimensions:, render: false, &blk)
       traversal = ViewTraversal.new(&blk)
-      traversal.walk!(structure, origin: origin, dimensions: dimensions, render: render)
+      structure = traversal.walk!(structure, origin: origin, dimensions: dimensions, render: render)
       structure
     end
 
     def send_molecule(structure, window_dims, mouse_position:, message:)
       mouse_coord = coord(*mouse_position)
 
-      traverse(structure, origin: [0,0], dimensions: window_dims) do
-        on_molecule do |molecule, origin:, dimensions:|
+      updated_structure = traverse(structure, origin: [0,0], dimensions: window_dims) 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...
           if mouse_overlap
+            molecule.position = origin
             molecule.send(message)
           end
+
+          molecule
         end
       end
+
+      updated_structure
     end
 
     def hover_molecule(structure, window_dims, mouse_position:)
@@ -33,7 +38,7 @@ module Dedalus
 
     def render!(structure, dims)
       traverse(structure, origin: [0,0], dimensions: dims, render: true) do
-        on_atom do |atom, origin:, dimensions:, freeform:|
+        on_atom do |atom, origin:, dimensions:, freeform:, z_index:|
           if atom.background_color
             atom.draw_bounding_box(
               color: atom.background_color,
@@ -50,10 +55,12 @@ module Dedalus
             atom.position = origin
           end
 
+          atom.z_order = z_index
+
           atom.render
         end
 
-        on_element do |element, origin:, dimensions:|
+        on_element do |element, origin:, dimensions:, z_index:|
           if element.background_color
             element.draw_bounding_box(
               color: element.background_color,

data/lib/dedalus/application_view.rb

@@ -11,14 +11,16 @@ module Dedalus
 
     def click
       p [ :app_view_click ]
-      composer.click_molecule(app_screen, [window.width, window.height], mouse_position: mouse_position)
+      composer.click_molecule(
+        app_screen,
+        [window.width, window.height],
+        mouse_position: mouse_position
+      )
     end
 
     def compose(screen)
-      screen = composer.hover_molecule(screen, dimensions, mouse_position: mouse_position)
-      composer.render!(screen, dimensions)
-      # cursor.position = mouse_position
-      # cursor.render
+      composer.hover_molecule(screen, dimensions, mouse_position: mouse_position)
+      composer.render!(screen.shown, dimensions)
     end
 
     def dimensions

data/lib/dedalus/elements/image.rb

@@ -31,9 +31,9 @@ module Dedalus
         [ ox, oy ]
       end
 
-      def z_order
-        @z_order ||= ZOrder::Foreground
-      end
+      # def z_order
+      #   @z_order ||= ZOrder::Foreground
+      # end
 
       def width
         2*padding + (asset.width * scale)

data/lib/dedalus/elements/image_grid.rb

@@ -1,7 +1,7 @@
 module Dedalus
   module Elements
     class ImageGrid < Dedalus::Molecule
-      attr_accessor :grid, :tiles_path, :tile_width, :tile_height
+      attr_accessor :grid, :tiles_path, :tile_width, :tile_height, :tile_class
       attr_accessor :scale
 
       def show
@@ -49,7 +49,7 @@ module Dedalus
       end
 
       def sprite_for(frame)
-        Sprite.new(
+        tile_class.constantize.new(
           frame: frame,
           asset_width: tile_width,
           asset_height: tile_height,
@@ -71,6 +71,7 @@ module Dedalus
           tiles_path: "media/images/tiles.png",
           tile_width: 64,
           tile_height: 64,
+          tile_class: "Dedalus::Elements::MapTile", #Elements::Sprite",
           scale: 0.2,
           grid: [
             [ nil, 0, 2, 0, 1 ],

data/lib/dedalus/elements/map_tile.rb

@@ -0,0 +1,31 @@
+module Dedalus
+  module Elements
+    class MapTile < Dedalus::Molecule
+      attr_accessor :frame, :asset_width, :asset_height, :path, :scale
+
+      attr_accessor :highlight
+
+      def show
+        tile_sprite
+      end
+
+      def tile_sprite
+        Sprite.new(
+          frame: frame,
+          asset_width: asset_width,
+          asset_height: asset_height,
+          path: path,
+          scale: scale
+        )
+      end
+
+      def self.description
+        'example of a custom tile class for image grid/sprite field'
+      end
+
+      def self.example_data
+        Sprite.example_data
+      end
+    end
+  end
+end

data/lib/dedalus/elements/sprite_field.rb

@@ -2,7 +2,7 @@ module Dedalus
   module Elements
     class SpriteField < Dedalus::Organism
       attr_accessor :grid, :sprite_map, :scale, :camera_location
-      attr_accessor :tile_width, :tile_height, :tiles_path
+      attr_accessor :tile_width, :tile_height, :tiles_path, :tile_class
 
       def show
         layers
@@ -45,6 +45,7 @@ module Dedalus
           grid: grid,
           tile_width: tile_width,
           tile_height: tile_height,
+          tile_class: tile_class,
           scale: scale,
           offset: camera_offset,
           name: 'sprite-field-tiles'
@@ -77,6 +78,7 @@ module Dedalus
           tiles_path: "media/images/tiles.png",
           tile_width: 64,
           tile_height: 64,
+          tile_class: "Dedalus::Elements::MapTile",
           sprite_map: {
             [1.2,2.4] => [ Sprite.new(Sprite.example_data) ]
           }

data/lib/dedalus/elements/text.rb

@@ -5,7 +5,7 @@ module Dedalus
 
       def render(*)
         x,y = *position
-        font.draw(text, x + padding, y + padding, ZOrder::Text, self.scale, self.scale)
+        font.draw(text, x + padding, y + padding, z_order, self.scale, self.scale)
 
         # draw_bounding_box(origin: [x,y], dimensions: dimensions)
       end

data/lib/dedalus/elements.rb

@@ -7,15 +7,6 @@ module Dedalus
     @active_view ||= nil
   end
 
-  class FontRepository
-    def self.get_font(font_name='Helvetica',size: 20)
-      @fonts ||= {}
-      @fonts[font_name] ||= {}
-      @fonts[font_name][size] ||= Gosu::Font.new(size, name: font_name)
-      @fonts[font_name][size]
-    end
-  end
-
   class Element
     attr_accessor :position, :offset
 
@@ -28,10 +19,17 @@ module Dedalus
     attr_accessor :padding, :margin
     attr_accessor :color, :background_color
 
+    attr_accessor :z_order #index
+
     def initialize(attrs={})
       attrs.each { |(k,v)| instance_variable_set(:"@#{k}",v) } unless attrs.nil?
     end
 
+    attr_accessor :shown
+    def shown
+      @shown ||= show
+    end
+
     def record?
       false
     end
@@ -46,7 +44,7 @@ module Dedalus
       window.draw_quad(x,   y,   c,
                        x,   y+h, c,
                        x+w, y,   c,
-                       x+w, y+h, c,ZOrder::Background)
+                       x+w, y+h, c, ZOrder::Background)
     end
 
     def view
@@ -103,6 +101,8 @@ module Dedalus
   # maybe should also pull out rows and columns?
   # could cleanup traversal impl, and will be clearer ultimately
   class Layer < Element
+    attr_accessor :elements
+
     def initialize(elements, freeform: false)
       @elements = elements
       @freeform = freeform
@@ -118,7 +118,7 @@ module Dedalus
   end
 
   class LayerStack < Element
-    attr_reader :layers
+    attr_accessor :layers
 
     def initialize(layers: [])
       @layers = []

data/lib/dedalus/font_repository.rb

@@ -0,0 +1,10 @@
+module Dedalus
+  class FontRepository
+    def self.get_font(font_name='Helvetica',size: 20)
+      @fonts ||= {}
+      @fonts[font_name] ||= {}
+      @fonts[font_name][size] ||= Gosu::Font.new(size, name: font_name)
+      @fonts[font_name][size]
+    end
+  end
+end

data/lib/dedalus/image_repository.rb

@@ -18,5 +18,12 @@ module Dedalus
       @recordings[id] ||= window.record(width.to_i,height.to_i,&blk)
       @recordings[id]
     end
+
+    # TODO could handle overflows/alignment in text (should use for code...?)
+    # def self.lookup_text(text, line_height)
+    #   @text_images ||= {}
+    #   @text_images[text] ||= Gosu::Image.from_text(text, line_height)
+    #   @text_images[text]
+    # end
   end
 end

data/lib/dedalus/pattern_library/molecules/library_section_tab.rb

@@ -4,11 +4,15 @@ module Dedalus
       attr_accessor :icon, :name, :description, :scale, :highlight, :section_color
 
       def show
-        Container.new([[icon_element, [ title_element, description_element ]]], padding: 16)
+        Container.new(
+          [[icon_element, [ title_element, description_element ]]],
+          padding: 16,
+          scale: scale
+        )
       end
 
       def hover
-        @scale = 0.2
+        self.scale = 1.05
       end
 
       def background_color
@@ -21,7 +25,7 @@ module Dedalus
       end
 
       def scale
-        @scale ||= 0.0
+        @scale ||= 1.0
       end
 
       def height
@@ -33,7 +37,7 @@ module Dedalus
       end
 
       def title_element
-        Elements::Heading.new(text: name)
+        Elements::Heading.new(text: name, scale: scale)
       end
 
       def description_element

data/lib/dedalus/pattern_library/molecules/periodic_table.rb

@@ -10,7 +10,7 @@ module Dedalus
               element_name: name,
               color: color,
               kind: kind,
-              scale: 0.5
+              scale: 0.35
             )
           end
         end

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

@@ -1,10 +1,17 @@
 module Dedalus
   module PatternLibrary
     class ApplicationSidebar < Dedalus::Organism
-      attr_accessor :library_section_tab_molecules
+      attr_accessor :library_section_tabs, :current_entry #_molecules
 
       def show
-        self.library_section_tab_molecules
+        library_section_tab_rows
+      end
+
+      def library_section_tab_rows
+        @tab_rows ||= self.library_section_tabs.map do |tab_data| #_molecules
+          tab_data[:highlight] = tab_data[:name] == current_entry
+          LibrarySectionTab.new(tab_data)
+        end
       end
 
       def padding
@@ -17,10 +24,10 @@ module Dedalus
 
       def self.example_data
         {
-          library_section_tab_molecules: [
-            LibrarySectionTab.new(LibrarySectionTab.example_data),
-            LibrarySectionTab.new(LibrarySectionTab.example_data),
-            LibrarySectionTab.new(LibrarySectionTab.example_data)
+          library_section_tabs: [
+            LibrarySectionTab.example_data,
+            LibrarySectionTab.example_data,
+            LibrarySectionTab.example_data
           ]
         }
       end

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

@@ -78,21 +78,22 @@ module Dedalus
       end
 
       def sidebar
-        ApplicationSidebar.new(
-          library_section_tab_molecules: section_tabs,
+        @sidebar ||= ApplicationSidebar.new(
+          library_section_tabs: library_section_tabs, #_molecules: section_tabs,
           width_percent: 0.2,
+          current_entry: current_entry_name,
           background_color: Palette.decode_color('darkgray')
         )
       end
 
-      def section_tabs
-        tab_list = library_section_tabs.map do |attrs|
-          highlight = attrs[:name] == current_entry_name
-          LibrarySectionTab.new(attrs.merge(highlight: highlight))
-        end
-        # p [ tab_list: tab_list ]
-        tab_list
-      end
+      # def section_tabs
+      #   tab_list = library_section_tabs.map do |attrs|
+      #     highlight = attrs[:name] == current_entry_name
+      #     LibrarySectionTab.new(attrs.merge(highlight: highlight))
+      #   end
+      #   # p [ tab_list: tab_list ]
+      #   tab_list
+      # end
     end
   end
 end

data/lib/dedalus/version.rb

@@ -1,4 +1,4 @@
 module Dedalus
   # dedalus version
-  VERSION = "0.2.17"
+  VERSION = "0.2.18"
 end

data/lib/dedalus/view_traversal.rb

@@ -19,7 +19,7 @@ module Dedalus
       @element_callback = blk
     end
 
-    def walk!(structure, origin:, dimensions:, freeform: false, render: false)
+    def walk!(structure, origin:, dimensions:, freeform: false, render: false, z_index: ZOrder::Background)
       width, height = *dimensions
 
       height = structure.height if !structure.is_a?(Array) && structure.height
@@ -28,7 +28,7 @@ module Dedalus
       x0, y0 = *origin
 
       if structure.is_a?(Dedalus::Atom)
-        @atom_callback.call(structure, origin: origin, dimensions: dimensions, freeform: freeform) if @atom_callback
+        @atom_callback.call(structure, origin: origin, dimensions: dimensions, freeform: freeform, z_index: z_index) if @atom_callback
 
       # implicitly array is rows, nested arrays are columns, doubly-nested arrays are rows, etc
       elsif structure.is_a?(Array)
@@ -46,11 +46,11 @@ module Dedalus
         margin_dims = [ width - margin*2, height - margin*2 ]
 
         if structure.is_a?(Dedalus::Molecule) && @molecule_callback
-          @molecule_callback.call(structure, origin: margin_origin, dimensions: margin_dims)
+          @molecule_callback.call(structure, origin: margin_origin, dimensions: margin_dims, z_index: z_index)
         end
 
         if @element_callback
-          @element_callback.call(structure, origin: margin_origin, dimensions: margin_dims)
+          @element_callback.call(structure, origin: margin_origin, dimensions: margin_dims, z_index: z_index)
         end
 
         pad = structure.padding || 0.0
@@ -58,33 +58,31 @@ module Dedalus
         pad_dims = [width - pad*2 - margin*2, height - pad*2 - margin*2 ]
 
         if structure.is_a?(LayerStack)
-          layers = structure.layers
-          layers.each do |layer|
+          structure.layers.each do |layer|
             if layer.freeform?
-              if layer.show.is_a?(Array)
-                layer.show.each do |layer_element|
-                  walk!(layer_element, origin: pad_origin, dimensions: pad_dims, freeform: true, render: render)
+              if layer.shown.is_a?(Array)
+                layer.elements.each_with_index do |layer_element, z_offset|
+                  walk!(layer_element, origin: pad_origin, dimensions: pad_dims, freeform: true, render: render, z_index: z_index+z_offset)
                 end
               else
-                walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: true, render: render)
+                walk!(layer.elements, origin: pad_origin, dimensions: pad_dims, freeform: true, render: render, z_index: z_index)
               end
             else
-              walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: false, render: render)
+              walk!(layer.elements, origin: pad_origin, dimensions: pad_dims, freeform: false, render: render, z_index: z_index)
             end
           end
         else
           if structure.record? && render
             recorded_image = ImageRepository.lookup_recording(structure.name, structure.width, structure.height, structure.window) do
-              walk!(structure.show, origin: [0,0], dimensions: pad_dims, freeform: freeform, render: render)
+              walk!(structure.shown, origin: [0,0], dimensions: pad_dims, freeform: freeform, render: render)
             end
 
             ox,oy = *pad_origin
-            recorded_image.draw(ox,oy,10)
+            recorded_image.draw(ox,oy,z_index)
           else
-            walk!(structure.show, origin: pad_origin, dimensions: pad_dims, freeform: freeform, render: render)
+            walk!(structure.shown, origin: pad_origin, dimensions: pad_dims, freeform: freeform, render: render, z_index: z_index)
           end
         end
-
       end
     end
 

data/lib/dedalus.rb

@@ -9,6 +9,7 @@ require 'dedalus/application_view'
 
 require 'dedalus/palette'
 require 'dedalus/image_repository'
+require 'dedalus/font_repository'
 
 require 'dedalus/elements'
 require 'dedalus/elements/void'
@@ -20,5 +21,6 @@ require 'dedalus/elements/icon'
 require 'dedalus/elements/sprite'
 require 'dedalus/elements/image_grid'
 require 'dedalus/elements/sprite_field'
+require 'dedalus/elements/map_tile'
 
 require 'dedalus/pattern_library'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dedalus
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Joseph Weissman
@@ -170,11 +170,13 @@ files:
 - lib/dedalus/elements/icon.rb
 - lib/dedalus/elements/image.rb
 - lib/dedalus/elements/image_grid.rb
+- lib/dedalus/elements/map_tile.rb
 - lib/dedalus/elements/paragraph.rb
 - lib/dedalus/elements/sprite.rb
 - lib/dedalus/elements/sprite_field.rb
 - lib/dedalus/elements/text.rb
 - lib/dedalus/elements/void.rb
+- lib/dedalus/font_repository.rb
 - lib/dedalus/image_repository.rb
 - lib/dedalus/palette.rb
 - lib/dedalus/pattern_library.rb