Skip to content

SkinnedMesh: Add raycast() method back. #25957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2023
Merged

SkinnedMesh: Add raycast() method back. #25957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/objects/Mesh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,15 @@ class Mesh extends Object3D {

if ( material === undefined ) return;

// Checking boundingSphere distance to ray
// test with bounding sphere in world space

if ( geometry.boundingSphere === null ) geometry.computeBoundingSphere();

_sphere.copy( geometry.boundingSphere );
_sphere.applyMatrix4( matrixWorld );

// check distance from ray origin to bounding sphere

_ray.copy( raycaster.ray ).recast( raycaster.near );

if ( _sphere.containsPoint( _ray.origin ) === false ) {
Expand All @@ -172,24 +174,26 @@ class Mesh extends Object3D {

}

//
// convert ray to local space of mesh

_inverseMatrix.copy( matrixWorld ).invert();
_ray.copy( raycaster.ray ).applyMatrix4( _inverseMatrix );

// Check boundingBox before continuing
// test with bounding box in local space

if ( geometry.boundingBox !== null ) {

if ( _ray.intersectsBox( geometry.boundingBox ) === false ) return;

}

this._computeIntersections( raycaster, intersects );
// test for intersections with geometry

this._computeIntersections( raycaster, intersects, _ray );

}

_computeIntersections( raycaster, intersects ) {
_computeIntersections( raycaster, intersects, rayLocalSpace ) {

let intersection;

Expand Down Expand Up @@ -224,7 +228,7 @@ class Mesh extends Object3D {
const b = index.getX( j + 1 );
const c = index.getX( j + 2 );

intersection = checkGeometryIntersection( this, groupMaterial, raycaster, _ray, uv, uv1, normal, a, b, c );
intersection = checkGeometryIntersection( this, groupMaterial, raycaster, rayLocalSpace, uv, uv1, normal, a, b, c );

if ( intersection ) {

Expand All @@ -249,7 +253,7 @@ class Mesh extends Object3D {
const b = index.getX( i + 1 );
const c = index.getX( i + 2 );

intersection = checkGeometryIntersection( this, material, raycaster, _ray, uv, uv1, normal, a, b, c );
intersection = checkGeometryIntersection( this, material, raycaster, rayLocalSpace, uv, uv1, normal, a, b, c );

if ( intersection ) {

Expand Down Expand Up @@ -282,7 +286,7 @@ class Mesh extends Object3D {
const b = j + 1;
const c = j + 2;

intersection = checkGeometryIntersection( this, groupMaterial, raycaster, _ray, uv, uv1, normal, a, b, c );
intersection = checkGeometryIntersection( this, groupMaterial, raycaster, rayLocalSpace, uv, uv1, normal, a, b, c );

if ( intersection ) {

Expand All @@ -307,7 +311,7 @@ class Mesh extends Object3D {
const b = i + 1;
const c = i + 2;

intersection = checkGeometryIntersection( this, material, raycaster, _ray, uv, uv1, normal, a, b, c );
intersection = checkGeometryIntersection( this, material, raycaster, rayLocalSpace, uv, uv1, normal, a, b, c );

if ( intersection ) {

Expand Down
41 changes: 33 additions & 8 deletions src/objects/SkinnedMesh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Matrix4 } from '../math/Matrix4.js';
import { Sphere } from '../math/Sphere.js';
import { Vector3 } from '../math/Vector3.js';
import { Vector4 } from '../math/Vector4.js';
import { Ray } from '../math/Ray.js';

const _basePosition = /*@__PURE__*/ new Vector3();

Expand All @@ -14,7 +15,9 @@ const _vector3 = /*@__PURE__*/ new Vector3();
const _matrix4 = /*@__PURE__*/ new Matrix4();
const _vertex = /*@__PURE__*/ new Vector3();

//const _sphere = /*@__PURE__*/ new Sphere();
const _sphere = /*@__PURE__*/ new Sphere();
const _inverseMatrix = /*@__PURE__*/ new Matrix4();
const _ray = /*@__PURE__*/ new Ray();

class SkinnedMesh extends Mesh {

Expand Down Expand Up @@ -97,18 +100,40 @@ class SkinnedMesh extends Mesh {

}

// raycast( raycaster, intersects ) {
raycast( raycaster, intersects ) {

// if ( this.boundingSphere === null ) this.computeBoundingSphere();
const material = this.material;
const matrixWorld = this.matrixWorld;

// _sphere.copy( this.boundingSphere );
// _sphere.applyMatrix4( this.matrixWorld );
if ( material === undefined ) return;

// if ( raycaster.ray.intersectsSphere( _sphere ) === false ) return;
// test with bounding sphere in world space

// this._computeIntersections( raycaster, intersects );
if ( this.boundingSphere === null ) this.computeBoundingSphere();

// }
_sphere.copy( this.boundingSphere );
_sphere.applyMatrix4( matrixWorld );

if ( raycaster.ray.intersectsSphere( _sphere ) === false ) return;

// convert ray to local space of skinned mesh

_inverseMatrix.copy( matrixWorld ).invert();
_ray.copy( raycaster.ray ).applyMatrix4( _inverseMatrix );

// test with bounding box in local space

if ( this.boundingBox !== null ) {

if ( _ray.intersectsBox( this.boundingBox ) === false ) return;

}

// test for intersections with geometry

this._computeIntersections( raycaster, intersects, _ray );

}

getVertexPosition( index, target ) {

Expand Down