summaryrefslogtreecommitdiffhomepage
path: root/lib/ruby2d/camera/triangle.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ruby2d/camera/triangle.rb')
-rw-r--r--lib/ruby2d/camera/triangle.rb19
1 files changed, 9 insertions, 10 deletions
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