Skip to content

Commit a21bfe7

Browse files
author
Mike Bond
committed
Fix specular extension loading
1 parent aece67e commit a21bfe7

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

packages/dev/core/src/Shaders/ShadersInclude/openpbrBaseLayerData.fx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ float alpha = 1.0;
4444
#ifdef SPECULAR_COLOR
4545
vec4 specularColorFromTexture = texture2D(specularColorSampler, vSpecularColorUV + uvOffset);
4646
#ifdef SPECULAR_COLOR_GAMMA
47-
specularColorFromTexture = toLinearSpace(specularColorFromTexture.rgb);
47+
specularColorFromTexture.rgb = toLinearSpace(specularColorFromTexture.rgb);
4848
#endif
4949
#endif
5050

packages/dev/core/src/ShadersWGSL/ShadersInclude/openpbrBaseLayerData.fx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var alpha: f32 = 1.0;
4444
#ifdef SPECULAR_COLOR
4545
var specularColorFromTexture: vec4f = textureSample(specularColorSampler, specularColorSamplerSampler, fragmentInputs.vSpecularColorUV + uvOffset);
4646
#ifdef SPECULAR_COLOR_GAMMA
47-
specularColorFromTexture = toLinearSpace(specularColorFromTexture.rgb);
47+
specularColorFromTexture.rgb = toLinearSpace(specularColorFromTexture.rgb);
4848
#endif
4949
#endif
5050

packages/dev/loaders/src/glTF/2.0/Extensions/KHR_materials_specular.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ export class KHR_materials_specular implements IGLTFLoaderExtension {
9898
}
9999

100100
const promises = new Array<Promise<any>>();
101+
promises.push(Promise.resolve());
101102

102103
if (useOpenPBR) {
103104
if (properties.specularFactor !== undefined) {
@@ -151,7 +152,7 @@ export class KHR_materials_specular implements IGLTFLoaderExtension {
151152
promises.push(
152153
this._loader.loadTextureInfoAsync(`${context}/specularColorTexture`, properties.specularColorTexture, (texture) => {
153154
texture.name = `${babylonMaterial.name} (Specular Color)`;
154-
(babylonMaterial as PBRMaterial).reflectionTexture = texture;
155+
(babylonMaterial as PBRMaterial).reflectanceTexture = texture;
155156
})
156157
);
157158
}

0 commit comments

Comments
 (0)