voxelamming 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd127d3be01c9626c89f8c30261e386d693f003e4fd5d98ada6e429d768d64df
-  data.tar.gz: 424aaa454b52aeee6fd8a4d2c986422e31824e1e66949d4d4dedf94806038799
+  metadata.gz: cfc40d2cd2af116222490bcd16e2738790ff96fbc9e71c2791786f0e1dad48d5
+  data.tar.gz: 963960a9697ba5bf0a6b70c3a6114e06202206d0b80c469c0205df7066438eaf
 SHA512:
-  metadata.gz: 8affe5c143e5f915ff5d19bf9763c01474ea091431c3d77e62dc0d2b2728cbe8f19e03dcd74a5b86f6460baac0a1f157a57929debacc9d92e38918b81ab300a9
-  data.tar.gz: 9705d0420d514da88f9551ccdb74b06f5260fbb18afef47f89fe74589917897e85aa5c84560388a24c3f7b017da0d3681d63e94edabfb9cd5a87743a702e4608
+  metadata.gz: 5c31b1d345afd868e04a0f8137f4919ceb3483e259ff3d4b4811bf5ab8e064d623763c87ba0a524269ebefc465db5e81f4ac4392088445491fab1a417a7d56fa
+  data.tar.gz: c05d465645818fc0c230607309f0981b079b0f120d54ee515782fced24afac134d741dacfeab22e8cef3ca29e35598e14c94e5ea2b2a88f28125800609ef0432

data/CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
+creativival@gmail.com.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

data/README.md

@@ -1,4 +1,4 @@
-# VoxelammingGem
+# Voxelamming
 
 This Ruby package converts Python code into JSON format and sends it to the Voxelamming app using WebSockets, allowing users to create 3D voxel models by writing Ruby scripts.
 
@@ -26,27 +26,27 @@ gem install voxelamming
 require 'voxelamming'
 
 room_name = '1000'
-build_box = Voxelamming::BuildBox.new(room_name)
+vox = Voxelamming::VoxelammingManager.new(room_name)
 
-build_box.set_box_size(0.5)
-build_box.set_build_interval(0.01)
+vox.set_box_size(0.5)
+vox.set_build_interval(0.01)
 
 for i in 0...100
-  build_box.create_box(-1, i, 0, r: 0, g: 1, b: 1)
-  build_box.create_box(0, i, 0, r: 1, g: 0, b: 0)
-  build_box.create_box(1, i, 0, r: 1, g: 1, b: 0)
-  build_box.create_box(2, i, 0, r: 0, g: 1, b: 1)
+  vox.create_box(-1, i, 0, r: 0, g: 1, b: 1)
+  vox.create_box(0, i, 0, r: 1, g: 0, b: 0)
+  vox.create_box(1, i, 0, r: 1, g: 1, b: 0)
+  vox.create_box(2, i, 0, r: 0, g: 1, b: 1)
 end
 
 for i in 0...50
-  build_box.remove_box(0, i * 2, 0)
-  build_box.remove_box(1, i * 2 + 1, 0)
+  vox.remove_box(0, i * 2, 0)
+  vox.remove_box(1, i * 2 + 1, 0)
 end
 
