kame-remocon 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0120ea3770eb1a69977bced26ed7d508d588104444091336495f70a4d2f0e31c
-  data.tar.gz: 76a684647d92c156a8f0ac2f390a4ad0b3206853223736fb4fbb5afb696c782f
+  metadata.gz: 18ad27c2216af93b47a919d1edfe7f8f85104e4b4b0e8489db78987588f420e9
+  data.tar.gz: 3d707f62afacfb522aa1aa2480705be16ed69b908f925ee97cdf2845ead075c6
 SHA512:
-  metadata.gz: 45ce6b97b71e6c0871918b286610fc68545886dd32741fdc6e265b426e95b96de53b59f1ce94bc11a76633baba75a0423f5077a97a3bff38d117a589c2a63a26
-  data.tar.gz: daf15be3c1a10e473c441d40495b8fb5b2561adf724e408963d57e3c7d479c77f043525eb1c1327da4ef3c65c8de8d9767d61e46ff4395679f884f3c97a9ec0b
+  metadata.gz: e343e857259af437ca47568404efbf3fc8e1b713c1412e7767c56b8b0c9790b0bd7d8ba1d548fe147c52b47e6e3a38b0745acaeb40a31a11924a2edad6fafcde
+  data.tar.gz: 4d3975a4252f5ca6995f42ca09a09edad7c18a69b50e506c66111353835604c6b6fb23edc0d9e3d45f0debf2865c925e4f69c0bcf917bb3ccf79309bca270e0d

data/lib/kame/remocon/opal/canvas.rb

@@ -9,6 +9,10 @@ class Kame::Remocon::Opal::Canvas
     Context.new `#@native.getContext(type)`
   end
 
+  def image_data
+    `#@native.toDataURL()`.sub(/^.*,/, "")
+  end
+
   class Context
     include Native
     include Native::Helpers

data/lib/kame/remocon/opal/turtle.rb

@@ -4,6 +4,7 @@ require_relative "./image"
 
 class Kame::Remocon::Opal::Turtle
   attr_accessor :default_color
+  attr_reader :code
 
   class Pos
     attr_reader :x, :y
@@ -59,6 +60,10 @@ class Kame::Remocon::Opal::Turtle
     end
   end
 
+  def image_data
+    @canvas.image_data
+  end
+
   def draw_kame
     (x, y) = @pos.canvas_coordinate
 
@@ -70,15 +75,17 @@ class Kame::Remocon::Opal::Turtle
     @context.set_transform(1, 0, 0, 1, 0, 0)
   end
 
-  def exec(program, wait=0)
+  def exec(code, wait=0, &callback)
+    @code = code
     clear
     reset
     commander = Commander.new
-    commander.instance_eval program
-    exec_commands(commander.commands, wait: wait)
+    commander.instance_eval code
+    exec_commands(commander.commands, wait: wait, &callback)
   end
 
-  def exec_commands(commands, wait: nil)
+  def exec_commands(commands, wait: nil, &callback)
+    callback ||= Proc.new {}
     wait ||= @wait
     if wait > 0
       exec = Proc.new do
@@ -98,7 +105,10 @@ class Kame::Remocon::Opal::Turtle
       interval = wait * 1000
       %x(
         var timer = setInterval(function() {
-          if (!exec()) { clearInterval(timer); }
+          if (!exec()) {
+            callback.$call();
+            clearInterval(timer);
+          }
         }, interval);
       )
     else
@@ -109,9 +119,11 @@ class Kame::Remocon::Opal::Turtle
       end
       if @kame.complete
         draw_kame
+        callback.call
       else
         @kame.onload do
           draw_kame
+          callback.call
         end
       end
     end

data/lib/kame/remocon/opal/views/app_view.rb

@@ -21,7 +21,7 @@ class Kame::Remocon::Opal::AppView
   state :bg_color, "black"
 
   def initialize
-    @program = <<~PROG
+    @code= <<~PROG
       pen_down
       forward 100
       turn_left 90
@@ -33,25 +33,29 @@ class Kame::Remocon::Opal::AppView
     PROG
   end
 
+  def self.render(parent, &block)
+    Hyalite.render(Kame::Remocon::Opal::AppView.el(on_mounted: block), parent)
+  end
+
   def mounted(canvas)
+    @canvas = canvas
     @turtle = Kame::Remocon::Opal::Turtle.new(canvas)
-    @turtle.exec @program
+    @turtle.exec @code
+    @code_getter = -> { @refs[:program].value }
 
     if Kame::Remocon::Opal::Config.ws_enabled?
       @remote = DRb::DRbObject.new_with_uri "ws://127.0.0.1:9292"
       DRb.start_service("ws://127.0.0.1:9292/callback")
       @remote.set_turtle DRb::DRbObject.new(@turtle)
     end
+
+    @props[:on_mounted]&.call(@turtle, @remote)
   end
 
   def exec
-    @program = @refs[:program].value
+    @code = @refs[:program].value
     wait = @refs[:wait][:checked] ? 0.3 : 0
-    @turtle.exec @program, wait
-  end
-
-  def create_image
-    set_state(render_image: true)
+    @turtle.exec @code, wait
   end
 
   def set_background
@@ -61,19 +65,16 @@ class Kame::Remocon::Opal::AppView
   end
 
   def render
-    program = @program
+    code = @code
     render_image = @state[:render_image]
     bg_color = @state[:bg_color]
 
     div do
       div do
         Kame::Remocon::Opal::CanvasView.el(onMounted: -> canvas { mounted(canvas) }, render_image: render_image, bg_color: bg_color)
-        div({class: "wrap-code-text"}, textarea({style: {width: "400px", height: "400px"}, ref: :program}, program))
+        div({class: "wrap-code-text"}, textarea({style: {width: "400px", height: "400px"}, ref: :program}, code))
       end
-      Hyalite.create_element(:p, {class: "exec-button"}, button({onClick: -> { exec }, name: "exec"}, "実行する"))
-
-      div do
-        h2(nil, "設定")
+      div({class: :setting}) do
         ul do
           li do
             input({type: :checkbox, checked: true, id: :wait, ref: :wait})
@@ -84,8 +85,8 @@ class Kame::Remocon::Opal::AppView
             label({for: :bg_color}, "黒背景")
           end
         end
-        #button({onClick: -> { create_image }, name: "create_image"}, "画像を作成")
       end
+      Hyalite.create_element(:p, {class: "exec-button"}, button({onClick: -> { exec }, name: "exec"}, "実行する"))
     end
   end
 end

data/lib/kame/remocon/opal/views/canvas_view.rb

@@ -23,9 +23,6 @@ class Kame::Remocon::Opal::CanvasView
 
     div({class: "wrap-canvas"}) do
       canvas(width: "400", height: "400", id: :canvas, ref: :canvas, style: {"background-color": bg_color})
-      if image
-        img(src: image, style: {"background-color": bg_color})
-      end
     end
   end
 end

data/lib/kame/remocon/version.rb

@@ -1,5 +1,5 @@
 module Kame
   module Remocon
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kame-remocon
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal