Merge pull request #1 from realtradam/bugfix1.1.1

Fixed changing z-index after the shape has been added not applying at all

10 files changed, 56 insertions, 11 deletions

diff --git a/lib/ruby2d/camera/circle.rb b/lib/ruby2d/camera/circle.rb
index 60629df..2896055 100644
--- a/lib/ruby2d/camera/circle.rb
+++ b/lib/ruby2d/camera/circle.rb
@@ -28,6 +28,11 @@ module Ruby2D
         Window.remove(self)
       end
 
+      def z=(z)
+        super(z)
+        Ruby2D::Camera._sort_by_z
+      end
+
       def remove
         @hide = true
       end
diff --git a/lib/ruby2d/camera/image.rb b/lib/ruby2d/camera/image.rb
index dccbec9..aa72685 100644
--- a/lib/ruby2d/camera/image.rb
+++ b/lib/ruby2d/camera/image.rb
@@ -34,6 +34,11 @@ module Camera
       Window.remove(self)
     end
 
+    def z=(z)
+      super(z)
+      Ruby2D::Camera._sort_by_z
+    end
+
     def remove
       @hide = true
     end
diff --git a/lib/ruby2d/camera/line.rb b/lib/ruby2d/camera/line.rb
index f6d8f03..6019f3c 100644
--- a/lib/ruby2d/camera/line.rb
+++ b/lib/ruby2d/camera/line.rb
@@ -45,15 +45,20 @@ module Ruby2D
       end
 
       # Methods for moving the shape
+      attr_writer :x, :y
+
       def x
         @x ||= 0
       end
 
-      attr_writer :x, :y
-
       def y
         @y ||= 0
       end
+
+      def z=(z)
+        super(z)
+        Ruby2D::Camera._sort_by_z
+      end
     end
   end
 end
diff --git a/lib/ruby2d/camera/quad.rb b/lib/ruby2d/camera/quad.rb
index 5b778b9..24ba516 100644
--- a/lib/ruby2d/camera/quad.rb
+++ b/lib/ruby2d/camera/quad.rb
@@ -49,15 +49,20 @@ module Ruby2D
       end
 
       # Methods for moving the shape
+      attr_writer :x, :y
+
       def x
         @x ||= 0
       end
 
-      attr_writer :x, :y
-
       def y
         @y ||= 0
       end
+
+      def z=(z)
+        super(z)
+        Ruby2D::Camera._sort_by_z
+      end
     end
   end
 end
diff --git a/lib/ruby2d/camera/rectangle.rb b/lib/ruby2d/camera/rectangle.rb
index 4d06eec..b3758b6 100644
--- a/lib/ruby2d/camera/rectangle.rb
+++ b/lib/ruby2d/camera/rectangle.rb
@@ -57,15 +57,20 @@ module Ruby2D
       end
 
       # Methods for moving the shape
+      attr_writer :x, :y
+
       def x
         @x ||= 0
       end
 
-      attr_writer :x, :y
-
       def y
         @y ||= 0
       end
+
+      def z=(z)
+        super(z)
+        Ruby2D::Camera._sort_by_z
+      end
     end
   end
 end
diff --git a/lib/ruby2d/camera/sprite.rb b/lib/ruby2d/camera/sprite.rb
index a1fb7b8..d01a86f 100644
--- a/lib/ruby2d/camera/sprite.rb
+++ b/lib/ruby2d/camera/sprite.rb
@@ -49,6 +49,11 @@ module Ruby2D
         Window.remove(self)
       end
 
+      def z=(z)
+        super(z)
+        Ruby2D::Camera._sort_by_z
+      end
+
       def remove
         @hide = true
       end
diff --git a/lib/ruby2d/camera/square.rb b/lib/ruby2d/camera/square.rb
index 75e1e83..b6f0321 100644
--- a/lib/ruby2d/camera/square.rb
+++ b/lib/ruby2d/camera/square.rb
@@ -57,15 +57,20 @@ module Ruby2D
       end
 
       # Methods for moving the shape
+      attr_writer :x, :y
+
       def x
         @x ||= 0
       end
 
-      attr_writer :x, :y
-
       def y
         @y ||= 0
       end
+
+      def z=(z)
+        super(z)
+        Ruby2D::Camera._sort_by_z
+      end
     end
   end
 end
diff --git a/lib/ruby2d/camera/text.rb b/lib/ruby2d/camera/text.rb
index 00f15b3..da23edb 100644
--- a/lib/ruby2d/camera/text.rb
+++ b/lib/ruby2d/camera/text.rb
@@ -46,6 +46,11 @@ module Ruby2D
         Window.remove(self)
       end
 
+      def z=(z)
+        super(z)
+        Ruby2D::Camera._sort_by_z
+      end
+
       def remove
         @hide = true
       end
diff --git a/lib/ruby2d/camera/triangle.rb b/lib/ruby2d/camera/triangle.rb
index b506fb4..56e2aef 100644
--- a/lib/ruby2d/camera/triangle.rb
+++ b/lib/ruby2d/camera/triangle.rb
@@ -44,15 +44,20 @@ module Ruby2D
       end
 
       # Methods for moving the shape
+      attr_writer :x, :y
+
       def x
         @x ||= 0
       end
 
-      attr_writer :x, :y
-
       def y
         @y ||= 0
       end
+
+      def z=(z)
+        super(z)
+        Ruby2D::Camera._sort_by_z
+      end
     end
   end
 end
diff --git a/lib/ruby2d/camera/version.rb b/lib/ruby2d/camera/version.rb
index 2372efc..1b12ce9 100644
--- a/lib/ruby2d/camera/version.rb
+++ b/lib/ruby2d/camera/version.rb
@@ -2,6 +2,6 @@
 
 module Ruby2d
   module Camera
-    VERSION = '1.1.0'
+    VERSION = '1.1.1.beta'
   end
 end