atome 0.5.7.0.3 → 0.5.7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4cbfd38de06ba3640f664d4de45324115580ecd7b9dd03d174cd9b008418ec
-  data.tar.gz: 0bc8aef35a336616ddfb183608fc364d363abd03cc211eeb1127a0343b1cc1db
+  metadata.gz: 43a34334a41145533d60173178c7320ca20fea32690d6e26919f7dfa0553d2b0
+  data.tar.gz: 691dc70c3ed9c4849e5d6b597f879207528f1b88f58a948491d162e424e3091f
 SHA512:
-  metadata.gz: 1340cb70b0212e385a616828f68c9e1684581874ef18c603f04dd40a800499352e603d404c6e91958f5b6a5933ba0583919ba2bde21d83b7bad68c1110c74a9e
-  data.tar.gz: 210a6c03ce4d95f613e2d5af338b71dee8037cb6525b483afb2fc9b6080cf76f994dfa6ac6f8ce82ea20bdacbad982e994ea6c6a6a05707fdd22270947b19ce7
+  metadata.gz: 72e6d3ad87fc01564331b9c585c6021ab2075b56caf57946e974c3fdebbaa572e92db9edd23b97e014a691d3e000777715bbfc5223f8e8d9ad1230fdb788d6e5
+  data.tar.gz: 896f6f73134f274736317b1fd3a97e37aa1e0e89dc1dd26aa612363b7492136295747e379e154a319802d506f67ed17462da6b1bc5c9b8d5aefc4ef0f4207a5f

data/lib/atome/atome.rb

@@ -51,14 +51,14 @@ class Atome
     @aid=  new_atome[:aid]  || identity_generator
     @controller_proc=[]
     @id = new_atome[:id] || @aid
-    Universe.atomes.each do |_aid,atome_f|
+    Universe.atomes.each_value do |atome_f|
       # we affect the already existing atome to target
-        if atome_f.id == @id
-          new_atome[:affect].each do |affected|
-            grab(affected).apply(@id)
-          end
-          return false
-        end
+      next unless atome_f.id == @id
+
+      new_atome[:affect].each do |affected|
+        grab(affected).apply(@id)
+      end
+      return false
     end
     Universe.add_to_atomes(@aid, self)
     Universe.id_to_aid(@id, @aid)

data/lib/atome/extensions/atome.rb

@@ -160,9 +160,6 @@ class Object
   end
 
   def grab(id_to_get)
-    if id_to_get.instance_of? Atome
-      alert id_to_get.id
-    end
     id_to_get=id_to_get.to_sym
     return if id_to_get == false
     aid_to_get= Universe.atomes_ids[id_to_get]

data/lib/atome/genesis/genesis.rb

@@ -152,9 +152,7 @@ class Genesis
           # attached.each do |attached_atome|
           #   collected_atomes << attached_atome if grab(attached_atome).type.to_sym == element.to_sym
           # end
-          # TODO : add category for atome( material/physical vs modifier : color, shadow, .. vs shape, image ..)
-          # then add condition same things fo code in presets/atome atome_common
-          if %i[color shadow paint border].include?(element)
+          if Universe.applicable_atomes.include?(element)
             # we do the same for apply to be able to retrieve 'color' and other atome that apply instead of being attached
             @apply.each do |attached_atome|
               collected_atomes << attached_atome if grab(attached_atome).type.to_sym == element.to_sym

data/lib/atome/genesis/particles/effect.rb

@@ -3,12 +3,12 @@
 new({ particle: :smooth, category: :effect, type: :int })
 
 new({ particle: :blur, category: :effect, type: :int }) do |params|
-  if affect.nil?
-      affect_to = affect
-  else
-    affect_to = [:self]
-  end
-  val= { value: params, affect: affect_to } unless params.instance_of?(Hash)
+  affect_to = if affect.nil?
+                affect
+              else
+                [:self]
+              end
+  val = { value: params, affect: affect_to } unless params.instance_of?(Hash)
   val
 end
 

data/lib/atome/genesis/particles/identity.rb

@@ -64,14 +64,25 @@ end
 
 new(particle: :selected, category: :identity, type: :boolean) do |params|
   if params == true
