diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index e42b9f2..8a03051 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -9,7 +9,6 @@ private Position3D position; private Velocity3D velocity; private AngularVelocity3D angularVelocity; - private Depth3D depth; private Angle angle; private Attribute attribute; private String model; @@ -32,17 +31,6 @@ setModel(model); } - public Object(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Angle angle, - Depth3D depth, Attribute attribute, String model) { - setPosition(position); - setVelocity(velocity); - setAngularVelocity(angularVelocity); - setAngle(angle); - setDepth(depth); - setAttribute(attribute); - setModel(model); - } - public Position3D getPosition() { return position; } @@ -58,11 +46,7 @@ public Angle getAngle() { return angle; } - - public Depth3D getDepth() { - return depth; - } - + public Attribute getAttribute() { return attribute; } @@ -87,10 +71,6 @@ this.angle = angle; } - public void setDepth(Depth3D depth) { - this.depth = depth; - } - public void setAttribute(Attribute attribute) { this.attribute = attribute; } @@ -125,29 +105,4 @@ } } - public boolean isPerDesion(Object another) { - Position3D ap = another.getPosition(); - Depth3D ad = another.getDepth(); - if (position.getX() <= ap.getX() && position.getX() + depth.getDepthX() >= ap.getX() + ad.getDepthX()) { - if (position.getY() <= ap.getY() && position.getY() + depth.getDepthY() >= ap.getY() + ad.getDepthY()) { - if (position.getZ() <= ap.getZ() && position.getZ() + depth.getDepthZ() >= ap.getZ() + ad.getDepthZ()) { - return true; - } - } - } - return false; - } - -// public boolean isPerDesion(Player another) { -// Position3D ap = another.getPosition(); -// Depth3D ad = another.getDepth(); -// if (position.getX() <= ap.getX() && position.getX() + depth.getDepthX() >= ap.getX() + ad.getDepthX()) { -// if (position.getY() <= ap.getY() && position.getY() + depth.getDepthY() >= ap.getY() + ad.getDepthY()) { -// if (position.getZ() <= ap.getZ() && position.getZ() + depth.getDepthZ() >= ap.getZ() + ad.getDepthZ()) { -// return true; -// } -// } -// } -// return false; -// } } \ No newline at end of file