summaryrefslogtreecommitdiffhomepage
path: root/room.rb
diff options
context:
space:
mode:
Diffstat (limited to 'room.rb')
-rw-r--r--room.rb32
1 files changed, 16 insertions, 16 deletions
diff --git a/room.rb b/room.rb
index 0366b36..4a4be4e 100644
--- a/room.rb
+++ b/room.rb
@@ -7,18 +7,18 @@ class Room
@x = x
@y = y
roomy = 155
- @objects.push Square.new(x: 125 + x,
+ @objects.push Camera::Square.new(x: 125 + x,
y: 230 + y,
size: 50,
color: 'blue',
z: 3)
- @objects.push Circle.new(x: 125 + x,
+ @objects.push Camera::Circle.new(x: 125 + x,
y: 205 + y,
radius: 25,
sectors: 64,
color: 'blue',
z: 3)
- @objects.push Quad.new(x1: 50 + x,
+ @objects.push Camera::Quad.new(x1: 50 + x,
y1: 130 + y + roomy,
x2: 125 + x,
y2: 180 + y + roomy,
@@ -28,7 +28,7 @@ class Room
y4: 130 + y + roomy,
color: 'aqua',
z: 1)
- @objects.push Quad.new(x1: 50 + x,
+ @objects.push Camera::Quad.new(x1: 50 + x,
y1: 45 + y + roomy,
x2: 50 + x,
y2: 125 + y + roomy,
@@ -38,7 +38,7 @@ class Room
y4: 45 + y + roomy,
color: 'orange',
z: 1)
- @objects.push Quad.new(x1: 255 + x,
+ @objects.push Camera::Quad.new(x1: 255 + x,
y1: 45 + y + roomy,
x2: 255 + x,
y2: 125 + y + roomy,
@@ -48,7 +48,7 @@ class Room
y4: 95 + y + roomy,
color: 'olive',
z: 1)
- @objects.push Sprite.new('./assets/sprites/blobdance-128.png',
+ @objects.push Camera::Sprite.new('./assets/sprites/blobdance-128.png',
x: 250 + x,
y: 135 + y + roomy,
width: 40,
@@ -58,7 +58,7 @@ class Room
time: 24,
z: 5)
@objects.last.play
- @objects.push Image.new(
+ @objects.push Camera::Image.new(
'assets/blobshadow.png',
x: 250 + x - 2 - 5,
y: 135 + y + roomy + 42 - 15,
@@ -66,7 +66,7 @@ class Room
height: 10,
z: 4
)
- @objects.push Sprite.new('./assets/sprites/dance2-112.png',
+ @objects.push Camera::Sprite.new('./assets/sprites/dance2-112.png',
x: 95 + x,
y: 115 + y + roomy,
width: 40,
@@ -76,7 +76,7 @@ class Room
time: 13,
z: 5)
@objects.last.play
- @objects.push Image.new(
+ @objects.push Camera::Image.new(
'assets/blobshadow.png',
x: 95 + x - 2 - 5,
y: 115 + y + roomy + 42 - 10,
@@ -84,7 +84,7 @@ class Room
height: 10,
z: 4
)
- @objects.push Sprite.new('./assets/sprites/dancer-128.png',
+ @objects.push Camera::Sprite.new('./assets/sprites/dancer-128.png',
x: 175 + x,
y: 120 + y + roomy,
width: 45,
@@ -94,7 +94,7 @@ class Room
time: 60,
z: 5)
@objects.last.play
- @objects.push Image.new(
+ @objects.push Camera::Image.new(
'assets/blobshadow.png',
x: 175 + x - 2 - 5,
y: 120 + y + roomy + 42 - 5,
@@ -102,14 +102,14 @@ class Room
height: 10,
z: 4
)
- @objects.each do |item|
- Camera << item
- end
+ #@objects.each do |item|
+ # Camera << item
+ #end
end
def remove
@objects.each do |item|
- Camera.remove item
+ #Camera.remove item
item.remove
end
end
@@ -118,7 +118,7 @@ class Room
x = @x + 80
y = @y + 160
if character.x >= x && character.x <= (x + (character.width * 2)) && character.y > y && character.y <= (y + (character.height * 2))
- Text.new('Press Space To Exit House',
+ Camera::Text.new('Press Space To Exit House',
x: x + 70,
y: y + 30,
color: 'white',