-    border({ thickness: 3, red: 1, green: 1, blue: 1, alpha: 1, pattern: :dotted })
-    border({ thickness: 10,  pattern: :solid, color: :red})
+    @selection_style=[]
+    select_style= border({ thickness: 3, red: 1, green: 1, blue: 1, alpha: 1, pattern: :dotted })
+    @selection_style << select_style.id
     grab(Universe.current_user).selection << @id
   elsif params == false
-    border({alpha: 0, thickness: 0})
+    @selection_style.each do |style_f|
+      remove(style_f)
+    end
+    @selection_style=nil
     grab(Universe.current_user).selection.collect.delete(@id)
   else
-    # TODO: for future use
+    @selection_style=[]
+     params.each do |part_f, val_f|
+       select_style=  send(part_f,val_f)
+       @selection_style << select_style.id
+     end
+    # border({ thickness: 3, red: 1, green: 0, blue: 1, alpha: 1, pattern: :dotted })
+    # border({ thickness: 10,  pattern: :solid, color: :red})
+    grab(Universe.current_user).selection << @id
   end
   params
 end

data/lib/atome/genesis/particles/material.rb

@@ -12,6 +12,8 @@ end
 new({ particle: :hide, category: :material, type: :boolean })
 
 new({ particle: :remove, category: :property, type: :hash }) do |params|
+
+
   if  params.instance_of? Hash
     if params[:row]
       data.delete_at(params[:row])

data/lib/atome/genesis/particles/utility.rb

@@ -25,6 +25,7 @@ def delete_recursive(atome_id)
 end
 
 new({ particle: :delete, category: :utility, type: :boolean, render: false }) do |params|
+
   if params == true
     # We use the tag persistent to exclude color of system object and other default colors
     unless @tag && (@tag[:persistent] || @tag[:system])
@@ -33,9 +34,19 @@ new({ particle: :delete, category: :utility, type: :boolean, render: false }) do
       render(:delete, params)
       # the machine delete the current atome from the universe
       id_found = @id.to_sym
-      parent_found = grab(@attach)
-      parent_found.attached.delete(id_found)
-      Universe.delete(@aid)
+      if @attach
+        parent_found = grab(@attach)
+        parent_found.attached.delete(id_found)
+      end
+      if @affect
+        @affect.each do |affected_atome|
+          affected_found = grab(affected_atome)
+          affected_found.apply.delete(id_found)
+          affected_found.refresh
+        end
+      end
+
+      # Universe.delete(@aid)
     end
   elsif params.instance_of? Hash
 
@@ -64,6 +75,7 @@ new({ particle: :delete, category: :utility, type: :boolean, render: false }) do
     send(params, 0) unless params == :id
   end
 end
+
 new({ particle: :clear, category: :utility, type: :boolean })
 
 new({ post: :clear }) do
@@ -255,7 +267,6 @@ end
 new({ particle: :storage, category: :utility, type: :hash })
 new({ particle: :state, category: :utility, type: :symbol })
 
-
 new({ particle: :record, category: :utility, type: :hash })
 new({ particle: :preview, category: :utility, type: :hash })
 

data/lib/atome/kernel/universe.rb

@@ -27,12 +27,13 @@ class Universe
   @allow_tool_operations = false
   @active_tools = []
   @atome_preset = []
+  @applicable_atomes= %i[color shadow border paint animation]
   # @historicize=false
   class << self
     attr_reader :atomes, :atomes_ids, :renderer_list, :molecule_list, :atome_list, :particle_list, :classes, :counter,
                 :atomes_specificities
     attr_accessor :connected, :allow_sync, :allow_localstorage, :database_ready, :edit_mode, :tools,
-                  :allow_tool_operations, :active_tools, :atome_preset
+                  :allow_tool_operations, :active_tools, :atome_preset, :applicable_atomes
 
     def messages
       @messages

data/lib/atome/presets/atome.rb

@@ -24,9 +24,7 @@ class Atome
     params = reordered_params.merge(params)
     params[:id]=params[:id].to_sym
     # condition to handle color/shadow/paint atomes that shouldn't be attach to view
