diff options
| -rw-r--r-- | lib/ruby2d/camera/line.rb | 20 | ||||
| -rw-r--r-- | lib/ruby2d/camera/quad.rb | 61 | ||||
| -rw-r--r-- | lib/ruby2d/camera/triangle.rb | 9 | ||||
| -rw-r--r-- | test.rb | 2 |
4 files changed, 81 insertions, 11 deletions
diff --git a/lib/ruby2d/camera/line.rb b/lib/ruby2d/camera/line.rb index faa7aad..e7e7c0f 100644 --- a/lib/ruby2d/camera/line.rb +++ b/lib/ruby2d/camera/line.rb @@ -4,10 +4,10 @@ module Ruby2D module Camera # Wraps existing variables as well as adding new methods # so that it can be handled by the Camera Module - module Line < Ruby2D::Line + class Line < Ruby2D::Line # Recalculates real coordiantes # Use after changing variables - def redraw + def _draw angle = Camera.angle * (Math::PI / 180) half_width = Window.width * 0.5 half_height = Window.height * 0.5 @@ -16,18 +16,24 @@ module Ruby2D 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_width = width * Camera.zoom - self.draw(x1: temp_x1, y1: temp_y1, + Ruby2D::Line.draw(x1: temp_x1, y1: temp_y1, x2: temp_x2, y2: temp_y2, width: temp_width, color: [ - [self.c1.r, self.c1.g, self.c1.b, self.c1.a], - [self.c2.r, self.c2.g, self.c2.b, self.c2.a], - [self.c3.r, self.c3.g, self.c3.b, self.c3.a], - [self.c4.r, self.c4.g, self.c4.b, self.c4.a] + [self.color.r, self.color.g, self.color.b, self.color.a], + [self.color.r, self.color.g, self.color.b, self.color.a], + [self.color.r, self.color.g, self.color.b, self.color.a], + [self.color.r, self.color.g, self.color.b, self.color.a] ], z: self.z) end + def initialize(opts= {}) + super(opts) + Ruby2D::Camera << self + self.remove + end + #Methods for moving the shape def x @x ||= 0 diff --git a/lib/ruby2d/camera/quad.rb b/lib/ruby2d/camera/quad.rb new file mode 100644 index 0000000..5dc52e1 --- /dev/null +++ b/lib/ruby2d/camera/quad.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +module Ruby2D + module Camera + # Wraps existing variables as well as adding new methods + # so that it can be handled by the Camera Module + class Quad < Ruby2D::Quad + # 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 + 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, x3: temp_x3, + x4: temp_x4, x4: temp_x4, + color: [ + [self.c1.r, self.c1.g, self.c1.b, self.c1.a], + [self.c2.r, self.c2.g, self.c2.b, self.c2.a], + [self.c3.r, self.c3.g, self.c3.b, self.c3.a], + [self.c4.r, self.c4.g, self.c4.b, self.c4.a] + ], + z: self.z + ) + end + + def initialize(opts= {}) + super(opts) + Ruby2D::Camera << self + self.remove + end + + + #Methods for moving the shape + def x + @x ||= 0 + end + + def x=(x) + @x = x + end + + def y + @y ||= 0 + end + + def y=(y) + @y = y + end + end + end +end diff --git a/lib/ruby2d/camera/triangle.rb b/lib/ruby2d/camera/triangle.rb index 9d3fbbf..356222b 100644 --- a/lib/ruby2d/camera/triangle.rb +++ b/lib/ruby2d/camera/triangle.rb @@ -18,9 +18,12 @@ module Ruby2D Ruby2D::Triangle.draw(x1: temp_x1, y1: temp_y1, x2: temp_x2, y2: temp_y2, x3: temp_x3, y3: temp_y3, - color: [[self.c1.r, self.c1.g, self.c1.b, self.c1.a], - [self.c2.r, self.c2.g, self.c2.b, self.c2.a], - [self.c3.r, self.c3.g, self.c3.b, self.c3.a]]) + color: [ + [self.c1.r, self.c1.g, self.c1.b, self.c1.a], + [self.c2.r, self.c2.g, self.c2.b, self.c2.a], + [self.c3.r, self.c3.g, self.c3.b, self.c3.a] + ], + z: self.z) end def initialize(opts= {}) @@ -1,7 +1,7 @@ require 'ruby2d' require 'ruby2d/camera' -Camera::Line.new +Camera::Quad.new #Camera::Image.new('./assets/bricktexture.png') #@test = Image.new('./assets/bricktexture.png') #@test.remove |