diff --git a/src/audio/AudioClient.java b/src/audio/AudioClient.java index 76b4e68..efb757c 100644 --- a/src/audio/AudioClient.java +++ b/src/audio/AudioClient.java @@ -12,7 +12,7 @@ public class AudioClient { public static void main(String[] args) throws InterruptedException { AudioPlayer player = new AudioPlayer(SAMPLE_RATE, 440); - Camera camera = new Camera(0.6, new Vector3(0, 0, -3)); + Camera camera = new Camera(0.6, new Vector3(0, 0, -2)); WorldObject cube = new WorldObject(args[0], new Vector3(0, 0, 0), new Vector3()); Vector3 rotation = new Vector3(0,Math.PI / 100,Math.PI / 100); diff --git a/src/shapes/Ellipse.java b/src/shapes/Ellipse.java index f05fc04..67da8cc 100644 --- a/src/shapes/Ellipse.java +++ b/src/shapes/Ellipse.java @@ -17,11 +17,11 @@ public class Ellipse extends Shape { } public Ellipse(double a, double b, Vector2 position) { - this(a, b, 100, 0, position); + this(a, b, Shape.DEFAULT_WEIGHT, 0, position); } public Ellipse(double a, double b) { - this(a, b, 100, 0, new Vector2()); + this(a, b, Shape.DEFAULT_WEIGHT, 0, new Vector2()); } @Override diff --git a/src/shapes/Line.java b/src/shapes/Line.java index 979b29b..274caea 100644 --- a/src/shapes/Line.java +++ b/src/shapes/Line.java @@ -4,8 +4,6 @@ public class Line extends Shape { private final Vector2 a; private final Vector2 b; - public static final double DEFAULT_WEIGHT = 100; - public Line(Vector2 a, Vector2 b, double weight) { this.a = a; this.b = b; @@ -14,7 +12,7 @@ public class Line extends Shape { } public Line(Vector2 a, Vector2 b) { - this(a, b, DEFAULT_WEIGHT); + this(a, b, Shape.DEFAULT_WEIGHT); } public Line(double x1, double y1, double x2, double y2, double weight) { diff --git a/src/shapes/Shape.java b/src/shapes/Shape.java index c8536de..0873e42 100644 --- a/src/shapes/Shape.java +++ b/src/shapes/Shape.java @@ -1,6 +1,8 @@ package shapes; public abstract class Shape { + public static final int DEFAULT_WEIGHT = 100; + protected double weight; protected double length; diff --git a/src/shapes/Vector2.java b/src/shapes/Vector2.java index 6f97e63..c8c4140 100644 --- a/src/shapes/Vector2.java +++ b/src/shapes/Vector2.java @@ -11,6 +11,7 @@ public class Vector2 extends Shape{ public Vector2(double x, double y) { this.x = x; this.y = y; + this.weight = Shape.DEFAULT_WEIGHT; } public Vector2() {