partially complete fixing code, found a strange bug with ruby2d

11 files changed, 45 insertions, 42 deletions

diff --git a/lib/ruby2d/camera.rb b/lib/ruby2d/camera.rb
index 3213e16..7c587f1 100644
--- a/lib/ruby2d/camera.rb
+++ b/lib/ruby2d/camera.rb
@@ -16,7 +16,6 @@ module Ruby2D
       def objects
         @objects ||= []
       end
-
     end
 
     def self._sort_by_z
diff --git a/lib/ruby2d/camera/circle.rb b/lib/ruby2d/camera/circle.rb
index 2896055..b2b8fd1 100644
--- a/lib/ruby2d/camera/circle.rb
+++ b/lib/ruby2d/camera/circle.rb
@@ -14,8 +14,8 @@ module Ruby2D
         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
+        temp_x = (((@x - Camera.x + radius) * Math.cos(angle)) - ((@y - Camera.y + radius) * Math.sin(angle))) * Camera.zoom + half_width
+        temp_y = (((@x - Camera.x + radius) * Math.sin(angle)) + ((@y - Camera.y + radius) * Math.cos(angle))) * Camera.zoom + half_height
         Ruby2D::Circle.draw(x: temp_x, y: temp_y,
                             radius: temp_radius,
                             sectors: sectors,
@@ -24,13 +24,13 @@ module Ruby2D
 
       def initialize(opts = {})
         super(opts)
-        Ruby2D::Camera << self
+        Camera << self
         Window.remove(self)
       end
 
       def z=(z)
         super(z)
-        Ruby2D::Camera._sort_by_z
+        Camera._sort_by_z
       end
 
       def remove
diff --git a/lib/ruby2d/camera/image.rb b/lib/ruby2d/camera/image.rb
index aa72685..3d4cf33 100644
--- a/lib/ruby2d/camera/image.rb
+++ b/lib/ruby2d/camera/image.rb
@@ -30,13 +30,13 @@ module Camera
 
     def initialize(path, opts = {})
       super(path, opts)
-      Ruby2D::Camera << self
+      Camera << self
       Window.remove(self)
     end
 
     def z=(z)
       super(z)
-      Ruby2D::Camera._sort_by_z
+      Camera._sort_by_z
     end
 
     def remove
diff --git a/lib/ruby2d/camera/line.rb b/lib/ruby2d/camera/line.rb
index 6019f3c..c9a8caf 100644
--- a/lib/ruby2d/camera/line.rb
+++ b/lib/ruby2d/camera/line.rb
@@ -32,7 +32,7 @@ module Ruby2D
 
       def initialize(opts = {})
         super(opts)
-        Ruby2D::Camera << self
+        Camera << self
         Window.remove(self)
       end
 
@@ -57,7 +57,7 @@ module Ruby2D
 
       def z=(z)
         super(z)
-        Ruby2D::Camera._sort_by_z
+        Camera._sort_by_z
       end
     end
   end
diff --git a/lib/ruby2d/camera/quad.rb b/lib/ruby2d/camera/quad.rb
index 24ba516..994c137 100644
--- a/lib/ruby2d/camera/quad.rb
+++ b/lib/ruby2d/camera/quad.rb
@@ -36,7 +36,7 @@ module Ruby2D
 
       def initialize(opts = {})
         super(opts)
-        Ruby2D::Camera << self
+        Camera << self
         Window.remove(self)
       end
 
@@ -61,7 +61,7 @@ module Ruby2D
 
       def z=(z)
         super(z)
-        Ruby2D::Camera._sort_by_z
+        Camera._sort_by_z
       end
     end
   end
diff --git a/lib/ruby2d/camera/rectangle.rb b/lib/ruby2d/camera/rectangle.rb
index b3758b6..f8a139e 100644
--- a/lib/ruby2d/camera/rectangle.rb
+++ b/lib/ruby2d/camera/rectangle.rb
@@ -36,7 +36,7 @@ module Ruby2D
 
       def initialize(opts = {})
         super(opts)
-        Ruby2D::Camera << self
+        Camera << self
         Window.remove(self)
         @x1 -= @x
         @x2 -= @x
@@ -69,7 +69,7 @@ module Ruby2D
 
       def z=(z)
         super(z)
-        Ruby2D::Camera._sort_by_z
+        Camera._sort_by_z
       end
     end
   end
diff --git a/lib/ruby2d/camera/sprite.rb b/lib/ruby2d/camera/sprite.rb
index d01a86f..da67d54 100644
--- a/lib/ruby2d/camera/sprite.rb
+++ b/lib/ruby2d/camera/sprite.rb
@@ -28,7 +28,6 @@ module Ruby2D
           temp_y += temp_width
           temp_width = -temp_width
           temp_height = -temp_height
-          puts 'both'
         when :horizontal
           temp_y += temp_width
           temp_height = -temp_height
@@ -45,13 +44,13 @@ module Ruby2D
 
       def initialize(path, opts = {})
         super(path, opts)
-        Ruby2D::Camera << self
+        Camera << self
         Window.remove(self)
       end
 
       def z=(z)
         super(z)
-        Ruby2D::Camera._sort_by_z
+        Camera._sort_by_z
       end
 
       def remove
diff --git a/lib/ruby2d/camera/square.rb b/lib/ruby2d/camera/square.rb
index b6f0321..7f74ee5 100644
--- a/lib/ruby2d/camera/square.rb
+++ b/lib/ruby2d/camera/square.rb
@@ -36,7 +36,7 @@ module Ruby2D
 
       def initialize(opts = {})
         super(opts)
-        Ruby2D::Camera << self
+        Camera << self
         Window.remove(self)
         @x1 -= @x
         @x2 -= @x
@@ -69,7 +69,7 @@ module Ruby2D
 
       def z=(z)
         super(z)
-        Ruby2D::Camera._sort_by_z
+        Camera._sort_by_z
       end
     end
   end
diff --git a/lib/ruby2d/camera/text.rb b/lib/ruby2d/camera/text.rb
index da23edb..04f2dcc 100644
--- a/lib/ruby2d/camera/text.rb
+++ b/lib/ruby2d/camera/text.rb
@@ -16,11 +16,13 @@ module Ruby2D
         return if @hide
 
         angle = Camera.angle * (Math::PI / 180)
+        render_text.size = size * Camera.zoom
+        #puts render_text.width
         half_width = Window.width * 0.5
         half_height = Window.height * 0.5
         if center
-          offset_y = y + (Camera.zoom / 2)
-          offset_x = x + (Camera.zoom / 2)
+          offset_x = x + (width / Camera.zoom / 2) - (render_text.width / 2 / Camera.zoom)
+          offset_y = y + (height / Camera.zoom / 2) - (render_text.height / 2 / Camera.zoom)
         else
           offset_x = x + (width / Camera.zoom / 2)
           offset_y = y + (height / Camera.zoom / 2)
@@ -30,25 +32,29 @@ module Ruby2D
         temp_y = (((offset_x - Camera.x) * Math.sin(angle)) + ((offset_y - Camera.y) * Math.cos(angle))) \
           * Camera.zoom + half_height - (height / 2)
         temp_rotate = rotate + Camera.angle
-        # Workaround for resizing text
-        # TODO: resizing doesnt work at all even with workaround
-        temp_size = size # * Camera.zoom
-        self.size *= Camera.zoom
-        draw(x: temp_x, y: temp_y,
-             rotate: temp_rotate,
-             color: [color.r, color.g, color.b, color.a])
-        self.size = temp_size
+        render_text.draw(x: temp_x, y: temp_y,
+                         rotate: temp_rotate,
+                         color: [color.r, color.g, color.b, color.a])
       end
 
       def initialize(text, opts = {})
         super(text, opts)
-        Ruby2D::Camera << self
+        self.render_text = Ruby2D::Text.new(text, opts)
+        render_text.remove
+        self.center = opts[:center]
+        Camera << self
         Window.remove(self)
       end
 
       def z=(z)
         super(z)
-        Ruby2D::Camera._sort_by_z
+        render_text.z = z
+        Camera._sort_by_z
+      end
+
+      def text=(text)
+        super(text)
+        render_text.text = text
       end
 
       def remove
@@ -59,7 +65,7 @@ module Ruby2D
         @hide = false
       end
 
-      attr_accessor :center
+      attr_accessor :center, :render_text
     end
   end
 end
diff --git a/lib/ruby2d/camera/triangle.rb b/lib/ruby2d/camera/triangle.rb
index 56e2aef..e97dd98 100644
--- a/lib/ruby2d/camera/triangle.rb
+++ b/lib/ruby2d/camera/triangle.rb
@@ -8,15 +8,15 @@ module Ruby2D
       def _draw
         return if @hide
 
-        angle = Ruby2D::Camera.angle * (Math::PI / 180)
+        angle = Camera.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
+        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
         Ruby2D::Triangle.draw(x1: temp_x1, y1: temp_y1,
                               x2: temp_x2, y2: temp_y2,
                               x3: temp_x3, y3: temp_y3,
@@ -30,9 +30,8 @@ module Ruby2D
 
       def initialize(opts = {})
         super(opts)
-        Ruby2D::Camera << self
+        Camera << self
         Window.remove(self)
-        add
       end
 
       def remove
@@ -56,7 +55,7 @@ module Ruby2D
 
       def z=(z)
         super(z)
-        Ruby2D::Camera._sort_by_z
+        Camera._sort_by_z
       end
     end
   end
diff --git a/lib/ruby2d/camera/version.rb b/lib/ruby2d/camera/version.rb
index 1b12ce9..b95b99a 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.1.2.beta'
   end
 end