瀏覽代碼

Fix #9460 and geometry buffer instances

sebavan 4 年之前
父節點
當前提交
76b92d9210
共有 2 個文件被更改,包括 11 次插入8 次删除
  1. 10 7
      src/Layers/effectLayer.ts
  2. 1 1
      src/Rendering/geometryBufferRenderer.ts

+ 10 - 7
src/Layers/effectLayer.ts

@@ -381,15 +381,18 @@ export abstract class EffectLayer {
             engine.clear(this.neutralColor, true, true, true);
         });
 
-        const boundingBoxRendererEnabled = this._scene.getBoundingBoxRenderer().enabled;
+        // Prevent package size in es6 (getBoundingBoxRenderer might not be present)
+        if (this._scene.getBoundingBoxRenderer) {
+            const boundingBoxRendererEnabled = this._scene.getBoundingBoxRenderer().enabled;
 
-        this._mainTexture.onBeforeBindObservable.add(() => {
-            this._scene.getBoundingBoxRenderer().enabled = !this.disableBoundingBoxesFromEffectLayer && boundingBoxRendererEnabled;
-        });
+            this._mainTexture.onBeforeBindObservable.add(() => {
+                this._scene.getBoundingBoxRenderer().enabled = !this.disableBoundingBoxesFromEffectLayer && boundingBoxRendererEnabled;
+            });
 
-        this._mainTexture.onAfterUnbindObservable.add(() => {
-            this._scene.getBoundingBoxRenderer().enabled = boundingBoxRendererEnabled;
-        });
+            this._mainTexture.onAfterUnbindObservable.add(() => {
+                this._scene.getBoundingBoxRenderer().enabled = boundingBoxRendererEnabled;
+            });
+        }
     }
 
     /**

+ 1 - 1
src/Rendering/geometryBufferRenderer.ts

@@ -578,7 +578,7 @@ export class GeometryBufferRenderer {
 
                 if (material) {
                     var sideOrientation: Nullable<number>;
-                    let instanceDataStorage = (effectiveMesh as Mesh)._instanceDataStorage;
+                    let instanceDataStorage = (renderingMesh as Mesh)._instanceDataStorage;
 
                     if (!instanceDataStorage.isFrozen &&
                         (material.backFaceCulling || material.overrideMaterialSideOrientation !== null)) {