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

BatchedMesh: default setColorAt to white #28416

Merged
merged 2 commits into from
May 18, 2024
Merged

BatchedMesh: default setColorAt to white #28416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84d21a0
BatchedMesh: default color to white
gkjohnson May 18, 2024
83a2adc
update comment
gkjohnson May 18, 2024
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
14 changes: 13 additions & 1 deletion src/objects/BatchedMesh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Box3 } from '../math/Box3.js';
import { Sphere } from '../math/Sphere.js';
import { Frustum } from '../math/Frustum.js';
import { Vector3 } from '../math/Vector3.js';
import { Color } from '../math/Color.js';

function sortOpaque( a, b ) {

Expand Down Expand Up @@ -72,6 +73,7 @@ const ID_ATTR_NAME = 'batchId';
const _matrix = /*@__PURE__*/ new Matrix4();
const _invMatrixWorld = /*@__PURE__*/ new Matrix4();
const _identityMatrix = /*@__PURE__*/ new Matrix4();
const _whiteColor = /*@__PURE__*/ new Color( 1, 1, 1 );
const _projScreenMatrix = /*@__PURE__*/ new Matrix4();
const _frustum = /*@__PURE__*/ new Frustum();
const _box = /*@__PURE__*/ new Box3();
Expand Down Expand Up @@ -193,7 +195,8 @@ class BatchedMesh extends Mesh {
let size = Math.sqrt( this._maxGeometryCount );
size = Math.ceil( size );

const colorsArray = new Float32Array( size * size * 4 ); // 4 floats per RGBA pixel
// 4 floats per RGBA pixel initialized to white
const colorsArray = new Float32Array( size * size * 4 ).fill( 1 );
const colorsTexture = new DataTexture( colorsArray, size, size, RGBAFormat, FloatType );
colorsTexture.colorSpace = ColorManagement.workingColorSpace;

Expand Down Expand Up @@ -434,6 +437,7 @@ class BatchedMesh extends Mesh {
const active = this._active;
const matricesTexture = this._matricesTexture;
const matricesArray = this._matricesTexture.image.data;
const colorsTexture = this._colorsTexture;

// push new visibility states
visibility.push( true );
Expand All @@ -447,6 +451,14 @@ class BatchedMesh extends Mesh {
_identityMatrix.toArray( matricesArray, geometryId * 16 );
matricesTexture.needsUpdate = true;

// initialize the color to white
if ( colorsTexture !== null ) {

_whiteColor.toArray( colorsTexture.image.data, geometryId * 4 );
colorsTexture.needsUpdate = true;

}

// add the reserved range and draw range objects
reservedRanges.push( reservedRange );
drawRanges.push( {
Expand Down