force srgb colorspace on diffuse like threejs does

EtherealEngine · Oct 28, 2023 · f922256 · f922256
1 parent a7e30a8
commit f922256
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/engine/src/assets/loaders/gltf/GLTFLoader.d.ts b/packages/engine/src/assets/loaders/gltf/GLTFLoader.d.ts
@@ -30,6 +30,7 @@ import {
   BufferAttribute,
   BufferGeometry,
   Camera,
+  ColorSpace,
   Group,
   InterleavedBufferAttribute,
   Loader,
@@ -128,7 +129,8 @@ export class GLTFParser {
       index: number
       texCoord?: number | undefined
       extensions?: any
-    }
+    },
+    colorSpace?: ColorSpace
   ) => Promise<void>
   assignFinalMaterial: (object: Mesh) => void
   getMaterialType: () => typeof MeshStandardMaterial

diff --git a/packages/engine/src/assets/loaders/gltf/extensions/EEMaterialImporterExtension.ts b/packages/engine/src/assets/loaders/gltf/extensions/EEMaterialImporterExtension.ts
@@ -23,7 +23,7 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
 Ethereal Engine. All Rights Reserved.
 */
 
-import { Color, Material } from 'three'
+import { Color, Material, SRGBColorSpace } from 'three'
 
 import { getState } from '@etherealengine/hyperflux'
 
@@ -111,7 +111,11 @@ export class EEMaterialImporterExtension extends ImporterExtension implements GL
         Object.entries(oldExtension.args).map(async ([k, v]) => {
           //check if the value is a texture
           if (matches.shape({ index: matches.number }).test(v)) {
-            await parser.assignTexture(parseTarget, k, v)
+            if (k === 'map') {
+              await parser.assignTexture(parseTarget, k, v, SRGBColorSpace)
+            } else {
+              await parser.assignTexture(parseTarget, k, v)
+            }
           }
           //check if the value is a color by checking key
           else if ((k.toLowerCase().includes('color') || k === 'emissive') && typeof v === 'number') {
@@ -131,7 +135,11 @@ export class EEMaterialImporterExtension extends ImporterExtension implements GL
             break
           case 'texture':
             if (v.contents) {
-              await parser.assignTexture(parseTarget, k, v.contents)
+              if (k === 'map') {
+                await parser.assignTexture(parseTarget, k, v.contents, SRGBColorSpace)
+              } else {
+                await parser.assignTexture(parseTarget, k, v.contents)
+              }
             } else {
               parseTarget[k] = null
             }