Skip to content

Commit 7d32e6a

Browse files
authored
Examples: More sRGB migration. (#26120)
* Examples: More sRGB migration. * Examples: Update screenshots.
1 parent d732ceb commit 7d32e6a

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

examples/jsm/loaders/STLLoader.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
BufferAttribute,
33
BufferGeometry,
4+
Color,
45
FileLoader,
56
Float32BufferAttribute,
67
Loader,
@@ -195,6 +196,8 @@ class STLLoader extends Loader {
195196
const vertices = new Float32Array( faces * 3 * 3 );
196197
const normals = new Float32Array( faces * 3 * 3 );
197198

199+
const color = new Color();
200+
198201
for ( let face = 0; face < faces; face ++ ) {
199202

200203
const start = dataOffset + face * faceLength;
@@ -239,9 +242,11 @@ class STLLoader extends Loader {
239242

240243
if ( hasColors ) {
241244

242-
colors[ componentIdx ] = r;
243-
colors[ componentIdx + 1 ] = g;
244-
colors[ componentIdx + 2 ] = b;
245+
color.set( r, g, b ).convertSRGBToLinear();
246+
247+
colors[ componentIdx ] = color.r;
248+
colors[ componentIdx + 1 ] = color.g;
249+
colors[ componentIdx + 2 ] = color.b;
245250

246251
}
247252

examples/jsm/loaders/VTKLoader.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
BufferAttribute,
33
BufferGeometry,
4+
Color,
45
FileLoader,
56
Float32BufferAttribute,
67
Loader
@@ -107,6 +108,8 @@ class VTKLoader extends Loader {
107108
let inColorSection = false;
108109
let inNormalsSection = false;
109110

111+
const color = new Color();
112+
110113
const lines = data.split( '\n' );
111114

112115
for ( const i in lines ) {
@@ -207,7 +210,10 @@ class VTKLoader extends Loader {
207210
const r = parseFloat( result[ 1 ] );
208211
const g = parseFloat( result[ 2 ] );
209212
const b = parseFloat( result[ 3 ] );
210-
colors.push( r, g, b );
213+
214+
color.set( r, g, b ).convertSRGBToLinear();
215+
216+
colors.push( color.r, color.g, color.b );
211217

212218
}
213219

@@ -319,9 +325,11 @@ class VTKLoader extends Loader {
319325
const g = colors[ 3 * i + 1 ];
320326
const b = colors[ 3 * i + 2 ];
321327

322-
newColors.push( r, g, b );
323-
newColors.push( r, g, b );
324-
newColors.push( r, g, b );
328+
color.set( r, g, b ).convertSRGBToLinear();
329+
330+
newColors.push( color.r, color.g, color.b );
331+
newColors.push( color.r, color.g, color.b );
332+
newColors.push( color.r, color.g, color.b );
325333

326334
}
327335

-755 Bytes
Loading

0 commit comments

Comments
 (0)