sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Added check for unit vector in Ray.setDirection()

Browse Source 
* Changed Ray constructor to set direction to 0, 0, 1 to satisfy above requirement
 * Ray no longer steals references

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8859 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..om 2011-12-04 21:48:23 +00:00
parent 28a10e239c
commit cebf822f0e
1 changed files with 523 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engine/src/core/com/jme3/math/Ray.java
View File

@ -52,25 +52,25 @@ public final class Ray implements Savable, Cloneable, Collidable, java.io.Serial
static final long serialVersionUID = 1; static final long serialVersionUID = 1;
//todo: merge with Line? /**
/** The ray's begining point. */ * The ray's begining point.
public Vector3f origin; */
/** The direction of the ray. */ public Vector3f origin = new Vector3f();
public Vector3f direction;
/**
* The direction of the ray.
*/
public Vector3f direction = new Vector3f(0, 0, 1);
public float limit = Float.POSITIVE_INFINITY; public float limit = Float.POSITIVE_INFINITY;
// protected static final Vector3f tempVa=new Vector3f();
// protected static final Vector3f tempVb=new Vector3f();
// protected static final Vector3f tempVc=new Vector3f();
// protected static final Vector3f tempVd=new Vector3f();
/** /**
* Constructor instantiates a new <code>Ray</code> object. As default, the * Constructor instantiates a new <code>Ray</code> object. As default, the
* origin is (0,0,0) and the direction is (0,0,0). * origin is (0,0,0) and the direction is (0,0,1).
* *
*/ */
public Ray() { public Ray() {
origin = new Vector3f();
direction = new Vector3f();
} }
/** /**
@ -80,8 +80,8 @@ public final class Ray implements Savable, Cloneable, Collidable, java.io.Serial
* @param direction the direction the ray travels in. * @param direction the direction the ray travels in.
*/ */
public Ray(Vector3f origin, Vector3f direction) { public Ray(Vector3f origin, Vector3f direction) {
this.origin = origin; setOrigin(origin)
this.direction = direction; setDirection(direction);
} }
/** /**
@ -476,6 +476,9 @@ public final class Ray implements Savable, Cloneable, Collidable, java.io.Serial
* @param direction the direction of the ray. * @param direction the direction of the ray.
*/ */
public void setDirection(Vector3f direction) { public void setDirection(Vector3f direction) {
if (!direction.isUnitVector()) {
throw new IllegalArgumentException("direction must be a unit vector");
}
this.direction.set(direction); this.direction.set(direction);
} }