Sfoglia il codice sorgente

Merge pull request #1552 from julien-moreau/master

Now serializing also overlays in SceneSerializer
David Catuhe 8 anni fa
parent
commit
f7730c1df9
2 ha cambiato i file con 17 aggiunte e 0 eliminazioni
  1. 13 0
      src/Mesh/babylon.mesh.ts
  2. 4 0
      src/Tools/babylon.sceneSerializer.ts

+ 13 - 0
src/Mesh/babylon.mesh.ts

@@ -1812,6 +1812,19 @@
                 mesh._waitingActions = parsedMesh.actions;
             }
 
+            // Overlay
+            if (parsedMesh.overlayAlpha !== undefined) {
+                mesh.overlayAlpha = parsedMesh.overlayAlpha;
+            }
+
+            if (parsedMesh.overlayColor !== undefined) {
+                mesh.overlayColor = Color3.FromArray(parsedMesh.overlayColor);
+            }
+
+            if (parsedMesh.renderOverlay !== undefined) {
+                mesh.renderOverlay = parsedMesh.renderOverlay;
+            }
+
             // Geometry
             mesh.hasVertexAlpha = parsedMesh.hasVertexAlpha;
 

+ 4 - 0
src/Tools/babylon.sceneSerializer.ts

@@ -162,7 +162,11 @@
         // Alpha
         serializationObject.alphaIndex = mesh.alphaIndex;
         serializationObject.hasVertexAlpha = mesh.hasVertexAlpha;
+        
+        // Overlay
         serializationObject.overlayAlpha = mesh.overlayAlpha;
+        serializationObject.overlayColor = mesh.overlayColor.asArray();
+        serializationObject.renderOverlay = mesh.renderOverlay;
 
         // Fog
         serializationObject.applyFog = mesh.applyFog;