kame-remocon 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99d6b147fd3d4c3a15470c2bd251fc24b997fcbd015a5e7bec612fef219cb3ee
-  data.tar.gz: 9903122a68c67ee226f21dc6a51328f38c1d578145378a93c9f30e8505d78369
+  metadata.gz: 0b7b14707f0668e82aee7190351a5e9583489061aa6a77bb3f9c5a1912780899
+  data.tar.gz: e741532064feeaa3f1b3c5136d346534d372bef4c5b324f60603228a1d820a11
 SHA512:
-  metadata.gz: fe52be152807635bfbb1ec58e8f90c8cac7b9086c0c885ebec051f49a2f8483e3e4ee3c89ef04fb5e68203519c24a21e02e759bee9580152f7d462bb16f65dde
-  data.tar.gz: ea6301a1a72b06254b494b8adfdf73a1d08eb4469c83b324a67e6872ef59edb72f69ac7a537e54fc7cfbaccfe31f5b5846520a9112745cbcf28530108a885a25
+  metadata.gz: 33dd39acb5d7cc0c555d581365f46437472f2564d7e7466c6eff7cda9d63e3609331e932452016aac61f9b2456e0287344e8394d1aa52033e73b75b041d7258a
+  data.tar.gz: a1f600cd7d4b25b2e9e22b52a09613addcd50ba34a91ab2cfc4562a6eadc8b43599e93e9d2ac22ba9cd19517a1c6b7208f4496ba08c76a2e39397c28f3e538e7

data/lib/kame/remocon/commander.rb

@@ -1,7 +1,7 @@
 class Commander
   attr_reader :commands
 
-  METHODS = [:clear, :reset, :pen_up, :pen_down, :turn_left, :turn_right, :forward, :backward, :move_to]
+  METHODS = [:clear, :reset, :pen_up, :pen_down, :color, :turn_left, :turn_right, :forward, :backward, :move_to]
 
   def initialize(forward = nil)
     if forward
@@ -43,6 +43,10 @@ class Commander
     self << [:pen_up]
   end
 
+  def color(color)
+    self << [:color, color]
+  end
+
   def forward(dist)
     self << [:forward, dist]
   end

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

@@ -26,6 +26,9 @@ end
 class AppView
   include Hyalite::Component
 
+  state :render_image, false
+  state :bg_color, "black"
+
   def initialize
     @program = <<~PROG
       pen_down
@@ -56,15 +59,30 @@ class AppView
     @turtle.exec @program, wait
   end
 
+  def create_image
+    set_state(render_image: true)
+  end
+
+  def set_background
+    bg_color = @refs[:bg_color][:checked]
+    @turtle.default_color = bg_color ? "white" : "black"
+    set_state(bg_color: bg_color ? "black" : "white")
+  end
+
   def render
     program = @program
+    render_image = @state[:render_image]
+    bg_color = @state[:bg_color]
     div do
       h2(nil, 'タートルグラフィックスに挑戦！！')
-      CanvasView.el(onMounted: -> canvas { mounted(canvas) })
+      CanvasView.el(onMounted: -> canvas { mounted(canvas) }, render_image: render_image, bg_color: bg_color)
       textarea({style: {width: "400px", height: "200px"}, ref: :program}, program)
       input({type: :checkbox, checked: true, id: :wait, ref: :wait})
       label({for: :wait}, "描く過程を表示する")
-      button({onClick: -> { exec() }, name: "exec"}, "Exec")
+      input({type: :checkbox, checked: true, id: :bg_color, ref: :bg_color, onClick: -> {set_background}})
+      label({for: :bg_color}, "黒背景")
+      button({onClick: -> { exec }, name: "exec"}, "実行する")
+      button({onClick: -> { create_image }, name: "create_image"}, "画像を作成")
     end
   end
 end

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

@@ -3,6 +3,8 @@ require "kame/remocon/commander"
 require_relative "./image"
 
 class Turtle
+  attr_accessor :default_color
+
   class Pos
     attr_reader :x, :y
 
@@ -21,9 +23,10 @@ class Turtle
     end
   end
 
-  def initialize(canvas, wait: 0)
+  def initialize(canvas, wait: 0, default_color: "white")
     @canvas = canvas
     @wait = wait
