aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-03-16 01:43:27 +0100
committerSven Gothel <[email protected]>2014-03-16 01:43:27 +0100
commit8352cb7c5d8cc971c87f13fe9f61e346c4d2c541 (patch)
tree046717b896460c5ddec6260ae58a09be0ea46c70 /src/jogl/classes/jogamp
parentf0bb162ab18cb39e6b8e07649aa826fbe84c6950 (diff)
Add generic support for picking via raycast intersection and AABBox (or similar)
- New simple type Ray, denominating a .. ray - Added PMVMatrix.gluUnProjectRay(..) similar to gluUnproject(..) however, result is a Ray. - Added AABBox.intersectsRay(Ray) ..
Diffstat (limited to 'src/jogl/classes/jogamp')
-rw-r--r--src/jogl/classes/jogamp/graph/geom/plane/Crossing.java2
-rw-r--r--src/jogl/classes/jogamp/opengl/ProjectFloat.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/jogl/classes/jogamp/graph/geom/plane/Crossing.java b/src/jogl/classes/jogamp/graph/geom/plane/Crossing.java
index 4ee0c250d..982575b53 100644
--- a/src/jogl/classes/jogamp/graph/geom/plane/Crossing.java
+++ b/src/jogl/classes/jogamp/graph/geom/plane/Crossing.java
@@ -880,7 +880,7 @@ public class Crossing {
* Returns how many times rectangle stripe cross shape or the are intersect
*/
public static int intersectShape(Path2D s, float x, float y, float w, float h) {
- if (!s.getBounds2D().intersects(x, y, w, h)) {
+ if (!s.getBounds2D().intersects2DRegion(x, y, w, h)) {
return 0;
}
return intersectPath(s.iterator(null), x, y, w, h);
diff --git a/src/jogl/classes/jogamp/opengl/ProjectFloat.java b/src/jogl/classes/jogamp/opengl/ProjectFloat.java
index 788c845fd..2e5677bd4 100644
--- a/src/jogl/classes/jogamp/opengl/ProjectFloat.java
+++ b/src/jogl/classes/jogamp/opengl/ProjectFloat.java
@@ -586,7 +586,7 @@ public class ProjectFloat {
* @param viewport
* @param obj_pos
*
- * @return
+ * @return true if successful, otherwise false (failed to invert matrix, or becomes z is infinity)
*/
public boolean gluUnProject(float winx, float winy, float winz,
float[] modelMatrix, int modelMatrix_offset,
@@ -644,7 +644,7 @@ public class ProjectFloat {
* @param viewport_offset
* @param obj_pos
* @param obj_pos_offset
- * @return
+ * @return true if successful, otherwise false (failed to invert matrix, or becomes z is infinity)
*/
public boolean gluUnProject(float winx, float winy, float winz,
FloatBuffer modelMatrix,
@@ -700,7 +700,7 @@ public class ProjectFloat {
* @param viewport
* @param obj_pos
*
- * @return
+ * @return true if successful, otherwise false (failed to invert matrix, or becomes z is infinity)
*/
public boolean gluUnProject(float winx, float winy, float winz,
FloatBuffer modelMatrix,
@@ -762,7 +762,7 @@ public class ProjectFloat {
* @param far
* @param obj_pos
*
- * @return
+ * @return true if successful, otherwise false (failed to invert matrix, or becomes z is infinity)
*/
public boolean gluUnProject4(float winx,
float winy,
@@ -828,7 +828,7 @@ public class ProjectFloat {
* @param far
* @param obj_pos
*
- * @return
+ * @return true if successful, otherwise false (failed to invert matrix, or becomes z is infinity)
*/
public boolean gluUnProject4(float winx,
float winy,