瀏覽代碼

Small fixes + stencil for PG

David Catuhe 8 年之前
父節點
當前提交
4de8f1bc8c

+ 1 - 1
Playground/index.html

@@ -3,6 +3,7 @@
 <head>
     <title>Babylon.js Playground</title>
     <script src="http://www.babylonjs.com/poly2tri.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.6.2/dat.gui.min.js"></script>
     <!--x-tag-->
     <script src="xtag.min.js"></script>
     <script src="splitbox.js"></script>
@@ -13,7 +14,6 @@
     <!-- Bootstrap -->
     <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <script src="node_modules/monaco-editor/min/vs/loader.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.6.2/dat.gui.min.js"></script>
     <!-- Babylon.js -->
     <script src="http://www.babylonjs.com/cannon.js"></script>
     <script src="http://www.babylonjs.com/Oimo.js"></script>

+ 1 - 1
Playground/index.js

@@ -160,7 +160,7 @@
                 }
 
                 var canvas = document.getElementById("renderCanvas");
-                engine = new BABYLON.Engine(canvas, true, {preserveDrawingBuffer: true});
+                engine = new BABYLON.Engine(canvas, true, {preserveDrawingBuffer: true, stencil: true});
                 document.getElementById("errorZone").innerHTML = "";
                 document.getElementById("statusBar").innerHTML = "Loading assets...Please wait";
 

File diff suppressed because it is too large
+ 24 - 25
dist/preview release/babylon.core.js


File diff suppressed because it is too large
+ 4654 - 4653
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 34 - 35
dist/preview release/babylon.js


File diff suppressed because it is too large
+ 45 - 25
dist/preview release/babylon.max.js


File diff suppressed because it is too large
+ 34 - 35
dist/preview release/babylon.noworker.js


+ 2 - 0
src/Materials/babylon.material.ts

@@ -120,6 +120,8 @@
         public onError: (effect: Effect, errors: string) => void;
         public getRenderTargetTextures: () => SmartArray<RenderTargetTexture>;
 
+        public doNotSerialize = false;
+
         /**
         * An event triggered when the material is disposed.
         * @type {BABYLON.Observable}

+ 3 - 1
src/Tools/babylon.sceneSerializer.ts

@@ -282,7 +282,9 @@
             var material: Material;
             for (index = 0; index < scene.materials.length; index++) {
                 material = scene.materials[index];
-                serializationObject.materials.push(material.serialize());
+                if (!material.doNotSerialize) {
+                    serializationObject.materials.push(material.serialize());
+                }
             }
 
             // MultiMaterials