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

BufferAttribute: Support (de)normalization in accessors. #22874

Merged
merged 3 commits into from
Aug 17, 2022
+160 −52
Merged

BufferAttribute: Support (de)normalization in accessors. #22874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6a80f9
BufferAttribute: Support (de)normalization in accessors.
donmccurdy Nov 22, 2021
9306797
Revert changes to MathUtils
donmccurdy Aug 16, 2022
75bcd8f
Clean up Color.js
donmccurdy Aug 16, 2022
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
123 changes: 107 additions & 16 deletions src/core/BufferAttribute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Vector4 } from '../math/Vector4.js';
import { Vector3 } from '../math/Vector3.js';
import { Vector2 } from '../math/Vector2.js';
import { Color } from '../math/Color.js';
import { denormalize, normalize } from '../math/MathUtils.js';
import { StaticDrawUsage } from '../constants.js';

const _vector = /*@__PURE__*/ new Vector3();
Expand Down Expand Up @@ -102,9 +103,19 @@ class BufferAttribute {

}

array[ offset ++ ] = color.r;
array[ offset ++ ] = color.g;
array[ offset ++ ] = color.b;
if ( this.normalized ) {

array[ offset ++ ] = normalize( color.r, array );
array[ offset ++ ] = normalize( color.g, array );
array[ offset ++ ] = normalize( color.b, array );

} else {

array[ offset ++ ] = color.r;
array[ offset ++ ] = color.g;
array[ offset ++ ] = color.b;

}

}

Expand All @@ -128,8 +139,17 @@ class BufferAttribute {

}

array[ offset ++ ] = vector.x;
array[ offset ++ ] = vector.y;
if ( this.normalized ) {

array[ offset ++ ] = normalize( vector.x, array );
array[ offset ++ ] = normalize( vector.y, array );

} else {

array[ offset ++ ] = vector.x;
array[ offset ++ ] = vector.y;

}

}

Expand All @@ -153,9 +173,19 @@ class BufferAttribute {

}

array[ offset ++ ] = vector.x;
array[ offset ++ ] = vector.y;
array[ offset ++ ] = vector.z;
if ( this.normalized ) {

array[ offset ++ ] = normalize( vector.x, array );
array[ offset ++ ] = normalize( vector.y, array );
array[ offset ++ ] = normalize( vector.z, array );

} else {

array[ offset ++ ] = vector.x;
array[ offset ++ ] = vector.y;
array[ offset ++ ] = vector.z;

}

}

Expand All @@ -179,10 +209,21 @@ class BufferAttribute {

}

array[ offset ++ ] = vector.x;
array[ offset ++ ] = vector.y;
array[ offset ++ ] = vector.z;
array[ offset ++ ] = vector.w;
if ( this.normalized ) {

array[ offset ++ ] = normalize( vector.x, array );
array[ offset ++ ] = normalize( vector.y, array );
array[ offset ++ ] = normalize( vector.z, array );
array[ offset ++ ] = normalize( vector.w, array );

} else {

array[ offset ++ ] = vector.x;
array[ offset ++ ] = vector.y;
array[ offset ++ ] = vector.z;
array[ offset ++ ] = vector.w;

}

}