-    # TODO : add category for atome( material/physical vs modifier : color, shadow, .. vs shape, image ..)
-    # then add condition same things fo code in genesis new_atome
-    if %i[color shadow paint border].include?(atome_preset)
+    if Universe.applicable_atomes.include?(atome_preset)
       unless params[:affect]
         params[:affect] = if @id == :view
                             [:black_matter]

data/lib/atome/utilities/utilities.rb

@@ -113,8 +113,6 @@ class Atome
       target_vector.data(atome_content)
     end
 
-
-
   end
 
   @initialized = {}
@@ -165,9 +163,11 @@ class Atome
     end
 
   end
+
   def add_text_visual(params)
     html.add_font_to_css(params)
   end
+
   def particle_main(element, params, &user_proc)
     # TODO : optimise below removing all conditions if possible
     if Atome.instance_variable_get("@main_#{element}").is_a?(Proc) # post is before rendering and broadcasting
@@ -348,23 +348,22 @@ class Atome
     send("#{element}_callback", return_params)
   end
 
-  def js_callback(id, particle, value,sub=nil )
-    current_atome= grab(id)
-   #  # alert current_atome.instance_variable_get('@record_code')
-    proc_found= current_atome.instance_variable_get("@#{particle}_code")[particle.to_sym]
+  def js_callback(id, particle, value, sub = nil)
+    current_atome = grab(id)
+    #  # alert current_atome.instance_variable_get('@record_code')
+    proc_found = current_atome.instance_variable_get("@#{particle}_code")[particle.to_sym]
     # proc_found= current_atome.instance_variable_get("@record_code")[:record]
-   #  # alert particle.class
-   #  # alert proc_found.class
+    #  # alert particle.class
+    #  # alert proc_found.class
     # proc_found.call
-   instance_exec(value, &proc_found) if proc_found.is_a?(Proc)
-   # #  # puts "params to be exec #{id}, #{particle}, #{value}, #{sub}"
-   #  alpha= grab(:the_big_box)
-   #  proc_found= alpha.instance_variable_get("@record_code")[:record]
+    instance_exec(value, &proc_found) if proc_found.is_a?(Proc)
+    # #  # puts "params to be exec #{id}, #{particle}, #{value}, #{sub}"
+    #  alpha= grab(:the_big_box)
+    #  proc_found= alpha.instance_variable_get("@record_code")[:record]
     # proc_found.call
 
   end
 
-
   # def callback(data)
   #   @callback[data.keys[0]] = data[data.keys[0]]
   # end
@@ -389,8 +388,7 @@ class Atome
   def particles_to_hash
     hash = {}
     instance_variables.each do |var|
-      next if %i[@html_object @history, @initialized].include?(var)
-
+      next if %i[@html_object @history @initialized @tick @controller_proc].include?(var)
       hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)
     end
     hash
@@ -400,10 +398,13 @@ class Atome
     # we get the current color because they will be removed
     particles_found = particles_to_hash
     particles_found.each do |particle_found, value_found|
+      puts "refresh : #{particle_found}, #{value_found}"
       send(particle_found, value_found)
     end
-    color.each do |col|
-      apply(col)
+    Universe.applicable_atomes.each do |atome_type|
+      send(atome_type).each do |col|
+        apply(col)
+      end
     end
   end
 

data/lib/atome/version.rb

@@ -2,5 +2,5 @@
 
 #  return atome version
 class Atome
-  VERSION = '0.5.7.0.3'
+  VERSION = '0.5.7.0.4'
 end

data/lib/renderers/html/material.rb

@@ -6,6 +6,12 @@ end
 
 new({ method: :gradient, renderer: :html, type: :hash })
 
+# new({ method: :remove, renderer: :html, type: :hash }) do |params|
+#   # alert "===> #{params}"
+#   # html.table_remove(params)
+#   html.remove(params)
+# end
+
 new({ method: :remove, renderer: :html, type: :string }) do |object_id_to_remove, bloc|
 
   if object_id_to_remove.instance_of? Hash
@@ -39,6 +45,12 @@ new({ method: :remove, renderer: :html, type: :string }) do |object_id_to_remove
       html.style("filter", 'none')
       @apply.delete(object_id_to_remove)
       apply(@apply)
