aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/graph
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-10-16 07:50:45 +0200
committerSven Gothel <[email protected]>2012-10-16 07:50:45 +0200
commit9ad5f1ea9f4ee9908fe5c5c422b287397b63e551 (patch)
tree38becf6642a670e1f08ffd206c26201761333a7b /src/jogl/classes/jogamp/graph
parent658d269db957cdb986f2da2fbe15d2441b6f03c4 (diff)
parentf15b5df4114e46b4c6a968b75aebb6014afc1806 (diff)
Merge remote-tracking branch 'hharrison/master'
Diffstat (limited to 'src/jogl/classes/jogamp/graph')
-rw-r--r--src/jogl/classes/jogamp/graph/geom/plane/Path2D.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/jogl/classes/jogamp/graph/geom/plane/Path2D.java b/src/jogl/classes/jogamp/graph/geom/plane/Path2D.java
index 8082fe4e1..bf5f5e9b6 100644
--- a/src/jogl/classes/jogamp/graph/geom/plane/Path2D.java
+++ b/src/jogl/classes/jogamp/graph/geom/plane/Path2D.java
@@ -397,7 +397,12 @@ public final class Path2D implements Cloneable {
}
public boolean contains(AABBox r) {
- return contains(r);
+ float lx = r.getMinX();
+ float ly = r.getMinY();
+ float w = r.getWidth();
+ float h = r.getHeight();
+ int cross = Crossing.intersectShape(this, lx, ly, w, h);
+ return cross != Crossing.CROSSING && isInside(cross);
}
public boolean intersects(AABBox r) {