Expand Down Expand Up @@ -270,6 +311,8 @@ class BufferAttribute {

set( value, offset = 0 ) {

if ( this.normalized ) value = normalize( value, this.array );

this.array.set( value, offset );

return this;
Expand All @@ -278,12 +321,18 @@ class BufferAttribute {

getX( index ) {

return this.array[ index * this.itemSize ];
let x = this.array[ index * this.itemSize ];

if ( this.normalized ) x = denormalize( x, this.array );

return x;

}

setX( index, x ) {

if ( this.normalized ) x = normalize( x, this.array );

this.array[ index * this.itemSize ] = x;

return this;
Expand All @@ -292,12 +341,18 @@ class BufferAttribute {

getY( index ) {

return this.array[ index * this.itemSize + 1 ];
let y = this.array[ index * this.itemSize + 1 ];

if ( this.normalized ) y = denormalize( y, this.array );

return y;

}

setY( index, y ) {

if ( this.normalized ) y = normalize( y, this.array );

this.array[ index * this.itemSize + 1 ] = y;

return this;
Expand All @@ -306,12 +361,18 @@ class BufferAttribute {

getZ( index ) {

return this.array[ index * this.itemSize + 2 ];
let z = this.array[ index * this.itemSize + 2 ];

if ( this.normalized ) z = denormalize( z, this.array );

return z;

}

setZ( index, z ) {

if ( this.normalized ) z = normalize( z, this.array );

this.array[ index * this.itemSize + 2 ] = z;

return this;
Expand All @@ -320,12 +381,18 @@ class BufferAttribute {

getW( index ) {

return this.array[ index * this.itemSize + 3 ];
let w = this.array[ index * this.itemSize + 3 ];

if ( this.normalized ) w = denormalize( w, this.array );

return w;

}

setW( index, w ) {

if ( this.normalized ) w = normalize( w, this.array );

this.array[ index * this.itemSize + 3 ] = w;

return this;
Expand All @@ -336,6 +403,13 @@ class BufferAttribute {

index *= this.itemSize;

if ( this.normalized ) {

x = normalize( x, this.array );
y = normalize( y, this.array );

}

this.array[ index + 0 ] = x;
this.array[ index + 1 ] = y;

Expand All @@ -347,6 +421,14 @@ class BufferAttribute {

index *= this.itemSize;

if ( this.normalized ) {

x = normalize( x, this.array );
y = normalize( y, this.array );
z = normalize( z, this.array );

}

this.array[ index + 0 ] = x;
this.array[ index + 1 ] = y;
this.array[ index + 2 ] = z;
Expand All @@ -359,6 +441,15 @@ class BufferAttribute {

index *= this.itemSize;

if ( this.normalized ) {

x = normalize( x, this.array );
y = normalize( y, this.array );
z = normalize( z, this.array );
w = normalize( w, this.array );

}

this.array[ index + 0 ] = x;
this.array[ index + 1 ] = y;
this.array[ index + 2 ] = z;
Expand Down
57 changes: 53 additions & 4 deletions src/core/InterleavedBufferAttribute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Vector3 } from '../math/Vector3.js';
import { BufferAttribute } from './BufferAttribute.js';
import { denormalize, normalize } from '../math/MathUtils.js';

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

Expand Down Expand Up @@ -87,6 +88,8 @@ class InterleavedBufferAttribute {

setX( index, x ) {

if ( this.normalized ) x = normalize( x, this.array );

this.data.array[ index * this.data.stride + this.offset ] = x;

return this;
Expand All @@ -95,6 +98,8 @@ class InterleavedBufferAttribute {

setY( index, y ) {

if ( this.normalized ) y = normalize( y, this.array );

this.data.array[ index * this.data.stride + this.offset + 1 ] = y;

return this;
Expand All @@ -103,6 +108,8 @@ class InterleavedBufferAttribute {

setZ( index, z ) {

if ( this.normalized ) z = normalize( z, this.array );

this.data.array[ index * this.data.stride + this.offset + 2 ] = z;

return this;
Expand All @@ -111,6 +118,8 @@ class InterleavedBufferAttribute {

setW( index, w ) {

if ( this.normalized ) w = normalize( w, this.array );

this.data.array[ index * this.data.stride + this.offset + 3 ] = w;

return this;
Expand All @@ -119,32 +128,55 @@ class InterleavedBufferAttribute {

getX( index ) {

return this.data.array[ index * this.data.stride + this.offset ];
let x = this.data.array[ index * this.data.stride + this.offset ];

if ( this.normalized ) x = denormalize( x, this.array );

return x;

}

getY( index ) {

return this.data.array[ index * this.data.stride + this.offset + 1 ];
let y = this.data.array[ index * this.data.stride + this.offset + 1 ];

if ( this.normalized ) y = denormalize( y, this.array );

return y;

}

getZ( index ) {

return this.data.array[ index * this.data.stride + this.offset + 2 ];
let z = this.data.array[ index * this.data.stride + this.offset + 2 ];

if ( this.normalized ) z = denormalize( z, this.array );

return z;

}

getW( index ) {

return this.data.array[ index * this.data.stride + this.offset + 3 ];
let w = this.data.array[ index * this.data.stride + this.offset + 3 ];

if ( this.normalized ) w = denormalize( w, this.array );

return w;

}

setXY( index, x, y ) {

index = index * this.data.stride + this.offset;

if ( this.normalized ) {

x = normalize( x, this.array );
y = normalize( y, this.array );

}

this.data.array[ index + 0 ] = x;
this.data.array[ index + 1 ] = y;

Expand All @@ -156,6 +188,14 @@ class InterleavedBufferAttribute {

index = index * this.data.stride + this.offset;

if ( this.normalized ) {

x = normalize( x, this.array );
y = normalize( y, this.array );
z = normalize( z, this.array );

}

this.data.array[ index + 0 ] = x;
this.data.array[ index + 1 ] = y;
this.data.array[ index + 2 ] = z;
Expand All @@ -168,6 +208,15 @@ class InterleavedBufferAttribute {

index = index * this.data.stride + this.offset;

if ( this.normalized ) {

x = normalize( x, this.array );
y = normalize( y, this.array );
z = normalize( z, this.array );
w = normalize( w, this.array );

}

this.data.array[ index + 0 ] = x;
this.data.array[ index + 1 ] = y;
this.data.array[ index + 2 ] = z;
Expand Down
10 changes: 0 additions & 10 deletions src/math/Color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,16 +580,6 @@ class Color {
this.g = attribute.getY( index );
this.b = attribute.getZ( index );

if ( attribute.normalized === true ) {

// assuming Uint8Array

this.r /= 255;
this.g /= 255;
this.b /= 255;

}

return this;

}
Expand Down
Loading