.dev2

9 files changed, 89 insertions, 12 deletions

diff --git a/lib/camera/wrappers/circle_wrapper.rb b/lib/camera/wrappers/circle_wrapper.rb
index bd4f54a..52a97c0 100644
--- a/lib/camera/wrappers/circle_wrapper.rb
+++ b/lib/camera/wrappers/circle_wrapper.rb
@@ -6,7 +6,7 @@ module Camera
   module CircleWrapped
     # Recalculates real coordiantes
     # Use after changing variables
-    def update
+    def redraw
       angle = Camera.angle * (Math::PI / 180)
       half_width = Window.width * 0.5
       half_height = Window.height * 0.5
diff --git a/lib/camera/wrappers/image_wrapper.rb b/lib/camera/wrappers/image_wrapper.rb
index 3f603d4..9e4b163 100644
--- a/lib/camera/wrappers/image_wrapper.rb
+++ b/lib/camera/wrappers/image_wrapper.rb
@@ -6,7 +6,7 @@ module Camera
   module ImageWrapped
     # Recalculates real coordiantes
     # Use after changing variables
-    def update
+    def redraw
       angle = Camera.angle * (Math::PI / 180)
       half_width = Window.width * 0.5
       half_height = Window.height * 0.5
diff --git a/lib/camera/wrappers/line_wrapper.rb b/lib/camera/wrappers/line_wrapper.rb
index 4024d1f..d2c1801 100644
--- a/lib/camera/wrappers/line_wrapper.rb
+++ b/lib/camera/wrappers/line_wrapper.rb
@@ -6,7 +6,7 @@ module Camera
   module LineWrapped
     # Recalculates real coordiantes
     # Use after changing variables
-    def update
+    def redraw
       angle = Camera.angle * (Math::PI / 180)
       half_width = Window.width * 0.5
       half_height = Window.height * 0.5
diff --git a/lib/camera/wrappers/quad_wrapper.rb b/lib/camera/wrappers/quad_wrapper.rb
index 19d6166..08a2d6c 100644
--- a/lib/camera/wrappers/quad_wrapper.rb
+++ b/lib/camera/wrappers/quad_wrapper.rb
@@ -6,7 +6,7 @@ module Camera
   module QuadWrapped
     # Recalculates real coordiantes
     # Use after changing variables
-    def update
+    def redraw
       angle = Camera.angle * (Math::PI / 180)
       half_width = Window.width * 0.5
       half_height = Window.height * 0.5
diff --git a/lib/camera/wrappers/rectangle_wrapper.rb b/lib/camera/wrappers/rectangle_wrapper.rb
index 51836db..887ab8b 100644
--- a/lib/camera/wrappers/rectangle_wrapper.rb
+++ b/lib/camera/wrappers/rectangle_wrapper.rb
@@ -6,7 +6,7 @@ module Camera
   module RectangleWrapped
     # Recalculates real coordiantes
     # Use after changing variables
-    def update
+    def redraw
       angle = Camera.angle * (Math::PI / 180)
       half_width = Window.width * 0.5
       half_height = Window.height * 0.5
diff --git a/lib/camera/wrappers/sprite_wrapper.rb b/lib/camera/wrappers/sprite_wrapper.rb
index 58ed1f7..d38c0bc 100644
--- a/lib/camera/wrappers/sprite_wrapper.rb
+++ b/lib/camera/wrappers/sprite_wrapper.rb
@@ -6,19 +6,32 @@ module Camera
   module SpriteWrapped
     # Recalculates real coordiantes
     # Use after changing variables
-    def update
+    def redraw
       angle = Camera.angle * (Math::PI / 180)
       half_width = Window.width * 0.5
       half_height = Window.height * 0.5
       offset_x = x + (width / 2)
       offset_y = y + (height / 2)
-      @x = (((offset_x - Camera.x) * Math.cos(angle)) - ((offset_y - Camera.y) * Math.sin(angle))) \
+      @x = @flip_x = (((offset_x - Camera.x) * Math.cos(angle)) - ((offset_y - Camera.y) * Math.sin(angle))) \
         * Camera.zoom + half_width - (width * Camera.zoom / 2)
-      @y = (((offset_x - Camera.x) * Math.sin(angle)) + ((offset_y - Camera.y) * Math.cos(angle))) \
+      @y = @flip_y = (((offset_x - Camera.x) * Math.sin(angle)) + ((offset_y - Camera.y) * Math.cos(angle))) \
         * Camera.zoom + half_height - (height * Camera.zoom / 2)
       @rotate = rotate + Camera.angle
-      @width = width * Camera.zoom
-      @height = height * Camera.zoom
+      @width = @flip_width = width * Camera.zoom
+      @height = @flip_height = height * Camera.zoom
+      case @flip
+      when :both
+        @flip_x = @x + @height
+        @flip_width = -@width
+        @flip_y = @y + @width
+        @flip_height = -@height
+      when :horizontal
+        @flip_y = @y + @width
+        @flip_height = -@height
+      when :vertical
+        @flip_x = @x + @height
+        @flip_width = -@width
+      end
     end
 
     #Methods for moving the shape
diff --git a/lib/camera/wrappers/square_wrapper.rb b/lib/camera/wrappers/square_wrapper.rb
index f828e0c..40578e5 100644
--- a/lib/camera/wrappers/square_wrapper.rb
+++ b/lib/camera/wrappers/square_wrapper.rb
@@ -6,7 +6,7 @@ module Camera
   module SquareWrapped
     # Recalculates real coordiantes
     # Use after changing variables
-    def update
+    def redraw
       angle = Camera.angle * (Math::PI / 180)
       half_width = Window.width * 0.5
       half_height = Window.height * 0.5
diff --git a/lib/camera/wrappers/text_wrapper.rb b/lib/camera/wrappers/text_wrapper.rb
new file mode 100644
index 0000000..56b35ed
--- /dev/null
+++ b/lib/camera/wrappers/text_wrapper.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Camera
+  # Wraps existing variables as well as adding new methods
+  # so that it can be handled by the Camera Module
+  module TextWrapped
+    # Recalculates real coordiantes
+    # Use after changing variables
+    def redraw
+      angle = Camera.angle * (Math::PI / 180)
+      half_width = Window.width * 0.5
+      half_height = Window.height * 0.5
+      offset_x = x + (width / 2)
+      offset_y = y + (height / 2)
+      @x = (((offset_x - Camera.x) * Math.cos(angle)) - ((offset_y - Camera.y) * Math.sin(angle))) \
+        * Camera.zoom + half_width - (width * Camera.zoom / 2)
+      @y = (((offset_x - Camera.x) * Math.sin(angle)) + ((offset_y - Camera.y) * Math.cos(angle))) \
+        * Camera.zoom + half_height - (height * Camera.zoom / 2)
+      @rotate = rotate + Camera.angle
+      @size = size * Camera.zoom
+    end
+
+    #Methods for moving the shape
+
+    # Wrappers for the coordinates so that
+    # they are handled by the Camera instead
+    # and for ease of programming
+    def x
+      @virtual_x ||= @x
+    end
+
+    def x=(x)
+      @virtual_x = x
+    end
+
+    def y
+      @virtual_y ||= @y
+    end
+
+    def y=(y)
+      @virtual_y = y
+    end
+
+    def x
+      @virtual_x ||= @x
+    end
+
+    def rotate
+      @virtual_rotate ||= @rotate
+    end
+
+    def rotate=(rotate)
+      @virtual_rotate = rotate
+    end
+
+    def size
+      @virtual_size ||= @size
+    end
+
+    def size=(size)
+      @virtual_size = size
+    end
+  end
+end
diff --git a/lib/camera/wrappers/triangle_wrapper.rb b/lib/camera/wrappers/triangle_wrapper.rb
index 46d8f35..b26ef81 100644
--- a/lib/camera/wrappers/triangle_wrapper.rb
+++ b/lib/camera/wrappers/triangle_wrapper.rb
@@ -6,7 +6,7 @@ module Camera
   module TriangleWrapped
     # Recalculates real coordiantes
     # Use after changing variables
-    def update
+    def redraw
       angle = Camera.angle * (Math::PI / 180)
       half_width = Window.width * 0.5
       half_height = Window.height * 0.5