From b935d5248aef79e2386a284b32f5888348a382d6 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 1 Apr 2014 16:31:05 +0200 Subject: Bug 801: WIP 1/2 - Add color attribute; Switch Shader instead of branching in shader; Update attributes and uniforms manually, drop ShaderState; - ShaderCode - add int insertShaderSource(int shaderIdx, int position, Class context, String path) - insertShaderSource(..): pos==-1 -> append code - VectorUtil - add isVec3InTriangle3(..., float epsilon) - add testSeg2SegIntersection(..., float epsilon) - add testTri2SegIntersection(..., float epsilon) - AffineTransform: Return result for chaining - Font - Add pixel precise 'getPointsBounds(final AffineTransform transform, CharSequence string, float pixelSize)' - Rename getString*() -> getMetric*() - OTGlyph: Release _points field, no more used - - Graph Triangulation - Count additional vertices in: Triangulator, CDTriangulator2D - OutlineShape: - Allow skipping of 'transformOutlines2Quadratic', i.e. allow tagging OutlineShape to be quadratic_nurbs via 'setIsQuadraticNurbs()' - Clarify cleanup ot outlines in same method 'cleanupOutlines()' - Count additional vertices .. - Graph Shader: - Start splitting and segmenting shader code for: - pass1 / pass2 - features, i.e. sampleCont, color-channel, .. --- .../jogamp/graph/geom/plane/AffineTransform.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/jogl/classes/jogamp/graph/geom/plane') diff --git a/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java b/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java index c6efae883..04b9d3bcd 100644 --- a/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java +++ b/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java @@ -319,24 +319,24 @@ public class AffineTransform implements Cloneable { return t; } - public final void translate(float mx, float my) { - concatenate(AffineTransform.getTranslateInstance(mx, my)); + public final AffineTransform translate(float mx, float my) { + return concatenate(AffineTransform.getTranslateInstance(mx, my)); } - public final void scale(float scx, float scy) { - concatenate(AffineTransform.getScaleInstance(scx, scy)); + public final AffineTransform scale(float scx, float scy) { + return concatenate(AffineTransform.getScaleInstance(scx, scy)); } - public final void shear(float shx, float shy) { - concatenate(AffineTransform.getShearInstance(shx, shy)); + public final AffineTransform shear(float shx, float shy) { + return concatenate(AffineTransform.getShearInstance(shx, shy)); } - public final void rotate(float angle) { - concatenate(AffineTransform.getRotateInstance(angle)); + public final AffineTransform rotate(float angle) { + return concatenate(AffineTransform.getRotateInstance(angle)); } - public final void rotate(float angle, float px, float py) { - concatenate(AffineTransform.getRotateInstance(angle, px, py)); + public final AffineTransform rotate(float angle, float px, float py) { + return concatenate(AffineTransform.getRotateInstance(angle, px, py)); } /** -- cgit v1.2.3