r2dsvg 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8296973a57c753bc725b879e70c9479f439a50feb5d7b5330be4694f54b5605e
-  data.tar.gz: 2ef0ea5d588963e2e429817ae0e044f258e3f2af08b8dca29171998595357ae8
+  metadata.gz: 3e718ce8f5b3d4197dd32f6e8a683e798d6584392ecc9887fe06c407e66c09b8
+  data.tar.gz: 774d9213286656b2e5e07187ae003e2779069a1f739c4b69daedd9d3613659ff
 SHA512:
-  metadata.gz: 55f66186da14d03535b3c1c5a201e8aa9f2c8c331ec5c7df5b13269e3357a0bd083ddebcaeeb3a9b21beed39a13d65638074f324dec8abd5b434a71bf23af335
-  data.tar.gz: ea0e41cfb9a3751f53692ba1890f433ba80cfbc39698ccd500b9a58cd99bff9d31885671831664a5707ad6bd1c3feaae9e67cb96b8dbfec3191d36bf49c4e0e3
+  metadata.gz: 4f9aabe5d38b712ecdc68e578e8161d1cb88e2f18507b830078f8dea4ae43da99b121982381ce688e6fd2270e4da399f9dac94b7885cffe83cfb4a164e5f4ce2
+  data.tar.gz: 295f9df35ebe9e3e755c771b52ebe86d16ab19ed298c00dd46797f94957b3a38571b80c5acbf74a98e8feff02437a54e2555953e7bbe3c9eac203e831d112f46

data/lib/r2dsvg.rb

@@ -18,10 +18,26 @@ text {fill: red, size: 20}
 
 CSS
 
+module SvgleX
+  
+  refine Svgle::Element do
+    
+    def obj=(object)
+      @obj = object
+    end
+    
+    def obj()
+      @obj
+    end
+    
+  end
+  
+end
 
 class R2dSvg
   include Ruby2D
   using ColouredText
+  using SvgleX
 
   class Render < DomRender
     
@@ -37,8 +53,19 @@ class R2dSvg
         h
       end
 
-      [:embed_audio, sources ]
+      [:embed_audio, sources, e]
     end    
+    
+    def image(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+      h = attributes
+
+      x, y, width, height = %i(x y width height).map{|x| h[x] ? h[x].to_i : nil }
+      src = h[:'xlink:href']
+
+      [:draw_image, [x, y, width, height], src, style, e, render_all(e)]
+    end       
 
     def rect(e, attributes, raw_style)
 
@@ -49,7 +76,7 @@ class R2dSvg
       x1, y1, width, height = %i(x y width height).map{|x| h[x].to_i }
       x2, y2, = x1 + width, y1 + height
 
-      [:draw_rectangle, [x1, y1, x2, y2], style, render_all(e)]
+      [:draw_rectangle, [x1, y1, x2, y2], style, e, render_all(e)]
     end
     
     def script(e, attributes, style)
@@ -73,7 +100,7 @@ class R2dSvg
 
       x, y = %i(x y).map{|x| attributes[x].to_i }
 
-      [:draw_text, [x, y], e.text, style, render_all(e)]
+      [:draw_text, [x, y], e.text, style, e, render_all(e)]
     end        
         
     private
@@ -100,9 +127,35 @@ class R2dSvg
 
     end
     
+    def draw_image(args)
+
+      dimensions, src, style, e = args
+
+      x, y, width, height = dimensions      
+      
+      filepath = Tempfile.new('r2dsvg').path + File.basename(src)
+      puts 'filepath: ' + filepath.inspect if @debug
+      File.write filepath, RXFHelper.read(src).first
+        
+      
+      if File.exists? filepath then
+
+        obj = Image.new(
+          filepath,
+          x: x, y: y,
+          width: width, height: height,
+          color: style[:fill],
+          z: style[:"z-index"].to_i
+        )        
+
+        e.obj = obj if e.respond_to? :obj=
+        @window.add obj
+      end
+    end     
+    
     def draw_rectangle(args)
 
-      coords, style = args
+      coords, style, e = args
 
       x1, y1, x2, y2 = coords
 
@@ -111,18 +164,20 @@ class R2dSvg
         puts ('style: ' + style.inspect).debug 
       end 
 
-      @window.add Rectangle.new(
+      obj = Rectangle.new(
         x: x1, y: y1,
         width: x2 - x1, height: y2 - y1,
         color: style[:fill],
         z: style[:"z-index"].to_i
       )
+      e.obj = obj if e.respond_to? :obj=
+      @window.add obj
 
     end
     
     def draw_text(args)
 
-      coords, text, style = args
+      coords, text, style, e = args
 
       x, y = coords
 
@@ -131,14 +186,16 @@ class R2dSvg
         puts ('style: ' + style.inspect).debug 
       end 
      
-      @window.add Text.new(
+      obj = Text.new(
         text,
         x: x, y: y,
         #font: 'vera.ttf',
         size: style[:font_size].to_i,
         color: style[:color],
         z: style[:"z-index"].to_i
-      )      
+      )
+      e.obj = obj
+      @window.add obj
 
     end
     
@@ -147,21 +204,33 @@ class R2dSvg
 
     def embed_audio(args)
       
-      sources, _ = args
+      sources, e = args
 
       if @debug then
         puts 'sources: ' + sources.inspect if @debug
         puts 'inside embed_audio'.info
       end 
      
-      audio = sources.find do |source|
-        File.exists? source[:src]
+      
+      audio_files = sources.map do |source|
+        
+        filepath = Tempfile.new('r2dsvg').path + File.basename(source[:src])
+        File.write filepath, RXFHelper.read(source[:src]).first
+        filepath
       end
       
+      audio = audio_files.find {|file| File.exists? file }
+      
       return unless audio
       
-      file = File.exists? audio[:src]? audio[:src] : nil
-      @window.add = Sound.new(file)
+      file = File.exists?(audio) ? audio : nil
+      puts 'file: ' + file.inspect if @debug
+      file = '/tmp/echo.wav'
+      obj = Sound.new(file)
+      e.obj = obj
+      
+      def e.play() self.obj.play()  end
+      #@window.add obj
 
     end     
     
@@ -214,27 +283,39 @@ class R2dSvg
     @width, @height = %i(width height).map{|x| doc.root.attributes[x].to_i }
     window.set title: title, width: @width, height: @height        
     
-    def doc.element_by_id(id)
-      self.root.element("//*[@id='#{id}']")
-    end        
     
     doc.root.xpath('//script').each {|x| eval x.text.unescape }
     
     drawing.render instructions
-        
-    window.on :mouse_move do |event|
-
-      @doc.root.xpath('//*[@onmousemove]').each do |x|
-                  
-        eval x.onmousemove() if x.hotspot? event.x, event.y
-        
-      end
 
+    @doc = doc              
+    
+    window.on(:mouse_move) {|event|  mouse(:move, event) }    
+    
+    window.on(:mouse_down) do |event|
+      mouse :down, event if event.button == :left
     end
 
-    @doc = doc    
+
     window.show
   end
+  
+  private
+  
+  def mouse(action, event)
+    
+    doc = @doc
+    
+    @doc.root.xpath("//*[@onmouse#{action}]").each do |x|
+
+      #puts 'x.class: ' + x.inspect if @debug
+      if x.obj and x.obj.contains? event.x, event.y then
+        eval x.method(('onmouse' + action.to_s).to_sym).call()
+      end
+    
+    end
+        
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2dsvg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -46,7 +46,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: ruby2d
   requirement: !ruby/object:Gem::Requirement