atome 0.5.6.6.1 → 0.5.6.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48cee602f2cd349974871fde44b32bafb512e38eaa9c9b0206f0bbead1336092
-  data.tar.gz: cd531edc3f602e907a21fab41249021a1e096c5045b41654780927a85bfbe94f
+  metadata.gz: 7f9be61ee0a8afe7d2d0945221f3b5939b87c8b580042008b3074af983e82093
+  data.tar.gz: d070e19b2b11923efeae91f05c28c0e309ab787c6f93570f44bac6b2d4a2e999
 SHA512:
-  metadata.gz: 97920b22233d015e31d819acf7f4ca2dcc9300c24d8a395f99b05d0e6c20d97a60c9604f68423a009dac9adf723c9cea3d463ac6380fb9fc62c32b40cbc40948
-  data.tar.gz: f736aae0c6cfbe55daf4a9a6083e33eb769ba00d2e129c53001f792335a829614e69cf06ba568c48cfc46e3deec0ca3f8295f02c6be509cc6c6d789ce4c77ab4
+  metadata.gz: 3b0e7f9c9fffea9072d6e4d09b91f99b5dc2ee2d465837b77ab7ad9fdaa20f56fd7897bc1befb047e8f81a60751ea1d074122abf30e7cf17dc72eba3109d87bf
+  data.tar.gz: 127a3ce37bb809b9e664c5188cdf2f0478624da98f89357f671e5de6af4a5544cb9ee35b99efe305a53e1b26fbb43a53d00a72a6103aff6eb6bfb6677ebcdd48

data/lib/atome/atome.rb

@@ -44,8 +44,15 @@ class Atome
     @int8 = {}
     @css = {}
     @aid = identity_generator
-    Universe.add_to_atomes(@aid, self)
+
     @id = new_atome[:id] || @aid
+    Universe.atomes.each do |_aid,atome_f|
+        if atome_f.id == @id
+          puts  "===> no for #{@id}"
+          return false
+        end
+    end
+    Universe.add_to_atomes(@aid, self)
     Universe.id_to_aid(@id, @aid)
     @type = new_atome[:type] || :element
     @attached = []

data/lib/atome/genesis/atomes.rb

@@ -2,42 +2,15 @@
 
 new({ atome: :color, type: :hash })
 
-# new({ post: :color }) do |params|
-#   puts "====> #{params}"
-#   params
-# end
-# new({ pre: :color}) do |params|
-#   alert "==> pre color params : #{params}"
-# end
-
-# new({ atome: :color, type: :hash })do |params|
-#   puts "1 #{params}______"
-#   params
-# end
-
-# new ({post: :color}) do |params|
-#   # # TODO : hack must call it properly thru renderer
-#   # params[:affect].each do |affected|
-#   #   grab(affected).html.reset_background
-#   # end
-# end
 new({ sanitizer: :color }) do |params|
-  # alert "sanitizer color: #{params}"
   params = create_color_hash(params) unless params.instance_of? Hash
-  # if params[:id]
-  #   alert "id is #{params[:id]}"
-  # end
-  # the condition below is to prevent the creation of multiple unwanted colors with same property and no ID specified
   unless params[:id]
     uniq_value = "#{params[:red].to_s.sub('.', '_')}_#{params[:green].to_s.sub('.', '_')}_#{params[:blue].to_s.sub('.', '_')}_#{params[:alpha].to_s.sub('.', '_')}_#{params[:left].to_s.sub('.', '_')}_#{params[:top].to_s.sub('.', '_')}_#{params[:diffusion].to_s.sub('.', '_')}"
-    params[:id] = "#{@id}_color_#{uniq_value}".to_sym
+    params[:id] = "color_#{uniq_value}".to_sym
   end
   params
 end
-# new({ post: :color }) do
-#
-#   # Atome.global_monitoring(self, [:red, :blue, :blue, :alpha, :left, :right, :diffusion], [:variable1, :variable2])
-# end
+
 new({ atome: :image })
 new({ sanitizer: :image }) do |params|
   unless params.instance_of? Hash
