diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
index e888b212fe3d0b7d8ac0b9690dba9757022eac01..a1696f64b340a7c3ed979cf3c3e5b359362dfb0e 100644 (file)
public class Block {
- private Rectangle rect;
+ private int x,y,w,h;
private TextureRegion texture;
+ public boolean collision, foreground;
+
public Block(int x, int y, int w, int h, TextureRegion texture) {
- rect = new Rectangle(x,y,w,h);
+ this(x,y,w,h,texture, true, false);
+ }
+
+ public Block(int x, int y, int w, int h, TextureRegion texture, boolean collision, boolean foreground) {
+ this.x = x;
+ this.y = y;
+ this.w = w;
+ this.h = h;
this.texture = texture;
+ this.collision = collision;
+ this.foreground = foreground;
}
public TextureRegion getTexture() {
return texture;
}
- public Rectangle getRect() {
- return rect;
- }
-
- public int getX() {
- return (int)rect.x;
+ public Rectangle getRect(int x, int y) {
+ x*=16;
+ y*=16;
+ return new Rectangle(x+this.x, y+this.y, w, h);
}
- public int getY() {
- return (int)rect.y;
- }
-
- public int getWidth() {
- return (int)rect.width;
- }
-
- public int getHeight() {
- return (int)rect.height;
- }
}