ruby_rpg 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b56f66eb45701f903472f4d948d42e1a67a9bf051c59e0515ee8df1195503d7e
-  data.tar.gz: 35e50569d84181202098fd7425025ef73bdc54d0d7eae16bef0ad0acbe1fb6fb
+  metadata.gz: 73ebf7bd3a497f3da5bb8bf0c953da36446ef912edede3605ae811a7d7778c21
+  data.tar.gz: 2c6d68447ef0502ca2d19020659bf09b1821fec4ff741ee5901a142358513701
 SHA512:
-  metadata.gz: '08ec8719dae3c6788e4aa692059706ed9635b540974164339c4a5887dc0a0a420b48d8b7abc4022f87b899b8e2c02674d060107ec8c3dad06dcd6431add8f433'
-  data.tar.gz: a65cadf65c339c7b656c825dfa1ea6365e6fb2c94f090396b3e11c4e515d78b45819447bd186ebfb79424ed5fc25689d66cb4ed4a59b76c7e0ad7b5d943a187d
+  metadata.gz: cc07ac48782722967f54d33c0aa633891f1f585557b6cb9427cf0d4ae711b5869c318631f17fd90ef5e82fbdfcf6946542e8cf0874b438aa2165818f601bb20d
+  data.tar.gz: da7fb040ce08572ff69666fe850a3d2bc6d0dd326b040e1c8772f2c4891cef54550baf18d2c558e29b1e9b5ed983a0b016eea6d5345137faaf878bcbbe28d350

data/lib/engine/components/orthographic_camera.rb

@@ -33,8 +33,8 @@ module Engine::Components
       @right = nil if game_object.rotation != @rotation
       @up = nil if game_object.rotation != @rotation
       @front = nil if game_object.rotation != @rotation
-      @matrix = nil if game_object.rotation.to_a != @rotation
-      @rotation = game_object.rotation.to_a
+      @matrix = nil if game_object.rotation.dup != @rotation
+      @rotation = game_object.rotation.dup
     end
 
     private

data/lib/engine/engine.rb

@@ -19,11 +19,11 @@ module Engine
   def self.open_window
     @old_time = Time.now
     @time = Time.now
-    @key_callback = create_key_callbacks # This must be an instance variable to prevent garbage collection
 
     Window.create_window
     GLFW.MakeContextCurrent(Window.window)
-    GLFW.SetKeyCallback(Window.window, @key_callback)
+
+    Input.init
     GL.load_lib
 
     set_opengl_blend_mode
@@ -34,8 +34,6 @@ module Engine
     GL.CullFace(GL::BACK)
 
     GLFW.SwapInterval(0)
-
-    Cursor.hide
   end
 
   def self.main_game_loop(&first_frame_block)
@@ -130,10 +128,4 @@ module Engine
     GL.Enable(GL::BLEND)
     GL.BlendFunc(GL::SRC_ALPHA, GL::ONE_MINUS_SRC_ALPHA)
   end
-
-  def self.create_key_callbacks
-    GLFW::create_callback(:GLFWkeyfun) do |window, key, scancode, action, mods|
-      Input.key_callback(key, action)
-    end
-  end
 end

data/lib/engine/game_object.rb

@@ -8,15 +8,17 @@ module Engine
       @methods.add(name)
     end
 
-    attr_accessor :name, :pos, :rotation, :scale, :components, :renderers, :ui_renderers, :created_at, :parent
+    attr_accessor :name, :pos, :scale, :components, :renderers, :ui_renderers, :created_at, :parent
 
     def initialize(name = "Game Object", pos: Vector[0, 0, 0], rotation: 0, scale: Vector[1, 1, 1], components: [], parent: nil)
       GameObject.object_spawned(self)
       @pos = Vector[pos[0], pos[1], pos[2] || 0]
       if rotation.is_a?(Numeric)
-        @rotation = Vector[0, 0, rotation]
+        self.rotation = Quaternion.from_euler(Vector[0, 0, rotation])
+      elsif rotation.is_a?(Quaternion)
+        self.rotation = rotation
       else
-        @rotation = rotation
+        self.rotation = Quaternion.from_euler(rotation)
       end
       @scale = scale
       @name = name
@@ -50,6 +52,20 @@ module Engine
       parent.children << self if parent
     end
 
+    def rotation
+      @rotation_quaternion
+    end
+
+    def rotation=(value)
+      raise "Rotation must be a Quaternion" unless value.is_a?(Quaternion)
+
+      @rotation_quaternion = value
+    end
+
+    def euler_angles
+      rotation.to_euler
+    end
+
     def x
       @pos[0]
     end
@@ -93,16 +109,16 @@ module Engine
     def rotate_around(axis, angle)
       rotation_quaternion = Quaternion.from_angle_axis(angle, axis)
 
-      @rotation = (rotation_quaternion * Quaternion.from_euler(rotation)).to_euler
+      self.rotation = rotation_quaternion * rotation
     end
 
     def model_matrix
-      cache_key = [@pos.dup, @rotation.dup, @scale.dup, @parent&.model_matrix&.to_a]
+      cache_key = [@pos.dup, rotation.dup, @scale.dup, @parent&.model_matrix&.to_a]
       @model_matrix = nil if @model_matrix_cache_key != cache_key
       @model_matrix_cache_key = cache_key
       @model_matrix ||=
         begin
-          rot = rotation * Math::PI / 180
+          rot = euler_angles * Math::PI / 180
 
           cos_x = Math.cos(rot[0])
           cos_y = Math.cos(rot[1])
@@ -186,7 +202,7 @@ module Engine
       GameObject.objects.each do |object|
         object.components.each { |component| component.update(delta_time) }
       end
-      
+
       Component.erase_destroyed_components
       GameObject.erase_destroyed_objects
     end

data/lib/engine/input.rb

@@ -2,6 +2,23 @@
 
 module Engine
   class Input
+    def self.init
+      @key_callback = GLFW::create_callback(:GLFWkeyfun) do |window, key, scancode, action, mods|
+        Input.key_callback(key, action)
+      end
+      GLFW.SetKeyCallback(Window.window, @key_callback)
+
+      @cursor_pos_callback = GLFW::create_callback(:GLFWcursorposfun) do |window, x, y|
+        Input.mouse_callback(x, y)
+      end
+      GLFW.SetCursorPosCallback(Window.window, @cursor_pos_callback)
+
+      @mouse_button_callback = GLFW::create_callback(:GLFWmousebuttonfun) do |window, button, action, mods|
+        Input.mouse_button_callback(button, action)
+      end
+      GLFW.SetMouseButtonCallback(Window.window, @mouse_button_callback)
+    end
+
     def self.key?(key)
       keys[key] == :down || keys[key] == :held
     end
@@ -14,6 +31,17 @@ module Engine
       keys[key] == :up
     end
 
+    def self.mouse_pos
+      @mouse_pos
+    end
+
+    def self.mouse_delta
+      return Vector[0, 0] if @old_mouse_pos.nil?
+      return Vector[0, 0] unless @mouse_pos_updated
+
+      @mouse_pos - @old_mouse_pos
+    end
+
     def self._on_key_down(key)
       keys[key] = :down
       if key == GLFW::KEY_ESCAPE
@@ -42,7 +70,22 @@ module Engine
       end
     end
 
+    def self.mouse_callback(x, y)
+      @mouse_pos_updated = true
+      @old_mouse_pos = @mouse_pos
+      @mouse_pos = Vector[x, y]
+    end
+
+    def self.mouse_button_callback(button, action)
+      if action == GLFW::PRESS
+        keys[button] = :down
+      elsif action == GLFW::RELEASE
+        keys[button] = :up
+      end
+    end
+
     def self.update_key_states
+      @mouse_pos_updated = false
       keys.each do |key, state|
         if state == :down
           keys[key] = :held

data/lib/engine/quaternion.rb

@@ -16,6 +16,12 @@ module Engine
       "Quaternion(w: #{@w}, x: #{@x}, y: #{@y}, z: #{@z})"
     end
 
+    def ==(other)
+      return false unless other.is_a?(Quaternion)
+
+      @w == other.w && @x == other.x && @y == other.y && @z == other.z
+    end
+
     def *(other)
       Quaternion.new(
         @w * other.w - @x * other.x - @y * other.y - @z * other.z,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rpg
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Max Hatfull
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: native_audio