@@ -131,8 +104,6 @@ new({ atome: :vector })
 new({ atome: :matrix })
 new({ atome: :atomized, type: :hash })
 
-# new({ atome: :color, type: :model })
-# new({ atome: :color, type: :template })
 
 
 

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

@@ -3,6 +3,7 @@
 new({ particle: :touch, category: :event, type: :hash, store: false })
 new({ sanitizer: :touch }) do |params, user_bloc|
   # TODO: factorise code below
+  # alert  "touch_code: #{@touch_code}"
   @touch ||= {}
   @touch_code ||= {}
   option = true

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

@@ -7,20 +7,23 @@ new({ sanitizer: :id }) do |params|
   # first we sanitize the the id below
 
   params = params.to_sym
-  # # we check id is already assign
-  # if Universe.atomes[params]
-  #   # we reassign the old id
-  #   puts "the id : #{params} is already used"
-  #   params = @id
-  #   # return false
-  # else
-    if @id.to_sym != params
-      Universe.update_atome_id(params, self, @id)
-    else
-      Universe.add_to_atomes(params, self)
-    end
+  # we check id is already assign
+  # the condition below is to prevent the creation of multiple unwanted colors with same property and no ID specified
+  #   if @id.to_sym != params
+  #     Universe.update_atome_id(params, self, @id)
+  #   else
+  #     Universe.add_to_atomes(params, self)
+  #   end
 
+
+  # Universe.atomes.each do |_aid,atome_f|
+  #
+  #   if atome_f.id == params
+  #     puts  "===> no for #{params}"
+  #   end
+  #
   # end
+
   params
 end
 new({ particle: :name, category: :identity, type: :string })

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

@@ -114,4 +114,6 @@ new({ after: :pattern })do |params|
   params
 end
 # new({ particle: :border, category: :material, type: :int })
-new({particle: :fill})
+new({particle: :fill, category: :material, type: :array })
+
+new({particle: :opacity, category: :material, type: :int })

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

@@ -35,7 +35,7 @@ new({ particle: :delete, category: :utility, type: :boolean, render: false }) do
       id_found = @id.to_sym
       parent_found = grab(@attach)
       parent_found.attached.delete(id_found)
-      Universe.delete(@id)
+      Universe.delete(@aid)
     end
   elsif params.instance_of? Hash
 

data/lib/atome/kernel/universe.rb

@@ -105,16 +105,21 @@ class Universe
     def id_to_aid(id, aid)
       @atomes_ids[id] = aid
     end
-
-    def update_atome_id(id, atome, prev_id)
-      @atomes[id] = atome
-      @atomes.delete(prev_id)
-    end
+    # def update_atome_id(aid, atome, prev_id)
+    #   @atomes[id] = atome
+    #   @atomes.delete(prev_id)
+    # end
+    # def update_atome_id(id, atome, prev_id)
+    #   @atomes[id] = atome
+    #   @atomes.delete(prev_id)
+    # end
 
     def user_atomes
       collected_id = []
       @atomes.each do |id_found, atome_found|
-        collected_id << id_found unless atome_found.tag && atome_found.tag[:system]
+        # collected_id << id_found unless atome_found.tag && atome_found.tag[:system]
+        collected_id << atome_found.id unless atome_found.tag && atome_found.tag[:system]
+
       end
       collected_id
     end

data/lib/atome/version.rb

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

data/lib/renderers/html/html.rb

@@ -24,6 +24,7 @@ class HTML
     @element ||= JS.global[:document].getElementById(id_found.to_s)
     @id = id_found
     @original_atome = current_atome
+    @touch_removed = {}
   end
 
   def object
@@ -200,7 +201,6 @@ class HTML
 
     # alert "hyperedit"
 
-
     particles_found = particles_found.merge(particles_from_style)
     current_atome = grab(@id)
     usr_bloc.call(particles_found)
@@ -496,15 +496,48 @@ class HTML
   end
 
   def fill(params)