+    when :border
+      # alert :poipoipoipoipo
+      html.style("border", 'none')
+      # html.style("filter", 'none')
+      @apply.delete(object_id_to_remove)
+      apply(@apply)
     when :paint
       atome_to_remove = grab(object_id_to_remove)
       atome_to_remove.gradient.each do |color_id|

data/lib/renderers/html/property.rb

@@ -31,11 +31,7 @@ new({ method: :insert, renderer: :html, type: :hash }) do |params|
   html.table_insert(params)
 end
 
-new({ method: :remove, renderer: :html, type: :hash }) do |params|
-  # alert "===> #{params}"
-  # html.table_remove(params)
-  html.remove(params)
-end
+
 
 new({ method: :sort, renderer: :html, type: :hash }) do |params|
   html.refresh_table(params)

data/vendor/assets/application/examples/border.rb

@@ -3,12 +3,18 @@
 
 
 
-
-
-
 b=box({id: :my_b_box, left: 150, top: 150})
- b.border({ thickness: 15, red: 1, green: 1, blue: 0, alpha: 1, pattern: :solid ,id: :jjjj, inside: true})
-
+b.shadow({
+           id: :s1,
+           # affect: [:the_circle],
+           left: 9, top: 3, blur: 9,
+           invert: false,
+           red: 0, green: 0, blue: 0, alpha: 1
+         })
+border1= b.border({ thickness: 15, red: 1, green: 1, blue: 0, alpha: 1, pattern: :solid ,id: :border_1, inside: true})
+wait 2 do
+  b.remove(:border_1)
+end
 wait 1.5 do
  border({ thickness: 30, red: 1, green: 1, blue: 0, alpha: 1, pattern: :solid ,id: :poil, inside: true})
 end

data/vendor/assets/application/examples/fonts.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # add new font face
-A.add_text_visual({ path: 'Roboto', name: 'Roboto-Thin' })
+A.add_text_visual({ path: 'Roboto', name: 'Roboto-Black' })
 A.add_text_visual({ path: 'Roboto', name: 'Roboto-Thin' })
 A.add_text_visual({ path: 'Roboto', name: 'Roboto-LightItalic' })
 

data/vendor/assets/application/examples/refresh.rb

@@ -9,6 +9,7 @@ b.instance_variable_set("@path", './medias/images/red_planet.png' )
 
 b.instance_variable_set("@smooth", 30)
 wait 1 do
+  # alert b.inspect
   b.refresh
   b.instance_variable_set("@left", 300)
   wait 1 do

data/vendor/assets/application/examples/selected.rb

@@ -1,8 +1,22 @@
 # frozen_string_literal: true
 
+# grab(:a_styles).data
 t = text({ data: 'touch me to select all', id: :the_text })
 b = box({ left: 12, id: :the_box })
-circle({ left: 230, id: :the_circle })
+c = circle({ left: 230, id: :the_circle })
+c.color(:green)
+# c.touch(true) do
+#   if c.selected
+#     c.selected(false)
+#   else
+#     # example of custom selection style
+#     c.selected({ shadow: {
+#       left: 9, top: 3, blur: 9,
+#       invert: false,
+#       red: 0, green: 0, blue: 0, alpha: 1
+#     }, border: { thickness: 5, red: 1, green: 1, blue: 1, alpha: 1, pattern: :dotted, id: :the_door,inside: true } })
+#   end
+# end
 image({ path: 'medias/images/red_planet.png', id: :the__red_planet, top: 233 })
 
 t.touch(true) do
@@ -16,9 +30,9 @@ t.touch(true) do
   selected_items = grab(Universe.current_user).selection # we create a group
 
   selected_items.each do |atome_id_selected|
-    atome_selected=grab(atome_id_selected)
-    atome_selected.width=rand(333)
-    atome_selected.height=rand(333)
+    atome_selected = grab(atome_id_selected)
+    atome_selected.width = rand(333)
+    atome_selected.height = rand(333)
 
   end
   b.selected(false)

data/vendor/assets/application/examples/shadow.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 c = circle({ id: :the_circle, left: 122, color: :orange, drag: { move: true, inertia: true, lock: :start } })
- c.color({ id: :col1, red: 1, blue: 1 })
+c.color({ id: :col1, red: 1, blue: 1 })
 
  c.shadow({
               id: :s1,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.7.0.3
+  version: 0.5.7.0.4
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo