diff options
| -rw-r--r-- | lib/ruby2d/camera/image.rb | 22 | ||||
| -rw-r--r-- | lib/ruby2d/camera/line.rb | 49 | ||||
| -rw-r--r-- | test.rb | 10 |
3 files changed, 71 insertions, 10 deletions
diff --git a/lib/ruby2d/camera/image.rb b/lib/ruby2d/camera/image.rb index ec229b1..19f9084 100644 --- a/lib/ruby2d/camera/image.rb +++ b/lib/ruby2d/camera/image.rb @@ -7,23 +7,29 @@ module Camera # Recalculates real coordiantes # Use after changing variables def _draw - angle = Camera.angle * (Math::PI / 180) + temp_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) - temp_x = (((offset_x - Camera.x) * Math.cos(angle)) - ((offset_y - Camera.y) * Math.sin(angle))) \ + offset_x = @x + (@width / 2) + offset_y = @y + (@height / 2) + temp_x = (((offset_x - Camera.x) * Math.cos(temp_angle)) - ((offset_y - Camera.y) * Math.sin(temp_angle))) \ * Camera.zoom + half_width - (width * Camera.zoom / 2) - temp_y = (((offset_x - Camera.x) * Math.sin(angle)) + ((offset_y - Camera.y) * Math.cos(angle))) \ + temp_y = (((offset_x - Camera.x) * Math.sin(temp_angle)) + ((offset_y - Camera.y) * Math.cos(temp_angle))) \ * Camera.zoom + half_height - (height * Camera.zoom / 2) - temp_rotate = rotate + Camera.angle - temp_width = width * Camera.zoom - temp_height = height * Camera.zoom + temp_rotate = self.rotate + Camera.angle + temp_width = self.width * Camera.zoom + temp_height = self.height * Camera.zoom self.draw(x: temp_x, y: temp_y, width: temp_width, height: temp_height, rotate: temp_rotate, color: [self.color.r, self.color.g, self.color.b, self.color.a]) end + + def initialize(opts= {}) + super(opts) + Ruby2D::Camera << self + self.remove + end end end diff --git a/lib/ruby2d/camera/line.rb b/lib/ruby2d/camera/line.rb new file mode 100644 index 0000000..faa7aad --- /dev/null +++ b/lib/ruby2d/camera/line.rb @@ -0,0 +1,49 @@ +# 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 + module Line < Ruby2D::Line + # 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_width = width * Camera.zoom + self.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] + ], + z: self.z) + 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 @@ -1,9 +1,15 @@ require 'ruby2d' require 'ruby2d/camera' -Camera::Image.new('./assets/bricktexture.png') - +Camera::Line.new +#Camera::Image.new('./assets/bricktexture.png') +#@test = Image.new('./assets/bricktexture.png') +#@test.remove update do +# @test.draw(x: get(:mouse_x), +# y: get(:mouse_y)) +# @test.x = get(:mouse_x) +# @test.y = get(:mouse_y) Camera.x = get(:mouse_x) Camera.angle = get(:mouse_y) end |