-build_box.send_data
+vox.send_data
 ```
 
-This code snippet demonstrates a simple example where a red voxel is created at a specific location. You can use various functions provided by the `BuildBox` class to build more complex models.
+This code snippet demonstrates a simple example where a red voxel is created at a specific location. You can use various functions provided by the `VoxelammingManager` class to build more complex models.
 
 #### Method description
 
@@ -75,6 +75,12 @@ This code snippet demonstrates a simple example where a red voxel is created at
 | `frame_out()` | Ends recording a frame. | |
 | `set_frame_fps(fps)` | Sets the frame rate (default: 2). | `fps`: Frame rate (int) |
 | `set_frame_repeats(repeats)` | Sets the number of frame repetitions (default: 10). | `repeats`: Number of repetitions (int) |
+| Game Method Name                                                                              | Description | Arguments                                                                                                                                                            |
+| `set_game_screen(width, height, angle=90, r=1, g=1, b=0, alpha=0.5)`                | Sets the game screen size. | `width`, `height`: screen size (float), `angle`: angle (float), `r`, `g`, `b`, `alpha`: color (float, 0-1)                                                            |
+| `set_game_score(score)`                                                                  | Sets the game score. | `score`: game score (int)                                                                                                                                            |
+| `send_game_over()`                                                                       | Triggers game over. |                                                                                                                                                                     |
+| `create_sprite(sprite_name, color_list, x, y, direction=90, scale=1, visible=True)`      | Creates a sprite. | `sprite_name`: sprite name (string), `color_list`: dot color data (string), `x`, `y`: position (float), `direction`: angle (float), `scale`: scale (float), `visible`: visibility (boolean) |
+| `move_sprite(sprite_name, x, y, direction=90, scale=1, visible=True)`                    | Moves a sprite. | `sprite_name`: sprite name (string), `x`, `y`: position (float), `direction`: angle (float), `scale`: scale (float), `visible`: visibility (boolean)                                  |
 
 ## Development
 
@@ -84,7 +90,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/creativival/voxelamming_ruby_gem. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/voxelamming_gem/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/creativival/voxelamming_ruby_gem. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/voxelamming_ruby_gem/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -92,4 +98,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the VoxelammingGem project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/voxelamming_gem/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Voxelamming project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/voxelamming_ruby_gem/blob/master/CODE_OF_CONDUCT.md).

data/index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <title>VoxelammingGem</title>
+    <title>Voxelamming</title>
     <style>
         body {
             font-family: sans-serif;
@@ -58,7 +58,7 @@
     </style>
 </head>
 <body>
-<h1><a href="#voxelamminggem" id="voxelamminggem"></a>VoxelammingGem</h1>
+<h1><a href="#voxelamminggem" id="voxelamminggem"></a>Voxelamming</h1>
 <p>This Ruby package converts Python code into JSON format and sends it to the Voxelamming app using WebSockets, allowing users to create 3D voxel models by writing Ruby scripts.</p>
 <h2><a href="#whats-voxelamming" id="whats-voxelamming"></a>What's Voxelamming?</h2>
 <p align="center"><img src="https://creativival.github.io/voxelamming/image/voxelamming_icon.png" alt="Voxelamming Logo" width="200"/></p>
@@ -75,26 +75,26 @@
 <pre><code class="ruby">require 'voxelamming'
 
 room_name = '1000'
-build_box = Voxelamming::BuildBox.new(room_name)
+vox = Voxelamming::VoxelammingManager.new(room_name)
 
-build_box.set_box_size(0.5)
-build_box.set_build_interval(0.01)
+vox.set_box_size(0.5)
+vox.set_build_interval(0.01)
 
 for i in 0...100
-  build_box.create_box(-1, i, 0, r: 0, g: 1, b: 1)
-  build_box.create_box(0, i, 0, r: 1, g: 0, b: 0)
-  build_box.create_box(1, i, 0, r: 1, g: 1, b: 0)
-  build_box.create_box(2, i, 0, r: 0, g: 1, b: 1)
+  vox.create_box(-1, i, 0, r: 0, g: 1, b: 1)
+  vox.create_box(0, i, 0, r: 1, g: 0, b: 0)
+  vox.create_box(1, i, 0, r: 1, g: 1, b: 0)
+  vox.create_box(2, i, 0, r: 0, g: 1, b: 1)
 end
 
 for i in 0...50
-  build_box.remove_box(0, i * 2, 0)
-  build_box.remove_box(1, i * 2 + 1, 0)
+  vox.remove_box(0, i * 2, 0)
+  vox.remove_box(1, i * 2 + 1, 0)
 end
 
-build_box.send_data
+vox.send_data
 </code></pre>
-<p>This code snippet demonstrates a simple example where a red voxel is created at a specific location. You can use various functions provided by the <code>BuildBox</code> class to build more complex models.</p>
+<p>This code snippet demonstrates a simple example where a red voxel is created at a specific location. You can use various functions provided by the <code>VoxelammingManager</code> class to build more complex models.</p>
 <h4><a href="#method-description" id="method-description"></a>Method description</h4>
 <table>
     <thead>
@@ -130,10 +130,10 @@ build_box.send_data
 <p>After checking out the repo, run <code>bin/setup</code> to install dependencies. Then, run <code>rake test</code> to run the tests. You can also run <code>bin/console</code> for an interactive prompt that will allow you to experiment.</p>
 <p>To install this gem onto your local machine, run <code>bundle exec rake install</code>. To release a new version, update the version number in <code>version.rb</code>, and then run <code>bundle exec rake release</code>, which will create a git tag for the version, push git commits and the created tag, and push the <code>.gem</code> file to <a href="https://rubygems.org">rubygems.org</a>.</p>
 <h2><a href="#contributing" id="contributing"></a>Contributing</h2>
-<p>Bug reports and pull requests are welcome on GitHub at <a href="https://github.com/[USERNAME]/voxelamming_gem">https://github.com/[USERNAME]/voxelamming_gem</a>. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the <a href="https://github.com/[USERNAME]/voxelamming_gem/blob/master/CODE_OF_CONDUCT.md">code of conduct</a>.</p>
+<p>Bug reports and pull requests are welcome on GitHub at <a href="https://github.com/[USERNAME]/voxelamming_ruby_gem">https://github.com/[USERNAME]/voxelamming_ruby_gem</a>. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the <a href="https://github.com/[USERNAME]/voxelamming_ruby_gem/blob/master/CODE_OF_CONDUCT.md">code of conduct</a>.</p>
 <h2><a href="#license" id="license"></a>License</h2>
 <p>The gem is available as open source under the terms of the <a href="https://opensource.org/licenses/MIT">MIT License</a>.</p>
 <h2><a href="#code-of-conduct" id="code-of-conduct"></a>Code of Conduct</h2>
-<p>Everyone interacting in the VoxelammingGem project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the <a href="https://github.com/[USERNAME]/voxelamming_gem/blob/master/CODE_OF_CONDUCT.md">code of conduct</a>.</p>
+<p>Everyone interacting in the Voxelamming project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the <a href="https://github.com/[USERNAME]/voxelamming_ruby_gem/blob/master/CODE_OF_CONDUCT.md">code of conduct</a>.</p>
 </body>
 </html>

data/lib/voxelamming/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Voxelamming
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/voxelamming.rb

@@ -17,7 +17,7 @@ module Voxelamming
   end
 
   # Main process
-  class BuildBox
+  class VoxelammingManager
     @@texture_names = ["grass", "stone", "dirt", "planks", "bricks"]
     @@model_names = ["Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto", "Sun",
                      "Moon", "ToyBiplane", "ToyCar", "Drummer", "Robot", "ToyRocket", "RocketToy1", "RocketToy2", "Skull"]
@@ -33,11 +33,15 @@ module Voxelamming
       @animation = [0, 0, 0, 0, 0, 0, 1, 0]
       @boxes = []
       @frames = []
-      @sentence = []
+      @sentences = []
       @lights = []
       @commands = []
       @models = []
       @model_moves = []
+      @sprites = []
+      @sprite_moves = []
+      @game_score = -1
+      @game_screen = []  # width, height, angle=90, red=1, green=1, blue=1, alpha=0.5
       @size = 1
       @shape = 'box'
       @is_metallic = 0
@@ -46,6 +50,9 @@ module Voxelamming
       @build_interval = 0.01
       @is_framing = false
       @frame_id = 0
+      @websocket = nil
+      @last_sent_time = nil
+      @timer = nil
     end
 
     def clear_data
@@ -58,7 +65,11 @@ module Voxelamming
       @animation = [0, 0, 0, 0, 0, 0, 1, 0]
       @boxes = []
       @frames = []
-      @sentence = []
+      @sentences = []
+      @sprites = []
+      @sprite_moves = []
+      @game_score = -1
+      @game_screen = []  # width, height, angle=90, red=1, green=1, blue=1, alpha=0.5
       @lights = []
       @commands = []
       @models = []
@@ -119,8 +130,8 @@ module Voxelamming
         x, y, z = round_numbers([x, y, z])
 
         # Compute the rotation after transform
-        translate_rotation_matrix = get_rotation_matrix(-pitch, -yaw, -roll)
-        rotate_matrix = matrix_multiply(translate_rotation_matrix, base_rotation_matrix)
+        transform_rotation_matrix = get_rotation_matrix(-pitch, -yaw, -roll)
+        rotate_matrix = matrix_multiply(transform_rotation_matrix, base_rotation_matrix)
         @matrix_transform = [x, y, z, *rotate_matrix[0], *rotate_matrix[1], *rotate_matrix[2]]
       else
         x, y, z = round_numbers([x, y, z])
@@ -196,11 +207,11 @@ module Voxelamming
       @build_interval = interval
     end
 
-    def write_sentence(sentence, x, y, z, r: 1, g: 1, b: 1, alpha: 1)
+    def write_sentence(sentence, x, y, z, r: 1, g: 1, b: 1, alpha: 1, font_size: 8, is_fixed_width: false)
       x, y, z = round_numbers([x, y, z]).map(&:to_s)
       r, g, b, alpha = round_two_decimals([r, g, b, alpha])
-      r, g, b, alpha =  [r, g, b, alpha].map(&:floor).map(&:to_s)
-      @sentence = [sentence, x, y, z, r, g, b, alpha]
+      r, g, b, alpha, font_size =  [r, g, b, alpha, font_size].map(&:floor).map(&:to_s)
+      @sentences << [sentence, x, y, z, r, g, b, alpha, font_size, is_fixed_width ? "1" : "0"]
     end
 
     def set_light(x, y, z, r: 1, g: 1, b: 1, alpha: 1, intensity: 1000, interval: 1, light_type: 'point')
@@ -308,6 +319,65 @@ module Voxelamming
       @model_moves << [entity_name, x, y, z, pitch, yaw, roll, scale]
     end
 
+    # Game API
+
+    def set_game_screen(width, height, angle = 90, r = 1, g = 1, b = 0, alpha = 0.5)
+      @game_screen = [width, height, angle, r, g, b, alpha]
+    end
+
+    def set_game_score(score)
+      @game_score = score.to_f
+    end
+
+    def send_game_over
+      @commands << 'gameOver'
+    end
+
+    def set_rotation_style(sprite_name, rotation_style = 'all around')
+      @rotation_styles[sprite_name] = rotation_style
+    end
+
+    def create_sprite(sprite_name, color_list, x, y, direction = 0, scale = 1, visible = true)
+      # 新しいスプライトデータを配列に追加
+      x, y, direction = round_numbers([x, y, direction])
+      x, y, direction, scale = [x, y, direction, scale].map(&:to_s)
+      @sprites << [sprite_name, color_list, x, y, direction, scale, visible ? '1' : '0']
+    end
+
+    def move_sprite(sprite_name, x, y, direction = 0, scale = 1, visible = true)
+      # x, y, directionを丸める
+      x, y, direction = round_numbers([x, y, direction])
+      x, y, direction, scale = [x, y, direction, scale].map(&:to_s)
+
+      # rotation_styleを取得
+      if @rotation_styles.has_key?(sprite_name)
+        rotation_style = @rotation_styles[sprite_name]
+
+        # rotation_styleが変更された場合、新しいスプライトデータを配列に追加
+        case rotation_style
+        when 'left-right'
+          direction_mod = direction.to_i % 360 # 常に0から359の範囲で処理（常に正の数になる）
+          if direction_mod > 90 && direction_mod < 270
+            direction = '-180' # -180は左右反転するようにボクセラミング側で実装されている
+          else
+            direction = '0'
+          end
+        when "don't rotate"
+          direction = '0'
+        else
+          direction = direction.to_s
+        end
+      else
+        # rotation_styleが設定されていない場合、そのままの値を使う
+        direction = direction.to_s
+      end
+
+      # sprites配列から同じスプライト名の要素を削除
+      @sprite_moves.reject! { |sprite_info| sprite_info[0] == sprite_name }
+
+      # 新しいスプライトデータを配列に追加
+      @sprite_moves << [sprite_name, x, y, direction, scale, visible ? '1' : '0']
+    end
 
     def send_data(name: '')
       puts 'send_data'
@@ -319,11 +389,15 @@ module Voxelamming
         "animation": @animation,
         "boxes": @boxes,
         "frames": @frames,
-        "sentence": @sentence,
+        "sentences": @sentences,
         "lights": @lights,
         "commands": @commands,
         "models": @models,
         "modelMoves": @model_moves,
+        "sprites": @sprites,
+        "spriteMoves": @sprite_moves,
+        "gameScore": @game_score,
+        "gameScreen": @game_screen,
         "size": @size,
         "shape": @shape,
         "interval": @build_interval,
@@ -335,35 +409,61 @@ module Voxelamming
       }.to_json
 
       EM.run do
-        ws = Faye::WebSocket::Client.new('wss://websocket.voxelamming.com')
-
-        ws.on :open do |_event|
-          p [:open]
-          puts 'WebSocket connection open'
-          ws.send(@room_name)
-          puts "Joined room: #{@room_name}"
-          ws.send(data_to_send)
-          puts data_to_send
-          puts 'Sent data to server'
-
-          EM.add_timer(1) do
-            ws.close
+        if @websocket.nil?
+          @websocket = Faye::WebSocket::Client.new('wss://websocket.voxelamming.com')
+
+          @websocket.on :open do |_event|
+            p [:open]
+            puts 'WebSocket connection open'
+            @websocket.send(@room_name)
+            puts "Joined room: #{@room_name}"
+            send_data_to_server(data_to_send)
+          end
+
+          @websocket.on :error do |event|
+            puts "WebSocket error: #{event.message}"
             EM.stop
           end
-        end
 
-        ws.on :error do |event|
-          puts "WebSocket error: #{event.message}"
-          EM.stop
+          @websocket.on :close do |_event|
+            puts 'WebSocket connection closed'
+            EM.stop
+          end
+        else
+          send_data_to_server(data_to_send)
         end
+      end
+    end
+
+    def send_data_to_server(data)
+      if @websocket && @websocket.ready_state == Faye::WebSocket::API::OPEN
+        @websocket.send(data)
+        puts 'Sent data to server'
+        @last_sent_time = Time.now
+
+        reset_close_timer
+      end
+    end
 
-        ws.on :close do |_event|
-          puts 'WebSocket connection closed'
-          EM.stop
+    def reset_close_timer
+      EM.cancel_timer(@timer) if @timer
+
+      @timer = EM.add_timer(2) do
+        if Time.now - @last_sent_time >= 2
+          close_connection
         end
       end
     end
 
+    def close_connection
+      if @websocket
+        puts 'Closing WebSocket connection.'
+        @websocket.close
+        @websocket = nil
+        EM.stop
+      end
+    end
+
     def round_numbers(num_list)
       if @is_allowed_float == 1
         round_two_decimals(num_list)
@@ -381,8 +481,8 @@ module Voxelamming
   class Turtle
     include Math
 
-    def initialize(build_box)
-      @build_box = build_box
+    def initialize(voxelamming_instance)
+      @vox = voxelamming_instance
       @x = 0
       @y = 0
       @z = 0
@@ -400,7 +500,7 @@ module Voxelamming
       x, y, z = x.round(3), y.round(3), z.round(3)
 
       if @drawable
-        @build_box.draw_line(@x, @y, @z, x, y, z, r: @color[0], g: @color[1], b: @color[2])
+        @vox.draw_line(@x, @y, @z, x, y, z, r: @color[0], g: @color[1], b: @color[2])
       end
 
       @x = x

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voxelamming
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - creativival
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-10 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -42,14 +42,16 @@ files:
 - lib/voxelamming.rb
 - lib/voxelamming/version.rb
 - sig/voxelamming.rbs
+- voxelamming-0.2.0.gem
+- voxelamming-0.3.0.gem
 homepage: https://creativival.github.io/voxelamming
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://creativival.github.io/voxelamming
-  source_code_uri: https://github.com/creativival/voxelamming_gem
-  changelog_uri: https://creativival.github.io/voxelamming_gem/CHANGELOG.md
+  source_code_uri: https://github.com/creativival/voxelamming_ruby_gem
+  changelog_uri: https://creativival.github.io/voxelamming_ruby_gem/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: