Added rotations for circle, triangle, and quaddev1.2.0-beta.1

5 files changed, 93 insertions, 28 deletions

diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown
index 2d993ab..99a5c0e 100644
--- a/CHANGELOG.mdown
+++ b/CHANGELOG.mdown
@@ -6,6 +6,11 @@
 ![Deprecated](https://img.shields.io/badge/-Deprecated-orange)
 ![Removed](https://img.shields.io/badge/-Removed-red)
 
+## 1.2.0-beta.1 - 2021-10-04
+![Added](https://img.shields.io/badge/-Added-brightgreen)
+- Added rotation functions for Triangles, Quads, and Circles
+	- Need to finish the rest of the shapes to be ready for release
+
 ## [1.1.1](https://github.com/realtradam/ruby2d-camera/releases/tag/1.1.1) - 2021-09-24
 ![Fixed](https://img.shields.io/badge/-Fixed-blue)
 - Fixed changing z-index after the shape has been added not applying at all
diff --git a/lib/ruby2d/camera/circle.rb b/lib/ruby2d/camera/circle.rb
index 2896055..98c5152 100644
--- a/lib/ruby2d/camera/circle.rb
+++ b/lib/ruby2d/camera/circle.rb
@@ -11,12 +11,17 @@ module Ruby2D
         return if @hide
 
         angle = Camera.angle * (Math::PI / 180)
+        self_angle = self.angle * (Math::PI / 180)
         half_width = Window.width * 0.5
         half_height = Window.height * 0.5
         temp_radius = @radius * Camera.zoom
-        temp_x = (((@x - Ruby2D::Camera.x + radius) * Math.cos(angle)) - ((@y - Ruby2D::Camera.y + radius) * Math.sin(angle))) * Ruby2D::Camera.zoom + half_width
-        temp_y = (((@x - Ruby2D::Camera.x + radius) * Math.sin(angle)) + ((@y - Ruby2D::Camera.y + radius) * Math.cos(angle))) * Ruby2D::Camera.zoom + half_height
-        Ruby2D::Circle.draw(x: temp_x, y: temp_y,
+        # rotate the shape
+        temp1_x = (x_offset * Math.cos(self_angle)) - (y_offset * Math.sin(self_angle)) + x
+        temp1_y = (y_offset * Math.cos(self_angle)) + (x_offset * Math.sin(self_angle)) + y
+        # apply the camera modifications
+        temp2_x = (((temp1_x - Ruby2D::Camera.x - radius) * Math.cos(angle)) - ((temp1_y - Ruby2D::Camera.y - radius) * Math.sin(angle))) * Ruby2D::Camera.zoom + half_width
+        temp2_y = (((temp1_x - Ruby2D::Camera.x - radius) * Math.sin(angle)) + ((temp1_y - Ruby2D::Camera.y - radius) * Math.cos(angle))) * Ruby2D::Camera.zoom + half_height
+        Ruby2D::Circle.draw(x: temp2_x, y: temp2_y,
                             radius: temp_radius,
                             sectors: sectors,
                             color: [color.r, color.g, color.b, color.a])
@@ -24,13 +29,32 @@ module Ruby2D
 
       def initialize(opts = {})
         super(opts)
+        unless opts[:x_offset].nil?
+          self.x_offset = opts[:x_offset]
+        end
+        unless opts[:y_offset].nil?
+          self.y_offset = opts[:y_offset]
+        end
         Ruby2D::Camera << self
         Window.remove(self)
       end
 
-      def z=(z)
-        super(z)
-        Ruby2D::Camera._sort_by_z
+      def angle
+        @angle ||= 0
+      end
+
+      def angle=(angle)
+        @angle = (angle % 360)
+      end
+
+      attr_writer :x_offset, :y_offset
+
+      def x_offset
+        @x_offset ||= 0
+      end
+
+      def y_offset
+        @y_offset ||= 0
       end
 
       def remove
diff --git a/lib/ruby2d/camera/quad.rb b/lib/ruby2d/camera/quad.rb
index 24ba516..6caaab8 100644
--- a/lib/ruby2d/camera/quad.rb
+++ b/lib/ruby2d/camera/quad.rb
@@ -11,20 +11,31 @@ module Ruby2D
         return if @hide
 
         angle = Camera.angle * (Math::PI / 180)
+        self_angle = self.angle * (Math::PI / 180)
         half_width = Window.width * 0.5
         half_height = Window.height * 0.5
-        temp_x1 = (((x + x1 - Camera.x) * Math.cos(angle)) - ((y + y1 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
-        temp_y1 = (((x + x1 - Camera.x) * Math.sin(angle)) + ((y + y1 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
-        temp_x2 = (((x + x2 - Camera.x) * Math.cos(angle)) - ((y + y2 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
-        temp_y2 = (((x + x2 - Camera.x) * Math.sin(angle)) + ((y + y2 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
-        temp_x3 = (((x + x3 - Camera.x) * Math.cos(angle)) - ((y + y3 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
-        temp_y3 = (((x + x3 - Camera.x) * Math.sin(angle)) + ((y + y3 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
-        temp_x4 = (((x + x4 - Camera.x) * Math.cos(angle)) - ((y + y4 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
-        temp_y4 = (((x + x4 - Camera.x) * Math.sin(angle)) + ((y + y4 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
-        Ruby2D::Quad.draw(x1: temp_x1, y1: temp_y1,
-                          x2: temp_x2, y2: temp_y2,
-                          x3: temp_x3, y3: temp_y3,
-                          x4: temp_x4, y4: temp_y4,
+        # rotate the shape
+        temp1_x1 = (x1 * Math.cos(self_angle)) - (y1 * Math.sin(self_angle))
+        temp1_y1 = (y1 * Math.cos(self_angle)) + (x1 * Math.sin(self_angle))
+        temp1_x2 = (x2 * Math.cos(self_angle)) - (y2 * Math.sin(self_angle))
+        temp1_y2 = (y2 * Math.cos(self_angle)) + (x2 * Math.sin(self_angle))
+        temp1_x3 = (x3 * Math.cos(self_angle)) - (y3 * Math.sin(self_angle))
+        temp1_y3 = (y3 * Math.cos(self_angle)) + (x3 * Math.sin(self_angle))
+        temp1_x4 = (x4 * Math.cos(self_angle)) - (y4 * Math.sin(self_angle))
+        temp1_y4 = (y4 * Math.cos(self_angle)) + (x4 * Math.sin(self_angle))
+        # apply the camera modifications
+        temp2_x1 = (((x + temp1_x1 - Camera.x) * Math.cos(angle)) - ((y + temp1_y1 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
+        temp2_y1 = (((x + temp1_x1 - Camera.x) * Math.sin(angle)) + ((y + temp1_y1 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
+        temp2_x2 = (((x + temp1_x2 - Camera.x) * Math.cos(angle)) - ((y + temp1_y2 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
+        temp2_y2 = (((x + temp1_x2 - Camera.x) * Math.sin(angle)) + ((y + temp1_y2 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
+        temp2_x3 = (((x + temp1_x3 - Camera.x) * Math.cos(angle)) - ((y + temp1_y3 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
+        temp2_y3 = (((x + temp1_x3 - Camera.x) * Math.sin(angle)) + ((y + temp1_y3 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
+        temp2_x4 = (((x + temp1_x4 - Camera.x) * Math.cos(angle)) - ((y + temp1_y4 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
+        temp2_y4 = (((x + temp1_x4 - Camera.x) * Math.sin(angle)) + ((y + temp1_y4 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
+        Ruby2D::Quad.draw(x1: temp2_x1, y1: temp2_y1,
+                          x2: temp2_x2, y2: temp2_y2,
+                          x3: temp2_x3, y3: temp2_y3,
+                          x4: temp2_x4, y4: temp2_y4,
                           color: [
                             [c1.r, c1.g, c1.b, c1.a],
                             [c2.r, c2.g, c2.b, c2.a],
@@ -48,6 +59,14 @@ module Ruby2D
         @hide = false
       end
 
+      def angle
+        @angle ||= 0
+      end
+
+      def angle=(angle)
+        @angle = (angle % 360)
+      end
+
       # Methods for moving the shape
       attr_writer :x, :y
 
diff --git a/lib/ruby2d/camera/triangle.rb b/lib/ruby2d/camera/triangle.rb
index 56e2aef..7e2a03d 100644
--- a/lib/ruby2d/camera/triangle.rb
+++ b/lib/ruby2d/camera/triangle.rb
@@ -9,17 +9,26 @@ module Ruby2D
         return if @hide
 
         angle = Ruby2D::Camera.angle * (Math::PI / 180)
+        self_angle = self.angle * (Math::PI / 180)
         half_width = Window.width * 0.5
         half_height = Window.height * 0.5
-        temp_x1 = (((x + @x1 - Ruby2D::Camera.x) * Math.cos(angle)) - ((y + @y1 - Ruby2D::Camera.y) * Math.sin(angle))) * Ruby2D::Camera.zoom + half_width
-        temp_y1 = (((x + @x1 - Ruby2D::Camera.x) * Math.sin(angle)) + ((y + @y1 - Ruby2D::Camera.y) * Math.cos(angle))) * Ruby2D::Camera.zoom + half_height
-        temp_x2 = (((x + @x2 - Ruby2D::Camera.x) * Math.cos(angle)) - ((y + @y2 - Ruby2D::Camera.y) * Math.sin(angle))) * Ruby2D::Camera.zoom + half_width
-        temp_y2 = (((x + @x2 - Ruby2D::Camera.x) * Math.sin(angle)) + ((y + @y2 - Ruby2D::Camera.y) * Math.cos(angle))) * Ruby2D::Camera.zoom + half_height
-        temp_x3 = (((x + @x3 - Ruby2D::Camera.x) * Math.cos(angle)) - ((y + @y3 - Ruby2D::Camera.y) * Math.sin(angle))) * Ruby2D::Camera.zoom + half_width
-        temp_y3 = (((x + @x3 - Ruby2D::Camera.x) * Math.sin(angle)) + ((y + @y3 - Ruby2D::Camera.y) * Math.cos(angle))) * Ruby2D::Camera.zoom + half_height
-        Ruby2D::Triangle.draw(x1: temp_x1, y1: temp_y1,
-                              x2: temp_x2, y2: temp_y2,
-                              x3: temp_x3, y3: temp_y3,
+        # rotate the shape
+        temp1_x1 = (x1 * Math.cos(self_angle)) - (y1 * Math.sin(self_angle))
+        temp1_y1 = (y1 * Math.cos(self_angle)) + (x1 * Math.sin(self_angle))
+        temp1_x2 = (x2 * Math.cos(self_angle)) - (y2 * Math.sin(self_angle))
+        temp1_y2 = (y2 * Math.cos(self_angle)) + (x2 * Math.sin(self_angle))
+        temp1_x3 = (x3 * Math.cos(self_angle)) - (y3 * Math.sin(self_angle))
+        temp1_y3 = (y3 * Math.cos(self_angle)) + (x3 * Math.sin(self_angle))
+        # apply camera operations
+        temp2_x1 = (((x + temp1_x1 - Camera.x) * Math.cos(angle)) - ((y + temp1_y1 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
+        temp2_y1 = (((x + temp1_x1 - Camera.x) * Math.sin(angle)) + ((y + temp1_y1 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
+        temp2_x2 = (((x + temp1_x2 - Camera.x) * Math.cos(angle)) - ((y + temp1_y2 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
+        temp2_y2 = (((x + temp1_x2 - Camera.x) * Math.sin(angle)) + ((y + temp1_y2 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
+        temp2_x3 = (((x + temp1_x3 - Camera.x) * Math.cos(angle)) - ((y + temp1_y3 - Camera.y) * Math.sin(angle))) * Camera.zoom + half_width
+        temp2_y3 = (((x + temp1_x3 - Camera.x) * Math.sin(angle)) + ((y + temp1_y3 - Camera.y) * Math.cos(angle))) * Camera.zoom + half_height
+        Ruby2D::Triangle.draw(x1: temp2_x1, y1: temp2_y1,
+                              x2: temp2_x2, y2: temp2_y2,
+                              x3: temp2_x3, y3: temp2_y3,
                               color: [
                                 [c1.r, c1.g, c1.b, c1.a],
                                 [c2.r, c2.g, c2.b, c2.a],
@@ -43,6 +52,14 @@ module Ruby2D
         @hide = false
       end
 
+      def angle
+        @angle ||= 0
+      end
+
+      def angle=(angle)
+        @angle = (angle % 360)
+      end
+
       # Methods for moving the shape
       attr_writer :x, :y
 
diff --git a/lib/ruby2d/camera/version.rb b/lib/ruby2d/camera/version.rb
index 1b12ce9..cdc8970 100644
--- a/lib/ruby2d/camera/version.rb
+++ b/lib/ruby2d/camera/version.rb
@@ -2,6 +2,6 @@
 
 module Ruby2d
   module Camera
-    VERSION = '1.1.1.beta'
+    VERSION = '1.2.0-beta.1'
   end
 end