Skip to content
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

Jump to bottom

BatchedMesh: Declare local variables to avoid using "this" #27045

Merged
merged 1 commit into from
Oct 24, 2023
Merged

BatchedMesh: Declare local variables to avoid using "this" #27045

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 39 additions & 21 deletions examples/jsm/objects/BatchedMesh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class BatchedMesh extends Mesh {

// @TODO: geometry.groups support?
// @TODO: geometry.drawRange support?
// @TODO: geometry.mortphAttributes support?
// @TODO: geometry.morphAttributes support?

if ( this._geometryCount >= this._maxGeometryCount ) {

Expand Down Expand Up @@ -345,76 +345,94 @@ class BatchedMesh extends Mesh {
// @TODO: Map geometryId to index of the arrays because
// optimize() can make geometryId mismatch the index

if ( geometryId >= this._matrices.length || this._alives[ geometryId ] === false ) {
const visibles = this._visibles;
const alives = this._alives;
const matricesTexture = this._matricesTexture;
const matrices = this._matrices;
const matricesArray = this._matricesArray;
if ( geometryId >= matrices.length || alives[ geometryId ] === false ) {

return this;

}

this._matrices[ geometryId ].copy( matrix );
if ( visibles[ geometryId ] === true ) {

if ( this._visibles[ geometryId ] === true ) {

matrix.toArray( this._matricesArray, geometryId * 16 );
this._matricesTexture.needsUpdate = true;
matrix.toArray( matricesArray, geometryId * 16 );
matricesTexture.needsUpdate = true;

}

matrices[ geometryId ].copy( matrix );

return this;

}

getMatrixAt( geometryId, matrix ) {

if ( geometryId >= this._matrices.length || this._alives[ geometryId ] === false ) {
const matrices = this._matrices;
const alives = this._alives;
if ( geometryId >= matrices.length || alives[ geometryId ] === false ) {

return matrix;

}

return matrix.copy( this._matrices[ geometryId ] );
return matrix.copy( matrices[ geometryId ] );

}

setVisibleAt( geometryId, visible ) {

if ( geometryId >= this._visibles.length || this._alives[ geometryId ] === false ) {

return this;

}
const visibles = this._visibles;
const alives = this._alives;
const matricesTexture = this._matricesTexture;
const matrices = this._matrices;
const matricesArray = this._matricesArray;

if ( this._visibles[ geometryId ] === visible ) {
// if the geometry is out of range, not active, or visibility state
// does not change then return early
if (
geometryId >= visibles.length ||
alives[ geometryId ] === false ||
visibles[ geometryId ] === visible
) {

return this;

}

// scale the matrix to zero if it's hidden
if ( visible === true ) {

this._matrices[ geometryId ].toArray( this._matricesArray, geometryId * 16 );
matrices[ geometryId ].toArray( matricesArray, geometryId * 16 );

} else {

_zeroScaleMatrix.toArray( this._matricesArray, geometryId * 16 );
_zeroScaleMatrix.toArray( matricesArray, geometryId * 16 );

}

this._matricesTexture.needsUpdate = true;
this._visibles[ geometryId ] = visible;
matricesTexture.needsUpdate = true;
visibles[ geometryId ] = visible;
return this;

}

getVisibleAt( geometryId ) {

if ( geometryId >= this._visibles.length || this._alives[ geometryId ] === false ) {
const visibles = this._visibles;
const alives = this._alives;

// return early if the geometry is out of range or not active
if ( geometryId >= visibles.length || alives[ geometryId ] === false ) {

return false;

}

return this._visibles[ geometryId ];
return visibles[ geometryId ];

}

Expand Down