-    atome_path= grab(params[:atome]).path
-    @element[:style][:backgroundImage] = "url('#{atome_path}')"
-    @element[:style][:backgroundRepeat] = 'repeat'
-    # @element[:style][:backgroundPosition] = '0 0, 110px 110px'
-    # @element[:style][:backgroundPosition] = "99px 0px"
-    # background-size: auto auto;
-    # @element[:style][:backgroundSize] = "cover"
-    @element[:style][:backgroundSize] = "#{params[:width]}px #{params[:height]}px"
+    # we remove previous background
+    elements_to_remove = @element.getElementsByClassName('background')
+
+    elements_to_remove = elements_to_remove.to_a
+    elements_to_remove.each do |child|
+      @element.removeChild(child)
+    end
+    params.each do |param|
+      background_layer = JS.global[:document].createElement("div")
+      background_layer[:style][:transform] = "rotate(#{param[:rotate]}deg)" # Applique une rotation de 45 degrés à l'élément
+      background_layer[:style][:position] = "absolute"
+
+      if param[:position]
+        background_layer[:style][:top] = "#{param[:position][:x]}px"
+        background_layer[:style][:left] = "#{param[:position][:y]}px"
+      else
+        background_layer[:style][:top] = "0"
+        background_layer[:style][:left] = "0"
+      end
 
+      if param[:size]
+        background_layer[:style][:width] = "#{param[:size][:x]}px"
+        background_layer[:style][:height] = "#{param[:size][:y]}px"
+      else
+        background_layer[:style][:width] = "100%"
+        background_layer[:style][:height] = "100%"
+      end
+
+      atome_path = grab(param[:atome]).path
+      background_layer[:style][:backgroundImage] = "url('#{atome_path}')"
+      background_layer[:style][:backgroundRepeat] = 'repeat'
+      background_layer[:className] = 'background'
+      background_layer[:style][:opacity] = param[:opacity]
+      if param[:repeat]
+        img_width = @original_atome.width / param[:repeat][:x]
+        img_height = @original_atome.height / param[:repeat][:y]
+        background_layer[:style][:backgroundSize] = "#{img_width}px #{img_height}px"
+      else
+        background_layer[:style][:backgroundSize] = "#{param[:width]}px #{param[:height]}px"
+      end
+      @element.appendChild(background_layer)
+    end
   end
 
   def filter(property, value)
@@ -1048,60 +1081,75 @@ class HTML
   def touch_tap(_option)
     interact = JS.eval("return interact('##{@id}')")
     @touch_tap = @original_atome.instance_variable_get('@touch_code')[:tap]
-    interact.on('tap') do |native_event|
-      event = Native(native_event)
-      # we use .call instead of instance_eval because instance_eval bring the current object as context
-      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-      # group etc..
-      @touch_tap.call(event) if @touch_tap.is_a?(Proc)
+    unless @touch_removed[:tap]
+      interact.on('tap') do |native_event|
+        event = Native(native_event)
+        # we use .call instead of instance_eval because instance_eval bring the current object as context
+        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+        # group etc..
+        @touch_tap.call(event) if @touch_tap.is_a?(Proc)
+      end
     end
+
   end
 
   def touch_double(_option)
     interact = JS.eval("return interact('##{@id}')")
     @touch_double = @original_atome.instance_variable_get('@touch_code')[:double]
-    interact.on('doubletap') do |native_event|
-      event = Native(native_event)
-      # we use .call instead of instance_eval because instance_eval bring the current object as context
-      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-      # group etc..
-      @touch_double.call(event) if @touch_double.is_a?(Proc)
+    unless @touch_removed[:double]
+      interact.on('doubletap') do |native_event|
+        event = Native(native_event)
+        # we use .call instead of instance_eval because instance_eval bring the current object as context
+        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+        # group etc..
+        @touch_double.call(event) if @touch_double.is_a?(Proc)
+      end
     end
+
   end
 
   def touch_long(_option)
     @touch_long = @original_atome.instance_variable_get('@touch_code')[:long]
     interact = JS.eval("return interact('##{@id}')")
