[Arakhnę-Dev] [417] * The intersection function uses the flattening paths. |
[ Thread Index |
Date Index
| More arakhne.org/dev Archives
]
Revision: 417
Author: galland
Date: 2013-04-08 11:07:54 +0200 (Mon, 08 Apr 2013)
Log Message:
-----------
* The intersection function uses the flattening paths.
Modified Paths:
--------------
trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Circle2f.java
trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Ellipse2f.java
trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/PathIterator2f.java
trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Rectangle2f.java
trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/RoundRectangle2f.java
Modified: trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Circle2f.java
===================================================================
--- trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Circle2f.java 2013-04-08 09:06:20 UTC (rev 416)
+++ trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Circle2f.java 2013-04-08 09:07:54 UTC (rev 417)
@@ -463,7 +463,7 @@
@Override
public boolean intersects(Path2f s) {
- return intersects(s.getPathIterator());
+ return intersects(s.getPathIterator(MathConstants.SPLINE_APPROXIMATION_RATIO));
}
@Override
@@ -671,7 +671,7 @@
public PathWindingRule getWindingRule() {
return PathWindingRule.NON_ZERO;
}
-
+
}
}
\ No newline at end of file
Modified: trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Ellipse2f.java
===================================================================
--- trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Ellipse2f.java 2013-04-08 09:06:20 UTC (rev 416)
+++ trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Ellipse2f.java 2013-04-08 09:07:54 UTC (rev 417)
@@ -478,7 +478,7 @@
@Override
public boolean intersects(Path2f s) {
- return intersects(s.getPathIterator());
+ return intersects(s.getPathIterator(MathConstants.SPLINE_APPROXIMATION_RATIO));
}
@Override
Modified: trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/PathIterator2f.java
===================================================================
--- trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/PathIterator2f.java 2013-04-08 09:06:20 UTC (rev 416)
+++ trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/PathIterator2f.java 2013-04-08 09:07:54 UTC (rev 417)
@@ -40,5 +40,5 @@
* @return the winding rule for the path.
*/
public PathWindingRule getWindingRule();
-
+
}
\ No newline at end of file
Modified: trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Rectangle2f.java
===================================================================
--- trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Rectangle2f.java 2013-04-08 09:06:20 UTC (rev 416)
+++ trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/Rectangle2f.java 2013-04-08 09:07:54 UTC (rev 417)
@@ -600,7 +600,7 @@
@Override
public boolean intersects(Path2f s) {
- return intersects(s.getPathIterator());
+ return intersects(s.getPathIterator(MathConstants.SPLINE_APPROXIMATION_RATIO));
}
@Override
@@ -801,7 +801,7 @@
public PathWindingRule getWindingRule() {
return PathWindingRule.NON_ZERO;
}
-
+
}
/** Iterator on the path elements of the rectangle.
@@ -912,7 +912,7 @@
public PathWindingRule getWindingRule() {
return PathWindingRule.NON_ZERO;
}
-
+
}
}
\ No newline at end of file
Modified: trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/RoundRectangle2f.java
===================================================================
--- trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/RoundRectangle2f.java 2013-04-08 09:06:20 UTC (rev 416)
+++ trunk/math/src/main/java/org/arakhne/afc/math/continous/object2d/RoundRectangle2f.java 2013-04-08 09:07:54 UTC (rev 417)
@@ -443,7 +443,7 @@
@Override
public boolean intersects(Path2f s) {
- return intersects(s.getPathIterator());
+ return intersects(s.getPathIterator(MathConstants.SPLINE_APPROXIMATION_RATIO));
}
@Override
@@ -593,7 +593,7 @@
public PathWindingRule getWindingRule() {
return PathWindingRule.NON_ZERO;
}
-
+
}
/** Iterator on the path elements of the rectangle.
@@ -727,7 +727,7 @@
public PathWindingRule getWindingRule() {
return PathWindingRule.NON_ZERO;
}
-
+
}
}
\ No newline at end of file