@onerjs/core 8.27.0 → 8.27.1

package/Materials/PBR/openPbrMaterial.js

@@ -1032,7 +1032,7 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                 ...(this._eventInfo.defineNames || {}),
                 ...(this._samplerDefines || {}),
             });
-            const effect = this._prepareEffect(mesh, defines, undefined, undefined, localOptions.useInstances, localOptions.clipPlane, mesh.hasThinInstances);
+            const effect = this._prepareEffect(mesh, mesh, defines, undefined, undefined, localOptions.useInstances, localOptions.clipPlane);
             if (this._onEffectCreatedObservable) {
                 onCreatedEffectParameters.effect = effect;
                 onCreatedEffectParameters.subMesh = null;
@@ -1153,7 +1153,7 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
         }
         const previousEffect = subMesh.effect;
         const lightDisposed = defines._areLightsDisposed;
-        let effect = this._prepareEffect(mesh, defines, this.onCompiled, this.onError, useInstances, null, subMesh.getRenderingMesh().hasThinInstances);
+        let effect = this._prepareEffect(mesh, subMesh.getRenderingMesh(), defines, this.onCompiled, this.onError, useInstances, null);
         let forceWasNotReadyPreviously = false;
         if (effect) {
             if (this._onEffectCreatedObservable) {
@@ -1462,8 +1462,8 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
         }
         return this.getScene().environmentTexture;
     }
-    _prepareEffect(mesh, defines, onCompiled = null, onError = null, useInstances = null, useClipPlane = null, useThinInstances) {
-        this._prepareDefines(mesh, defines, useInstances, useClipPlane, useThinInstances);
+    _prepareEffect(mesh, renderingMesh, defines, onCompiled = null, onError = null, useInstances = null, useClipPlane = null) {
+        this._prepareDefines(mesh, renderingMesh, defines, useInstances, useClipPlane);
         if (!defines.isDirty) {
             return null;
         }
@@ -1650,7 +1650,8 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
         this._eventInfo.customCode = undefined;
         return effect;
     }
-    _prepareDefines(mesh, defines, useInstances = null, useClipPlane = null, useThinInstances = false) {
+    _prepareDefines(mesh, renderingMesh, defines, useInstances = null, useClipPlane = null) {
+        const useThinInstances = renderingMesh.hasThinInstances;
         const scene = this.getScene();
         const engine = scene.getEngine();
         // Lights
@@ -1789,7 +1790,7 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
         }
         // Misc.
         if (defines._areMiscDirty) {
-            PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this.needAlphaTestingForMesh(mesh), defines, this._applyDecalMapAfterDetailMap);
+            PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this.needAlphaTestingForMesh(mesh), defines, this._applyDecalMapAfterDetailMap, this._useVertexPulling, renderingMesh, this._setVertexOutputInvariant);
             defines.UNLIT = this._unlit || ((this.pointsCloud || this.wireframe) && !mesh.isVerticesDataPresent(VertexBuffer.NormalKind));
             defines.DEBUGMODE = this._debugMode;
         }