-    interact.on('hold') do |native_event|
-      event = Native(native_event)
-      # we use .call instead of instance_eval because instance_eval bring the current object as context
-      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-      # group etc..
-      @touch_long.call(event) if @touch_long.is_a?(Proc)
+    unless @touch_removed[:long]
+      interact.on('hold') do |native_event|
+        event = Native(native_event)
+        # we use .call instead of instance_eval because instance_eval bring the current object as context
+        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+        # group etc..
+        @touch_long.call(event) if @touch_long.is_a?(Proc)
+      end
     end
+
   end
 
   def touch_down(_option)
     @touch_down = @original_atome.instance_variable_get('@touch_code')[:down]
     interact = JS.eval("return interact('##{@id}')")
-    interact.on('down') do |native_event|
-      event = Native(native_event)
-      # we use .call instead of instance_eval because instance_eval bring the current object as context
-      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-      # group etc..
-      @touch_down.call(event) if @touch_down.is_a?(Proc)
+    unless @touch_removed[:down]
+      interact.on('down') do |native_event|
+        event = Native(native_event)
+        # we use .call instead of instance_eval because instance_eval bring the current object as context
+        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+        # group etc..
+        @touch_down.call(event) if @touch_down.is_a?(Proc)
+      end
+
     end
   end
 
   def touch_up(_option)
-    @touch_up = @original_atome.instance_variable_get('@touch_code')[:up]
     interact = JS.eval("return interact('##{@id}')")
-    interact.on('up') do |native_event|
-      event = Native(native_event)
-      # we use .call instead of instance_eval because instance_eval bring the current object as context
-      # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
-      # group etc..
-      @touch_up.call(event) if @touch_up.is_a?(Proc)
+    @touch_up = @original_atome.instance_variable_get('@touch_code')[:up]
+    unless @touch_removed[:up]
+      interact.on('up') do |native_event|
+        event = Native(native_event)
+        # we use .call instead of instance_eval because instance_eval bring the current object as context
+        # and it's lead to a problem of context and force the use of grab(:view) when suing atome method such as shape ,
+        # group etc..
+        @touch_up.call(event) if @touch_up.is_a?(Proc)
+      end
+
     end
   end
 
@@ -1109,15 +1157,25 @@ class HTML
     case option
     when :double
       @touch_double = ''
+      @touch_removed[:double] = true
     when :down
       @touch_down = ''
+      @touch_removed[:down] = true
     when :long
+      @touch_removed[:long] = true
       @touch_long = ''
     when :tap
+      @touch_removed[:tap] = true
       @touch_tap = ''
     when :up
+      @touch_removed[:up] = true
       @touch_up = ''
     else
+      @touch_removed[:double] = true
+      @touch_removed[:down] = true
+      @touch_removed[:long] = true
+      @touch_removed[:tap] = true
+      @touch_removed[:up] = true
       @touch_double = ''
       @touch_down = ''
       @touch_long = ''

data/lib/renderers/html/material.rb

@@ -76,4 +76,9 @@ new({ method: :pattern, type: :integer, renderer: :html})
 
 new({ method: :fill, renderer: :html }) do |params|
   html.fill(params)
+end
+
+new({ method: :opacity, type: :integer, renderer: :html}) do |value|
+  # html.opacity(value)
+  html.style('opacity',value)
 end

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

@@ -4,4 +4,7 @@
 # aid is used to provide an unique and persistent id for any atome
 b=box({ left: 12, id: :the_first_box })
 
-puts " atome aid is : #{ b.aid}"
+puts " atome aid is : #{b.aid}"
+wait 1 do
+  hook(b.aid).color(:red)
+end

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

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
 
-b=box({width: 300, height: 333})
+b=box({width: 300, height: 333, color: {alpha: 0}})
 image({id: :logo,path: 'medias/images/logos/atome.svg', width: 66, left: 555})
 grab(:black_matter).image({id: :planet,path: 'medias/images/red_planet.png', width: 66,height: 66,  left: 555, top: 180})
 
 
