Skip to content

Commit 89a4d0e

Browse files
mrdoobmrdoob
committed
Fixed Ray.js distance calculation so it uses world position.
1 parent b476481 commit 89a4d0e

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

‎build/Three.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeCanvas.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeDOM.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeSVG.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeWebGL.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/Ray.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,17 @@ THREE.Ray.prototype = {
150150

151151
function distanceFromIntersection( origin, direction, object ) {
152152

153-
var vector, dot, intersect, distance;
153+
var vector, dot, intersect, distance,
154+
position = object.matrixWorld.getPosition();
154155

155-
vector = object.position.clone().subSelf( origin );
156+
vector = position.clone().subSelf( origin );
156157
dot = vector.dot( direction );
157158

158-
// TODO: Double check this
159-
// if ( dot < 0 ) return false; // Object is behind origin
160-
161159
intersect = origin.clone().addSelf( direction.clone().multiplyScalar( dot ) );
162-
distance = object.position.distanceTo( intersect );
160+
distance = position.distanceTo( intersect );
163161

162+
// TODO: Check if distance is negative (object behind camera).
163+
164164
return distance;
165165

166166
}

0 commit comments

Comments
 (0)