@babylonjs/core 7.10.2 → 7.10.3

package/Meshes/mesh.js

@@ -262,7 +262,7 @@ export class Mesh extends AbstractMesh {
         this._instanceDataStorage.forceMatrixUpdates = value;
     }
     /**
-     * @constructor
+     * Constructor
      * @param name The value used by scene.getMeshByName() to do a lookup.
      * @param scene The scene to add this mesh to.
      * @param parent The parent of this mesh, if it has one
@@ -303,10 +303,6 @@ export class Mesh extends AbstractMesh {
         // Use by builder only to know what orientation were the mesh build in.
         /** @internal */
         this._originalBuilderSideOrientation = Mesh.DEFAULTSIDE;
-        /**
-         * Use this property to change the original side orientation defined at construction time
-         */
-        this.overrideMaterialSideOrientation = null;
         /**
          * Gets or sets a boolean indicating whether to render ignoring the active camera's max z setting. (false by default)
          * You should not mix meshes that have this property set to true with meshes that have it set to false if they all write
@@ -316,6 +312,12 @@ export class Mesh extends AbstractMesh {
          */
         this.ignoreCameraMaxZ = false;
         scene = this.getScene();
+        if (this._scene.useRightHandedSystem) {
+            this.sideOrientation = 0;
+        }
+        else {
+            this.sideOrientation = 1;
+        }
         this._onBeforeDraw = (isInstance, world, effectiveMaterial) => {
             if (isInstance && effectiveMaterial) {
                 if (this._uniformBuffer) {
@@ -1906,14 +1908,11 @@ export class Mesh extends AbstractMesh {
         let sideOrientation;
         if (!instanceDataStorage.isFrozen &&
             (this._internalMeshDataInfo._effectiveMaterial.backFaceCulling ||
-                this.overrideMaterialSideOrientation !== null ||
+                this._internalMeshDataInfo._effectiveMaterial.sideOrientation !== null ||
                 this._internalMeshDataInfo._effectiveMaterial.twoSidedLighting)) {
             // Note: if two sided lighting is enabled, we need to ensure that the normal will point in the right direction even if the determinant of the world matrix is negative
             const mainDeterminant = effectiveMesh._getWorldMatrixDeterminant();
-            sideOrientation = this.overrideMaterialSideOrientation;
-            if (sideOrientation == null) {
-                sideOrientation = this._internalMeshDataInfo._effectiveMaterial.sideOrientation;
-            }
+            sideOrientation = this._internalMeshDataInfo._effectiveMaterial._getEffectiveOrientation(this);
             if (mainDeterminant < 0) {
                 sideOrientation = sideOrientation === Material.ClockWiseSideOrientation ? Material.CounterClockWiseSideOrientation : Material.ClockWiseSideOrientation;
             }
@@ -2493,8 +2492,7 @@ export class Mesh extends AbstractMesh {
         const normals = new Float32Array(indices.length * 3);
         let normalsCount = 0;
         // Decide if normals should be flipped
-        const flipNormalGeneration = this.overrideMaterialSideOrientation ===
-            (this._scene.useRightHandedSystem ? 1 : 0);
+        const flipNormalGeneration = this.sideOrientation === (this._scene.useRightHandedSystem ? 1 : 0);
         // Generate new normals
         for (let index = 0; index < indices.length; index += 3) {
             const p1 = Vector3.FromArray(positions, indices[index] * 3);
@@ -3027,7 +3025,7 @@ export class Mesh extends AbstractMesh {
         serializationObject.ellipsoidOffset = this.ellipsoidOffset.asArray();
         serializationObject.doNotSyncBoundingInfo = this.doNotSyncBoundingInfo;
         serializationObject.isBlocker = this.isBlocker;
-        serializationObject.overrideMaterialSideOrientation = this.overrideMaterialSideOrientation;
+        serializationObject.sideOrientation = this.sideOrientation;
         // Parent
         if (this.parent) {
             this.parent._serializeAsParent(serializationObject);
@@ -3314,8 +3312,8 @@ export class Mesh extends AbstractMesh {
         if (parsedMesh.ellipsoidOffset) {
             mesh.ellipsoidOffset = Vector3.FromArray(parsedMesh.ellipsoidOffset);
         }
-        if (parsedMesh.overrideMaterialSideOrientation !== undefined) {
-            mesh.overrideMaterialSideOrientation = parsedMesh.overrideMaterialSideOrientation;
+        if (parsedMesh.sideOrientation !== undefined) {
+            mesh.sideOrientation = parsedMesh.sideOrientation;
         }
         if (parsedMesh.isBlocker !== undefined) {
             mesh.isBlocker = parsedMesh.isBlocker;
@@ -3771,15 +3769,15 @@ export class Mesh extends AbstractMesh {
         const materialIndexArray = new Array();
         // Merge
         const indiceArray = new Array();
-        const currentOverrideMaterialSideOrientation = meshes[0].overrideMaterialSideOrientation;
+        const currentsideOrientation = meshes[0].sideOrientation;
         for (index = 0; index < meshes.length; index++) {
             const mesh = meshes[index];
             if (mesh.isAnInstance) {
                 Logger.Warn("Cannot merge instance meshes.");
                 return null;
             }
-            if (currentOverrideMaterialSideOrientation !== mesh.overrideMaterialSideOrientation) {
-                Logger.Warn("Cannot merge meshes with different overrideMaterialSideOrientation values.");
+            if (currentsideOrientation !== mesh.sideOrientation) {
+                Logger.Warn("Cannot merge meshes with different sideOrientation values.");
                 return null;
             }
             if (subdivideWithSubMeshes) {
@@ -3856,7 +3854,7 @@ export class Mesh extends AbstractMesh {
         }
         // Setting properties
         meshSubclass.checkCollisions = source.checkCollisions;
-        meshSubclass.overrideMaterialSideOrientation = source.overrideMaterialSideOrientation;
+        meshSubclass.sideOrientation = source.sideOrientation;
         // Cleaning
         if (disposeSource) {
             for (index = 0; index < meshes.length; index++) {
@@ -3918,7 +3916,7 @@ export class Mesh extends AbstractMesh {
     }
     /** @internal */
     _shouldConvertRHS() {
-        return this.overrideMaterialSideOrientation === Material.CounterClockWiseSideOrientation;
+        return this._scene.useRightHandedSystem && this.sideOrientation === Material.CounterClockWiseSideOrientation;
     }
     /** @internal */
     _getRenderingFillMode(fillMode) {