diff --git a/pom.xml b/pom.xml index f8d5e12..01ce5ac 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 virtual-cardboard nengen - 0.0.7 + 0.0.8 1.8 diff --git a/src/main/java/visuals/constraint/box/ConstraintCoordinate.java b/src/main/java/visuals/constraint/box/ConstraintCoordinate.java index 0a6c43a..fdd8ab0 100644 --- a/src/main/java/visuals/constraint/box/ConstraintCoordinate.java +++ b/src/main/java/visuals/constraint/box/ConstraintCoordinate.java @@ -39,14 +39,17 @@ public ConstraintCoordinate translate(Constraint x, Constraint y) { return new ConstraintCoordinate(this.x.add(x), this.y.add(y)); } + @Deprecated public ConstraintCoordinate translate(float x, float y) { return translate(absolute(x), absolute(y)); } + @Deprecated public ConstraintCoordinate translate(Vector2f v) { return translate(v.x(), v.y()); } + @Deprecated public ConstraintCoordinate translate(ConstraintCoordinate c) { return translate(c.x, c.y); } @@ -59,8 +62,24 @@ public ConstraintCoordinate subtract(Vector2f v) { return translate(v.negate()); } - public ConstraintCoordinate multiply(float f) { - return new ConstraintCoordinate(x.multiply(f), y.multiply(f)); + public ConstraintSize scale(float f) { + return scale(f, f); + } + + public ConstraintSize scale(float f1, float f2) { + return new ConstraintSize(x.multiply(f1), x.multiply(f2)); + } + + public ConstraintSize add(ConstraintSize other) { + return add(other.w(), other.h()); + } + + public ConstraintSize add(Vector2f v) { + return add(absolute(v.x()), absolute(v.y())); + } + + public ConstraintSize add(Constraint cw, Constraint ch) { + return new ConstraintSize(x.add(cw), x.add(ch)); } public ConstraintCoordinate neg() { diff --git a/src/main/java/visuals/constraint/box/ConstraintSize.java b/src/main/java/visuals/constraint/box/ConstraintSize.java index b36f1c7..d43bfa9 100644 --- a/src/main/java/visuals/constraint/box/ConstraintSize.java +++ b/src/main/java/visuals/constraint/box/ConstraintSize.java @@ -32,11 +32,19 @@ public Constraint h() { } public ConstraintSize scale(float f) { - return new ConstraintSize(w.multiply(f), h.multiply(f)); + return scale(f, f); + } + + public ConstraintSize scale(float f1, float f2) { + return new ConstraintSize(w.multiply(f1), h.multiply(f2)); } public ConstraintSize add(ConstraintSize other) { - return new ConstraintSize(w.add(other.w), h.add(other.h)); + return add(other.w(), other.h()); + } + + public ConstraintSize add(Constraint cw, Constraint ch) { + return new ConstraintSize(w.add(cw), h.add(ch)); } public ConstraintSize neg() {