AfflictionNetworks/pythagoras
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be more flexible about the type of our target transform.

Browse Source
This commit is contained in:
Michael Bayne
2012-05-03 08:56:35 -07:00
parent 0daba7bc49
commit 8bcd5c25c8
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/pythagoras/f/Transforms.java
+15 -21
View File
@@ -31,8 +31,7 @@ public class Transforms
* into} may refer to the same instance as {@code a} or {@code b}.
* @return {@code into} for chaining.
*/
public static AffineTransform multiply (
AffineTransform a, AffineTransform b, AffineTransform into) {
public static <T extends Transform> T multiply (AffineTransform a, AffineTransform b, T into) {
return multiply(a.m00, a.m01, a.m10, a.m11, a.tx, a.ty,
b.m00, b.m01, b.m10, b.m11, b.tx, b.ty, into);
}
@@ -42,11 +41,9 @@ public class Transforms
* into} may refer to the same instance as {@code a}.
* @return {@code into} for chaining.
*/
public static AffineTransform multiply (
AffineTransform a, float m00, float m01, float m10, float m11, float tx, float ty,
AffineTransform into) {
return multiply(a.m00, a.m01, a.m10, a.m11, a.tx, a.ty,
m00, m01, m10, m11, tx, ty, into);
public static <T extends Transform> T multiply (
AffineTransform a, float m00, float m01, float m10, float m11, float tx, float ty, T into) {
return multiply(a.m00, a.m01, a.m10, a.m11, a.tx, a.ty, m00, m01, m10, m11, tx, ty, into);
}
/**
@@ -54,27 +51,24 @@ public class Transforms
* into} may refer to the same instance as {@code b}.
* @return {@code into} for chaining.
*/
public static AffineTransform multiply (
float m00, float m01, float m10, float m11, float tx, float ty,
AffineTransform b, AffineTransform into) {
return multiply(m00, m01, m10, m11, tx, ty,
b.m00, b.m01, b.m10, b.m11, b.tx, b.ty, into);
public static <T extends Transform> T multiply (
float m00, float m01, float m10, float m11, float tx, float ty, AffineTransform b, T into) {
return multiply(m00, m01, m10, m11, tx, ty, b.m00, b.m01, b.m10, b.m11, b.tx, b.ty, into);
}
/**
* Multiplies the supplied two affine transforms, storing the result in {@code into}.
* @return {@code into} for chaining.
*/
public static AffineTransform multiply (
public static <T extends Transform> T multiply (
float am00, float am01, float am10, float am11, float atx, float aty,
float bm00, float bm01, float bm10, float bm11, float btx, float bty,
AffineTransform into) {
into.m00 = am00 * bm00 + am10 * bm01;
into.m01 = am01 * bm00 + am11 * bm01;
into.m10 = am00 * bm10 + am10 * bm11;
into.m11 = am01 * bm10 + am11 * bm11;
into.tx = am00 * btx + am10 * bty + atx;
into.ty = am01 * btx + am11 * bty + aty;
float bm00, float bm01, float bm10, float bm11, float btx, float bty, T into) {
into.setTransform(am00 * bm00 + am10 * bm01,
am01 * bm00 + am11 * bm01,
am00 * bm10 + am10 * bm11,
am01 * bm10 + am11 * bm11,
am00 * btx + am10 * bty + atx,
am01 * btx + am11 * bty + aty);
return into;
}
}