-new({particle: :fill})
-
-new({ method: :fill, renderer: :html }) do |params|
-  html.fill(params)
+b.fill([atome:  :logo, width: 33, height: 33 ])
+b.overflow(:hidden)
+wait 1 do
+  b.fill([atome:  :planet, width: 33, height: 33 ])
+  wait 1 do
+    b.fill([{atome:  :planet,repeat: {x: 5, y: 3}}])
+    wait 1 do
+      b.fill([{atome:  :planet,width: 33, height: 33 ,rotate: 33, size: { x: 800,y: 600 }, position: { x:-200,y: -200 } }])
+      wait 3 do
+        b.fill([{atome:  :planet,repeat: {x: 5, y: 3}}, { atome: :logo, width: 33, height: 33 ,  opacity: 0.3} ])
+      end
+    end
+  end
 end
-b.fill({atome:  :logo, width: 33, height: 33 })
 
-wait 1 do
-  b.fill({atome:  :planet, width: 33, height: 33 })
-end
+b.drag(true)

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+image({id: :planet,path: 'medias/images/red_planet.png', width: 66,height: 66,  left: 33, top: 33})
+b=box({width: 66, height: 66, color: :yellowgreen})
+
+  wait 1 do
+
+    b.opacity(0.3)
+  end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+color({ id: :creation_layer_col, alpha: 1 })
+
+b = box({ top: :auto, bottom: 0, id: :box_tool })
+
+b.touch(:down) do
+  creation_layer = box({ top: 0, left: 0, id: :creation_layer, width: '100%', height: '100%', apply: :creation_layer_col })
+  creation_layer.touch(:down) do |event|
+    left_found = event[:pageX].to_i
+    top_found = event[:pageY].to_i
+    box({ left: left_found, top: top_found ,id: "tutu_#{Universe.atomes.length}", color: :red})
+    creation_layer.delete(true)
+    creation_layer.touch({ remove: :down })
+    puts Universe.atomes.length
+    puts "=> #{Universe.user_atomes}"
+  end
+end
+
+# c= color({ red: 1, id: :toto })
+# # puts c.aid
+# puts Universe.atomes.length
+# wait 0.5 do
+#   c= color({ red: 1, id: :toto })
+#   # puts c.aid
+#   puts Universe.atomes.length
+# end
+
+# wait 1 do
+#   c= color({ red: 1, id: :toto })
+#   puts c.aid
+#   puts Universe.atomes.length
+#   wait 1 do
+#     c= color({ red: 1, id: :toto })
+#     puts c.aid
+#     puts Universe.atomes.length
+#     wait 1 do
+#       c= color({ red: 1, id: :toto })
+#       puts c.aid
+#       puts Universe.atomes.length
+#       wait 1 do
+#         c= color({ red: 1, id: :toto })
+#         puts c.aid
+#         puts Universe.atomes.length
+#         alert "=> #{Universe.user_atomes}"
+#       end
+#     end
+#   end
+# end

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

@@ -4,7 +4,10 @@ b = box({ left: 666, color: :blue, smooth: 6, id: :the_box2 })
 
 t=text({id: :the_text, data: 'type of touch : ?'})
 
-t.touch(:down) do
+t.touch(:down) do |event|
+
+  puts event[:pageX]
+  puts event[:pageY]
   b.touch({remove: :down})
    # b.touch(:remove) # or  b.touch(false) to remove all touches bindings
   t.data('touch down killed')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.6.6.1
+  version: 0.5.6.6.5
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -580,6 +580,7 @@ files:
 - vendor/assets/application/examples/on_resize.rb
 - vendor/assets/application/examples/on_the_fly_ruby_code_loading.rb
 - vendor/assets/application/examples/online.rb
+- vendor/assets/application/examples/opacity.rb
 - vendor/assets/application/examples/over.rb
 - vendor/assets/application/examples/paint.rb
 - vendor/assets/application/examples/particles.rb
@@ -611,6 +612,7 @@ files:
 - vendor/assets/application/examples/terminal.rb
 - vendor/assets/application/examples/test.rb
 - vendor/assets/application/examples/text.rb
+- vendor/assets/application/examples/tools.rb
 - vendor/assets/application/examples/touch.rb
 - vendor/assets/application/examples/type_mutation.rb
 - vendor/assets/application/examples/unit.rb