+    @default_color = default_color
     @context = @canvas.get_context("2d");
     clear
     reset
@@ -35,7 +38,10 @@ class Turtle
   def new_commander
     forwarder = Forwarder.new(self, *Commander::METHODS) do
       @context.clear_rect(0, 0, @canvas.width, @canvas.height)
-      @context.stroke(@path)
+      @paths.each do |path, color|
+        @context.stroke_style = color
+        @context.stroke(path)
+      end
       draw_kame
     end
 
@@ -58,7 +64,7 @@ class Turtle
 
     c = Math.cos(@direction / 180 * Math::PI)
     s = Math.sin(@direction / 180 * Math::PI)
-    transform = [c, s, -s, c, x - 10 * c + 10 * s, y - 10 * c - 10 * s] 
+    transform = [c, s, -s, c, x - 10 * c + 10 * s, y - 10 * c - 10 * s]
     @context.set_transform(*transform)
     @context.draw_image(@kame, 0, 0, 20, 20)
     @context.set_transform(1, 0, 0, 1, 0, 0)
@@ -81,7 +87,10 @@ class Turtle
         else
           exec_command(commands.shift)
           @context.clear_rect(0, 0, @canvas.width, @canvas.height)
-          @context.stroke(@path)
+          @paths.each do |path, color|
+            @context.stroke_style = color
+            @context.stroke(path)
+          end
           draw_kame
           true
         end
@@ -94,7 +103,10 @@ class Turtle
       )
     else
       commands.each(&self.method(:exec_command))
-      @context.stroke(@path)
+      @paths.each do |path, color|
+        @context.stroke_style = color
+        @context.stroke(path)
+      end
       if @kame.complete
         draw_kame
       else
@@ -113,6 +125,7 @@ class Turtle
   def clear
     @context.clear_rect(0, 0, @canvas.width, @canvas.height)
     @path = Canvas::Path2D.new
+    @paths = [[@path, @default_color]]
     nil
   end
 
@@ -122,7 +135,6 @@ class Turtle
     @pos = Pos.new(0, 0)
     @path.move_to(*@pos.canvas_coordinate)
     @context.move_to(*@pos.canvas_coordinate)
-    @context.stroke_style = "white"
     nil
   end
 
@@ -146,6 +158,13 @@ class Turtle
     nil
   end
 
+  def color(color)
+    @path = Canvas::Path2D.new
+    @path.move_to(*@pos.canvas_coordinate)
+    @paths << [@path, color]
+    nil
+  end
+
   def forward(dist)
     @pos = position_to(dist)
     move

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

@@ -1,6 +1,10 @@
 class CanvasView
   include Hyalite::Component
 
+  def create_image
+    canvas = @refs[:canvas].native
+    `canvas.toDataURL()`
+  end
 
   def component_did_mount
     el = @refs[:canvas]
@@ -10,6 +14,18 @@ class CanvasView
   end
 
   def render
-    canvas({width: "400", height: "400", ref: :canvas, style: {"background-color": "black"}})
+    image = nil
+    if @props[:render_image]
+      image = create_image
+    end
+
+    bg_color = @props[:bg_color]
+
+    div 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/turtle_proxy.rb

@@ -33,6 +33,10 @@ class TurtleProxy
     @turtle.pen_up
   end
 
+  def color(color)
+    @turtle.color(color)
+  end
+
   def forward(dist)
     @turtle.forward(dist)
   end

data/lib/kame/remocon/version.rb

@@ -1,5 +1,5 @@
 module Kame
   module Remocon
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kame-remocon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2019-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -195,7 +195,6 @@ files:
 - lib/kame/remocon/opal/controllers/application_controller.rb
 - lib/kame/remocon/opal/image.rb
 - lib/kame/remocon/opal/turtle.rb
-- lib/kame/remocon/opal/views/canvas.rb
 - lib/kame/remocon/opal/views/canvas_view.rb
 - lib/kame/remocon/remote_object.rb
 - lib/kame/remocon/server.rb

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

@@ -1,7 +0,0 @@
-class Canvas
-  include Hyalite::Component
-
-  def render
-    canvas({width: 480, height: 480})    
-  end
-end