From 92d95c78e1473126a1ec24ff0389c926862cc58d Mon Sep 17 00:00:00 2001 From: Evgeni Popov Date: Wed, 12 Oct 2022 14:57:03 +0200 Subject: [PATCH 1/2] Make some setters protected --- packages/dev/core/src/Materials/Textures/baseTexture.ts | 6 +++--- packages/dev/core/src/Materials/Textures/thinTexture.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/dev/core/src/Materials/Textures/baseTexture.ts b/packages/dev/core/src/Materials/Textures/baseTexture.ts index 90af17b83c2..0c641527ed0 100644 --- a/packages/dev/core/src/Materials/Textures/baseTexture.ts +++ b/packages/dev/core/src/Materials/Textures/baseTexture.ts @@ -224,7 +224,7 @@ export class BaseTexture extends ThinTexture implements IAnimatable { return this._texture.isCube; } - public set isCube(value: boolean) { + protected set isCube(value: boolean) { if (!this._texture) { this._isCube = value; } else { @@ -244,7 +244,7 @@ export class BaseTexture extends ThinTexture implements IAnimatable { return this._texture.is3D; } - public set is3D(value: boolean) { + protected set is3D(value: boolean) { if (!this._texture) { return; } @@ -264,7 +264,7 @@ export class BaseTexture extends ThinTexture implements IAnimatable { return this._texture.is2DArray; } - public set is2DArray(value: boolean) { + protected set is2DArray(value: boolean) { if (!this._texture) { return; } diff --git a/packages/dev/core/src/Materials/Textures/thinTexture.ts b/packages/dev/core/src/Materials/Textures/thinTexture.ts index a1e9cb6a179..59278feed23 100644 --- a/packages/dev/core/src/Materials/Textures/thinTexture.ts +++ b/packages/dev/core/src/Materials/Textures/thinTexture.ts @@ -84,7 +84,7 @@ export class ThinTexture { return this._texture.isCube; } - public set isCube(value: boolean) { + protected set isCube(value: boolean) { if (!this._texture) { return; } @@ -103,7 +103,7 @@ export class ThinTexture { return this._texture.is3D; } - public set is3D(value: boolean) { + protected set is3D(value: boolean) { if (!this._texture) { return; } @@ -122,7 +122,7 @@ export class ThinTexture { return this._texture.is2DArray; } - public set is2DArray(value: boolean) { + protected set is2DArray(value: boolean) { if (!this._texture) { return; } From 559952c8cea79c330953529367b06c18447569f7 Mon Sep 17 00:00:00 2001 From: Evgeni Popov Date: Wed, 12 Oct 2022 18:05:46 +0200 Subject: [PATCH 2/2] Fix access to isCube --- packages/dev/core/src/Materials/Textures/baseTexture.ts | 3 ++- packages/dev/core/src/Misc/dds.ts | 2 +- packages/dev/core/src/Misc/environmentTextureTools.ts | 2 +- packages/dev/core/src/XR/features/WebXRLightEstimation.ts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/dev/core/src/Materials/Textures/baseTexture.ts b/packages/dev/core/src/Materials/Textures/baseTexture.ts index 0c641527ed0..4384f262522 100644 --- a/packages/dev/core/src/Materials/Textures/baseTexture.ts +++ b/packages/dev/core/src/Materials/Textures/baseTexture.ts @@ -211,7 +211,8 @@ export class BaseTexture extends ThinTexture implements IAnimatable { @serialize() public anisotropicFilteringLevel = BaseTexture.DEFAULT_ANISOTROPIC_FILTERING_LEVEL; - private _isCube = false; + /** @internal */ + public _isCube = false; /** * Define if the texture is a cube texture or if false a 2d texture. */ diff --git a/packages/dev/core/src/Misc/dds.ts b/packages/dev/core/src/Misc/dds.ts index 2f9c029f250..08d8a2f1de6 100644 --- a/packages/dev/core/src/Misc/dds.ts +++ b/packages/dev/core/src/Misc/dds.ts @@ -833,7 +833,7 @@ ThinEngine.prototype.createPrefilteredCubeTexture = function ( // Wrap in a base texture for easy binding. const lodTexture = new BaseTexture(scene); - lodTexture.isCube = true; + lodTexture._isCube = true; lodTexture._texture = glTextureFromLod; glTextureFromLod.isReady = true; diff --git a/packages/dev/core/src/Misc/environmentTextureTools.ts b/packages/dev/core/src/Misc/environmentTextureTools.ts index bf37a4325fb..10e0b1ac359 100644 --- a/packages/dev/core/src/Misc/environmentTextureTools.ts +++ b/packages/dev/core/src/Misc/environmentTextureTools.ts @@ -615,7 +615,7 @@ export function UploadLevelsAsync(texture: InternalTexture, imageData: ArrayBuff // Wrap in a base texture for easy binding. const lodTexture = new BaseTexture(null); - lodTexture.isCube = true; + lodTexture._isCube = true; lodTexture._texture = glTextureFromLod; lodTextures![mipmapIndex] = lodTexture; diff --git a/packages/dev/core/src/XR/features/WebXRLightEstimation.ts b/packages/dev/core/src/XR/features/WebXRLightEstimation.ts index 73c95511d04..1a625a89d5d 100644 --- a/packages/dev/core/src/XR/features/WebXRLightEstimation.ts +++ b/packages/dev/core/src/XR/features/WebXRLightEstimation.ts @@ -259,7 +259,7 @@ export class WebXRLightEstimation extends WebXRAbstractFeature { if (!this.options.disableCubeMapReflection) { if (!this._reflectionCubeMap) { this._reflectionCubeMap = new BaseTexture(this._xrSessionManager.scene); - this._reflectionCubeMap.isCube = true; + this._reflectionCubeMap._isCube = true; this._reflectionCubeMap.coordinatesMode = Constants.TEXTURE_CUBIC_MODE; if (this.options.setSceneEnvironmentTexture) { this._xrSessionManager.scene.environmentTexture = this._reflectionCubeMap;