Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
zhangyupeng
/
Babylon.js
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js into drigax/fixGLTFLightDirectionRoundTrip

Nicholas Barlow 5 vuotta sitten
vanhempi
388e684deb a1b7bdaea6
commit
362817f289
93 muutettua tiedostoa jossa 1229 lisäystä ja 907 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 1 1
      Playground/css/index.css
  2. 2 6
      Playground/debug.html
  3. 0 6
      Playground/frame.html
  4. 387 357
      Playground/index-local.html
  5. 2 1
      Playground/index.html
  6. 1 0
      Playground/indexStable.html
  7. 1 0
      Playground/indexWebGPU.html
  8. 27 9
      Playground/js/main.js
  9. 4 4
      Playground/js/monacoCreator.js
  10. 0 55
      Playground/test.html
  11. 1 2
      dist/preview release/babylon.d.ts
  12. 1 1
      dist/preview release/babylon.js
  13. 54 41
      dist/preview release/babylon.max.js
  14. 1 1
      dist/preview release/babylon.max.js.map
  15. 2 4
      dist/preview release/babylon.module.d.ts
  16. 25 19
      dist/preview release/documentation.d.ts
  17. 28 9
      dist/preview release/loaders/babylon.glTF1FileLoader.js
  18. 1 1
      dist/preview release/loaders/babylon.glTF1FileLoader.js.map
  19. 2 2
      dist/preview release/loaders/babylon.glTF1FileLoader.min.js
  20. 46 4
      dist/preview release/loaders/babylon.glTF2FileLoader.js
  21. 1 1
      dist/preview release/loaders/babylon.glTF2FileLoader.js.map
  22. 1 1
      dist/preview release/loaders/babylon.glTF2FileLoader.min.js
  23. 70 11
      dist/preview release/loaders/babylon.glTFFileLoader.js
  24. 1 1
      dist/preview release/loaders/babylon.glTFFileLoader.js.map
  25. 2 2
      dist/preview release/loaders/babylon.glTFFileLoader.min.js
  26. 14 2
      dist/preview release/loaders/babylon.objFileLoader.js
  27. 1 1
      dist/preview release/loaders/babylon.objFileLoader.js.map
  28. 1 1
      dist/preview release/loaders/babylon.objFileLoader.min.js
  29. 2 0
      dist/preview release/loaders/babylon.stlFileLoader.js
  30. 1 1
      dist/preview release/loaders/babylon.stlFileLoader.js.map
  31. 1 1
      dist/preview release/loaders/babylon.stlFileLoader.min.js
  32. 22 19
      dist/preview release/loaders/babylonjs.loaders.d.ts
  33. 86 13
      dist/preview release/loaders/babylonjs.loaders.js
  34. 1 1
      dist/preview release/loaders/babylonjs.loaders.js.map
  35. 2 2
      dist/preview release/loaders/babylonjs.loaders.min.js
  36. 49 46
      dist/preview release/loaders/babylonjs.loaders.module.d.ts
  37. 6 6
      dist/preview release/materialsLibrary/babylon.cellMaterial.js
  38. 1 1
      dist/preview release/materialsLibrary/babylon.cellMaterial.js.map
  39. 5 5
      dist/preview release/materialsLibrary/babylon.customMaterial.js
  40. 1 1
      dist/preview release/materialsLibrary/babylon.customMaterial.js.map
  41. 6 6
      dist/preview release/materialsLibrary/babylon.fireMaterial.js
  42. 1 1
      dist/preview release/materialsLibrary/babylon.fireMaterial.js.map
  43. 6 6
      dist/preview release/materialsLibrary/babylon.furMaterial.js
  44. 1 1
      dist/preview release/materialsLibrary/babylon.furMaterial.js.map
  45. 6 6
      dist/preview release/materialsLibrary/babylon.gradientMaterial.js
  46. 1 1
      dist/preview release/materialsLibrary/babylon.gradientMaterial.js.map
  47. 6 6
      dist/preview release/materialsLibrary/babylon.gridMaterial.js
  48. 1 1
      dist/preview release/materialsLibrary/babylon.gridMaterial.js.map
  49. 6 6
      dist/preview release/materialsLibrary/babylon.lavaMaterial.js
  50. 1 1
      dist/preview release/materialsLibrary/babylon.lavaMaterial.js.map
  51. 6 6
      dist/preview release/materialsLibrary/babylon.mixMaterial.js
  52. 1 1
      dist/preview release/materialsLibrary/babylon.mixMaterial.js.map
  53. 6 6
      dist/preview release/materialsLibrary/babylon.normalMaterial.js
  54. 1 1
      dist/preview release/materialsLibrary/babylon.normalMaterial.js.map
  55. 6 6
      dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.js
  56. 1 1
      dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.js.map
  57. 6 6
      dist/preview release/materialsLibrary/babylon.simpleMaterial.js
  58. 1 1
      dist/preview release/materialsLibrary/babylon.simpleMaterial.js.map
  59. 6 6
      dist/preview release/materialsLibrary/babylon.skyMaterial.js
  60. 1 1
      dist/preview release/materialsLibrary/babylon.skyMaterial.js.map
  61. 6 6
      dist/preview release/materialsLibrary/babylon.terrainMaterial.js
  62. 1 1
      dist/preview release/materialsLibrary/babylon.terrainMaterial.js.map
  63. 6 6
      dist/preview release/materialsLibrary/babylon.triPlanarMaterial.js
  64. 1 1
      dist/preview release/materialsLibrary/babylon.triPlanarMaterial.js.map
  65. 6 6
      dist/preview release/materialsLibrary/babylon.waterMaterial.js
  66. 1 1
      dist/preview release/materialsLibrary/babylon.waterMaterial.js.map
  67. 47 47
      dist/preview release/materialsLibrary/babylonjs.materials.js
  68. 1 1
      dist/preview release/materialsLibrary/babylonjs.materials.js.map
  69. 1 1
      dist/preview release/packagesSizeBaseLine.json
  70. 2 4
      dist/preview release/viewer/babylon.module.d.ts
  71. 23 23
      dist/preview release/viewer/babylon.viewer.js
  72. 2 2
      dist/preview release/viewer/babylon.viewer.max.js
  73. 49 46
      dist/preview release/viewer/babylonjs.loaders.module.d.ts
  74. 5 1
      loaders/src/OBJ/mtlFileLoader.ts
  75. 13 1
      loaders/src/OBJ/objFileLoader.ts
  76. 2 0
      loaders/src/STL/stlFileLoader.ts
  77. 29 10
      loaders/src/glTF/1.0/glTFLoader.ts
  78. 2 0
      loaders/src/glTF/1.0/glTFLoaderInterfaces.ts
  79. 6 0
      loaders/src/glTF/2.0/Extensions/KHR_lights_punctual.ts
  80. 45 4
      loaders/src/glTF/2.0/glTFLoader.ts
  81. 17 3
      loaders/src/glTF/glTFFileLoader.ts
  82. 3 0
      src/Loading/Plugins/babylonFileLoader.ts
  83. 0 5
      src/Loading/sceneLoader.ts
  84. 0 3
      src/Materials/Background/backgroundMaterial.ts
  85. 0 6
      src/Materials/PBR/pbrBaseMaterial.ts
  86. 0 2
      src/Materials/standardMaterial.ts
  87. 3 0
      src/Misc/brdfTextureTools.ts
  88. 1 5
      src/Shaders/background.vertex.fx
  89. 1 5
      src/Shaders/default.vertex.fx
  90. 1 5
      src/Shaders/pbr.vertex.fx
  91. 13 0
      src/assetContainer.ts
  92. 18 3
      src/scene.ts
  93. BIN
      tests/validation/ReferenceImages/pointLightShadows.png

+ 1 - 1
Playground/css/index.css
Näytä tiedosto 

@@ -1,4 +1,4 @@
 
-@import url("https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css");

+

 html,

 body {

     width: 100%;

+ 2 - 6
Playground/debug.html
Näytä tiedosto 

@@ -1,11 +1,6 @@
 
 <!DOCTYPE html>

 <html>

 

-    <!--

-    The purpose of the Debug.html file is to debug a new Playground feature.

-    // TO DO - Fix the console error : "Manifest: Line: 1, column 1, Unexpected token"

- -->

-

     <head>

         <title>Babylon.js Playground</title>

         <meta charset='utf-8' />

@@ -38,6 +33,7 @@
 
         <meta name="theme-color" content="#ffffff">

 

         <link rel="stylesheet" href="https://use.typekit.net/cta4xsb.css" />

+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" />

         <link rel="stylesheet" href="/css/index.css" />

         <link rel="stylesheet" href="/css/index_mobile.css" />

 

@@ -120,7 +116,7 @@
 
         </script>

 

         <!-- Monaco -->

-        <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.18.1/min/vs/loader.js"></script>

+        <script src="/node_modules/monaco-editor/dev/vs/loader.js"></script>

 

     </head>

+ 0 - 6
Playground/frame.html
Näytä tiedosto 

@@ -1,11 +1,5 @@
 
 <!DOCTYPE html>

 <html>

-

-    <!--

-    The purpose of the Frame.html file is to ???

-    // TO DO - Complete that

- -->

-

     <head>

         <title>Babylon.js Playground</title>

         <meta charset='utf-8' />

+ 387 - 357
Playground/index-local.html
Näytä tiedosto 

@@ -1,412 +1,442 @@
 
 <!DOCTYPE html>

 <html>

 

-<!--

-    The purpose of the index-local.html file is to ???

-    // TO DO - Complete that

-    // TO DO - Fix error - "BabylonLoader.js:26 GET http://localhost/Tools/Config/config.json 404 (Not Found)". File exist, Wamp can't read it

- -->

-

-<head>

-    <title>Babylon.js Playground</title>

-    <meta charset='utf-8' />

-    <meta name="viewport" content="width=device-width, user-scalable=no">

-    <link rel="shortcut icon" href="https://www.babylonjs.com/favicon.ico">

-

-    <link rel="stylesheet" href="https://use.typekit.net/cta4xsb.css">

-    <link rel="stylesheet" href="/css/index.css" />

-    <link rel="stylesheet" href="/css/index_mobile.css" />

-

-    <!-- Pep -->

-    <script src="https://code.jquery.com/pep/0.4.2/pep.min.js"></script>

-    <!--For canvas/code separator-->

-    <script src="/js/libs/split.js"></script>

-

-    <!-- DatGUI -->

-    <script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.6.2/dat.gui.min.js"></script>

-    <!-- jszip -->

-    <script src="/js/libs/jszip.min.js"></script>

-    <script src="/js/libs/fileSaver.js"></script>

-

-    <!-- Dependencies -->

-    <script src="../dist/preview%20release/ammo.js"></script>

-    <script src="../dist/preview%20release/recast.js"></script>

-    <script src="../dist/preview%20release/cannon.js"></script>

-    <script src="../dist/preview%20release/Oimo.js"></script>

-    <script src="../dist/preview%20release/earcut.min.js"></script>

-    <!-- Monaco -->

-

-    <!-- Babylon.js -->

-    <script src="../Tools/DevLoader/BabylonLoader.js"></script>

-</head>

-

-<body>

-    <!-- Big screens -->

-    <div class="navbar navBar1280 languageJS">

-        <div class="categoryTitle">

-            <img class="logo" src="/css/img/logo_v4.svg">

-            <div class="version">Playground <span class="versionSub" id="mainTitle1280"></span></div>

-        </div>

+    <head>

+        <title>Babylon.js Playground</title>

+        <meta charset='utf-8' />

+        <meta name="viewport" content="width=device-width, user-scalable=no">

+        <link rel="shortcut icon" href="https://www.babylonjs.com/favicon.ico">

+

+        <link rel="stylesheet" href="https://use.typekit.net/cta4xsb.css" />

+        <link rel="stylesheet"

+            href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" />

+        <link rel="stylesheet" href="/css/index.css" />

+        <link rel="stylesheet" href="/css/index_mobile.css" />

+

+        <!-- Pep -->

+        <script src="https://code.jquery.com/pep/0.4.2/pep.min.js"></script>

+        <!--For canvas/code separator-->

+        <script src="js/libs/split.js"></script>

+

+        <!-- DatGUI -->

+        <script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.6.2/dat.gui.min.js"></script>

+        <!-- jszip -->

+        <script src="js/libs/jszip.min.js"></script>

+        <script src="js/libs/fileSaver.js"></script>

+

+        <!-- Dependencies -->

+        <script src="../dist/preview%20release/ammo.js"></script>

+        <script src="../dist/preview%20release/recast.js"></script>

+        <script src="../dist/preview%20release/cannon.js"></script>

+        <script src="../dist/preview%20release/Oimo.js"></script>

+        <script src="../dist/preview%20release/earcut.min.js"></script>

+        <!-- Monaco -->

+

+        <!-- Babylon.js -->

+        <script src="../Tools/DevLoader/BabylonLoader.js"></script>

+    </head>

+

+    <body>

+        <!-- Big screens -->

+        <div class="navbar navBar1280 languageJS">

+            <div class="categoryTitle">

+                <img class="logo" src="css/img/logo_v4.svg">

+                <div class="version">Playground <span class="versionSub" id="mainTitle1280"></span></div>

+            </div>

 

-        <div class="category languageJS" id="JStoTSbar">

-            <div class="buttonJStoTS languageTS" id="toTSbutton1280" title="Switch to TypeScript">Typescript</div>

-            <div class="buttonJStoTS languageJS" id="toJSbutton1280" title="Switch to JavaScript">Javascript</div>

-            <div class="buttonPG run removeOnDiff" id="runButton1280" title="Run&#10;(Alt+Enter)"><img src="/css/img/playButton.svg"></div>

-            <div class="buttonPG removeOnDiff" id="saveButton1280" title="Save&#10;(Ctrl+S)"><img src="/css/img/saveButton.svg"></div>

-            <div class="buttonPG removeOnPhone removeOnDiff" id="zipButton1280" title="Download ZIP&#10;(Ctrl+Shift+S)"><img src="/css/img/downloadButton.svg"></div>

-            <div class="buttonPG removeOnDiff" id="newButton1280" title="Create new"><img src="/css/img/newButton.svg"></div>

-            <div class="buttonPG removeOnPhone removeOnDiff" id="clearButton1280" title="Clear"><img src="/css/img/clearButton.svg"></div>

-            <div class="buttonPG removeOnPhone removeOnDiff" id="diffButton1280" title="Compare"><img src="/css/img/diffButton.svg"></div>

-            <div class="buttonPG removeOnPhone displayOnDiff" id="previousButton1280" title="Previous difference&#10;(Shift+Alt+F5)"><img src="/css/img/previousButton.svg"></div>

-            <div class="buttonPG removeOnPhone displayOnDiff" id="nextButton1280" title="Next difference&#10;(Alt+F5)"><img src="/css/img/nextButton.svg"></div>

-            <div class="buttonPG removeOnPhone displayOnDiff" id="exitButton1280" title="Exit&#10;(Esc)"><img src="/css/img/exitButton.svg"></div>

-            <div class="buttonPG select removeOnDiff" id="menuButton1280" title="Options"><img src="/css/img/optionsButton.svg">

-                <div class="toDisplay languageJS">

-                    <div class="option subSelect">Theme <i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub languageJS">

-                            <div class="option selected" id="darkTheme1280">Dark</div>

-                            <div class="option" id="lightTheme1280">Light</div>

+            <div class="category languageJS" id="JStoTSbar">

+                <div class="buttonJStoTS languageTS" id="toTSbutton1280" title="Switch to TypeScript">Typescript</div>

+                <div class="buttonJStoTS languageJS" id="toJSbutton1280" title="Switch to JavaScript">Javascript</div>

+                <div class="buttonPG run removeOnDiff" id="runButton1280" title="Run&#10;(Alt+Enter)"><img

+                        src="css/img/playButton.svg"></div>

+                <div class="buttonPG removeOnDiff" id="saveButton1280" title="Save&#10;(Ctrl+S)"><img

+                        src="css/img/saveButton.svg"></div>

+                <div class="buttonPG removeOnPhone removeOnDiff" id="zipButton1280"

+                    title="Download ZIP&#10;(Ctrl+Shift+S)"><img src="css/img/downloadButton.svg"></div>

+                <div class="buttonPG removeOnDiff" id="newButton1280" title="Create new"><img

+                        src="css/img/newButton.svg"></div>

+                <div class="buttonPG removeOnPhone removeOnDiff" id="clearButton1280" title="Clear"><img

+                        src="css/img/clearButton.svg"></div>

+                <div class="buttonPG removeOnPhone removeOnDiff" id="diffButton1280" title="Compare"><img

+                        src="css/img/diffButton.svg"></div>

+                <div class="buttonPG removeOnPhone displayOnDiff" id="previousButton1280"

+                    title="Previous difference&#10;(Shift+Alt+F5)"><img src="css/img/previousButton.svg"></div>

+                <div class="buttonPG removeOnPhone displayOnDiff" id="nextButton1280"

+                    title="Next difference&#10;(Alt+F5)"><img src="css/img/nextButton.svg"></div>

+                <div class="buttonPG removeOnPhone displayOnDiff" id="exitButton1280" title="Exit&#10;(Esc)"><img

+                        src="css/img/exitButton.svg"></div>

+                <div class="buttonPG select removeOnDiff" id="menuButton1280" title="Options"><img

+                        src="css/img/optionsButton.svg">

+                    <div class="toDisplay languageJS">

+                        <div class="option subSelect">Theme <i class="fa fa-chevron-right" aria-hidden="true"></i>

+                            <div class="toDisplaySub languageJS">

+                                <div class="option selected" id="darkTheme1280">Dark</div>

+                                <div class="option" id="lightTheme1280">Light</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect">Font size <i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub displayFontSize languageJS">

-                            <div class="option">12</div>

-                            <div class="option selected">14</div>

-                            <div class="option">16</div>

-                            <div class="option">18</div>

-                            <div class="option">20</div>

-                            <div class="option">22</div>

+                        <div class="option subSelect">Font size <i class="fa fa-chevron-right" aria-hidden="true"></i>

+                            <div class="toDisplaySub displayFontSize languageJS">

+                                <div class="option">12</div>

+                                <div class="option selected">14</div>

+                                <div class="option">16</div>

+                                <div class="option">18</div>

+                                <div class="option">20</div>

+                                <div class="option">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option noSubSelect" id="safemodeToggle1280">Safe mode

-                        <i class="fa fa-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option checked noSubSelect" id="editorButton1280">Editor

-                        <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>

-                    <div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>

-                    <div class="option noSubSelect" id="formatButton1280">Format code</div>

-                    <div class="option noSubSelect" id="minimapToggle1280">Minimap

-                        <i class="fa fa-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option subSelect" id="qrCodeHover1280">QR Code Link <i class="fa fa-chevron-right"

-                            aria-hidden="true"></i>

-                        <div class="toDisplaySub qrCodeImage">

-                            <div class="option" id="qrCodeImage1280">[QR Code Image]</div>

+                        <div class="option noSubSelect" id="safemodeToggle1280">Safe mode

+                            <i class="fa fa-square" aria-hidden="true"></i>

                         </div>

+                        <div class="option checked noSubSelect" id="editorButton1280">Editor

+                            <i class="fa fa-check-square" aria-hidden="true"></i>

+                        </div>

+                        <div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>

+                        <div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>

+                        <div class="option noSubSelect" id="formatButton1280">Format code</div>

+                        <div class="option noSubSelect" id="minimapToggle1280">Minimap

+                            <i class="fa fa-square" aria-hidden="true"></i>

+                        </div>

+                        <div class="option subSelect" id="qrCodeHover1280">QR Code Link <i class="fa fa-chevron-right"

+                                aria-hidden="true"></i>

+                            <div class="toDisplaySub qrCodeImage">

+                                <div class="option" id="qrCodeImage1280">[QR Code Image]</div>

+                            </div>

+                        </div>

+                        <div class="option uncheck noSubSelect" id="debugButton1280">Inspector</div>

+                        <div class="option nosubselect" id="metadataButton1280">Metadata</div>

                     </div>

-                    <div class="option uncheck noSubSelect" id="debugButton1280">Inspector</div>

-                    <div class="option nosubselect" id="metadataButton1280">Metadata</div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="buttonPG select removeOnDiff" title="Select Babylon.js version">

-                <span id="currentVersion1280"></span>

-                <div class="toDisplay currentVersionDisplay" style="display: none"></div>

+            <div class="category right">

+                <div class="buttonPG select removeOnDiff" title="Select Babylon.js version">

+                    <span id="currentVersion1280"></span>

+                    <div class="toDisplay currentVersionDisplay" style="display: none"></div>

+                </div>

+                <div class="buttonPG select removeOnDiff" title="Examples"><img class="examplesButton"

+                        src="css/img/examplesButton.svg"></div>

             </div>

-            <div class="buttonPG select removeOnDiff" title="Examples"><img class="examplesButton" src="/css/img/examplesButton.svg"></div>

         </div>

-    </div>

 

-    <!-- Mid-size screens -->

-    <div class="navbar navBar1024 languageJS">

-        <div class="categoryTitle">

-            <img class="logo" src="/css/img/logo_v4.svg">

-            <div class="version"><span class="versionSub" id="mainTitle1024"></span></div>

-        </div>

+        <!-- Mid-size screens -->

+        <div class="navbar navBar1024 languageJS">

+            <div class="categoryTitle">

+                <img class="logo" src="css/img/logo_v4.svg">

+                <div class="version"><span class="versionSub" id="mainTitle1024"></span></div>

+            </div>

+

+            <div class="category languageJS" id="JStoTSbar">

+                <div class="buttonJStoTS languageTS" id="toTSbutton1024" title="Switch to TypeScript">TS</div>

+                <div class="buttonJStoTS languageJS" id="toJSbutton1024" title="Switch to JavaScript">JS</div>

+                <div class="buttonSpaceKiller"></div>

+                <div class="buttonPG run removeOnDiff" id="runButton1024" title="Run&#10;(Alt+Enter)"><img

+                        src="css/img/playButton.svg"></div>

+                <div class="buttonPG removeOnDiff" id="saveButton1024" title="Save&#10;(Ctrl+S)"><img

+                        src="css/img/saveButton.svg"></div>

+                <div class="buttonPG removeOnPhone removeOnDiff" id="zipButton1024"

+                    title="Download ZIP&#10;(Ctrl+Shift+S)"><img src="css/img/downloadButton.svg"></div>

+                <div class="buttonPG removeOnDiff" id="newButton1024" title="Create new"><img

+                        src="css/img/newButton.svg"></div>

+                <div class="buttonPG removeOnPhone removeOnDiff" id="clearButton1024" title="Clear"><img

+                        src="css/img/clearButton.svg"></div>

+                <div class="buttonPG removeOnPhone removeOnDiff" id="diffButton1024" title="Compare"><img

+                        src="css/img/diffButton.svg"></div>

+                <div class="buttonPG removeOnPhone displayOnDiff" id="previousButton1024"><img

+                        src="css/img/previousButton.svg"></div>

+                <div class="buttonPG removeOnPhone displayOnDiff" id="nextButton1024"><img src="css/img/nextButton.svg">

+                </div>

+                <div class="buttonPG removeOnPhone displayOnDiff" id="exitButton1024"><img src="css/img/exitButton.svg">

+                </div>

+

+                <div class="buttonPG select removeOnDiff" id="menuButton1024" title="Options"><img

+                        src="css/img/optionsButton.svg">

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme <i class="fa fa-chevron-right" aria-hidden="true"></i>

 

-        <div class="category languageJS" id="JStoTSbar">

-            <div class="buttonJStoTS languageTS" id="toTSbutton1024" title="Switch to TypeScript">TS</div>

-            <div class="buttonJStoTS languageJS" id="toJSbutton1024" title="Switch to JavaScript">JS</div>

-            <div class="buttonSpaceKiller"></div>

-            <div class="buttonPG run removeOnDiff" id="runButton1024" title="Run&#10;(Alt+Enter)"><img src="/css/img/playButton.svg"></div>

-            <div class="buttonPG removeOnDiff" id="saveButton1024" title="Save&#10;(Ctrl+S)"><img src="/css/img/saveButton.svg"></div>

-            <div class="buttonPG removeOnPhone removeOnDiff" id="zipButton1024" title="Download ZIP&#10;(Ctrl+Shift+S)"><img src="/css/img/downloadButton.svg"></div>

-            <div class="buttonPG removeOnDiff" id="newButton1024" title="Create new"><img src="/css/img/newButton.svg"></div>

-            <div class="buttonPG removeOnPhone removeOnDiff" id="clearButton1024" title="Clear"><img src="/css/img/clearButton.svg"></div>

-            <div class="buttonPG removeOnPhone removeOnDiff" id="diffButton1024" title="Compare"><img src="/css/img/diffButton.svg"></div>

-            <div class="buttonPG removeOnPhone displayOnDiff" id="previousButton1024"><img src="/css/img/previousButton.svg"></div>

-            <div class="buttonPG removeOnPhone displayOnDiff" id="nextButton1024"><img src="/css/img/nextButton.svg"></div>

-            <div class="buttonPG removeOnPhone displayOnDiff" id="exitButton1024"><img src="/css/img/exitButton.svg"></div>

-

-            <div class="buttonPG select removeOnDiff" id="menuButton1024" title="Options"><img src="/css/img/optionsButton.svg">

-                <div class="toDisplay">

-                    <div class="option subSelect">Theme <i class="fa fa-chevron-right" aria-hidden="true"></i>

-

-                        <div class="toDisplaySub">

-                            <div class="option selected" id="darkTheme1024">Dark</div>

-                            <div class="option" id="lightTheme1024">Light</div>

+                            <div class="toDisplaySub">

+                                <div class="option selected" id="darkTheme1024">Dark</div>

+                                <div class="option" id="lightTheme1024">Light</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect">Font size <i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub displayFontSize">

-                            <div class="option">12</div>

-                            <div class="option selected">14</div>

-                            <div class="option">16</div>

-                            <div class="option">18</div>

-                            <div class="option">20</div>

-                            <div class="option">22</div>

+                        <div class="option subSelect">Font size <i class="fa fa-chevron-right" aria-hidden="true"></i>

+                            <div class="toDisplaySub displayFontSize">

+                                <div class="option">12</div>

+                                <div class="option selected">14</div>

+                                <div class="option">16</div>

+                                <div class="option">18</div>

+                                <div class="option">20</div>

+                                <div class="option">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option noSubSelect" id="safemodeToggle1024">Safe mode

-                        <i class="fa fa-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option checked noSubSelect" id="editorButton1024">Editor

-                        <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>

-                    <div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>

-                    <div class="option noSubSelect" id="formatButton1024">Format code</div>

-                    <div class="option noSubSelect" id="minimapToggle1024">Minimap

-                        <i class="fa fa-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option subSelect" id="qrCodeHover1024">QR Code Link <i class="fa fa-chevron-right"

-                            aria-hidden="true"></i>

-                        <div class="toDisplaySub qrCodeImage">

-                            <div class="option" id="qrCodeImage1024">[QR Code Image]</div>

+                        <div class="option noSubSelect" id="safemodeToggle1024">Safe mode

+                            <i class="fa fa-square" aria-hidden="true"></i>

                         </div>

+                        <div class="option checked noSubSelect" id="editorButton1024">Editor

+                            <i class="fa fa-check-square" aria-hidden="true"></i>

+                        </div>

+                        <div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>

+                        <div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>

+                        <div class="option noSubSelect" id="formatButton1024">Format code</div>

+                        <div class="option noSubSelect" id="minimapToggle1024">Minimap

+                            <i class="fa fa-square" aria-hidden="true"></i>

+                        </div>

+                        <div class="option subSelect" id="qrCodeHover1024">QR Code Link <i class="fa fa-chevron-right"

+                                aria-hidden="true"></i>

+                            <div class="toDisplaySub qrCodeImage">

+                                <div class="option" id="qrCodeImage1024">[QR Code Image]</div>

+                            </div>

+                        </div>

+                        <div class="option uncheck noSubSelect" id="debugButton1024">Inspector</div>

+                        <div class="option noSubSelect" id="metadataButton1024">Metadata</div>

                     </div>

-                    <div class="option uncheck noSubSelect" id="debugButton1024">Inspector</div>

-                    <div class="option noSubSelect" id="metadataButton1024">Metadata</div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="buttonPG select removeOnDiff" title="Select Babylon.js version">

-                <span id="currentVersion1024"></span>

-                <div class="toDisplay currentVersionDisplay" style="display: none">

+            <div class="category right">

+                <div class="buttonPG select removeOnDiff" title="Select Babylon.js version">

+                    <span id="currentVersion1024"></span>

+                    <div class="toDisplay currentVersionDisplay" style="display: none">

+                    </div>

                 </div>

+                <div class="buttonPG select removeOnDiff" title="Examples"><img class="examplesButton"

+                        src="css/img/examplesButton.svg"></div>

             </div>

-            <div class="buttonPG select removeOnDiff" title="Examples"><img class="examplesButton" src="/css/img/examplesButton.svg"></div>

         </div>

-    </div>

-

-    <!-- Mobile -->

-    <div class="navbar navBarMobile languageJS">

-        <div class="category languageJS" id="JStoTSbar">

-            <div class="buttonPG select" id="menuButtonMobile"><img src="/css/img/hamburgerButton.svg">

-                <div class="toDisplay">

-                    <div class="option noSubSelect languageTS" id="toTSbuttonMobile">TypeScript</div>

-                    <div class="option noSubSelect languageJS" id="toJSbuttonMobile">JavaScript</div>

-                    <div class="option noSubSelect run removeOnDiff" id="runButtonMobile"><img src="/css/img/playButton.svg">Run</div>

-                    <div class="option noSubSelect removeOnDiff" id="saveButtonMobile"><img src="/css/img/saveButton.svg">Save</div>

-                    <div class="option noSubSelect removeOnDiff" id="zipButtonMobile"><img src="/css/img/downloadButton.svg">Download</div>

-                    <div class="option noSubSelect removeOnDiff" id="newButtonMobile"><img src="/css/img/newButton.svg">New</div>

-                    <div class="option noSubSelect removeOnDiff" id="clearButtonMobile"><img src="/css/img/clearButton.svg">Clear</div>

-                    <div class="option noSubSelect removeOnDiff" id="diffButtonMobile"><img src="/css/img/diffButton.svg">Diff</div>

-                    <div class="option noSubSelect displayOnDiff" id="previousButtonMobile"><img src="/css/img/previousButton.svg">Previous</div>

-                    <div class="option noSubSelect displayOnDiff" id="nextButtonMobile"><img src="/css/img/nextButton.svg">Next</div>

-                    <div class="option noSubSelect displayOnDiff" id="exitButtonMobile"><img src="/css/img/exitButton.svg">Exit</div>

-

-                    <div class="option noSubSelect removeOnDiff" id="debugButtonMobile"><img

-                            src="/css/img/inspectorButton.svg">Inspector</div>

-                    <div class="option subSelect removeOnDiff">

-                        <img src="/css/img/optionsButton.svg">

-                        <div id="currentVersionMobile"></div>

-                        <div class="toDisplaySub currentVersionDisplay">

+

+        <!-- Mobile -->

+        <div class="navbar navBarMobile languageJS">

+            <div class="category languageJS" id="JStoTSbar">

+                <div class="buttonPG select" id="menuButtonMobile"><img src="css/img/hamburgerButton.svg">

+                    <div class="toDisplay">

+                        <div class="option noSubSelect languageTS" id="toTSbuttonMobile">TypeScript</div>

+                        <div class="option noSubSelect languageJS" id="toJSbuttonMobile">JavaScript</div>

+                        <div class="option noSubSelect run removeOnDiff" id="runButtonMobile"><img

+                                src="css/img/playButton.svg">Run</div>

+                        <div class="option noSubSelect removeOnDiff" id="saveButtonMobile"><img

+                                src="css/img/saveButton.svg">Save</div>

+                        <div class="option noSubSelect removeOnDiff" id="zipButtonMobile"><img

+                                src="css/img/downloadButton.svg">Download</div>

+                        <div class="option noSubSelect removeOnDiff" id="newButtonMobile"><img

+                                src="css/img/newButton.svg">New</div>

+                        <div class="option noSubSelect removeOnDiff" id="clearButtonMobile"><img

+                                src="css/img/clearButton.svg">Clear</div>

+                        <div class="option noSubSelect removeOnDiff" id="diffButtonMobile"><img

+                                src="css/img/diffButton.svg">Diff</div>

+                        <div class="option noSubSelect displayOnDiff" id="previousButtonMobile"><img

+                                src="css/img/previousButton.svg">Previous</div>

+                        <div class="option noSubSelect displayOnDiff" id="nextButtonMobile"><img

+                                src="css/img/nextButton.svg">Next</div>

+                        <div class="option noSubSelect displayOnDiff" id="exitButtonMobile"><img

+                                src="css/img/exitButton.svg">Exit</div>

+

+                        <div class="option noSubSelect removeOnDiff" id="debugButtonMobile"><img

+                                src="css/img/inspectorButton.svg">Inspector</div>

+                        <div class="option subSelect removeOnDiff">

+                            <img src="css/img/optionsButton.svg">

+                            <div id="currentVersionMobile"></div>

+                            <div class="toDisplaySub currentVersionDisplay">

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect removeOnDiff"><img src="/css/img/optionsButton.svg">Theme

-                        <div class="toDisplaySub">

-                            <div class="option selected" id="darkThemeMobile">Dark</div>

-                            <div class="option" id="lightThemeMobile">Light</div>

+                        <div class="option subSelect removeOnDiff"><img src="css/img/optionsButton.svg">Theme

+                            <div class="toDisplaySub">

+                                <div class="option selected" id="darkThemeMobile">Dark</div>

+                                <div class="option" id="lightThemeMobile">Light</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect removeOnDiff"><img src="/css/img/optionsButton.svg">Font size

-                        <div class="toDisplaySub displayFontSize">

-                            <div class="option">8</div>

-                            <div class="option">10</div>

-                            <div class="option selected">12</div>

-                            <div class="option">14</div>

-                            <div class="option">16</div>

-                            <div class="option">18</div>

-                            <div class="option">20</div>

-                            <div class="option">22</div>

+                        <div class="option subSelect removeOnDiff"><img src="css/img/optionsButton.svg">Font size

+                            <div class="toDisplaySub displayFontSize">

+                                <div class="option">8</div>

+                                <div class="option">10</div>

+                                <div class="option selected">12</div>

+                                <div class="option">14</div>

+                                <div class="option">16</div>

+                                <div class="option">18</div>

+                                <div class="option">20</div>

+                                <div class="option">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div style="display: none;" class="option noSubSelect" id="safemodeToggleMobile">Safe mode

-                        <i class="fa fa-square" aria-hidden="true"></i>

-                    </div>

-                    <div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor

-                        <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"

-                        style="display: none">Fullscreen</div>

-                    <div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"

-                        style="display: none">Editor

-                        Fullscreen</div>

-                    <div class="option nosubselect removeOnDiff" id="formatButtonMobile"><img src="/css/img/optionsButton.svg">Format

-                        code</div>

-                    <div style="display: none;" class="option nosubselect" id="minimapToggleMobile">Minimap

-                        <i class="fa fa-square" aria-hidden="true"></i>

-                    </div>

-                    <!-- <div class="option subSelect" id="qrCodeHoverMobile"><img src="/css/img/optionsButton.svg">QR Code Link

+                        <div style="display: none;" class="option noSubSelect" id="safemodeToggleMobile">Safe mode

+                            <i class="fa fa-square" aria-hidden="true"></i>

+                        </div>

+                        <div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor

+                            <i class="fa fa-check-square" aria-hidden="true"></i>

+                        </div>

+                        <div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"

+                            style="display: none">Fullscreen</div>

+                        <div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"

+                            style="display: none">Editor

+                            Fullscreen</div>

+                        <div class="option nosubselect removeOnDiff" id="formatButtonMobile"><img

+                                src="css/img/optionsButton.svg">Format

+                            code</div>

+                        <div style="display: none;" class="option nosubselect" id="minimapToggleMobile">Minimap

+                            <i class="fa fa-square" aria-hidden="true"></i>

+                        </div>

+                        <!-- <div class="option subSelect" id="qrCodeHoverMobile"><img src="css/img/optionsButton.svg">QR Code Link

                         <div class="toDisplaySub qrCodeImage">

                             <div class="option" id="qrCodeImageMobile">[QR Code Image]</div>

                         </div>

                     </div> -->

-                    <div class="option nosubselect removeOnDiff" id="metadataButtonMobile"><img

-                            src="/css/img/metadataButton.svg">Metadata</div>

-                    <div class="option nosubselect removeOnDiff"><img class="examplesButton"

-                            src="/css/img/examplesButton.svg">Examples</div>

-                    <div class="option subSelect removeOnDiff"><img src="/css/img/examplesButton.svg">Links / Tools

-                        <div class="toDisplaySub displayFooterLinks">

-                            <div class="option link">

-                                <a target='_new' href="https://www.netlify.com/">Deployed by Netlify</a>

-                            </div>

-                            <div class="option link">

-                                <a target='_new' href="https://forum.babylonjs.com/">Forum</a>

-                            </div>

-                            <div class="option link">

-                                <a target='_new' href="https://www.babylonjs.com/sandbox">Sandbox</a>

-                            </div>

-                            <div class="option link">

-                                <a target='_new' href="https://doc.babylonjs.com">Documentation</a>

-                            </div>

-                            <div class="option link">

-                                <a target='_new' href="https://doc.babylonjs.com/playground">Search</a>

+                        <div class="option nosubselect removeOnDiff" id="metadataButtonMobile"><img

+                                src="css/img/metadataButton.svg">Metadata</div>

+                        <div class="option nosubselect removeOnDiff"><img class="examplesButton"

+                                src="css/img/examplesButton.svg">Examples</div>

+                        <div class="option subSelect removeOnDiff"><img src="css/img/examplesButton.svg">Links / Tools

+                            <div class="toDisplaySub displayFooterLinks">

+                                <div class="option link">

+                                    <a target='_new' href="https://www.netlify.com/">Deployed by Netlify</a>

+                                </div>

+                                <div class="option link">

+                                    <a target='_new' href="https://forum.babylonjs.com/">Forum</a>

+                                </div>

+                                <div class="option link">

+                                    <a target='_new' href="https://www.babylonjs.com/sandbox">Sandbox</a>

+                                </div>

+                                <div class="option link">

+                                    <a target='_new' href="https://doc.babylonjs.com">Documentation</a>

+                                </div>

+                                <div class="option link">

+                                    <a target='_new' href="https://doc.babylonjs.com/playground">Search</a>

+                                </div>

                             </div>

                         </div>

                     </div>

                 </div>

+                <div class="categoryTitle">

+                    <img class="logo" src="css/img/logo_v4.svg">

+                    <div class="version"><span class="versionSub" id="mainTitleMobile"></span></div>

+                </div>

             </div>

-            <div class="categoryTitle">

-                <img class="logo" src="/css/img/logo_v4.svg">

-                <div class="version"><span class="versionSub" id="mainTitleMobile"></span></div>

-            </div>

-        </div>

 

-        <div id="switchWrapper" class="languageJS removeOnDiff">

-            <img id="switchWrapperCode" src="/css/img/codeButton.svg">

-            <img id="switchWrapperCanvas" src="/css/img/canvas3Dbutton.svg">

+            <div id="switchWrapper" class="languageJS removeOnDiff">

+                <img id="switchWrapperCode" src="css/img/codeButton.svg">

+                <img id="switchWrapperCanvas" src="css/img/canvas3Dbutton.svg">

+            </div>

         </div>

-    </div>

 

-    <!-- Common things -->

+        <!-- Common things -->

 

-    <div class="wrapper">

-        <div id="jsEditor"></div>

-        <div id="diffView" class="diff-view"></div>

-        <div id="canvasZone">

-            <canvas touch-action="none" id="renderCanvas"></canvas>

-        </div>

-    </div>

-    <div id="exampleList" class="javascript">

-        <div id="exampleBanner" class="languageJS">

-            <h1>Examples<img id="examplesButtonClose" src="/css/img/clearButton.svg"></h1>

-        </div>

-        <div class="horizontalSeparator"></div>

-        <input id="filterBar" type="text" placeholder="Filter examples...">

-        <img id="filterBarClear"

-            src="https://d33wubrfki0l68.cloudfront.net/17ca450bae302631f4857cd8c3992234ec5dd9a7/057f9/img/ui/clear_button.png">

-    </div>

-

-    <div class="fpsLabel languageJS" id="fpsLabel"></div>

-

-    <div id="errorZone">

-    </div>

-

-    <div class="navbarBottom">

-        <div id="statusBar"></div>

-        <div class="links">

-            <div class='link'>

-                <a target='_new' href="https://www.netlify.com/">Deployed by Netlify</a>

-            </div>

-            <div class='link'>

-                <a target='_new' href="https://forum.babylonjs.com/">Forum</a>

+        <div class="wrapper">

+            <div id="jsEditor"></div>

+            <div id="diffView" class="diff-view"></div>

+            <div id="canvasZone">

+                <canvas touch-action="none" id="renderCanvas"></canvas>

             </div>

-            <div class='link'>

-                <a target='_new' href="https://www.babylonjs.com/sandbox">Sandbox</a>

-            </div>

-            <div class='link'>

-                <a target='_new' href="https://doc.babylonjs.com">Documentation</a>

-            </div>

-            <div class='link'>

-                <a target='_new' href="https://doc.babylonjs.com/playground">Search</a>

+        </div>

+        <div id="exampleList" class="javascript">

+            <div id="exampleBanner" class="languageJS">

+                <h1>Examples<img id="examplesButtonClose" src="css/img/clearButton.svg"></h1>

             </div>

+            <div class="horizontalSeparator"></div>

+            <input id="filterBar" type="text" placeholder="Filter examples...">

+            <img id="filterBarClear"

+                src="https://d33wubrfki0l68.cloudfront.net/17ca450bae302631f4857cd8c3992234ec5dd9a7/057f9/img/ui/clear_button.png">

+        </div>

+

+        <div class="fpsLabel languageJS" id="fpsLabel"></div>

+

+        <div id="errorZone">

         </div>

-    </div>

-

-    <div id="saveLayer" class="save-layer">

-        <div class="save-form languageJS ">

-            <img id="saveFormButtonClose" src="/css/img/clearButton.svg">

-            <label for="saveFormTitle">TITLE</label>

-            <div class="separator"></div>

-            <input type="text" maxlength="120" id="saveFormTitle" class="save-form-title">

-

-            <label for="saveFormDescription">DESCRIPTION</label>

-            <div class="separator"></div>

-            <textarea id="saveFormDescription" rows="4" cols="10"></textarea>

-

-            <label for="saveFormTags">TAGS (separated by comma)</label>

-            <div class="separator"></div>

-            <textarea id="saveFormTags" rows="4" cols="10"></textarea>

-

-            <div class="save-form-buttons" id="saveFormButtons">

-                <div id="saveFormButtonOk">OK</div>

-                <div id="saveFormButtonCancel">Cancel</div>

+

+        <div class="navbarBottom">

+            <div id="statusBar"></div>

+            <div class="links">

+                <div class='link'>

+                    <a target='_new' href="https://www.netlify.com/">Deployed by Netlify</a>

+                </div>

+                <div class='link'>

+                    <a target='_new' href="https://forum.babylonjs.com/">Forum</a>

+                </div>

+                <div class='link'>

+                    <a target='_new' href="https://www.babylonjs.com/sandbox">Sandbox</a>

+                </div>

+                <div class='link'>

+                    <a target='_new' href="https://doc.babylonjs.com">Documentation</a>

+                </div>

+                <div class='link'>

+                    <a target='_new' href="https://doc.babylonjs.com/playground">Search</a>

+                </div>

             </div>

         </div>

-    </div>

 

-    <div id="diffLayer" class="save-layer">

-        <div class="save-form diff-form">

-            <label for="diffFormSource">COMPARISON SOURCE</label>

-            <div class="separator"></div>

-            <input type="text" maxlength="120" id="diffFormSource" placeholder="leave blank to use current snippet, or use snippet ID" class="save-form-title">

+        <div id="saveLayer" class="save-layer">

+            <div class="save-form languageJS ">

+                <img id="saveFormButtonClose" src="css/img/clearButton.svg">

+                <label for="saveFormTitle">TITLE</label>

+                <div class="separator"></div>

+                <input type="text" maxlength="120" id="saveFormTitle" class="save-form-title">

+

+                <label for="saveFormDescription">DESCRIPTION</label>

+                <div class="separator"></div>

+                <textarea id="saveFormDescription" rows="4" cols="10"></textarea>

 

-            <label for="diffFormCompareTo">COMPARE TO</label>

-            <div class="separator"></div>

-            <input type="text" maxlength="120" id="diffFormCompareTo" placeholder="snippet ID" class="save-form-title">

+                <label for="saveFormTags">TAGS (separated by comma)</label>

+                <div class="separator"></div>

+                <textarea id="saveFormTags" rows="4" cols="10"></textarea>

+

+                <div class="save-form-buttons" id="saveFormButtons">

+                    <div id="saveFormButtonOk">OK</div>

+                    <div id="saveFormButtonCancel">Cancel</div>

+                </div>

+            </div>

+        </div>

 

-            <div class="save-form-buttons" id="diffFormButtons">

-                <div id="diffFormButtonOk">OK</div>

-                <div id="diffFormButtonCancel">Cancel</div>

+        <div id="diffLayer" class="save-layer">

+            <div class="save-form diff-form">

+                <label for="diffFormSource">COMPARISON SOURCE</label>

+                <div class="separator"></div>

+                <input type="text" maxlength="120" id="diffFormSource"

+                    placeholder="leave blank to use current snippet, or use snippet ID" class="save-form-title">

+

+                <label for="diffFormCompareTo">COMPARE TO</label>

+                <div class="separator"></div>

+                <input type="text" maxlength="120" id="diffFormCompareTo" placeholder="snippet ID"

+                    class="save-form-title">

+

+                <div class="save-form-buttons" id="diffFormButtons">

+                    <div id="diffFormButtonOk">OK</div>

+                    <div id="diffFormButtonCancel">Cancel</div>

+                </div>

             </div>

         </div>

-    </div>

 

-    <div id="waitDiv">

-        <div id="logo-part">

-            <img src="/css/img/v4.svg" id="waitLogo" />

-            <img src="/css/img/spinner.svg" id="waitSpinner" />

+        <div id="waitDiv">

+            <div id="logo-part">

+                <img src="css/img/v4.svg" id="waitLogo" />

+                <img src="css/img/spinner.svg" id="waitSpinner" />

+            </div>

         </div>

-    </div>

-

-    <!-- jQuery -->

-    <script src="https://code.jquery.com/jquery.js"></script>

-    <script src="https://rawcdn.githack.com/jeromeetienne/jquery-qrcode/master/jquery.qrcode.min.js"></script>

-

-    <!-- Main scripts -->

-    <script src="/js/config_versions.js"></script>

-    <script src="/js/pbt.js"></script>

-    <script src="/js/examples.js"></script>

-    <script src="/js/main.js"></script>

-    <script src="/js/menuPG.js"></script>

-    <script src="/js/monacoCreator.js"></script>

-    <script src="/js/settingsPG.js"></script>

-    <script src="/js/utils.js"></script>

-    <script src="/js/zipTool.js"></script>

-    

-    <script>

-        BABYLONDEVTOOLS.Loader

-            .require('node_modules/monaco-editor/dev/vs/loader.js')

-            .require('js/index.js')

-            .load(function () {

-                BABYLON.DracoCompression.Configuration.decoder = {

-                    wasmUrl: "../dist/preview%20release/draco_wasm_wrapper_gltf.js",

-                    wasmBinaryUrl: "../dist/preview%20release/draco_decoder_gltf.wasm",

-                    fallbackUrl: "../dist/preview%20release/draco_decoder_gltf.js"

-                };

-                BABYLON.GLTFValidation.Configuration = {

-                    url: "../dist/preview%20release/gltf_validator.js"

-                };

-            });

-    </script>

-</body>

+

+        <!-- jQuery -->

+        <script src="https://code.jquery.com/jquery.js"></script>

+        <script src="https://rawcdn.githack.com/jeromeetienne/jquery-qrcode/master/jquery.qrcode.min.js"></script>

+

+        <!-- Main scripts -->

+        <script src="js/config_versions.js"></script>

+        <script src="js/pbt.js"></script>

+        <script src="js/examples.js"></script>

+        <script src="js/main.js"></script>

+        <script src="js/menuPG.js"></script>

+        <script src="js/monacoCreator.js"></script>

+        <script src="js/settingsPG.js"></script>

+        <script src="js/utils.js"></script>

+        <script src="js/zipTool.js"></script>

+

+        <script>

+            BABYLONDEVTOOLS.Loader

+                .require('node_modules/monaco-editor/dev/vs/loader.js')

+                .require('js/index.js')

+                .load(function () {

+                    BABYLON.DracoCompression.Configuration.decoder = {

+                        wasmUrl: "../dist/preview%20release/draco_wasm_wrapper_gltf.js",

+                        wasmBinaryUrl: "../dist/preview%20release/draco_decoder_gltf.wasm",

+                        fallbackUrl: "../dist/preview%20release/draco_decoder_gltf.js"

+                    };

+                    BABYLON.GLTFValidation.Configuration = {

+                        url: "../dist/preview%20release/gltf_validator.js"

+                    };

+                });

+        </script>

+    </body>

 

 </html>

+ 2 - 1
Playground/index.html
Näytä tiedosto 

@@ -11,6 +11,7 @@
 
         <link rel="shortcut icon" href="https://www.babylonjs.com/favicon.ico">

 

         <link rel="stylesheet" href="https://use.typekit.net/cta4xsb.css" />

+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" />

         <link rel="stylesheet" href="/css/index.css" />

         <link rel="stylesheet" href="/css/index_mobile.css" />

 

@@ -431,7 +432,7 @@
 
         </script>

 

         <!-- Monaco -->

-        <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.18.1/min/vs/loader.js"></script>

+        <script src="/node_modules/monaco-editor/dev/vs/loader.js"></script>

 

         <!-- jQuery -->

         <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>

+ 1 - 0
Playground/indexStable.html
Näytä tiedosto 

@@ -8,6 +8,7 @@
 
         <link rel="shortcut icon" href="https://www.babylonjs.com/img/favicon/favicon.ico">

 

         <link rel="stylesheet" href="https://use.typekit.net/cta4xsb.css" />

+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" />

         <link rel="stylesheet" href="/css/index.css" />

         <link rel="stylesheet" href="/css/index_mobile.css" />

+ 1 - 0
Playground/indexWebGPU.html
Näytä tiedosto 

@@ -8,6 +8,7 @@
 
         <link rel="shortcut icon" href="https://www.babylonjs.com/favicon.ico">

 

         <link rel="stylesheet" href="https://use.typekit.net/cta4xsb.css" />

+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" />

         <link rel="stylesheet" href="/css/index.css" />

         <link rel="stylesheet" href="/css/index_mobile.css" />

+ 27 - 9
Playground/js/main.js
Näytä tiedosto 

@@ -854,17 +854,35 @@ class Main {
 
         xmlHttp.onreadystatechange = function () {

             if (xmlHttp.readyState === 4) {

                 if (xmlHttp.status === 200) {

-                    var baseUrl = location.href.replace(location.hash, "").replace(location.search, "");

                     var snippet = JSON.parse(xmlHttp.responseText);

-                    var newUrl = baseUrl + "#" + snippet.id;

-                    this.currentSnippetToken = snippet.id;

-                    if (snippet.version && snippet.version !== "0") {

-                        newUrl += "#" + snippet.version;

+                    if (location.pathname && location.pathname.indexOf('pg/') !== -1) {

+                        // full path with /pg/??????

+                        if (location.pathname.indexOf('revision') !== -1) {

+                            location.href = location.href.replace(/revision\/(\d+)/, "revision/" + snippet.version);

+                        } else {

+                            location.href = location.href + '/revision/' + snippet.version;

+                        }

+                    } else if (location.search && location.search.indexOf('pg=') !== -1) {

+                        // query string with ?pg=??????

+                        const currentQuery = this.parseQuery(location.search);

+                        if (currentQuery.revision) {

+                            location.href = location.href.replace(/revision=(\d+)/, "revision=" + snippet.version);

+                        } else {

+                            location.href = location.href + '&revision=' + snippet.version;

+                        }

+                    } else {

+                        // default behavior!

+                        var baseUrl = location.href.replace(location.hash, "").replace(location.search, "");

+                        var newUrl = baseUrl + "#" + snippet.id;

+                        this.currentSnippetToken = snippet.id;

+                        if (snippet.version && snippet.version !== "0") {

+                            newUrl += "#" + snippet.version;

+                        }

+                        location.href = newUrl;

+                        // Hide the complete title & co message

+                        this.hideNoMetadata();

+                        compileAndRun(this.parent, this.fpsLabel);

                     }

-                    location.href = newUrl;

-                    // Hide the complete title & co message

-                    this.hideNoMetadata();

-                    compileAndRun(this.parent, this.fpsLabel);

                 } else {

                     this.parent.utils.showError("Unable to save your code. It may be too long.", null);

                 }

+ 4 - 4
Playground/js/monacoCreator.js
Näytä tiedosto 

@@ -71,15 +71,15 @@ class MonacoCreator {
 
 

         this.setupDefinitionWorker(libContent);

 

-        require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.18.1/min/vs' } });

+        require.config({ paths: { 'vs': '/node_modules/monaco-editor/dev/vs' } });

 

         require(['vs/editor/editor.main'], () => {

             this.setupMonacoCompilationPipeline(libContent);

             this.setupMonacoColorProvider();

 

-            // require(['vs/language/typescript/languageFeatures'], module => {

-            //     this.hookMonacoCompletionProvider(module.SuggestAdapter);

-            // });

+            require(['vs/language/typescript/languageFeatures'], module => {

+                this.hookMonacoCompletionProvider(module.SuggestAdapter);

+            });

 

             this.parent.main.run();

         });

+ 0 - 55
Playground/test.html
Näytä tiedosto 

@@ -1,55 +0,0 @@
 
-<!-- TO DO - What is the purpose of this page ? -->

-

-<div class="navbar-inner" id="topbar">

-    <a class="brand largeOnly" href="#" id="mainTitle">Babylon.js Playground</a>

-    <div class="btn-group">

-        <button class="btn" id="runButton">Run</button>

-        <button class="btn" id="saveButton">Save</button>

-        <button class="btn desktopOnly" id="zipButton">Get .zip</button>

-        <button class="btn desktopOnly" id="newButton">New</button>

-        <button class="btn desktopOnly" id="clearButton">Clear</button>

-    </div>

-    <div class="btn-group desktopOnly">

-        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">

-            <span id="currentFontSize">Font: 12</span>

-            <span class="caret"></span>

-        </a>

-        <ul class="dropdown-menu" id="sizeList">

-            <li><a href="#" onclick="setFontSize(12);">12</a></li>

-            <li><a href="#" onclick="setFontSize(14);">14</a></li>

-            <li><a href="#" onclick="setFontSize(16);">16</a></li>

-            <li><a href="#" onclick="setFontSize(18);">18</a></li>

-            <li><a href="#" onclick="setFontSize(20);">20</a></li>

-            <li><a href="#" onclick="setFontSize(22);">22</a></li>

-        </ul>

-    </div>

-    <div class="btn-group desktopOnly">

-        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">

-            <span id="currentVersion">Version: Latest</span>

-            <span class="caret"></span>

-        </a>

-        <ul class="dropdown-menu" id="versionList">

-            <li><a href="#" onclick="setVersion('latest');">Latest</a></li>

-            <li><a href="#" onclick="setVersion('2.5');">2.5</a></li>

-        </ul>

-    </div>

-    <div class="btn-group">

-        <label class="btn btn-sm active">

-                    <input type="checkbox" autocomplete="off" id='safemodeToggle' style="margin-top:-0.1em;margin-right:4px">Safe Mode

-                </label>

-        <button class="btn btn-sm" id="metadataButton">+Meta data</button>

-        <button class="btn btn-sm" id="editorButton">-Editor</button>

-        <button class="btn btn-sm" id="debugButton">+Debug layer</button>

-    </div>

-    <div class="btn-group pull-right">

-        <button class="btn" id="fullscreenButton">Fullscreen</button>

-        <button class="btn" id="editorFullscreenButton">Editor Fullscreen</button>

-    </div>

-    <div class="btn-group pull-right">

-        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">

-            <span id="currentScript">Predefined scripts</span>

-            <span class="caret"></span>

-        </a>

-        <ul class="dropdown-menu" id="scriptsList"></ul>

-    </div>

-</div>

+ 1 - 2
dist/preview release/babylon.d.ts
Näytä tiedosto 

@@ -26333,7 +26333,6 @@ declare module BABYLON {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

@@ -36953,6 +36952,7 @@ declare module BABYLON {
 
      * Container with a set of assets that can be added or removed from a scene.

      */

     export class AssetContainer extends AbstractScene {

+        private _wasAddedToScene;

         /**

          * The scene the AssetContainer belongs to.

          */

@@ -50807,7 +50807,6 @@ declare module BABYLON {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/babylon.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 54 - 41
dist/preview release/babylon.max.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/babylon.max.js.map


+ 2 - 4
dist/preview release/babylon.module.d.ts
Näytä tiedosto 

@@ -27169,7 +27169,6 @@ declare module "babylonjs/Materials/standardMaterial" {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

@@ -38052,6 +38051,7 @@ declare module "babylonjs/assetContainer" {
 
      * Container with a set of assets that can be added or removed from a scene.

      */

     export class AssetContainer extends AbstractScene {

+        private _wasAddedToScene;

         /**

          * The scene the AssetContainer belongs to.

          */

@@ -53009,7 +53009,6 @@ declare module "babylonjs/Materials/PBR/pbrBaseMaterial" {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

@@ -99612,7 +99611,6 @@ declare module BABYLON {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

@@ -110232,6 +110230,7 @@ declare module BABYLON {
 
      * Container with a set of assets that can be added or removed from a scene.

      */

     export class AssetContainer extends AbstractScene {

+        private _wasAddedToScene;

         /**

          * The scene the AssetContainer belongs to.

          */

@@ -124086,7 +124085,6 @@ declare module BABYLON {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

+ 25 - 19
dist/preview release/documentation.d.ts
Näytä tiedosto 

@@ -36953,6 +36953,7 @@ declare module BABYLON {
 
      * Container with a set of assets that can be added or removed from a scene.

      */

     export class AssetContainer extends AbstractScene {

+        private _wasAddedToScene;

         /**

          * The scene the AssetContainer belongs to.

          */

@@ -69143,10 +69144,12 @@ declare module BABYLON {
 
          * Get the physics impostor of a specific controller.

          * The impostor is not attached to a mesh because a mesh for each controller is not obligatory

          * @param controller the controller or the controller id of which to get the impostor

+         * @returns the impostor or null

          */

         getImpostorForController(controller: WebXRInputSource | string): Nullable<PhysicsImpostor>;

         /**

          * Get the headset impostor, if enabled

+         * @returns the impostor

          */

         getHeadsetImpostor(): PhysicsImpostor | undefined;

         /**

@@ -74283,14 +74286,18 @@ declare module BABYLON {
 
         COMPLETE = 2

     }

     /** @hidden */

+    export interface IImportMeshAsyncOutput {

+        meshes: AbstractMesh[];

+        particleSystems: IParticleSystem[];

+        skeletons: Skeleton[];

+        animationGroups: AnimationGroup[];

+        lights: Light[];

+        transformNodes: TransformNode[];

+    }

+    /** @hidden */

     export interface IGLTFLoader extends IDisposable {

         readonly state: Nullable<GLTFLoaderState>;

-        importMeshAsync: (meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync: (meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<IImportMeshAsyncOutput>;

         loadAsync: (scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<void>;

     }

     /**

@@ -74936,6 +74943,7 @@ declare module BABYLON.GLTF1 {
 
         importOnlyMeshes: boolean;

         importMeshesNames?: string[];

         dummyNodes: Node[];

+        forAssetContainer: boolean;

     }

     /** @hidden */

     export interface INodeToRoot {

@@ -75037,17 +75045,13 @@ declare module BABYLON.GLTF1 {
 
         * Imports one or more meshes from a loaded gltf file and adds them to the scene

         * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

         * @param scene the scene the meshes should be added to

+        * @param forAssetContainer defines if the entities must be stored in the scene

         * @param data gltf data containing information of the meshes in a loaded file

         * @param rootUrl root url to load from

         * @param onProgress event that fires when loading progress has occured

         * @returns a promise containg the loaded meshes, particles, skeletons and animations

         */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<IImportMeshAsyncOutput>;

         private _loadAsync;

         /**

         * Imports all objects from a loaded gltf file and adds them to the scene

@@ -75484,6 +75488,10 @@ declare module BABYLON.GLTF2 {
 
     export class GLTFLoader implements IGLTFLoader {

         /** @hidden */

         _completePromises: Promise<any>[];

+        /** @hidden */

+        _forAssetContainer: boolean;

+        /** Storage */

+        _babylonLights: Light[];

         private _disposed;

         private _parent;

         private _state;

@@ -75541,12 +75549,7 @@ declare module BABYLON.GLTF2 {
 
         /** @hidden */

         dispose(): void;

         /** @hidden */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<IImportMeshAsyncOutput>;

         /** @hidden */

         loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<void>;

         private _loadAsync;

@@ -75565,6 +75568,7 @@ declare module BABYLON.GLTF2 {
 
         loadSceneAsync(context: string, scene: IScene): Promise<void>;

         private _forEachPrimitive;

         private _getMeshes;

+        private _getTransformNodes;

         private _getSkeletons;

         private _getAnimationGroups;

         private _startAnimations;

@@ -76217,8 +76221,9 @@ declare module BABYLON {
 
          * @param scene defines the scene the material will be created in

          * @param data defines the mtl data to parse

          * @param rootUrl defines the rooturl to use in order to load relative dependencies

+         * @param forAssetContainer defines if the material should be registered in the scene

          */

-        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string): void;

+        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, forAssetContainer: boolean): void;

         /**

          * Gets the texture for the material.

          *

@@ -76344,6 +76349,7 @@ declare module BABYLON {
 
         facePattern4: RegExp;

         /** @hidden */

         facePattern5: RegExp;

+        private _forAssetContainer;

         private _meshLoadOptions;

         /**

          * Creates loader for .OBJ files

+ 28 - 9
dist/preview release/loaders/babylon.glTF1FileLoader.js
Näytä tiedosto 

@@ -658,7 +658,9 @@ var loadAnimations = function (gltfRuntime) {
 
                 modifyKey = true;

             }

             if (!modifyKey) {

+                gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

                 babylonAnimation = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Animation"](anim, isBone ? "_matrix" : targetPath, 1, animationType, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Animation"].ANIMATIONLOOPMODE_CYCLE);

+                gltfRuntime.scene._blockEntityCollection = false;

             }

             // For each frame

             for (var j = 0; j < bufferInput.length; j++) {

@@ -950,7 +952,9 @@ var importSkeleton = function (gltfRuntime, skins, mesh, newSkeleton, id) {
 
 */

 var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {

     if (!newMesh) {

+        gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

         newMesh = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Mesh"](node.name || "", gltfRuntime.scene);

+        gltfRuntime.scene._blockEntityCollection = false;

         newMesh.id = id;

     }

     if (!node.babylonNode) {

@@ -1056,6 +1060,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
 
         }

     }

     var material;

+    gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

     if (subMaterials.length > 1) {

         material = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["MultiMaterial"]("multimat" + id, gltfRuntime.scene);

         material.subMaterials = subMaterials;

@@ -1072,6 +1077,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
 
     // Apply geometry

     new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Geometry"](id, gltfRuntime.scene, vertexData, false, newMesh);

     newMesh.computeWorldMatrix(true);

+    gltfRuntime.scene._blockEntityCollection = false;

     // Apply submeshes

     newMesh.subMeshes = [];

     var index = 0;

@@ -1207,6 +1213,7 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
     else if (node.camera && !node.babylonNode && !gltfRuntime.importOnlyMeshes) {

         var camera = gltfRuntime.cameras[node.camera];

         if (camera) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             if (camera.type === "orthographic") {

                 var orthoCamera = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["FreeCamera"](node.camera, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Vector3"].Zero(), gltfRuntime.scene, false);

                 orthoCamera.name = node.name || "";

@@ -1228,6 +1235,7 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
                 }

                 lastNode = persCamera;

             }

+            gltfRuntime.scene._blockEntityCollection = false;

         }

     }

     // Empty node

@@ -1236,7 +1244,9 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
             return node.babylonNode;

         }

         else if (lastNode === null) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             var dummy = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Mesh"](node.name || "", gltfRuntime.scene);

+            gltfRuntime.scene._blockEntityCollection = false;

             node.babylonNode = dummy;

             lastNode = dummy;

         }

@@ -1482,7 +1492,8 @@ var GLTFLoaderBase = /** @class */ (function () {
 
             loadedBufferViews: {},

             loadedShaderCount: 0,

             importOnlyMeshes: false,

-            dummyNodes: []

+            dummyNodes: [],

+            forAssetContainer: false

         };

         // Parse

         if (parsedData.extensions) {

@@ -1634,7 +1645,9 @@ var GLTFLoaderBase = /** @class */ (function () {
 
         }

         var technique = gltfRuntime.techniques[material.technique];

         if (!technique) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             var defaultMaterial = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["StandardMaterial"](id, gltfRuntime.scene);

+            gltfRuntime.scene._blockEntityCollection = false;

             defaultMaterial.diffuseColor = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Color3"](0.5, 0.5, 0.5);

             defaultMaterial.sideOrientation = babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Material"].CounterClockWiseSideOrientation;

             onSuccess(defaultMaterial);

@@ -1781,10 +1794,11 @@ var GLTFLoader = /** @class */ (function () {
 
     GLTFLoader.prototype.dispose = function () {

         // do nothing

     };

-    GLTFLoader.prototype._importMeshAsync = function (meshesNames, scene, data, rootUrl, onSuccess, onProgress, onError) {

+    GLTFLoader.prototype._importMeshAsync = function (meshesNames, scene, data, rootUrl, forAssetContainer, onSuccess, onProgress, onError) {

         var _this = this;

         scene.useRightHandedSystem = true;

         GLTFLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, function (gltfRuntime) {

+            gltfRuntime.forAssetContainer = forAssetContainer;

             gltfRuntime.importOnlyMeshes = true;

             if (meshesNames === "") {

                 gltfRuntime.importMeshesNames = [];

@@ -1836,27 +1850,30 @@ var GLTFLoader = /** @class */ (function () {
 
     * Imports one or more meshes from a loaded gltf file and adds them to the scene

     * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

     * @param scene the scene the meshes should be added to

+    * @param forAssetContainer defines if the entities must be stored in the scene

     * @param data gltf data containing information of the meshes in a loaded file

     * @param rootUrl root url to load from

     * @param onProgress event that fires when loading progress has occured

     * @returns a promise containg the loaded meshes, particles, skeletons and animations

     */

-    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onProgress) {

+    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, forAssetContainer, data, rootUrl, onProgress) {

         var _this = this;

         return new Promise(function (resolve, reject) {

-            _this._importMeshAsync(meshesNames, scene, data, rootUrl, function (meshes, skeletons) {

+            _this._importMeshAsync(meshesNames, scene, data, rootUrl, forAssetContainer, function (meshes, skeletons) {

                 resolve({

                     meshes: meshes,

                     particleSystems: [],

                     skeletons: skeletons,

-                    animationGroups: []

+                    animationGroups: [],

+                    lights: [],

+                    transformNodes: []

                 });

             }, onProgress, function (message) {

                 reject(new Error(message));

             });

         });

     };

-    GLTFLoader.prototype._loadAsync = function (scene, data, rootUrl, onSuccess, onProgress, onError) {

+    GLTFLoader.prototype._loadAsync = function (scene, data, rootUrl, forAssetContainer, onSuccess, onProgress, onError) {

         var _this = this;

         scene.useRightHandedSystem = true;

         GLTFLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, function (gltfRuntime) {

@@ -1891,7 +1908,7 @@ var GLTFLoader = /** @class */ (function () {
 
     GLTFLoader.prototype.loadAsync = function (scene, data, rootUrl, onProgress) {

         var _this = this;

         return new Promise(function (resolve, reject) {

-            _this._loadAsync(scene, data, rootUrl, function () {

+            _this._loadAsync(scene, data, rootUrl, false, function () {

                 resolve();

             }, onProgress, function (message) {

                 reject(new Error(message));

@@ -3155,7 +3172,7 @@ var GLTFFileLoader = /** @class */ (function () {
 
             _this.onParsedObservable.clear();

             _this._log("Loading " + (fileName || ""));

             _this._loader = _this._getLoader(data);

-            return _this._loader.importMeshAsync(meshesNames, scene, data, rootUrl, onProgress, fileName);

+            return _this._loader.importMeshAsync(meshesNames, scene, false, data, rootUrl, onProgress, fileName);

         });

     };

     /** @hidden */

@@ -3186,7 +3203,7 @@ var GLTFFileLoader = /** @class */ (function () {
 
             _this.onTextureLoadedObservable.add(function (texture) {

                 textures.push(texture);

             });

-            return _this._loader.importMeshAsync(null, scene, data, rootUrl, onProgress, fileName).then(function (result) {

+            return _this._loader.importMeshAsync(null, scene, true, data, rootUrl, onProgress, fileName).then(function (result) {

                 var container = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__["AssetContainer"](scene);

                 Array.prototype.push.apply(container.meshes, result.meshes);

                 Array.prototype.push.apply(container.particleSystems, result.particleSystems);

@@ -3194,6 +3211,8 @@ var GLTFFileLoader = /** @class */ (function () {
 
                 Array.prototype.push.apply(container.animationGroups, result.animationGroups);

                 Array.prototype.push.apply(container.materials, materials);

                 Array.prototype.push.apply(container.textures, textures);

+                Array.prototype.push.apply(container.lights, result.lights);

+                Array.prototype.push.apply(container.transformNodes, result.transformNodes);

                 return container;

             });

         });

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylon.glTF1FileLoader.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 2
dist/preview release/loaders/babylon.glTF1FileLoader.min.js


+ 46 - 4
dist/preview release/loaders/babylon.glTF2FileLoader.js
Näytä tiedosto 

@@ -474,6 +474,7 @@ var KHR_lights = /** @class */ (function () {
 
                 var babylonLight;

                 var light = _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["ArrayItem"].Get(extensionContext, _this._lights, extension.light);

                 var name = light.name || babylonMesh.name;

+                _this._loader.babylonScene._blockEntityCollection = _this._loader._forAssetContainer;

                 switch (light.type) {

                     case LightType.DIRECTIONAL: {

                         babylonLight = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["DirectionalLight"](name, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Vector3"].Backward(), _this._loader.babylonScene);

@@ -491,14 +492,17 @@ var KHR_lights = /** @class */ (function () {
 
                         break;

                     }

                     default: {

+                        _this._loader.babylonScene._blockEntityCollection = false;

                         throw new Error(extensionContext + ": Invalid light type (" + light.type + ")");

                     }

                 }

+                _this._loader.babylonScene._blockEntityCollection = false;

                 babylonLight.falloffType = babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Light"].FALLOFF_GLTF;

                 babylonLight.diffuse = light.color ? babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Color3"].FromArray(light.color) : babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Color3"].White();

                 babylonLight.intensity = light.intensity == undefined ? 1 : light.intensity;

                 babylonLight.range = light.range == undefined ? Number.MAX_VALUE : light.range;

                 babylonLight.parent = babylonMesh;

+                _this._loader._babylonLights.push(babylonLight);

                 _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].AddPointerMetadata(babylonLight, extensionContext);

                 assign(babylonMesh);

             });

@@ -1856,6 +1860,10 @@ var GLTFLoader = /** @class */ (function () {
 
     function GLTFLoader(parent) {

         /** @hidden */

         this._completePromises = new Array();

+        /** @hidden */

+        this._forAssetContainer = false;

+        /** Storage */

+        this._babylonLights = [];

         this._disposed = false;

         this._state = null;

         this._extensions = new Array();

@@ -1972,13 +1980,14 @@ var GLTFLoader = /** @class */ (function () {
 
         this._parent._clear();

     };

     /** @hidden */

-    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onProgress, fileName) {

+    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, forAssetContainer, data, rootUrl, onProgress, fileName) {

         var _this = this;

         return Promise.resolve().then(function () {

             _this._babylonScene = scene;

             _this._rootUrl = rootUrl;

             _this._fileName = fileName || "scene";

             _this._progressCallback = onProgress;

+            _this._forAssetContainer = forAssetContainer;

             _this._loadData(data);

             var nodes = null;

             if (meshesNames) {

@@ -2005,7 +2014,9 @@ var GLTFLoader = /** @class */ (function () {
 
                     meshes: _this._getMeshes(),

                     particleSystems: [],

                     skeletons: _this._getSkeletons(),

-                    animationGroups: _this._getAnimationGroups()

+                    animationGroups: _this._getAnimationGroups(),

+                    lights: _this._babylonLights,

+                    transformNodes: _this._getTransformNodes()

                 };

             });

         });

@@ -2172,7 +2183,9 @@ var GLTFLoader = /** @class */ (function () {
 
         this.log(_glTFFileLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoaderState"][this._state]);

     };

     GLTFLoader.prototype._createRootNode = function () {

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         this._rootBabylonMesh = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Mesh"]("__root__", this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         this._rootBabylonMesh.setEnabled(false);

         var rootNode = {

             _babylonTransformNode: this._rootBabylonMesh,

@@ -2261,6 +2274,19 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         return meshes;

     };

+    GLTFLoader.prototype._getTransformNodes = function () {

+        var transformNodes = new Array();

+        var nodes = this._gltf.nodes;

+        if (nodes) {

+            for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {

+                var node = nodes_2[_i];

+                if (node._babylonTransformNode && node._babylonTransformNode.getClassName() === "TransformNode") {

+                    transformNodes.push(node._babylonTransformNode);

+                }

+            }

+        }

+        return transformNodes;

+    };

     GLTFLoader.prototype._getSkeletons = function () {

         var skeletons = new Array();

         var skins = this._gltf.skins;

@@ -2355,7 +2381,9 @@ var GLTFLoader = /** @class */ (function () {
 
         };

         if (node.mesh == undefined) {

             var nodeName = node.name || "node" + node.index;

+            this._babylonScene._blockEntityCollection = this._forAssetContainer;

             node._babylonTransformNode = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["TransformNode"](nodeName, this._babylonScene);

+            this._babylonScene._blockEntityCollection = false;

             loadNode(node._babylonTransformNode);

         }

         else {

@@ -2435,7 +2463,9 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         else {

             var promises = new Array();

+            this._babylonScene._blockEntityCollection = this._forAssetContainer;

             var babylonMesh_1 = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Mesh"](name, this._babylonScene);

+            this._babylonScene._blockEntityCollection = false;

             babylonMesh_1.overrideMaterialSideOrientation = this._babylonScene.useRightHandedSystem ? babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Material"].CounterClockWiseSideOrientation : babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Material"].ClockWiseSideOrientation;

             this._createMorphTargets(context, node, mesh, primitive, babylonMesh_1);

             promises.push(this._loadVertexDataAsync(context, primitive, babylonMesh_1).then(function (babylonGeometry) {

@@ -2655,7 +2685,9 @@ var GLTFLoader = /** @class */ (function () {
 
             return skin._data.promise;

         }

         var skeletonId = "skeleton" + skin.index;

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonSkeleton = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Skeleton"](skin.name || skeletonId, skeletonId, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         // See https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#skins (second implementation note)

         babylonSkeleton.overrideMesh = this._rootBabylonMesh;

         this._loadBones(context, skin, babylonSkeleton);

@@ -2737,7 +2769,9 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         var promises = new Array();

         this.logOpen(context + " " + (camera.name || ""));

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonCamera = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["FreeCamera"](camera.name || "camera" + camera.index, babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Vector3"].Zero(), this._babylonScene, false);

+        this._babylonScene._blockEntityCollection = false;

         babylonCamera.rotation = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Vector3"](0, Math.PI, 0);

         switch (camera.type) {

             case "perspective" /* PERSPECTIVE */: {

@@ -2797,7 +2831,9 @@ var GLTFLoader = /** @class */ (function () {
 
         if (promise) {

             return promise;

         }

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonAnimationGroup = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["AnimationGroup"](animation.name || "animation" + animation.index, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         animation._babylonAnimationGroup = babylonAnimationGroup;

         var promises = new Array();

         ArrayItem.Assign(animation.channels);

@@ -3242,7 +3278,9 @@ var GLTFLoader = /** @class */ (function () {
 
         });

     };

     GLTFLoader.prototype._createDefaultMaterial = function (name, babylonDrawMode) {

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonMaterial = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["PBRMaterial"](name, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         // Moved to mesh so user can change materials on gltf meshes: babylonMaterial.sideOrientation = this._babylonScene.useRightHandedSystem ? Material.CounterClockWiseSideOrientation : Material.ClockWiseSideOrientation;

         babylonMaterial.fillMode = babylonDrawMode;

         babylonMaterial.enableSpecularAntiAliasing = true;

@@ -3421,6 +3459,7 @@ var GLTFLoader = /** @class */ (function () {
 
             }

         }

         var deferred = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Deferred"]();

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonTexture = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Texture"](url, this._babylonScene, samplerData.noMipMaps, false, samplerData.samplingMode, function () {

             if (!_this._disposed) {

                 deferred.resolve();

@@ -3430,6 +3469,7 @@ var GLTFLoader = /** @class */ (function () {
 
                 deferred.reject(new Error(context + ": " + ((exception && exception.message) ? exception.message : message || "Failed to load texture")));

             }

         }, undefined, undefined, undefined, image.mimeType);

+        this._babylonScene._blockEntityCollection = false;

         promises.push(deferred.promise);

         if (!url) {

             promises.push(this.loadImageAsync("/images/" + image.index, image).then(function (data) {

@@ -4407,7 +4447,7 @@ var GLTFFileLoader = /** @class */ (function () {
 
             _this.onParsedObservable.clear();

             _this._log("Loading " + (fileName || ""));

             _this._loader = _this._getLoader(data);

-            return _this._loader.importMeshAsync(meshesNames, scene, data, rootUrl, onProgress, fileName);

+            return _this._loader.importMeshAsync(meshesNames, scene, false, data, rootUrl, onProgress, fileName);

         });

     };

     /** @hidden */

@@ -4438,7 +4478,7 @@ var GLTFFileLoader = /** @class */ (function () {
 
             _this.onTextureLoadedObservable.add(function (texture) {

                 textures.push(texture);

             });

-            return _this._loader.importMeshAsync(null, scene, data, rootUrl, onProgress, fileName).then(function (result) {

+            return _this._loader.importMeshAsync(null, scene, true, data, rootUrl, onProgress, fileName).then(function (result) {

                 var container = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__["AssetContainer"](scene);

                 Array.prototype.push.apply(container.meshes, result.meshes);

                 Array.prototype.push.apply(container.particleSystems, result.particleSystems);

@@ -4446,6 +4486,8 @@ var GLTFFileLoader = /** @class */ (function () {
 
                 Array.prototype.push.apply(container.animationGroups, result.animationGroups);

                 Array.prototype.push.apply(container.materials, materials);

                 Array.prototype.push.apply(container.textures, textures);

+                Array.prototype.push.apply(container.lights, result.lights);

+                Array.prototype.push.apply(container.transformNodes, result.transformNodes);

                 return container;

             });

         });

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylon.glTF2FileLoader.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylon.glTF2FileLoader.min.js


+ 70 - 11
dist/preview release/loaders/babylon.glTFFileLoader.js
Näytä tiedosto 

@@ -658,7 +658,9 @@ var loadAnimations = function (gltfRuntime) {
 
                 modifyKey = true;

             }

             if (!modifyKey) {

+                gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

                 babylonAnimation = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Animation"](anim, isBone ? "_matrix" : targetPath, 1, animationType, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Animation"].ANIMATIONLOOPMODE_CYCLE);

+                gltfRuntime.scene._blockEntityCollection = false;

             }

             // For each frame

             for (var j = 0; j < bufferInput.length; j++) {

@@ -950,7 +952,9 @@ var importSkeleton = function (gltfRuntime, skins, mesh, newSkeleton, id) {
 
 */

 var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {

     if (!newMesh) {

+        gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

         newMesh = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Mesh"](node.name || "", gltfRuntime.scene);

+        gltfRuntime.scene._blockEntityCollection = false;

         newMesh.id = id;

     }

     if (!node.babylonNode) {

@@ -1056,6 +1060,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
 
         }

     }

     var material;

+    gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

     if (subMaterials.length > 1) {

         material = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["MultiMaterial"]("multimat" + id, gltfRuntime.scene);

         material.subMaterials = subMaterials;

@@ -1072,6 +1077,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
 
     // Apply geometry

     new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Geometry"](id, gltfRuntime.scene, vertexData, false, newMesh);

     newMesh.computeWorldMatrix(true);

+    gltfRuntime.scene._blockEntityCollection = false;

     // Apply submeshes

     newMesh.subMeshes = [];

     var index = 0;

@@ -1207,6 +1213,7 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
     else if (node.camera && !node.babylonNode && !gltfRuntime.importOnlyMeshes) {

         var camera = gltfRuntime.cameras[node.camera];

         if (camera) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             if (camera.type === "orthographic") {

                 var orthoCamera = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["FreeCamera"](node.camera, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Vector3"].Zero(), gltfRuntime.scene, false);

                 orthoCamera.name = node.name || "";

@@ -1228,6 +1235,7 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
                 }

                 lastNode = persCamera;

             }

+            gltfRuntime.scene._blockEntityCollection = false;

         }

     }

     // Empty node

@@ -1236,7 +1244,9 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
             return node.babylonNode;

         }

         else if (lastNode === null) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             var dummy = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Mesh"](node.name || "", gltfRuntime.scene);

+            gltfRuntime.scene._blockEntityCollection = false;

             node.babylonNode = dummy;

             lastNode = dummy;

         }

@@ -1482,7 +1492,8 @@ var GLTFLoaderBase = /** @class */ (function () {
 
             loadedBufferViews: {},

             loadedShaderCount: 0,

             importOnlyMeshes: false,

-            dummyNodes: []

+            dummyNodes: [],

+            forAssetContainer: false

         };

         // Parse

         if (parsedData.extensions) {

@@ -1634,7 +1645,9 @@ var GLTFLoaderBase = /** @class */ (function () {
 
         }

         var technique = gltfRuntime.techniques[material.technique];

         if (!technique) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             var defaultMaterial = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["StandardMaterial"](id, gltfRuntime.scene);

+            gltfRuntime.scene._blockEntityCollection = false;

             defaultMaterial.diffuseColor = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Color3"](0.5, 0.5, 0.5);

             defaultMaterial.sideOrientation = babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Material"].CounterClockWiseSideOrientation;

             onSuccess(defaultMaterial);

@@ -1781,10 +1794,11 @@ var GLTFLoader = /** @class */ (function () {
 
     GLTFLoader.prototype.dispose = function () {

         // do nothing

     };

-    GLTFLoader.prototype._importMeshAsync = function (meshesNames, scene, data, rootUrl, onSuccess, onProgress, onError) {

+    GLTFLoader.prototype._importMeshAsync = function (meshesNames, scene, data, rootUrl, forAssetContainer, onSuccess, onProgress, onError) {

         var _this = this;

         scene.useRightHandedSystem = true;

         GLTFLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, function (gltfRuntime) {

+            gltfRuntime.forAssetContainer = forAssetContainer;

             gltfRuntime.importOnlyMeshes = true;

             if (meshesNames === "") {

                 gltfRuntime.importMeshesNames = [];

@@ -1836,27 +1850,30 @@ var GLTFLoader = /** @class */ (function () {
 
     * Imports one or more meshes from a loaded gltf file and adds them to the scene

     * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

     * @param scene the scene the meshes should be added to

+    * @param forAssetContainer defines if the entities must be stored in the scene

     * @param data gltf data containing information of the meshes in a loaded file

     * @param rootUrl root url to load from

     * @param onProgress event that fires when loading progress has occured

     * @returns a promise containg the loaded meshes, particles, skeletons and animations

     */

-    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onProgress) {

+    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, forAssetContainer, data, rootUrl, onProgress) {

         var _this = this;

         return new Promise(function (resolve, reject) {

-            _this._importMeshAsync(meshesNames, scene, data, rootUrl, function (meshes, skeletons) {

+            _this._importMeshAsync(meshesNames, scene, data, rootUrl, forAssetContainer, function (meshes, skeletons) {

                 resolve({

                     meshes: meshes,

                     particleSystems: [],

                     skeletons: skeletons,

-                    animationGroups: []

+                    animationGroups: [],

+                    lights: [],

+                    transformNodes: []

                 });

             }, onProgress, function (message) {

                 reject(new Error(message));

             });

         });

     };

-    GLTFLoader.prototype._loadAsync = function (scene, data, rootUrl, onSuccess, onProgress, onError) {

+    GLTFLoader.prototype._loadAsync = function (scene, data, rootUrl, forAssetContainer, onSuccess, onProgress, onError) {

         var _this = this;

         scene.useRightHandedSystem = true;

         GLTFLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, function (gltfRuntime) {

@@ -1891,7 +1908,7 @@ var GLTFLoader = /** @class */ (function () {
 
     GLTFLoader.prototype.loadAsync = function (scene, data, rootUrl, onProgress) {

         var _this = this;

         return new Promise(function (resolve, reject) {

-            _this._loadAsync(scene, data, rootUrl, function () {

+            _this._loadAsync(scene, data, rootUrl, false, function () {

                 resolve();

             }, onProgress, function (message) {

                 reject(new Error(message));

@@ -3034,6 +3051,7 @@ var KHR_lights = /** @class */ (function () {
 
                 var babylonLight;

                 var light = _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["ArrayItem"].Get(extensionContext, _this._lights, extension.light);

                 var name = light.name || babylonMesh.name;

+                _this._loader.babylonScene._blockEntityCollection = _this._loader._forAssetContainer;

                 switch (light.type) {

                     case LightType.DIRECTIONAL: {

                         babylonLight = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["DirectionalLight"](name, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Vector3"].Backward(), _this._loader.babylonScene);

@@ -3051,14 +3069,17 @@ var KHR_lights = /** @class */ (function () {
 
                         break;

                     }

                     default: {

+                        _this._loader.babylonScene._blockEntityCollection = false;

                         throw new Error(extensionContext + ": Invalid light type (" + light.type + ")");

                     }

                 }

+                _this._loader.babylonScene._blockEntityCollection = false;

                 babylonLight.falloffType = babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Light"].FALLOFF_GLTF;

                 babylonLight.diffuse = light.color ? babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Color3"].FromArray(light.color) : babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Color3"].White();

                 babylonLight.intensity = light.intensity == undefined ? 1 : light.intensity;

                 babylonLight.range = light.range == undefined ? Number.MAX_VALUE : light.range;

                 babylonLight.parent = babylonMesh;

+                _this._loader._babylonLights.push(babylonLight);

                 _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].AddPointerMetadata(babylonLight, extensionContext);

                 assign(babylonMesh);

             });

@@ -4416,6 +4437,10 @@ var GLTFLoader = /** @class */ (function () {
 
     function GLTFLoader(parent) {

         /** @hidden */

         this._completePromises = new Array();

+        /** @hidden */

+        this._forAssetContainer = false;

+        /** Storage */

+        this._babylonLights = [];

         this._disposed = false;

         this._state = null;

         this._extensions = new Array();

@@ -4532,13 +4557,14 @@ var GLTFLoader = /** @class */ (function () {
 
         this._parent._clear();

     };

     /** @hidden */

-    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onProgress, fileName) {

+    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, forAssetContainer, data, rootUrl, onProgress, fileName) {

         var _this = this;

         return Promise.resolve().then(function () {

             _this._babylonScene = scene;

             _this._rootUrl = rootUrl;

             _this._fileName = fileName || "scene";

             _this._progressCallback = onProgress;

+            _this._forAssetContainer = forAssetContainer;

             _this._loadData(data);

             var nodes = null;

             if (meshesNames) {

@@ -4565,7 +4591,9 @@ var GLTFLoader = /** @class */ (function () {
 
                     meshes: _this._getMeshes(),

                     particleSystems: [],

                     skeletons: _this._getSkeletons(),

-                    animationGroups: _this._getAnimationGroups()

+                    animationGroups: _this._getAnimationGroups(),

+                    lights: _this._babylonLights,

+                    transformNodes: _this._getTransformNodes()

                 };

             });

         });

@@ -4732,7 +4760,9 @@ var GLTFLoader = /** @class */ (function () {
 
         this.log(_glTFFileLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoaderState"][this._state]);

     };

     GLTFLoader.prototype._createRootNode = function () {

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         this._rootBabylonMesh = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Mesh"]("__root__", this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         this._rootBabylonMesh.setEnabled(false);

         var rootNode = {

             _babylonTransformNode: this._rootBabylonMesh,

@@ -4821,6 +4851,19 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         return meshes;

     };

+    GLTFLoader.prototype._getTransformNodes = function () {

+        var transformNodes = new Array();

+        var nodes = this._gltf.nodes;

+        if (nodes) {

+            for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {

+                var node = nodes_2[_i];

+                if (node._babylonTransformNode && node._babylonTransformNode.getClassName() === "TransformNode") {

+                    transformNodes.push(node._babylonTransformNode);

+                }

+            }

+        }

+        return transformNodes;

+    };

     GLTFLoader.prototype._getSkeletons = function () {

         var skeletons = new Array();

         var skins = this._gltf.skins;

@@ -4915,7 +4958,9 @@ var GLTFLoader = /** @class */ (function () {
 
         };

         if (node.mesh == undefined) {

             var nodeName = node.name || "node" + node.index;

+            this._babylonScene._blockEntityCollection = this._forAssetContainer;

             node._babylonTransformNode = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["TransformNode"](nodeName, this._babylonScene);

+            this._babylonScene._blockEntityCollection = false;

             loadNode(node._babylonTransformNode);

         }

         else {

@@ -4995,7 +5040,9 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         else {

             var promises = new Array();

+            this._babylonScene._blockEntityCollection = this._forAssetContainer;

             var babylonMesh_1 = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Mesh"](name, this._babylonScene);

+            this._babylonScene._blockEntityCollection = false;

             babylonMesh_1.overrideMaterialSideOrientation = this._babylonScene.useRightHandedSystem ? babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Material"].CounterClockWiseSideOrientation : babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Material"].ClockWiseSideOrientation;

             this._createMorphTargets(context, node, mesh, primitive, babylonMesh_1);

             promises.push(this._loadVertexDataAsync(context, primitive, babylonMesh_1).then(function (babylonGeometry) {

@@ -5215,7 +5262,9 @@ var GLTFLoader = /** @class */ (function () {
 
             return skin._data.promise;

         }

         var skeletonId = "skeleton" + skin.index;

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonSkeleton = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Skeleton"](skin.name || skeletonId, skeletonId, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         // See https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#skins (second implementation note)

         babylonSkeleton.overrideMesh = this._rootBabylonMesh;

         this._loadBones(context, skin, babylonSkeleton);

@@ -5297,7 +5346,9 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         var promises = new Array();

         this.logOpen(context + " " + (camera.name || ""));

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonCamera = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["FreeCamera"](camera.name || "camera" + camera.index, babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Vector3"].Zero(), this._babylonScene, false);

+        this._babylonScene._blockEntityCollection = false;

         babylonCamera.rotation = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Vector3"](0, Math.PI, 0);

         switch (camera.type) {

             case "perspective" /* PERSPECTIVE */: {

@@ -5357,7 +5408,9 @@ var GLTFLoader = /** @class */ (function () {
 
         if (promise) {

             return promise;

         }

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonAnimationGroup = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["AnimationGroup"](animation.name || "animation" + animation.index, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         animation._babylonAnimationGroup = babylonAnimationGroup;

         var promises = new Array();

         ArrayItem.Assign(animation.channels);

@@ -5802,7 +5855,9 @@ var GLTFLoader = /** @class */ (function () {
 
         });

     };

     GLTFLoader.prototype._createDefaultMaterial = function (name, babylonDrawMode) {

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonMaterial = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["PBRMaterial"](name, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         // Moved to mesh so user can change materials on gltf meshes: babylonMaterial.sideOrientation = this._babylonScene.useRightHandedSystem ? Material.CounterClockWiseSideOrientation : Material.ClockWiseSideOrientation;

         babylonMaterial.fillMode = babylonDrawMode;

         babylonMaterial.enableSpecularAntiAliasing = true;

@@ -5981,6 +6036,7 @@ var GLTFLoader = /** @class */ (function () {
 
             }

         }

         var deferred = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Deferred"]();

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonTexture = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Texture"](url, this._babylonScene, samplerData.noMipMaps, false, samplerData.samplingMode, function () {

             if (!_this._disposed) {

                 deferred.resolve();

@@ -5990,6 +6046,7 @@ var GLTFLoader = /** @class */ (function () {
 
                 deferred.reject(new Error(context + ": " + ((exception && exception.message) ? exception.message : message || "Failed to load texture")));

             }

         }, undefined, undefined, undefined, image.mimeType);

+        this._babylonScene._blockEntityCollection = false;

         promises.push(deferred.promise);

         if (!url) {

             promises.push(this.loadImageAsync("/images/" + image.index, image).then(function (data) {

@@ -6967,7 +7024,7 @@ var GLTFFileLoader = /** @class */ (function () {
 
             _this.onParsedObservable.clear();

             _this._log("Loading " + (fileName || ""));

             _this._loader = _this._getLoader(data);

-            return _this._loader.importMeshAsync(meshesNames, scene, data, rootUrl, onProgress, fileName);

+            return _this._loader.importMeshAsync(meshesNames, scene, false, data, rootUrl, onProgress, fileName);

         });

     };

     /** @hidden */

@@ -6998,7 +7055,7 @@ var GLTFFileLoader = /** @class */ (function () {
 
             _this.onTextureLoadedObservable.add(function (texture) {

                 textures.push(texture);

             });

-            return _this._loader.importMeshAsync(null, scene, data, rootUrl, onProgress, fileName).then(function (result) {

+            return _this._loader.importMeshAsync(null, scene, true, data, rootUrl, onProgress, fileName).then(function (result) {

                 var container = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__["AssetContainer"](scene);

                 Array.prototype.push.apply(container.meshes, result.meshes);

                 Array.prototype.push.apply(container.particleSystems, result.particleSystems);

@@ -7006,6 +7063,8 @@ var GLTFFileLoader = /** @class */ (function () {
 
                 Array.prototype.push.apply(container.animationGroups, result.animationGroups);

                 Array.prototype.push.apply(container.materials, materials);

                 Array.prototype.push.apply(container.textures, textures);

+                Array.prototype.push.apply(container.lights, result.lights);

+                Array.prototype.push.apply(container.transformNodes, result.transformNodes);

                 return container;

             });

         });

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylon.glTFFileLoader.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 2
dist/preview release/loaders/babylon.glTFFileLoader.min.js


+ 14 - 2
dist/preview release/loaders/babylon.objFileLoader.js
Näytä tiedosto 

@@ -182,8 +182,9 @@ var MTLFileLoader = /** @class */ (function () {
 
      * @param scene defines the scene the material will be created in

      * @param data defines the mtl data to parse

      * @param rootUrl defines the rooturl to use in order to load relative dependencies

+     * @param forAssetContainer defines if the material should be registered in the scene

      */

-    MTLFileLoader.prototype.parseMTL = function (scene, data, rootUrl) {

+    MTLFileLoader.prototype.parseMTL = function (scene, data, rootUrl, forAssetContainer) {

         if (data instanceof ArrayBuffer) {

             return;

         }

@@ -218,7 +219,9 @@ var MTLFileLoader = /** @class */ (function () {
 
                 }

                 //Create a new material.

                 // value is the name of the material read in the mtl file

+                scene._blockEntityCollection = forAssetContainer;

                 material = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["StandardMaterial"](value, scene);

+                scene._blockEntityCollection = false;

             }

             else if (key === "kd" && material) {

                 // Diffuse color (color under white light) using RGB values

@@ -454,6 +457,7 @@ var OBJFileLoader = /** @class */ (function () {
 
         // f -vertex/-uvs/-normal -vertex/-uvs/-normal -vertex/-uvs/-normal ...

         /** @hidden */

         this.facePattern5 = /f\s+(((-[\d]{1,}\/-[\d]{1,}\/-[\d]{1,}[\s]?){3,})+)/;

+        this._forAssetContainer = false;

         this._meshLoadOptions = meshLoadOptions || OBJFileLoader.currentMeshLoadOptions;

     }

     Object.defineProperty(OBJFileLoader, "INVERT_TEXTURE_Y", {

@@ -566,6 +570,8 @@ var OBJFileLoader = /** @class */ (function () {
 
      * @returns The loaded asset container

      */

     OBJFileLoader.prototype.loadAssetContainerAsync = function (scene, data, rootUrl, onProgress, fileName) {

+        var _this = this;

+        this._forAssetContainer = true;

         return this.importMeshAsync(null, scene, data, rootUrl).then(function (result) {

             var container = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["AssetContainer"](scene);

             result.meshes.forEach(function (mesh) { return container.meshes.push(mesh); });

@@ -585,7 +591,11 @@ var OBJFileLoader = /** @class */ (function () {
 
                     }

                 }

             });

+            _this._forAssetContainer = false;

             return container;

+        }).catch(function (ex) {

+            _this._forAssetContainer = false;

+            throw ex;

         });

     };

     /**

@@ -1118,7 +1128,9 @@ var OBJFileLoader = /** @class */ (function () {
 
             //Set the data with VertexBuffer for each mesh

             handledMesh = meshesFromObj[j];

             //Create a Mesh with the name of the obj mesh

+            scene._blockEntityCollection = this._forAssetContainer;

             var babylonMesh = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Mesh"](meshesFromObj[j].name, scene);

+            scene._blockEntityCollection = false;

             //Push the name of the material to an array

             //This is indispensable for the importMesh function

             materialToUse.push(meshesFromObj[j].materialName);

@@ -1155,7 +1167,7 @@ var OBJFileLoader = /** @class */ (function () {
 
                 _this._loadMTL(fileToLoad, rootUrl, function (dataLoaded) {

                     try {

                         //Create materials thanks MTLLoader function

-                        materialsFromMTLFile.parseMTL(scene, dataLoaded, rootUrl);

+                        materialsFromMTLFile.parseMTL(scene, dataLoaded, rootUrl, _this._forAssetContainer);

                         //Look at each material loaded in the mtl file

                         for (var n = 0; n < materialsFromMTLFile.materials.length; n++) {

                             //Three variables to get all meshes with the same material

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylon.objFileLoader.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylon.objFileLoader.min.js


+ 2 - 0
dist/preview release/loaders/babylon.stlFileLoader.js
Näytä tiedosto 

@@ -274,7 +274,9 @@ var STLFileLoader = /** @class */ (function () {
 
      */

     STLFileLoader.prototype.loadAssetContainer = function (scene, data, rootUrl, onError) {

         var container = new babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__["AssetContainer"](scene);

+        scene._blockEntityCollection = true;

         this.importMesh(null, scene, data, rootUrl, container.meshes, null, null);

+        scene._blockEntityCollection = false;

         return container;

     };

     STLFileLoader.prototype._isBinary = function (data) {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylon.stlFileLoader.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylon.stlFileLoader.min.js


+ 22 - 19
dist/preview release/loaders/babylonjs.loaders.d.ts
Näytä tiedosto 

@@ -108,14 +108,18 @@ declare module BABYLON {
 
         COMPLETE = 2

     }

     /** @hidden */

+    export interface IImportMeshAsyncOutput {

+        meshes: AbstractMesh[];

+        particleSystems: IParticleSystem[];

+        skeletons: Skeleton[];

+        animationGroups: AnimationGroup[];

+        lights: Light[];

+        transformNodes: TransformNode[];

+    }

+    /** @hidden */

     export interface IGLTFLoader extends IDisposable {

         readonly state: Nullable<GLTFLoaderState>;

-        importMeshAsync: (meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync: (meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<IImportMeshAsyncOutput>;

         loadAsync: (scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<void>;

     }

     /**

@@ -761,6 +765,7 @@ declare module BABYLON.GLTF1 {
 
         importOnlyMeshes: boolean;

         importMeshesNames?: string[];

         dummyNodes: Node[];

+        forAssetContainer: boolean;

     }

     /** @hidden */

     export interface INodeToRoot {

@@ -862,17 +867,13 @@ declare module BABYLON.GLTF1 {
 
         * Imports one or more meshes from a loaded gltf file and adds them to the scene

         * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

         * @param scene the scene the meshes should be added to

+        * @param forAssetContainer defines if the entities must be stored in the scene

         * @param data gltf data containing information of the meshes in a loaded file

         * @param rootUrl root url to load from

         * @param onProgress event that fires when loading progress has occured

         * @returns a promise containg the loaded meshes, particles, skeletons and animations

         */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<IImportMeshAsyncOutput>;

         private _loadAsync;

         /**

         * Imports all objects from a loaded gltf file and adds them to the scene

@@ -1309,6 +1310,10 @@ declare module BABYLON.GLTF2 {
 
     export class GLTFLoader implements IGLTFLoader {

         /** @hidden */

         _completePromises: Promise<any>[];

+        /** @hidden */

+        _forAssetContainer: boolean;

+        /** Storage */

+        _babylonLights: Light[];

         private _disposed;

         private _parent;

         private _state;

@@ -1366,12 +1371,7 @@ declare module BABYLON.GLTF2 {
 
         /** @hidden */

         dispose(): void;

         /** @hidden */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<IImportMeshAsyncOutput>;

         /** @hidden */

         loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<void>;

         private _loadAsync;

@@ -1390,6 +1390,7 @@ declare module BABYLON.GLTF2 {
 
         loadSceneAsync(context: string, scene: IScene): Promise<void>;

         private _forEachPrimitive;

         private _getMeshes;

+        private _getTransformNodes;

         private _getSkeletons;

         private _getAnimationGroups;

         private _startAnimations;

@@ -2042,8 +2043,9 @@ declare module BABYLON {
 
          * @param scene defines the scene the material will be created in

          * @param data defines the mtl data to parse

          * @param rootUrl defines the rooturl to use in order to load relative dependencies

+         * @param forAssetContainer defines if the material should be registered in the scene

          */

-        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string): void;

+        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, forAssetContainer: boolean): void;

         /**

          * Gets the texture for the material.

          *

@@ -2169,6 +2171,7 @@ declare module BABYLON {
 
         facePattern4: RegExp;

         /** @hidden */

         facePattern5: RegExp;

+        private _forAssetContainer;

         private _meshLoadOptions;

         /**

          * Creates loader for .OBJ files

+ 86 - 13
dist/preview release/loaders/babylonjs.loaders.js
Näytä tiedosto 

@@ -411,8 +411,9 @@ var MTLFileLoader = /** @class */ (function () {
 
      * @param scene defines the scene the material will be created in

      * @param data defines the mtl data to parse

      * @param rootUrl defines the rooturl to use in order to load relative dependencies

+     * @param forAssetContainer defines if the material should be registered in the scene

      */

-    MTLFileLoader.prototype.parseMTL = function (scene, data, rootUrl) {

+    MTLFileLoader.prototype.parseMTL = function (scene, data, rootUrl, forAssetContainer) {

         if (data instanceof ArrayBuffer) {

             return;

         }

@@ -447,7 +448,9 @@ var MTLFileLoader = /** @class */ (function () {
 
                 }

                 //Create a new material.

                 // value is the name of the material read in the mtl file

+                scene._blockEntityCollection = forAssetContainer;

                 material = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["StandardMaterial"](value, scene);

+                scene._blockEntityCollection = false;

             }

             else if (key === "kd" && material) {

                 // Diffuse color (color under white light) using RGB values

@@ -683,6 +686,7 @@ var OBJFileLoader = /** @class */ (function () {
 
         // f -vertex/-uvs/-normal -vertex/-uvs/-normal -vertex/-uvs/-normal ...

         /** @hidden */

         this.facePattern5 = /f\s+(((-[\d]{1,}\/-[\d]{1,}\/-[\d]{1,}[\s]?){3,})+)/;

+        this._forAssetContainer = false;

         this._meshLoadOptions = meshLoadOptions || OBJFileLoader.currentMeshLoadOptions;

     }

     Object.defineProperty(OBJFileLoader, "INVERT_TEXTURE_Y", {

@@ -795,6 +799,8 @@ var OBJFileLoader = /** @class */ (function () {
 
      * @returns The loaded asset container

      */

     OBJFileLoader.prototype.loadAssetContainerAsync = function (scene, data, rootUrl, onProgress, fileName) {

+        var _this = this;

+        this._forAssetContainer = true;

         return this.importMeshAsync(null, scene, data, rootUrl).then(function (result) {

             var container = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["AssetContainer"](scene);

             result.meshes.forEach(function (mesh) { return container.meshes.push(mesh); });

@@ -814,7 +820,11 @@ var OBJFileLoader = /** @class */ (function () {
 
                     }

                 }

             });

+            _this._forAssetContainer = false;

             return container;

+        }).catch(function (ex) {

+            _this._forAssetContainer = false;

+            throw ex;

         });

     };

     /**

@@ -1347,7 +1357,9 @@ var OBJFileLoader = /** @class */ (function () {
 
             //Set the data with VertexBuffer for each mesh

             handledMesh = meshesFromObj[j];

             //Create a Mesh with the name of the obj mesh

+            scene._blockEntityCollection = this._forAssetContainer;

             var babylonMesh = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Mesh"](meshesFromObj[j].name, scene);

+            scene._blockEntityCollection = false;

             //Push the name of the material to an array

             //This is indispensable for the importMesh function

             materialToUse.push(meshesFromObj[j].materialName);

@@ -1384,7 +1396,7 @@ var OBJFileLoader = /** @class */ (function () {
 
                 _this._loadMTL(fileToLoad, rootUrl, function (dataLoaded) {

                     try {

                         //Create materials thanks MTLLoader function

-                        materialsFromMTLFile.parseMTL(scene, dataLoaded, rootUrl);

+                        materialsFromMTLFile.parseMTL(scene, dataLoaded, rootUrl, _this._forAssetContainer);

                         //Look at each material loaded in the mtl file

                         for (var n = 0; n < materialsFromMTLFile.materials.length; n++) {

                             //Three variables to get all meshes with the same material

@@ -1625,7 +1637,9 @@ var STLFileLoader = /** @class */ (function () {
 
      */

     STLFileLoader.prototype.loadAssetContainer = function (scene, data, rootUrl, onError) {

         var container = new babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__["AssetContainer"](scene);

+        scene._blockEntityCollection = true;

         this.importMesh(null, scene, data, rootUrl, container.meshes, null, null);

+        scene._blockEntityCollection = false;

         return container;

     };

     STLFileLoader.prototype._isBinary = function (data) {

@@ -2023,7 +2037,9 @@ var loadAnimations = function (gltfRuntime) {
 
                 modifyKey = true;

             }

             if (!modifyKey) {

+                gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

                 babylonAnimation = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Animation"](anim, isBone ? "_matrix" : targetPath, 1, animationType, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Animation"].ANIMATIONLOOPMODE_CYCLE);

+                gltfRuntime.scene._blockEntityCollection = false;

             }

             // For each frame

             for (var j = 0; j < bufferInput.length; j++) {

@@ -2315,7 +2331,9 @@ var importSkeleton = function (gltfRuntime, skins, mesh, newSkeleton, id) {
 
 */

 var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {

     if (!newMesh) {

+        gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

         newMesh = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Mesh"](node.name || "", gltfRuntime.scene);

+        gltfRuntime.scene._blockEntityCollection = false;

         newMesh.id = id;

     }

     if (!node.babylonNode) {

@@ -2421,6 +2439,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
 
         }

     }

     var material;

+    gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

     if (subMaterials.length > 1) {

         material = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["MultiMaterial"]("multimat" + id, gltfRuntime.scene);

         material.subMaterials = subMaterials;

@@ -2437,6 +2456,7 @@ var importMesh = function (gltfRuntime, node, meshes, id, newMesh) {
 
     // Apply geometry

     new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Geometry"](id, gltfRuntime.scene, vertexData, false, newMesh);

     newMesh.computeWorldMatrix(true);

+    gltfRuntime.scene._blockEntityCollection = false;

     // Apply submeshes

     newMesh.subMeshes = [];

     var index = 0;

@@ -2572,6 +2592,7 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
     else if (node.camera && !node.babylonNode && !gltfRuntime.importOnlyMeshes) {

         var camera = gltfRuntime.cameras[node.camera];

         if (camera) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             if (camera.type === "orthographic") {

                 var orthoCamera = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["FreeCamera"](node.camera, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Vector3"].Zero(), gltfRuntime.scene, false);

                 orthoCamera.name = node.name || "";

@@ -2593,6 +2614,7 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
                 }

                 lastNode = persCamera;

             }

+            gltfRuntime.scene._blockEntityCollection = false;

         }

     }

     // Empty node

@@ -2601,7 +2623,9 @@ var importNode = function (gltfRuntime, node, id, parent) {
 
             return node.babylonNode;

         }

         else if (lastNode === null) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             var dummy = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Mesh"](node.name || "", gltfRuntime.scene);

+            gltfRuntime.scene._blockEntityCollection = false;

             node.babylonNode = dummy;

             lastNode = dummy;

         }

@@ -2847,7 +2871,8 @@ var GLTFLoaderBase = /** @class */ (function () {
 
             loadedBufferViews: {},

             loadedShaderCount: 0,

             importOnlyMeshes: false,

-            dummyNodes: []

+            dummyNodes: [],

+            forAssetContainer: false

         };

         // Parse

         if (parsedData.extensions) {

@@ -2999,7 +3024,9 @@ var GLTFLoaderBase = /** @class */ (function () {
 
         }

         var technique = gltfRuntime.techniques[material.technique];

         if (!technique) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             var defaultMaterial = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["StandardMaterial"](id, gltfRuntime.scene);

+            gltfRuntime.scene._blockEntityCollection = false;

             defaultMaterial.diffuseColor = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Color3"](0.5, 0.5, 0.5);

             defaultMaterial.sideOrientation = babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Material"].CounterClockWiseSideOrientation;

             onSuccess(defaultMaterial);

@@ -3146,10 +3173,11 @@ var GLTFLoader = /** @class */ (function () {
 
     GLTFLoader.prototype.dispose = function () {

         // do nothing

     };

-    GLTFLoader.prototype._importMeshAsync = function (meshesNames, scene, data, rootUrl, onSuccess, onProgress, onError) {

+    GLTFLoader.prototype._importMeshAsync = function (meshesNames, scene, data, rootUrl, forAssetContainer, onSuccess, onProgress, onError) {

         var _this = this;

         scene.useRightHandedSystem = true;

         GLTFLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, function (gltfRuntime) {

+            gltfRuntime.forAssetContainer = forAssetContainer;

             gltfRuntime.importOnlyMeshes = true;

             if (meshesNames === "") {

                 gltfRuntime.importMeshesNames = [];

@@ -3201,27 +3229,30 @@ var GLTFLoader = /** @class */ (function () {
 
     * Imports one or more meshes from a loaded gltf file and adds them to the scene

     * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

     * @param scene the scene the meshes should be added to

+    * @param forAssetContainer defines if the entities must be stored in the scene

     * @param data gltf data containing information of the meshes in a loaded file

     * @param rootUrl root url to load from

     * @param onProgress event that fires when loading progress has occured

     * @returns a promise containg the loaded meshes, particles, skeletons and animations

     */

-    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onProgress) {

+    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, forAssetContainer, data, rootUrl, onProgress) {

         var _this = this;

         return new Promise(function (resolve, reject) {

-            _this._importMeshAsync(meshesNames, scene, data, rootUrl, function (meshes, skeletons) {

+            _this._importMeshAsync(meshesNames, scene, data, rootUrl, forAssetContainer, function (meshes, skeletons) {

                 resolve({

                     meshes: meshes,

                     particleSystems: [],

                     skeletons: skeletons,

-                    animationGroups: []

+                    animationGroups: [],

+                    lights: [],

+                    transformNodes: []

                 });

             }, onProgress, function (message) {

                 reject(new Error(message));

             });

         });

     };

-    GLTFLoader.prototype._loadAsync = function (scene, data, rootUrl, onSuccess, onProgress, onError) {

+    GLTFLoader.prototype._loadAsync = function (scene, data, rootUrl, forAssetContainer, onSuccess, onProgress, onError) {

         var _this = this;

         scene.useRightHandedSystem = true;

         GLTFLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, function (gltfRuntime) {

@@ -3256,7 +3287,7 @@ var GLTFLoader = /** @class */ (function () {
 
     GLTFLoader.prototype.loadAsync = function (scene, data, rootUrl, onProgress) {

         var _this = this;

         return new Promise(function (resolve, reject) {

-            _this._loadAsync(scene, data, rootUrl, function () {

+            _this._loadAsync(scene, data, rootUrl, false, function () {

                 resolve();

             }, onProgress, function (message) {

                 reject(new Error(message));

@@ -4399,6 +4430,7 @@ var KHR_lights = /** @class */ (function () {
 
                 var babylonLight;

                 var light = _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["ArrayItem"].Get(extensionContext, _this._lights, extension.light);

                 var name = light.name || babylonMesh.name;

+                _this._loader.babylonScene._blockEntityCollection = _this._loader._forAssetContainer;

                 switch (light.type) {

                     case LightType.DIRECTIONAL: {

                         babylonLight = new babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["DirectionalLight"](name, babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Vector3"].Backward(), _this._loader.babylonScene);

@@ -4416,14 +4448,17 @@ var KHR_lights = /** @class */ (function () {
 
                         break;

                     }

                     default: {

+                        _this._loader.babylonScene._blockEntityCollection = false;

                         throw new Error(extensionContext + ": Invalid light type (" + light.type + ")");

                     }

                 }

+                _this._loader.babylonScene._blockEntityCollection = false;

                 babylonLight.falloffType = babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Light"].FALLOFF_GLTF;

                 babylonLight.diffuse = light.color ? babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Color3"].FromArray(light.color) : babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__["Color3"].White();

                 babylonLight.intensity = light.intensity == undefined ? 1 : light.intensity;

                 babylonLight.range = light.range == undefined ? Number.MAX_VALUE : light.range;

                 babylonLight.parent = babylonMesh;

+                _this._loader._babylonLights.push(babylonLight);

                 _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].AddPointerMetadata(babylonLight, extensionContext);

                 assign(babylonMesh);

             });

@@ -5781,6 +5816,10 @@ var GLTFLoader = /** @class */ (function () {
 
     function GLTFLoader(parent) {

         /** @hidden */

         this._completePromises = new Array();

+        /** @hidden */

+        this._forAssetContainer = false;

+        /** Storage */

+        this._babylonLights = [];

         this._disposed = false;

         this._state = null;

         this._extensions = new Array();

@@ -5897,13 +5936,14 @@ var GLTFLoader = /** @class */ (function () {
 
         this._parent._clear();

     };

     /** @hidden */

-    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onProgress, fileName) {

+    GLTFLoader.prototype.importMeshAsync = function (meshesNames, scene, forAssetContainer, data, rootUrl, onProgress, fileName) {

         var _this = this;

         return Promise.resolve().then(function () {

             _this._babylonScene = scene;

             _this._rootUrl = rootUrl;

             _this._fileName = fileName || "scene";

             _this._progressCallback = onProgress;

+            _this._forAssetContainer = forAssetContainer;

             _this._loadData(data);

             var nodes = null;

             if (meshesNames) {

@@ -5930,7 +5970,9 @@ var GLTFLoader = /** @class */ (function () {
 
                     meshes: _this._getMeshes(),

                     particleSystems: [],

                     skeletons: _this._getSkeletons(),

-                    animationGroups: _this._getAnimationGroups()

+                    animationGroups: _this._getAnimationGroups(),

+                    lights: _this._babylonLights,

+                    transformNodes: _this._getTransformNodes()

                 };

             });

         });

@@ -6097,7 +6139,9 @@ var GLTFLoader = /** @class */ (function () {
 
         this.log(_glTFFileLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoaderState"][this._state]);

     };

     GLTFLoader.prototype._createRootNode = function () {

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         this._rootBabylonMesh = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Mesh"]("__root__", this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         this._rootBabylonMesh.setEnabled(false);

         var rootNode = {

             _babylonTransformNode: this._rootBabylonMesh,

@@ -6186,6 +6230,19 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         return meshes;

     };

+    GLTFLoader.prototype._getTransformNodes = function () {

+        var transformNodes = new Array();

+        var nodes = this._gltf.nodes;

+        if (nodes) {

+            for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {

+                var node = nodes_2[_i];

+                if (node._babylonTransformNode && node._babylonTransformNode.getClassName() === "TransformNode") {

+                    transformNodes.push(node._babylonTransformNode);

+                }

+            }

+        }

+        return transformNodes;

+    };

     GLTFLoader.prototype._getSkeletons = function () {

         var skeletons = new Array();

         var skins = this._gltf.skins;

@@ -6280,7 +6337,9 @@ var GLTFLoader = /** @class */ (function () {
 
         };

         if (node.mesh == undefined) {

             var nodeName = node.name || "node" + node.index;

+            this._babylonScene._blockEntityCollection = this._forAssetContainer;

             node._babylonTransformNode = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["TransformNode"](nodeName, this._babylonScene);

+            this._babylonScene._blockEntityCollection = false;

             loadNode(node._babylonTransformNode);

         }

         else {

@@ -6360,7 +6419,9 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         else {

             var promises = new Array();

+            this._babylonScene._blockEntityCollection = this._forAssetContainer;

             var babylonMesh_1 = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Mesh"](name, this._babylonScene);

+            this._babylonScene._blockEntityCollection = false;

             babylonMesh_1.overrideMaterialSideOrientation = this._babylonScene.useRightHandedSystem ? babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Material"].CounterClockWiseSideOrientation : babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Material"].ClockWiseSideOrientation;

             this._createMorphTargets(context, node, mesh, primitive, babylonMesh_1);

             promises.push(this._loadVertexDataAsync(context, primitive, babylonMesh_1).then(function (babylonGeometry) {

@@ -6580,7 +6641,9 @@ var GLTFLoader = /** @class */ (function () {
 
             return skin._data.promise;

         }

         var skeletonId = "skeleton" + skin.index;

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonSkeleton = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Skeleton"](skin.name || skeletonId, skeletonId, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         // See https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#skins (second implementation note)

         babylonSkeleton.overrideMesh = this._rootBabylonMesh;

         this._loadBones(context, skin, babylonSkeleton);

@@ -6662,7 +6725,9 @@ var GLTFLoader = /** @class */ (function () {
 
         }

         var promises = new Array();

         this.logOpen(context + " " + (camera.name || ""));

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonCamera = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["FreeCamera"](camera.name || "camera" + camera.index, babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Vector3"].Zero(), this._babylonScene, false);

+        this._babylonScene._blockEntityCollection = false;

         babylonCamera.rotation = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Vector3"](0, Math.PI, 0);

         switch (camera.type) {

             case "perspective" /* PERSPECTIVE */: {

@@ -6722,7 +6787,9 @@ var GLTFLoader = /** @class */ (function () {
 
         if (promise) {

             return promise;

         }

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonAnimationGroup = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["AnimationGroup"](animation.name || "animation" + animation.index, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         animation._babylonAnimationGroup = babylonAnimationGroup;

         var promises = new Array();

         ArrayItem.Assign(animation.channels);

@@ -7167,7 +7234,9 @@ var GLTFLoader = /** @class */ (function () {
 
         });

     };

     GLTFLoader.prototype._createDefaultMaterial = function (name, babylonDrawMode) {

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonMaterial = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["PBRMaterial"](name, this._babylonScene);

+        this._babylonScene._blockEntityCollection = false;

         // Moved to mesh so user can change materials on gltf meshes: babylonMaterial.sideOrientation = this._babylonScene.useRightHandedSystem ? Material.CounterClockWiseSideOrientation : Material.ClockWiseSideOrientation;

         babylonMaterial.fillMode = babylonDrawMode;

         babylonMaterial.enableSpecularAntiAliasing = true;

@@ -7346,6 +7415,7 @@ var GLTFLoader = /** @class */ (function () {
 
             }

         }

         var deferred = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Deferred"]();

+        this._babylonScene._blockEntityCollection = this._forAssetContainer;

         var babylonTexture = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["Texture"](url, this._babylonScene, samplerData.noMipMaps, false, samplerData.samplingMode, function () {

             if (!_this._disposed) {

                 deferred.resolve();

@@ -7355,6 +7425,7 @@ var GLTFLoader = /** @class */ (function () {
 
                 deferred.reject(new Error(context + ": " + ((exception && exception.message) ? exception.message : message || "Failed to load texture")));

             }

         }, undefined, undefined, undefined, image.mimeType);

+        this._babylonScene._blockEntityCollection = false;

         promises.push(deferred.promise);

         if (!url) {

             promises.push(this.loadImageAsync("/images/" + image.index, image).then(function (data) {

@@ -8332,7 +8403,7 @@ var GLTFFileLoader = /** @class */ (function () {
 
             _this.onParsedObservable.clear();

             _this._log("Loading " + (fileName || ""));

             _this._loader = _this._getLoader(data);

-            return _this._loader.importMeshAsync(meshesNames, scene, data, rootUrl, onProgress, fileName);

+            return _this._loader.importMeshAsync(meshesNames, scene, false, data, rootUrl, onProgress, fileName);

         });

     };

     /** @hidden */

@@ -8363,7 +8434,7 @@ var GLTFFileLoader = /** @class */ (function () {
 
             _this.onTextureLoadedObservable.add(function (texture) {

                 textures.push(texture);

             });

-            return _this._loader.importMeshAsync(null, scene, data, rootUrl, onProgress, fileName).then(function (result) {

+            return _this._loader.importMeshAsync(null, scene, true, data, rootUrl, onProgress, fileName).then(function (result) {

                 var container = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__["AssetContainer"](scene);

                 Array.prototype.push.apply(container.meshes, result.meshes);

                 Array.prototype.push.apply(container.particleSystems, result.particleSystems);

@@ -8371,6 +8442,8 @@ var GLTFFileLoader = /** @class */ (function () {
 
                 Array.prototype.push.apply(container.animationGroups, result.animationGroups);

                 Array.prototype.push.apply(container.materials, materials);

                 Array.prototype.push.apply(container.textures, textures);

+                Array.prototype.push.apply(container.lights, result.lights);

+                Array.prototype.push.apply(container.transformNodes, result.transformNodes);

                 return container;

             });

         });

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/loaders/babylonjs.loaders.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 2
dist/preview release/loaders/babylonjs.loaders.min.js


+ 49 - 46
dist/preview release/loaders/babylonjs.loaders.module.d.ts
Näytä tiedosto 

@@ -46,6 +46,8 @@ declare module "babylonjs-loaders/glTF/glTFFileLoader" {
 
     import { WebRequest } from "babylonjs/Misc/webRequest";

     import { IFileRequest } from "babylonjs/Misc/fileRequest";

     import { IDataBuffer } from 'babylonjs/Misc/dataReader';

+    import { Light } from 'babylonjs/Lights/light';

+    import { TransformNode } from 'babylonjs/Meshes/transformNode';

     /**

      * Mode that determines the coordinate system to use.

      */

@@ -125,14 +127,18 @@ declare module "babylonjs-loaders/glTF/glTFFileLoader" {
 
         COMPLETE = 2

     }

     /** @hidden */

+    export interface IImportMeshAsyncOutput {

+        meshes: AbstractMesh[];

+        particleSystems: IParticleSystem[];

+        skeletons: Skeleton[];

+        animationGroups: AnimationGroup[];

+        lights: Light[];

+        transformNodes: TransformNode[];

+    }

+    /** @hidden */

     export interface IGLTFLoader extends IDisposable {

         readonly state: Nullable<GLTFLoaderState>;

-        importMeshAsync: (meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync: (meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<IImportMeshAsyncOutput>;

         loadAsync: (scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<void>;

     }

     /**

@@ -783,6 +789,7 @@ declare module "babylonjs-loaders/glTF/1.0/glTFLoaderInterfaces" {
 
         importOnlyMeshes: boolean;

         importMeshesNames?: string[];

         dummyNodes: Node[];

+        forAssetContainer: boolean;

     }

     /** @hidden */

     export interface INodeToRoot {

@@ -863,15 +870,11 @@ declare module "babylonjs-loaders/glTF/1.0/glTFLoaderUtils" {
 
 declare module "babylonjs-loaders/glTF/1.0/glTFLoader" {

     import { IGLTFRuntime } from "babylonjs-loaders/glTF/1.0/glTFLoaderInterfaces";

     import { Nullable } from "babylonjs/types";

-    import { AnimationGroup } from "babylonjs/Animations/animationGroup";

-    import { Skeleton } from "babylonjs/Bones/skeleton";

-    import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";

     import { Material } from "babylonjs/Materials/material";

     import { Texture } from "babylonjs/Materials/Textures/texture";

-    import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";

     import { SceneLoaderProgressEvent } from "babylonjs/Loading/sceneLoader";

     import { Scene } from "babylonjs/scene";

-    import { IGLTFLoader, GLTFLoaderState, IGLTFLoaderData } from "babylonjs-loaders/glTF/glTFFileLoader";

+    import { IGLTFLoader, GLTFLoaderState, IGLTFLoaderData, IImportMeshAsyncOutput } from "babylonjs-loaders/glTF/glTFFileLoader";

     /**

     * Implementation of the base glTF spec

     * @hidden

@@ -900,17 +903,13 @@ declare module "babylonjs-loaders/glTF/1.0/glTFLoader" {
 
         * Imports one or more meshes from a loaded gltf file and adds them to the scene

         * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

         * @param scene the scene the meshes should be added to

+        * @param forAssetContainer defines if the entities must be stored in the scene

         * @param data gltf data containing information of the meshes in a loaded file

         * @param rootUrl root url to load from

         * @param onProgress event that fires when loading progress has occured

         * @returns a promise containg the loaded meshes, particles, skeletons and animations

         */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<IImportMeshAsyncOutput>;

         private _loadAsync;

         /**

         * Imports all objects from a loaded gltf file and adds them to the scene

@@ -1362,8 +1361,6 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
     import { Nullable } from "babylonjs/types";

     import { Camera } from "babylonjs/Cameras/camera";

     import { AnimationGroup } from "babylonjs/Animations/animationGroup";

-    import { Skeleton } from "babylonjs/Bones/skeleton";

-    import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";

     import { Material } from "babylonjs/Materials/material";

     import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";

     import { TransformNode } from "babylonjs/Meshes/transformNode";

@@ -1374,9 +1371,10 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
     import { IProperty } from "babylonjs-gltf2interface";

     import { IGLTF, INode, IScene, IMesh, ICamera, IAnimation, IAnimationChannel, IBufferView, IMaterial, ITextureInfo, IImage, IMeshPrimitive, IArrayItem as IArrItem } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";

     import { IGLTFLoaderExtension } from "babylonjs-loaders/glTF/2.0/glTFLoaderExtension";

-    import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData } from "babylonjs-loaders/glTF/glTFFileLoader";

+    import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData, IImportMeshAsyncOutput } from "babylonjs-loaders/glTF/glTFFileLoader";

     import { IAnimatable } from 'babylonjs/Animations/animatable.interface';

     import { IDataBuffer } from 'babylonjs/Misc/dataReader';

+    import { Light } from 'babylonjs/Lights/light';

     /**

      * Helper class for working with arrays when loading the glTF asset

      */

@@ -1401,6 +1399,10 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
     export class GLTFLoader implements IGLTFLoader {

         /** @hidden */

         _completePromises: Promise<any>[];

+        /** @hidden */

+        _forAssetContainer: boolean;

+        /** Storage */

+        _babylonLights: Light[];

         private _disposed;

         private _parent;

         private _state;

@@ -1458,12 +1460,7 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
         /** @hidden */

         dispose(): void;

         /** @hidden */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<IImportMeshAsyncOutput>;

         /** @hidden */

         loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<void>;

         private _loadAsync;

@@ -1482,6 +1479,7 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
         loadSceneAsync(context: string, scene: IScene): Promise<void>;

         private _forEachPrimitive;

         private _getMeshes;

+        private _getTransformNodes;

         private _getSkeletons;

         private _getAnimationGroups;

         private _startAnimations;

@@ -2246,8 +2244,9 @@ declare module "babylonjs-loaders/OBJ/mtlFileLoader" {
 
          * @param scene defines the scene the material will be created in

          * @param data defines the mtl data to parse

          * @param rootUrl defines the rooturl to use in order to load relative dependencies

+         * @param forAssetContainer defines if the material should be registered in the scene

          */

-        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string): void;

+        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, forAssetContainer: boolean): void;

         /**

          * Gets the texture for the material.

          *

@@ -2381,6 +2380,7 @@ declare module "babylonjs-loaders/OBJ/objFileLoader" {
 
         facePattern4: RegExp;

         /** @hidden */

         facePattern5: RegExp;

+        private _forAssetContainer;

         private _meshLoadOptions;

         /**

          * Creates loader for .OBJ files

@@ -2695,14 +2695,18 @@ declare module BABYLON {
 
         COMPLETE = 2

     }

     /** @hidden */

+    export interface IImportMeshAsyncOutput {

+        meshes: AbstractMesh[];

+        particleSystems: IParticleSystem[];

+        skeletons: Skeleton[];

+        animationGroups: AnimationGroup[];

+        lights: Light[];

+        transformNodes: TransformNode[];

+    }

+    /** @hidden */

     export interface IGLTFLoader extends IDisposable {

         readonly state: Nullable<GLTFLoaderState>;

-        importMeshAsync: (meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync: (meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<IImportMeshAsyncOutput>;

         loadAsync: (scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<void>;

     }

     /**

@@ -3348,6 +3352,7 @@ declare module BABYLON.GLTF1 {
 
         importOnlyMeshes: boolean;

         importMeshesNames?: string[];

         dummyNodes: Node[];

+        forAssetContainer: boolean;

     }

     /** @hidden */

     export interface INodeToRoot {

@@ -3449,17 +3454,13 @@ declare module BABYLON.GLTF1 {
 
         * Imports one or more meshes from a loaded gltf file and adds them to the scene

         * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

         * @param scene the scene the meshes should be added to

+        * @param forAssetContainer defines if the entities must be stored in the scene

         * @param data gltf data containing information of the meshes in a loaded file

         * @param rootUrl root url to load from

         * @param onProgress event that fires when loading progress has occured

         * @returns a promise containg the loaded meshes, particles, skeletons and animations

         */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<IImportMeshAsyncOutput>;

         private _loadAsync;

         /**

         * Imports all objects from a loaded gltf file and adds them to the scene

@@ -3896,6 +3897,10 @@ declare module BABYLON.GLTF2 {
 
     export class GLTFLoader implements IGLTFLoader {

         /** @hidden */

         _completePromises: Promise<any>[];

+        /** @hidden */

+        _forAssetContainer: boolean;

+        /** Storage */

+        _babylonLights: Light[];

         private _disposed;

         private _parent;

         private _state;

@@ -3953,12 +3958,7 @@ declare module BABYLON.GLTF2 {
 
         /** @hidden */

         dispose(): void;

         /** @hidden */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<IImportMeshAsyncOutput>;

         /** @hidden */

         loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<void>;

         private _loadAsync;

@@ -3977,6 +3977,7 @@ declare module BABYLON.GLTF2 {
 
         loadSceneAsync(context: string, scene: IScene): Promise<void>;

         private _forEachPrimitive;

         private _getMeshes;

+        private _getTransformNodes;

         private _getSkeletons;

         private _getAnimationGroups;

         private _startAnimations;

@@ -4629,8 +4630,9 @@ declare module BABYLON {
 
          * @param scene defines the scene the material will be created in

          * @param data defines the mtl data to parse

          * @param rootUrl defines the rooturl to use in order to load relative dependencies

+         * @param forAssetContainer defines if the material should be registered in the scene

          */

-        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string): void;

+        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, forAssetContainer: boolean): void;

         /**

          * Gets the texture for the material.

          *

@@ -4756,6 +4758,7 @@ declare module BABYLON {
 
         facePattern4: RegExp;

         /** @hidden */

         facePattern5: RegExp;

+        private _forAssetContainer;

         private _meshLoadOptions;

         /**

          * Creates loader for .OBJ files

+ 6 - 6
dist/preview release/materialsLibrary/babylon.cellMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -366,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cellPixelShader", function() { return cellPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -399,7 +399,7 @@ var cellPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cellVertexShader", function() { return cellVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -433,7 +433,7 @@ var cellVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CellMaterial", function() { return CellMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _cell_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./cell.fragment */ "./cell/cell.fragment.ts");
 
 /* harmony import */ var _cell_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./cell.vertex */ "./cell/cell.vertex.ts");
 
@@ -775,14 +775,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.cellMaterial.js.map


+ 5 - 5
dist/preview release/materialsLibrary/babylon.customMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -369,7 +369,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ShaderSpecialParts", function() { return ShaderSpecialParts; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CustomMaterial", function() { return CustomMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__);
 
 

 

@@ -604,7 +604,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ShaderAlebdoParts", function() { return ShaderAlebdoParts; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PBRCustomMaterial", function() { return PBRCustomMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__);
 
 

 

@@ -841,14 +841,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.customMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.fireMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -366,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "firePixelShader", function() { return firePixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -393,7 +393,7 @@ var firePixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fireVertexShader", function() { return fireVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -424,7 +424,7 @@ var fireVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FireMaterial", function() { return FireMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _fire_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fire.fragment */ "./fire/fire.fragment.ts");
 
 /* harmony import */ var _fire_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fire.vertex */ "./fire/fire.vertex.ts");
 
@@ -803,14 +803,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.fireMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.furMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -366,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "furPixelShader", function() { return furPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -399,7 +399,7 @@ var furPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "furVertexShader", function() { return furVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -433,7 +433,7 @@ var furVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FurMaterial", function() { return FurMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _fur_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fur.fragment */ "./fur/fur.fragment.ts");
 
 /* harmony import */ var _fur_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fur.vertex */ "./fur/fur.vertex.ts");
 
@@ -965,14 +965,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.furMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.gradientMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -366,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gradientPixelShader", function() { return gradientPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -399,7 +399,7 @@ var gradientPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gradientVertexShader", function() { return gradientVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -433,7 +433,7 @@ var gradientVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GradientMaterial", function() { return GradientMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _gradient_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./gradient.fragment */ "./gradient/gradient.fragment.ts");
 
 /* harmony import */ var _gradient_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./gradient.vertex */ "./gradient/gradient.vertex.ts");
 
@@ -744,14 +744,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.gradientMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.gridMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -366,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gridPixelShader", function() { return gridPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -390,7 +390,7 @@ var gridPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gridVertexShader", function() { return gridVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -417,7 +417,7 @@ var gridVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GridMaterial", function() { return GridMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _grid_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./grid.fragment */ "./grid/grid.fragment.ts");
 
 /* harmony import */ var _grid_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./grid.vertex */ "./grid/grid.vertex.ts");
 
@@ -717,14 +717,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.gridMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.lavaMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -383,7 +383,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lavaPixelShader", function() { return lavaPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -416,7 +416,7 @@ var lavaPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lavaVertexShader", function() { return lavaVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -450,7 +450,7 @@ var lavaVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LavaMaterial", function() { return LavaMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _lava_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./lava.fragment */ "./lava/lava.fragment.ts");
 
 /* harmony import */ var _lava_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./lava.vertex */ "./lava/lava.vertex.ts");
 
@@ -863,14 +863,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.lavaMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.mixMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -412,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mixPixelShader", function() { return mixPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -445,7 +445,7 @@ var mixPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mixVertexShader", function() { return mixVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -479,7 +479,7 @@ var mixVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MixMaterial", function() { return MixMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _mix_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./mix.fragment */ "./mix/mix.fragment.ts");
 
 /* harmony import */ var _mix_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./mix.vertex */ "./mix/mix.vertex.ts");
 
@@ -968,14 +968,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.mixMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.normalMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -412,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "normalPixelShader", function() { return normalPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -445,7 +445,7 @@ var normalPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "normalVertexShader", function() { return normalVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -479,7 +479,7 @@ var normalVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NormalMaterial", function() { return NormalMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _normal_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./normal.fragment */ "./normal/normal.fragment.ts");
 
 /* harmony import */ var _normal_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./normal.vertex */ "./normal/normal.vertex.ts");
 
@@ -808,14 +808,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.normalMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -412,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shadowOnlyPixelShader", function() { return shadowOnlyPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -444,7 +444,7 @@ var shadowOnlyPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shadowOnlyVertexShader", function() { return shadowOnlyVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -478,7 +478,7 @@ var shadowOnlyVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ShadowOnlyMaterial", function() { return ShadowOnlyMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _shadowOnly_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./shadowOnly.fragment */ "./shadowOnly/shadowOnly.fragment.ts");
 
 /* harmony import */ var _shadowOnly_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./shadowOnly.vertex */ "./shadowOnly/shadowOnly.vertex.ts");
 
@@ -699,14 +699,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.shadowOnlyMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.simpleMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -412,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "simplePixelShader", function() { return simplePixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -445,7 +445,7 @@ var simplePixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "simpleVertexShader", function() { return simpleVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -479,7 +479,7 @@ var simpleVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SimpleMaterial", function() { return SimpleMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _simple_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./simple.fragment */ "./simple/simple.fragment.ts");
 
 /* harmony import */ var _simple_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./simple.vertex */ "./simple/simple.vertex.ts");
 
@@ -766,14 +766,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.simpleMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.skyMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -412,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skyPixelShader", function() { return skyPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -438,7 +438,7 @@ var skyPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skyVertexShader", function() { return skyVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -465,7 +465,7 @@ var skyVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SkyMaterial", function() { return SkyMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _sky_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./sky.fragment */ "./sky/sky.fragment.ts");
 
 /* harmony import */ var _sky_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./sky.vertex */ "./sky/sky.vertex.ts");
 
@@ -798,14 +798,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.skyMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.terrainMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -412,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "terrainPixelShader", function() { return terrainPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -445,7 +445,7 @@ var terrainPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "terrainVertexShader", function() { return terrainVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -479,7 +479,7 @@ var terrainVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TerrainMaterial", function() { return TerrainMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _terrain_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./terrain.fragment */ "./terrain/terrain.fragment.ts");
 
 /* harmony import */ var _terrain_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./terrain.vertex */ "./terrain/terrain.vertex.ts");
 
@@ -896,14 +896,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.terrainMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.triPlanarMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -413,7 +413,7 @@ __webpack_require__.r(__webpack_exports__);
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TriPlanarMaterial", function() { return TriPlanarMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _triplanar_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./triplanar.fragment */ "./triPlanar/triplanar.fragment.ts");
 
 /* harmony import */ var _triplanar_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./triplanar.vertex */ "./triPlanar/triplanar.vertex.ts");
 
@@ -820,7 +820,7 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "triplanarPixelShader", function() { return triplanarPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -853,7 +853,7 @@ var triplanarPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "triplanarVertexShader", function() { return triplanarVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -876,14 +876,14 @@ var triplanarVertexShader = { name: name, shader: shader };
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.triPlanarMaterial.js.map


+ 6 - 6
dist/preview release/materialsLibrary/babylon.waterMaterial.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -412,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waterPixelShader", function() { return waterPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -448,7 +448,7 @@ var waterPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waterVertexShader", function() { return waterVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -484,7 +484,7 @@ var waterVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WaterMaterial", function() { return WaterMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _water_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./water.fragment */ "./water/water.fragment.ts");
 
 /* harmony import */ var _water_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./water.vertex */ "./water/water.vertex.ts");
 
@@ -1187,14 +1187,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylon.waterMaterial.js.map


+ 47 - 47
dist/preview release/materialsLibrary/babylonjs.materials.js
Näytä tiedosto 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -366,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cellPixelShader", function() { return cellPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -399,7 +399,7 @@ var cellPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cellVertexShader", function() { return cellVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -433,7 +433,7 @@ var cellVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CellMaterial", function() { return CellMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _cell_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./cell.fragment */ "./cell/cell.fragment.ts");
 
 /* harmony import */ var _cell_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./cell.vertex */ "./cell/cell.vertex.ts");
 
@@ -759,7 +759,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ShaderSpecialParts", function() { return ShaderSpecialParts; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CustomMaterial", function() { return CustomMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__);
 
 

 

@@ -994,7 +994,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ShaderAlebdoParts", function() { return ShaderAlebdoParts; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PBRCustomMaterial", function() { return PBRCustomMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__);
 
 

 

@@ -1204,7 +1204,7 @@ babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].Registered
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "firePixelShader", function() { return firePixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -1231,7 +1231,7 @@ var firePixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fireVertexShader", function() { return fireVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -1262,7 +1262,7 @@ var fireVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FireMaterial", function() { return FireMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _fire_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fire.fragment */ "./fire/fire.fragment.ts");
 
 /* harmony import */ var _fire_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fire.vertex */ "./fire/fire.vertex.ts");
 
@@ -1622,7 +1622,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "furPixelShader", function() { return furPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -1655,7 +1655,7 @@ var furPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "furVertexShader", function() { return furVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -1689,7 +1689,7 @@ var furVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FurMaterial", function() { return FurMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _fur_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fur.fragment */ "./fur/fur.fragment.ts");
 
 /* harmony import */ var _fur_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fur.vertex */ "./fur/fur.vertex.ts");
 
@@ -2202,7 +2202,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gradientPixelShader", function() { return gradientPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -2235,7 +2235,7 @@ var gradientPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gradientVertexShader", function() { return gradientVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -2269,7 +2269,7 @@ var gradientVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GradientMaterial", function() { return GradientMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _gradient_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./gradient.fragment */ "./gradient/gradient.fragment.ts");
 
 /* harmony import */ var _gradient_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./gradient.vertex */ "./gradient/gradient.vertex.ts");
 
@@ -2561,7 +2561,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gridPixelShader", function() { return gridPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -2585,7 +2585,7 @@ var gridPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gridVertexShader", function() { return gridVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -2612,7 +2612,7 @@ var gridVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GridMaterial", function() { return GridMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _grid_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./grid.fragment */ "./grid/grid.fragment.ts");
 
 /* harmony import */ var _grid_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./grid.vertex */ "./grid/grid.vertex.ts");
 
@@ -2991,7 +2991,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lavaPixelShader", function() { return lavaPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -3024,7 +3024,7 @@ var lavaPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lavaVertexShader", function() { return lavaVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -3058,7 +3058,7 @@ var lavaVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LavaMaterial", function() { return LavaMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _lava_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./lava.fragment */ "./lava/lava.fragment.ts");
 
 /* harmony import */ var _lava_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./lava.vertex */ "./lava/lava.vertex.ts");
 
@@ -3537,7 +3537,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mixPixelShader", function() { return mixPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -3570,7 +3570,7 @@ var mixPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mixVertexShader", function() { return mixVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -3604,7 +3604,7 @@ var mixVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MixMaterial", function() { return MixMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _mix_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./mix.fragment */ "./mix/mix.fragment.ts");
 
 /* harmony import */ var _mix_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./mix.vertex */ "./mix/mix.vertex.ts");
 
@@ -4120,7 +4120,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "normalPixelShader", function() { return normalPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -4153,7 +4153,7 @@ var normalPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "normalVertexShader", function() { return normalVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -4187,7 +4187,7 @@ var normalVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NormalMaterial", function() { return NormalMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _normal_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./normal.fragment */ "./normal/normal.fragment.ts");
 
 /* harmony import */ var _normal_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./normal.vertex */ "./normal/normal.vertex.ts");
 
@@ -4543,7 +4543,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shadowOnlyPixelShader", function() { return shadowOnlyPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -4575,7 +4575,7 @@ var shadowOnlyPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shadowOnlyVertexShader", function() { return shadowOnlyVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -4609,7 +4609,7 @@ var shadowOnlyVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ShadowOnlyMaterial", function() { return ShadowOnlyMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _shadowOnly_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./shadowOnly.fragment */ "./shadowOnly/shadowOnly.fragment.ts");
 
 /* harmony import */ var _shadowOnly_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./shadowOnly.vertex */ "./shadowOnly/shadowOnly.vertex.ts");
 
@@ -4857,7 +4857,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "simplePixelShader", function() { return simplePixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -4890,7 +4890,7 @@ var simplePixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "simpleVertexShader", function() { return simpleVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -4924,7 +4924,7 @@ var simpleVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SimpleMaterial", function() { return SimpleMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _simple_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./simple.fragment */ "./simple/simple.fragment.ts");
 
 /* harmony import */ var _simple_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./simple.vertex */ "./simple/simple.vertex.ts");
 
@@ -5238,7 +5238,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skyPixelShader", function() { return skyPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -5264,7 +5264,7 @@ var skyPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skyVertexShader", function() { return skyVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -5291,7 +5291,7 @@ var skyVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SkyMaterial", function() { return SkyMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _sky_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./sky.fragment */ "./sky/sky.fragment.ts");
 
 /* harmony import */ var _sky_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./sky.vertex */ "./sky/sky.vertex.ts");
 
@@ -5651,7 +5651,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "terrainPixelShader", function() { return terrainPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -5684,7 +5684,7 @@ var terrainPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "terrainVertexShader", function() { return terrainVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -5718,7 +5718,7 @@ var terrainVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TerrainMaterial", function() { return TerrainMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _terrain_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./terrain.fragment */ "./terrain/terrain.fragment.ts");
 
 /* harmony import */ var _terrain_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./terrain.vertex */ "./terrain/terrain.vertex.ts");
 
@@ -6163,7 +6163,7 @@ __webpack_require__.r(__webpack_exports__);
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TriPlanarMaterial", function() { return TriPlanarMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _triplanar_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./triplanar.fragment */ "./triPlanar/triplanar.fragment.ts");
 
 /* harmony import */ var _triplanar_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./triplanar.vertex */ "./triPlanar/triplanar.vertex.ts");
 
@@ -6570,7 +6570,7 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "triplanarPixelShader", function() { return triplanarPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -6603,7 +6603,7 @@ var triplanarPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "triplanarVertexShader", function() { return triplanarVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -6653,7 +6653,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waterPixelShader", function() { return waterPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -6689,7 +6689,7 @@ var waterPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waterVertexShader", function() { return waterVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -6725,7 +6725,7 @@ var waterVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WaterMaterial", function() { return WaterMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _water_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./water.fragment */ "./water/water.fragment.ts");
 
 /* harmony import */ var _water_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./water.vertex */ "./water/water.vertex.ts");
 
@@ -7428,14 +7428,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/decorators":
 
+/***/ "babylonjs/Materials/effect":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
 
 /***/ })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/materialsLibrary/babylonjs.materials.js.map


+ 1 - 1
dist/preview release/packagesSizeBaseLine.json
Näytä tiedosto 

@@ -1 +1 @@
 
-{"thinEngineOnly":112467,"engineOnly":148577,"sceneOnly":503616,"minGridMaterial":634243,"minStandardMaterial":774375}
 
+{"thinEngineOnly":112467,"engineOnly":148577,"sceneOnly":504040,"minGridMaterial":634667,"minStandardMaterial":774799}

+ 2 - 4
dist/preview release/viewer/babylon.module.d.ts
Näytä tiedosto 

@@ -27169,7 +27169,6 @@ declare module "babylonjs/Materials/standardMaterial" {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

@@ -38052,6 +38051,7 @@ declare module "babylonjs/assetContainer" {
 
      * Container with a set of assets that can be added or removed from a scene.

      */

     export class AssetContainer extends AbstractScene {

+        private _wasAddedToScene;

         /**

          * The scene the AssetContainer belongs to.

          */

@@ -53009,7 +53009,6 @@ declare module "babylonjs/Materials/PBR/pbrBaseMaterial" {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

@@ -99612,7 +99611,6 @@ declare module BABYLON {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

@@ -110232,6 +110230,7 @@ declare module BABYLON {
 
      * Container with a set of assets that can be added or removed from a scene.

      */

     export class AssetContainer extends AbstractScene {

+        private _wasAddedToScene;

         /**

          * The scene the AssetContainer belongs to.

          */

@@ -124086,7 +124085,6 @@ declare module BABYLON {
 
         USE_LOCAL_REFLECTIONMAP_CUBIC: boolean;

         REFLECTIONMAP_PROJECTION: boolean;

         REFLECTIONMAP_SKYBOX: boolean;

-        REFLECTIONMAP_SKYBOX_TRANSFORMED: boolean;

         REFLECTIONMAP_EXPLICIT: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR: boolean;

         REFLECTIONMAP_EQUIRECTANGULAR_FIXED: boolean;

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 23 - 23
dist/preview release/viewer/babylon.viewer.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 2
dist/preview release/viewer/babylon.viewer.max.js


+ 49 - 46
dist/preview release/viewer/babylonjs.loaders.module.d.ts
Näytä tiedosto 

@@ -46,6 +46,8 @@ declare module "babylonjs-loaders/glTF/glTFFileLoader" {
 
     import { WebRequest } from "babylonjs/Misc/webRequest";

     import { IFileRequest } from "babylonjs/Misc/fileRequest";

     import { IDataBuffer } from 'babylonjs/Misc/dataReader';

+    import { Light } from 'babylonjs/Lights/light';

+    import { TransformNode } from 'babylonjs/Meshes/transformNode';

     /**

      * Mode that determines the coordinate system to use.

      */

@@ -125,14 +127,18 @@ declare module "babylonjs-loaders/glTF/glTFFileLoader" {
 
         COMPLETE = 2

     }

     /** @hidden */

+    export interface IImportMeshAsyncOutput {

+        meshes: AbstractMesh[];

+        particleSystems: IParticleSystem[];

+        skeletons: Skeleton[];

+        animationGroups: AnimationGroup[];

+        lights: Light[];

+        transformNodes: TransformNode[];

+    }

+    /** @hidden */

     export interface IGLTFLoader extends IDisposable {

         readonly state: Nullable<GLTFLoaderState>;

-        importMeshAsync: (meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync: (meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<IImportMeshAsyncOutput>;

         loadAsync: (scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<void>;

     }

     /**

@@ -783,6 +789,7 @@ declare module "babylonjs-loaders/glTF/1.0/glTFLoaderInterfaces" {
 
         importOnlyMeshes: boolean;

         importMeshesNames?: string[];

         dummyNodes: Node[];

+        forAssetContainer: boolean;

     }

     /** @hidden */

     export interface INodeToRoot {

@@ -863,15 +870,11 @@ declare module "babylonjs-loaders/glTF/1.0/glTFLoaderUtils" {
 
 declare module "babylonjs-loaders/glTF/1.0/glTFLoader" {

     import { IGLTFRuntime } from "babylonjs-loaders/glTF/1.0/glTFLoaderInterfaces";

     import { Nullable } from "babylonjs/types";

-    import { AnimationGroup } from "babylonjs/Animations/animationGroup";

-    import { Skeleton } from "babylonjs/Bones/skeleton";

-    import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";

     import { Material } from "babylonjs/Materials/material";

     import { Texture } from "babylonjs/Materials/Textures/texture";

-    import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";

     import { SceneLoaderProgressEvent } from "babylonjs/Loading/sceneLoader";

     import { Scene } from "babylonjs/scene";

-    import { IGLTFLoader, GLTFLoaderState, IGLTFLoaderData } from "babylonjs-loaders/glTF/glTFFileLoader";

+    import { IGLTFLoader, GLTFLoaderState, IGLTFLoaderData, IImportMeshAsyncOutput } from "babylonjs-loaders/glTF/glTFFileLoader";

     /**

     * Implementation of the base glTF spec

     * @hidden

@@ -900,17 +903,13 @@ declare module "babylonjs-loaders/glTF/1.0/glTFLoader" {
 
         * Imports one or more meshes from a loaded gltf file and adds them to the scene

         * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

         * @param scene the scene the meshes should be added to

+        * @param forAssetContainer defines if the entities must be stored in the scene

         * @param data gltf data containing information of the meshes in a loaded file

         * @param rootUrl root url to load from

         * @param onProgress event that fires when loading progress has occured

         * @returns a promise containg the loaded meshes, particles, skeletons and animations

         */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<IImportMeshAsyncOutput>;

         private _loadAsync;

         /**

         * Imports all objects from a loaded gltf file and adds them to the scene

@@ -1362,8 +1361,6 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
     import { Nullable } from "babylonjs/types";

     import { Camera } from "babylonjs/Cameras/camera";

     import { AnimationGroup } from "babylonjs/Animations/animationGroup";

-    import { Skeleton } from "babylonjs/Bones/skeleton";

-    import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";

     import { Material } from "babylonjs/Materials/material";

     import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";

     import { TransformNode } from "babylonjs/Meshes/transformNode";

@@ -1374,9 +1371,10 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
     import { IProperty } from "babylonjs-gltf2interface";

     import { IGLTF, INode, IScene, IMesh, ICamera, IAnimation, IAnimationChannel, IBufferView, IMaterial, ITextureInfo, IImage, IMeshPrimitive, IArrayItem as IArrItem } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";

     import { IGLTFLoaderExtension } from "babylonjs-loaders/glTF/2.0/glTFLoaderExtension";

-    import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData } from "babylonjs-loaders/glTF/glTFFileLoader";

+    import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData, IImportMeshAsyncOutput } from "babylonjs-loaders/glTF/glTFFileLoader";

     import { IAnimatable } from 'babylonjs/Animations/animatable.interface';

     import { IDataBuffer } from 'babylonjs/Misc/dataReader';

+    import { Light } from 'babylonjs/Lights/light';

     /**

      * Helper class for working with arrays when loading the glTF asset

      */

@@ -1401,6 +1399,10 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
     export class GLTFLoader implements IGLTFLoader {

         /** @hidden */

         _completePromises: Promise<any>[];

+        /** @hidden */

+        _forAssetContainer: boolean;

+        /** Storage */

+        _babylonLights: Light[];

         private _disposed;

         private _parent;

         private _state;

@@ -1458,12 +1460,7 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
         /** @hidden */

         dispose(): void;

         /** @hidden */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<IImportMeshAsyncOutput>;

         /** @hidden */

         loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<void>;

         private _loadAsync;

@@ -1482,6 +1479,7 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
         loadSceneAsync(context: string, scene: IScene): Promise<void>;

         private _forEachPrimitive;

         private _getMeshes;

+        private _getTransformNodes;

         private _getSkeletons;

         private _getAnimationGroups;

         private _startAnimations;

@@ -2246,8 +2244,9 @@ declare module "babylonjs-loaders/OBJ/mtlFileLoader" {
 
          * @param scene defines the scene the material will be created in

          * @param data defines the mtl data to parse

          * @param rootUrl defines the rooturl to use in order to load relative dependencies

+         * @param forAssetContainer defines if the material should be registered in the scene

          */

-        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string): void;

+        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, forAssetContainer: boolean): void;

         /**

          * Gets the texture for the material.

          *

@@ -2381,6 +2380,7 @@ declare module "babylonjs-loaders/OBJ/objFileLoader" {
 
         facePattern4: RegExp;

         /** @hidden */

         facePattern5: RegExp;

+        private _forAssetContainer;

         private _meshLoadOptions;

         /**

          * Creates loader for .OBJ files

@@ -2695,14 +2695,18 @@ declare module BABYLON {
 
         COMPLETE = 2

     }

     /** @hidden */

+    export interface IImportMeshAsyncOutput {

+        meshes: AbstractMesh[];

+        particleSystems: IParticleSystem[];

+        skeletons: Skeleton[];

+        animationGroups: AnimationGroup[];

+        lights: Light[];

+        transformNodes: TransformNode[];

+    }

+    /** @hidden */

     export interface IGLTFLoader extends IDisposable {

         readonly state: Nullable<GLTFLoaderState>;

-        importMeshAsync: (meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync: (meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<IImportMeshAsyncOutput>;

         loadAsync: (scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<void>;

     }

     /**

@@ -3348,6 +3352,7 @@ declare module BABYLON.GLTF1 {
 
         importOnlyMeshes: boolean;

         importMeshesNames?: string[];

         dummyNodes: Node[];

+        forAssetContainer: boolean;

     }

     /** @hidden */

     export interface INodeToRoot {

@@ -3449,17 +3454,13 @@ declare module BABYLON.GLTF1 {
 
         * Imports one or more meshes from a loaded gltf file and adds them to the scene

         * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

         * @param scene the scene the meshes should be added to

+        * @param forAssetContainer defines if the entities must be stored in the scene

         * @param data gltf data containing information of the meshes in a loaded file

         * @param rootUrl root url to load from

         * @param onProgress event that fires when loading progress has occured

         * @returns a promise containg the loaded meshes, particles, skeletons and animations

         */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<IImportMeshAsyncOutput>;

         private _loadAsync;

         /**

         * Imports all objects from a loaded gltf file and adds them to the scene

@@ -3896,6 +3897,10 @@ declare module BABYLON.GLTF2 {
 
     export class GLTFLoader implements IGLTFLoader {

         /** @hidden */

         _completePromises: Promise<any>[];

+        /** @hidden */

+        _forAssetContainer: boolean;

+        /** Storage */

+        _babylonLights: Light[];

         private _disposed;

         private _parent;

         private _state;

@@ -3953,12 +3958,7 @@ declare module BABYLON.GLTF2 {
 
         /** @hidden */

         dispose(): void;

         /** @hidden */

-        importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<{

-            meshes: AbstractMesh[];

-            particleSystems: IParticleSystem[];

-            skeletons: Skeleton[];

-            animationGroups: AnimationGroup[];

-        }>;

+        importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<IImportMeshAsyncOutput>;

         /** @hidden */

         loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<void>;

         private _loadAsync;

@@ -3977,6 +3977,7 @@ declare module BABYLON.GLTF2 {
 
         loadSceneAsync(context: string, scene: IScene): Promise<void>;

         private _forEachPrimitive;

         private _getMeshes;

+        private _getTransformNodes;

         private _getSkeletons;

         private _getAnimationGroups;

         private _startAnimations;

@@ -4629,8 +4630,9 @@ declare module BABYLON {
 
          * @param scene defines the scene the material will be created in

          * @param data defines the mtl data to parse

          * @param rootUrl defines the rooturl to use in order to load relative dependencies

+         * @param forAssetContainer defines if the material should be registered in the scene

          */

-        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string): void;

+        parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, forAssetContainer: boolean): void;

         /**

          * Gets the texture for the material.

          *

@@ -4756,6 +4758,7 @@ declare module BABYLON {
 
         facePattern4: RegExp;

         /** @hidden */

         facePattern5: RegExp;

+        private _forAssetContainer;

         private _meshLoadOptions;

         /**

          * Creates loader for .OBJ files

+ 5 - 1
loaders/src/OBJ/mtlFileLoader.ts
Näytä tiedosto 

@@ -27,8 +27,9 @@ export class MTLFileLoader {
 
      * @param scene defines the scene the material will be created in

      * @param data defines the mtl data to parse

      * @param rootUrl defines the rooturl to use in order to load relative dependencies

+     * @param forAssetContainer defines if the material should be registered in the scene

      */

-    public parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string): void {

+    public parseMTL(scene: Scene, data: string | ArrayBuffer, rootUrl: string, forAssetContainer: boolean): void {

         if (data instanceof ArrayBuffer) {

             return;

         }

@@ -69,7 +70,10 @@ export class MTLFileLoader {
 
                 }

                 //Create a new material.

                 // value is the name of the material read in the mtl file

+

+                scene._blockEntityCollection = forAssetContainer;

                 material = new StandardMaterial(value, scene);

+                scene._blockEntityCollection = false;

             } else if (key === "kd" && material) {

                 // Diffuse color (color under white light) using RGB values

+ 13 - 1
loaders/src/OBJ/objFileLoader.ts
Näytä tiedosto 

@@ -153,6 +153,8 @@ export class OBJFileLoader implements ISceneLoaderPluginAsync, ISceneLoaderPlugi
 
     /** @hidden */
 
     public facePattern5 = /f\s+(((-[\d]{1,}\/-[\d]{1,}\/-[\d]{1,}[\s]?){3,})+)/;
 
 
+    private _forAssetContainer = false;
 
+
 
     private _meshLoadOptions: MeshLoadOptions;
 
 
     /**
 
@@ -271,6 +273,8 @@ export class OBJFileLoader implements ISceneLoaderPluginAsync, ISceneLoaderPlugi
 
      * @returns The loaded asset container
 
      */
 
     public loadAssetContainerAsync(scene: Scene, data: string, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<AssetContainer> {
 
+        this._forAssetContainer = true;
 
+
 
         return this.importMeshAsync(null, scene, data, rootUrl).then((result) => {
 
             var container = new AssetContainer(scene);
 
             result.meshes.forEach((mesh) => container.meshes.push(mesh));
 
@@ -291,7 +295,11 @@ export class OBJFileLoader implements ISceneLoaderPluginAsync, ISceneLoaderPlugi
 
                     }
 
                 }
 
             });
 
+            this._forAssetContainer = false;
 
             return container;
 
+        }).catch((ex) => {
 
+            this._forAssetContainer = false;
 
+            throw ex;
 
         });
 
     }
 
 
@@ -918,7 +926,11 @@ export class OBJFileLoader implements ISceneLoaderPluginAsync, ISceneLoaderPlugi
 
             //Set the data with VertexBuffer for each mesh
 
             handledMesh = meshesFromObj[j];
 
             //Create a Mesh with the name of the obj mesh
 
+
 
+            scene._blockEntityCollection = this._forAssetContainer;
 
             var babylonMesh = new Mesh(meshesFromObj[j].name, scene);
 
+            scene._blockEntityCollection = false;
 
+
 
             //Push the name of the material to an array
 
             //This is indispensable for the importMesh function
 
             materialToUse.push(meshesFromObj[j].materialName);
 
@@ -957,7 +969,7 @@ export class OBJFileLoader implements ISceneLoaderPluginAsync, ISceneLoaderPlugi
 
                 this._loadMTL(fileToLoad, rootUrl, (dataLoaded) => {
 
                     try {
 
                         //Create materials thanks MTLLoader function
 
-                        materialsFromMTLFile.parseMTL(scene, dataLoaded, rootUrl);
 
+                        materialsFromMTLFile.parseMTL(scene, dataLoaded, rootUrl, this._forAssetContainer);
 
                         //Look at each material loaded in the mtl file
 
                         for (var n = 0; n < materialsFromMTLFile.materials.length; n++) {
 
                             //Three variables to get all meshes with the same material

+ 2 - 0
loaders/src/STL/stlFileLoader.ts
Näytä tiedosto 

@@ -136,7 +136,9 @@ export class STLFileLoader implements ISceneLoaderPlugin {
 
      */
 
     public loadAssetContainer(scene: Scene, data: string, rootUrl: string, onError?: (message: string, exception?: any) => void): AssetContainer {
 
         var container = new AssetContainer(scene);
 
+        scene._blockEntityCollection = true;
 
         this.importMesh(null, scene, data, rootUrl, container.meshes, null, null);
 
+        scene._blockEntityCollection = false;
 
         return container;
 
     }

+ 29 - 10
loaders/src/glTF/1.0/glTFLoader.ts
Näytä tiedosto 

@@ -5,11 +5,9 @@ import { Quaternion, Color3, Vector3, Matrix } from "babylonjs/Maths/math";
 
 import { Tools } from "babylonjs/Misc/tools";

 import { Camera } from "babylonjs/Cameras/camera";

 import { FreeCamera } from "babylonjs/Cameras/freeCamera";

-import { AnimationGroup } from "babylonjs/Animations/animationGroup";

 import { Animation } from "babylonjs/Animations/animation";

 import { Bone } from "babylonjs/Bones/bone";

 import { Skeleton } from "babylonjs/Bones/skeleton";

-import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";

 import { Effect } from "babylonjs/Materials/effect";

 import { Material } from "babylonjs/Materials/material";

 import { MultiMaterial } from "babylonjs/Materials/multiMaterial";

@@ -31,7 +29,7 @@ import { SceneLoaderProgressEvent } from "babylonjs/Loading/sceneLoader";
 
 import { Scene } from "babylonjs/scene";

 

 import { GLTFUtils } from "./glTFLoaderUtils";

-import { GLTFFileLoader, IGLTFLoader, GLTFLoaderState, IGLTFLoaderData } from "../glTFFileLoader";

+import { GLTFFileLoader, IGLTFLoader, GLTFLoaderState, IGLTFLoaderData, IImportMeshAsyncOutput } from "../glTFFileLoader";

 import { Constants } from 'babylonjs/Engines/constants';

 

 /**

@@ -246,7 +244,9 @@ var loadAnimations = (gltfRuntime: IGLTFRuntime) => {
 
             }

 

             if (!modifyKey) {

+                gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

                 babylonAnimation = new Animation(anim, isBone ? "_matrix" : targetPath, 1, animationType, Animation.ANIMATIONLOOPMODE_CYCLE);

+                gltfRuntime.scene._blockEntityCollection = false;

             }

 

             // For each frame

@@ -606,7 +606,9 @@ var importSkeleton = (gltfRuntime: IGLTFRuntime, skins: IGLTFSkins, mesh: Mesh,
 
 */

 var importMesh = (gltfRuntime: IGLTFRuntime, node: IGLTFNode, meshes: string[], id: string, newMesh: Mesh): Mesh => {

     if (!newMesh) {

+        gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

         newMesh = new Mesh(node.name || "", gltfRuntime.scene);

+        gltfRuntime.scene._blockEntityCollection = false;

         newMesh.id = id;

     }

 

@@ -732,6 +734,7 @@ var importMesh = (gltfRuntime: IGLTFRuntime, node: IGLTFNode, meshes: string[],
 
         }

     }

     let material: StandardMaterial | MultiMaterial;

+    gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

     if (subMaterials.length > 1) {

         material = new MultiMaterial("multimat" + id, gltfRuntime.scene);

         (material as MultiMaterial).subMaterials = subMaterials;

@@ -752,6 +755,8 @@ var importMesh = (gltfRuntime: IGLTFRuntime, node: IGLTFNode, meshes: string[],
 
     new Geometry(id, gltfRuntime.scene, vertexData!, false, newMesh);

     newMesh.computeWorldMatrix(true);

 

+    gltfRuntime.scene._blockEntityCollection = false;

+

     // Apply submeshes

     newMesh.subMeshes = [];

     var index = 0;

@@ -916,6 +921,8 @@ var importNode = (gltfRuntime: IGLTFRuntime, node: IGLTFNode, id: string, parent
 
         var camera: IGLTFCamera = gltfRuntime.cameras[node.camera];

 

         if (camera) {

+

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             if (camera.type === "orthographic") {

                 var orthoCamera = new FreeCamera(node.camera, Vector3.Zero(), gltfRuntime.scene, false);

 

@@ -943,6 +950,8 @@ var importNode = (gltfRuntime: IGLTFRuntime, node: IGLTFNode, id: string, parent
 
 

                 lastNode = persCamera;

             }

+

+            gltfRuntime.scene._blockEntityCollection = false;

         }

     }

 

@@ -952,7 +961,9 @@ var importNode = (gltfRuntime: IGLTFRuntime, node: IGLTFNode, id: string, parent
 
             return node.babylonNode;

         }

         else if (lastNode === null) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             var dummy = new Mesh(node.name || "", gltfRuntime.scene);

+            gltfRuntime.scene._blockEntityCollection = false;

             node.babylonNode = dummy;

             lastNode = dummy;

         }

@@ -1238,7 +1249,9 @@ export class GLTFLoaderBase {
 
 

             importOnlyMeshes: false,

 

-            dummyNodes: []

+            dummyNodes: [],

+

+            forAssetContainer: false

         };

 

         // Parse

@@ -1430,7 +1443,9 @@ export class GLTFLoaderBase {
 
 

         var technique: IGLTFTechnique = gltfRuntime.techniques[material.technique];

         if (!technique) {

+            gltfRuntime.scene._blockEntityCollection = gltfRuntime.forAssetContainer;

             var defaultMaterial = new StandardMaterial(id, gltfRuntime.scene);

+            gltfRuntime.scene._blockEntityCollection = false;

             defaultMaterial.diffuseColor = new Color3(0.5, 0.5, 0.5);

             defaultMaterial.sideOrientation = Material.CounterClockWiseSideOrientation;

             onSuccess(defaultMaterial);

@@ -1605,10 +1620,11 @@ export class GLTFLoader implements IGLTFLoader {
 
         // do nothing

     }

 

-    private _importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onSuccess: (meshes: AbstractMesh[], skeletons: Skeleton[]) => void, onProgress?: (event: SceneLoaderProgressEvent) => void, onError?: (message: string) => void): boolean {

+    private _importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, forAssetContainer: boolean, onSuccess: (meshes: AbstractMesh[], skeletons: Skeleton[]) => void, onProgress?: (event: SceneLoaderProgressEvent) => void, onError?: (message: string) => void): boolean {

         scene.useRightHandedSystem = true;

 

         GLTFLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, (gltfRuntime) => {

+            gltfRuntime.forAssetContainer = forAssetContainer;

             gltfRuntime.importOnlyMeshes = true;

 

             if (meshesNames === "") {

@@ -1672,19 +1688,22 @@ export class GLTFLoader implements IGLTFLoader {
 
     * Imports one or more meshes from a loaded gltf file and adds them to the scene

     * @param meshesNames a string or array of strings of the mesh names that should be loaded from the file

     * @param scene the scene the meshes should be added to

+    * @param forAssetContainer defines if the entities must be stored in the scene

     * @param data gltf data containing information of the meshes in a loaded file

     * @param rootUrl root url to load from

     * @param onProgress event that fires when loading progress has occured

     * @returns a promise containg the loaded meshes, particles, skeletons and animations

     */

-    public importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<{ meshes: AbstractMesh[], particleSystems: IParticleSystem[], skeletons: Skeleton[], animationGroups: AnimationGroup[] }> {

+    public importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<IImportMeshAsyncOutput> {

         return new Promise((resolve, reject) => {

-            this._importMeshAsync(meshesNames, scene, data, rootUrl, (meshes, skeletons) => {

+            this._importMeshAsync(meshesNames, scene, data, rootUrl, forAssetContainer, (meshes, skeletons) => {

                 resolve({

                     meshes: meshes,

                     particleSystems: [],

                     skeletons: skeletons,

-                    animationGroups: []

+                    animationGroups: [],

+                    lights: [],

+                    transformNodes: []

                 });

             }, onProgress, (message) => {

                 reject(new Error(message));

@@ -1692,7 +1711,7 @@ export class GLTFLoader implements IGLTFLoader {
 
         });

     }

 

-    private _loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, onSuccess: () => void, onProgress?: (event: SceneLoaderProgressEvent) => void, onError?: (message: string) => void): void {

+    private _loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, forAssetContainer: boolean, onSuccess: () => void, onProgress?: (event: SceneLoaderProgressEvent) => void, onError?: (message: string) => void): void {

         scene.useRightHandedSystem = true;

 

         GLTFLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, (gltfRuntime) => {

@@ -1730,7 +1749,7 @@ export class GLTFLoader implements IGLTFLoader {
 
     */

     public loadAsync(scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void): Promise<void> {

         return new Promise((resolve, reject) => {

-            this._loadAsync(scene, data, rootUrl, () => {

+            this._loadAsync(scene, data, rootUrl, false, () => {

                 resolve();

             }, onProgress, (message) => {

                 reject(new Error(message));

+ 2 - 0
loaders/src/glTF/1.0/glTFLoaderInterfaces.ts
Näytä tiedosto 

@@ -409,6 +409,8 @@ export interface IGLTFRuntime {
 
     importMeshesNames?: string[];

 

     dummyNodes: Node[];

+

+    forAssetContainer: boolean;

 }

 

 /** @hidden */

+ 6 - 0
loaders/src/glTF/2.0/Extensions/KHR_lights_punctual.ts
Näytä tiedosto 

@@ -85,6 +85,8 @@ export class KHR_lights implements IGLTFLoaderExtension {
 
                 const light = ArrayItem.Get(extensionContext, this._lights, extension.light);
 
                 const name = light.name || babylonMesh.name;
 
 
+                this._loader.babylonScene._blockEntityCollection = this._loader._forAssetContainer;
 
+
 
                 switch (light.type) {
 
                     case LightType.DIRECTIONAL: {
 
                         babylonLight = new DirectionalLight(name, Vector3.Backward(), this._loader.babylonScene);
 
@@ -102,16 +104,20 @@ export class KHR_lights implements IGLTFLoaderExtension {
 
                         break;
 
                     }
 
                     default: {
 
+                        this._loader.babylonScene._blockEntityCollection = false;
 
                         throw new Error(`${extensionContext}: Invalid light type (${light.type})`);
 
                     }
 
                 }
 
 
+                this._loader.babylonScene._blockEntityCollection = false;
 
                 babylonLight.falloffType = Light.FALLOFF_GLTF;
 
                 babylonLight.diffuse = light.color ? Color3.FromArray(light.color) : Color3.White();
 
                 babylonLight.intensity = light.intensity == undefined ? 1 : light.intensity;
 
                 babylonLight.range = light.range == undefined ? Number.MAX_VALUE : light.range;
 
                 babylonLight.parent = babylonMesh;
 
 
+                this._loader._babylonLights.push(babylonLight);
 
+
 
                 GLTFLoader.AddPointerMetadata(babylonLight, extensionContext);
 
 
                 assign(babylonMesh);

+ 45 - 4
loaders/src/glTF/2.0/glTFLoader.ts
Näytä tiedosto 

@@ -9,7 +9,6 @@ import { AnimationGroup } from "babylonjs/Animations/animationGroup";
 
 import { Animation } from "babylonjs/Animations/animation";
 
 import { Bone } from "babylonjs/Bones/bone";
 
 import { Skeleton } from "babylonjs/Bones/skeleton";
 
-import { IParticleSystem } from "babylonjs/Particles/IParticleSystem";
 
 import { Material } from "babylonjs/Materials/material";
 
 import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
 
 import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
 
@@ -27,12 +26,13 @@ import { Scene } from "babylonjs/scene";
 
 import { IProperty, AccessorType, CameraType, AnimationChannelTargetPath, AnimationSamplerInterpolation, AccessorComponentType, MaterialAlphaMode, TextureMinFilter, TextureWrapMode, TextureMagFilter, MeshPrimitiveMode } from "babylonjs-gltf2interface";
 
 import { _IAnimationSamplerData, IGLTF, ISampler, INode, IScene, IMesh, IAccessor, ISkin, ICamera, IAnimation, IAnimationChannel, IAnimationSampler, IBuffer, IBufferView, IMaterialPbrMetallicRoughness, IMaterial, ITextureInfo, ITexture, IImage, IMeshPrimitive, IArrayItem as IArrItem, _ISamplerData } from "./glTFLoaderInterfaces";
 
 import { IGLTFLoaderExtension } from "./glTFLoaderExtension";
 
-import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData, GLTFLoaderCoordinateSystemMode, GLTFLoaderAnimationStartMode } from "../glTFFileLoader";
 
+import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData, GLTFLoaderCoordinateSystemMode, GLTFLoaderAnimationStartMode, IImportMeshAsyncOutput } from "../glTFFileLoader";
 
 import { IAnimationKey, AnimationKeyInterpolation } from 'babylonjs/Animations/animationKey';
 
 import { IAnimatable } from 'babylonjs/Animations/animatable.interface';
 
 import { IDataBuffer } from 'babylonjs/Misc/dataReader';
 
 import { LoadFileError } from 'babylonjs/Misc/fileTools';
 
 import { Logger } from 'babylonjs/Misc/logger';
 
+import { Light } from 'babylonjs/Lights/light';
 
 
 interface TypedArrayLike extends ArrayBufferView {
 
     readonly length: number;
 
@@ -99,6 +99,12 @@ export class GLTFLoader implements IGLTFLoader {
 
     /** @hidden */
 
     public _completePromises = new Array<Promise<any>>();
 
 
+    /** @hidden */
 
+    public _forAssetContainer = false;
 
+
 
+    /** Storage */
 
+    public _babylonLights: Light[] = [];
 
+
 
     private _disposed = false;
 
     private _parent: GLTFFileLoader;
 
     private _state: Nullable<GLTFLoaderState> = null;
 
@@ -225,12 +231,13 @@ export class GLTFLoader implements IGLTFLoader {
 
     }
 
 
     /** @hidden */
 
-    public importMeshAsync(meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<{ meshes: AbstractMesh[], particleSystems: IParticleSystem[], skeletons: Skeleton[], animationGroups: AnimationGroup[] }> {
 
+    public importMeshAsync(meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string): Promise<IImportMeshAsyncOutput> {
 
         return Promise.resolve().then(() => {
 
             this._babylonScene = scene;
 
             this._rootUrl = rootUrl;
 
             this._fileName = fileName || "scene";
 
             this._progressCallback = onProgress;
 
+            this._forAssetContainer = forAssetContainer;
 
             this._loadData(data);
 
 
             let nodes: Nullable<Array<number>> = null;
 
@@ -261,7 +268,9 @@ export class GLTFLoader implements IGLTFLoader {
 
                     meshes: this._getMeshes(),
 
                     particleSystems: [],
 
                     skeletons: this._getSkeletons(),
 
-                    animationGroups: this._getAnimationGroups()
 
+                    animationGroups: this._getAnimationGroups(),
 
+                    lights: this._babylonLights,
 
+                    transformNodes: this._getTransformNodes()
 
                 };
 
             });
 
         });
 
@@ -455,7 +464,9 @@ export class GLTFLoader implements IGLTFLoader {
 
     }
 
 
     private _createRootNode(): INode {
 
+        this._babylonScene._blockEntityCollection = this._forAssetContainer;
 
         this._rootBabylonMesh = new Mesh("__root__", this._babylonScene);
 
+        this._babylonScene._blockEntityCollection = false;
 
         this._rootBabylonMesh.setEnabled(false);
 
 
         const rootNode: INode = {
 
@@ -555,6 +566,21 @@ export class GLTFLoader implements IGLTFLoader {
 
         return meshes;
 
     }
 
 
+    private _getTransformNodes(): TransformNode[] {
 
+        const transformNodes = new Array<TransformNode>();
 
+
 
+        const nodes = this._gltf.nodes;
 
+        if (nodes) {
 
+            for (const node of nodes) {
 
+                if (node._babylonTransformNode && node._babylonTransformNode.getClassName() === "TransformNode") {
 
+                    transformNodes.push(node._babylonTransformNode);
 
+                }
 
+            }
 
+        }
 
+
 
+        return transformNodes;
 
+    }
 
+
 
     private _getSkeletons(): Skeleton[] {
 
         const skeletons = new Array<Skeleton>();
 
 
@@ -658,7 +684,9 @@ export class GLTFLoader implements IGLTFLoader {
 
 
         if (node.mesh == undefined) {
 
             const nodeName = node.name || `node${node.index}`;
 
+            this._babylonScene._blockEntityCollection = this._forAssetContainer;
 
             node._babylonTransformNode = new TransformNode(nodeName, this._babylonScene);
 
+            this._babylonScene._blockEntityCollection = false;
 
             loadNode(node._babylonTransformNode);
 
         }
 
         else {
 
@@ -755,7 +783,9 @@ export class GLTFLoader implements IGLTFLoader {
 
         else {
 
             const promises = new Array<Promise<any>>();
 
 
+            this._babylonScene._blockEntityCollection = this._forAssetContainer;
 
             const babylonMesh = new Mesh(name, this._babylonScene);
 
+            this._babylonScene._blockEntityCollection = false;
 
             babylonMesh.overrideMaterialSideOrientation = this._babylonScene.useRightHandedSystem ? Material.CounterClockWiseSideOrientation : Material.ClockWiseSideOrientation;
 
 
             this._createMorphTargets(context, node, mesh, primitive, babylonMesh);
 
@@ -1012,7 +1042,9 @@ export class GLTFLoader implements IGLTFLoader {
 
         }
 
 
         const skeletonId = `skeleton${skin.index}`;
 
+        this._babylonScene._blockEntityCollection = this._forAssetContainer;
 
         const babylonSkeleton = new Skeleton(skin.name || skeletonId, skeletonId, this._babylonScene);
 
+        this._babylonScene._blockEntityCollection = false;
 
 
         // See https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#skins (second implementation note)
 
         babylonSkeleton.overrideMesh = this._rootBabylonMesh;
 
@@ -1116,7 +1148,10 @@ export class GLTFLoader implements IGLTFLoader {
 
 
         this.logOpen(`${context} ${camera.name || ""}`);
 
 
+        this._babylonScene._blockEntityCollection = this._forAssetContainer;
 
         const babylonCamera = new FreeCamera(camera.name || `camera${camera.index}`, Vector3.Zero(), this._babylonScene, false);
 
+        this._babylonScene._blockEntityCollection = false;
 
+
 
         babylonCamera.rotation = new Vector3(0, Math.PI, 0);
 
 
         switch (camera.type) {
 
@@ -1187,7 +1222,9 @@ export class GLTFLoader implements IGLTFLoader {
 
             return promise;
 
         }
 
 
+        this._babylonScene._blockEntityCollection = this._forAssetContainer;
 
         const babylonAnimationGroup = new AnimationGroup(animation.name || `animation${animation.index}`, this._babylonScene);
 
+        this._babylonScene._blockEntityCollection = false;
 
         animation._babylonAnimationGroup = babylonAnimationGroup;
 
 
         const promises = new Array<Promise<any>>();
 
@@ -1687,7 +1724,9 @@ export class GLTFLoader implements IGLTFLoader {
 
     }
 
 
     private _createDefaultMaterial(name: string, babylonDrawMode: number): Material {
 
+        this._babylonScene._blockEntityCollection = this._forAssetContainer;
 
         const babylonMaterial = new PBRMaterial(name, this._babylonScene);
 
+        this._babylonScene._blockEntityCollection = false;
 
         // Moved to mesh so user can change materials on gltf meshes: babylonMaterial.sideOrientation = this._babylonScene.useRightHandedSystem ? Material.CounterClockWiseSideOrientation : Material.ClockWiseSideOrientation;
 
         babylonMaterial.fillMode = babylonDrawMode;
 
         babylonMaterial.enableSpecularAntiAliasing = true;
 
@@ -1894,6 +1933,7 @@ export class GLTFLoader implements IGLTFLoader {
 
         }
 
 
         const deferred = new Deferred<void>();
 
+        this._babylonScene._blockEntityCollection = this._forAssetContainer;
 
         const babylonTexture = new Texture(url, this._babylonScene, samplerData.noMipMaps, false, samplerData.samplingMode, () => {
 
             if (!this._disposed) {
 
                 deferred.resolve();
 
@@ -1903,6 +1943,7 @@ export class GLTFLoader implements IGLTFLoader {
 
                 deferred.reject(new Error(`${context}: ${(exception && exception.message) ? exception.message : message || "Failed to load texture"}`));
 
             }
 
         }, undefined, undefined, undefined, image.mimeType);
 
+        this._babylonScene._blockEntityCollection = false;
 
         promises.push(deferred.promise);
 
 
         if (!url) {

+ 17 - 3
loaders/src/glTF/glTFFileLoader.ts
Näytä tiedosto 

@@ -17,6 +17,8 @@ import { IFileRequest } from "babylonjs/Misc/fileRequest";
 
 import { Logger } from 'babylonjs/Misc/logger';

 import { DataReader, IDataBuffer } from 'babylonjs/Misc/dataReader';

 import { GLTFValidation } from './glTFValidation';

+import { Light } from 'babylonjs/Lights/light';

+import { TransformNode } from 'babylonjs/Meshes/transformNode';

 

 /**

  * Mode that determines the coordinate system to use.

@@ -110,9 +112,19 @@ export enum GLTFLoaderState {
 
 }

 

 /** @hidden */

+export interface IImportMeshAsyncOutput {

+    meshes: AbstractMesh[];

+    particleSystems: IParticleSystem[];

+    skeletons: Skeleton[];

+    animationGroups: AnimationGroup[];

+    lights: Light[];

+    transformNodes: TransformNode[];

+}

+

+/** @hidden */

 export interface IGLTFLoader extends IDisposable {

     readonly state: Nullable<GLTFLoaderState>;

-    importMeshAsync: (meshesNames: any, scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<{ meshes: AbstractMesh[], particleSystems: IParticleSystem[], skeletons: Skeleton[], animationGroups: AnimationGroup[] }>;

+    importMeshAsync: (meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<IImportMeshAsyncOutput>;

     loadAsync: (scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: SceneLoaderProgressEvent) => void, fileName?: string) => Promise<void>;

 }

 

@@ -551,7 +563,7 @@ export class GLTFFileLoader implements IDisposable, ISceneLoaderPluginAsync, ISc
 
 

             this._log(`Loading ${fileName || ""}`);

             this._loader = this._getLoader(data);

-            return this._loader.importMeshAsync(meshesNames, scene, data, rootUrl, onProgress, fileName);

+            return this._loader.importMeshAsync(meshesNames, scene, false, data, rootUrl, onProgress, fileName);

         });

     }

 

@@ -586,7 +598,7 @@ export class GLTFFileLoader implements IDisposable, ISceneLoaderPluginAsync, ISc
 
                 textures.push(texture);

             });

 

-            return this._loader.importMeshAsync(null, scene, data, rootUrl, onProgress, fileName).then((result) => {

+            return this._loader.importMeshAsync(null, scene, true, data, rootUrl, onProgress, fileName).then((result) => {

                 const container = new AssetContainer(scene);

                 Array.prototype.push.apply(container.meshes, result.meshes);

                 Array.prototype.push.apply(container.particleSystems, result.particleSystems);

@@ -594,6 +606,8 @@ export class GLTFFileLoader implements IDisposable, ISceneLoaderPluginAsync, ISc
 
                 Array.prototype.push.apply(container.animationGroups, result.animationGroups);

                 Array.prototype.push.apply(container.materials, materials);

                 Array.prototype.push.apply(container.textures, textures);

+                Array.prototype.push.apply(container.lights, result.lights);

+                Array.prototype.push.apply(container.transformNodes, result.transformNodes);

                 return container;

             });

         });

+ 3 - 0
src/Loading/Plugins/babylonFileLoader.ts
Näytä tiedosto 

@@ -112,6 +112,8 @@ var loadDetailLevels = (scene: Scene, mesh: AbstractMesh) => {
 
 var loadAssetContainer = (scene: Scene, data: string, rootUrl: string, onError?: (message: string, exception?: any) => void, addToScene = false): AssetContainer => {

     var container = new AssetContainer(scene);

 

+    scene._blockEntityCollection = !addToScene;

+

     // Entire method running in try block, so ALWAYS logs as far as it got, only actually writes details

     // when SceneLoader.debugLogging = true (default), or exception encountered.

     // Everything stored in var log instead of writing separate lines to support only writing in exception,

@@ -448,6 +450,7 @@ var loadAssetContainer = (scene: Scene, data: string, rootUrl: string, onError?:
 
             throw err;

         }

     } finally {

+        scene._blockEntityCollection = false;

         if (log !== null && SceneLoader.loggingLevel !== SceneLoader.NO_LOGGING) {

             Logger.Log(logOperation("loadAssets", parsedData ? parsedData.producer : "Unknown") + (SceneLoader.loggingLevel !== SceneLoader.MINIMAL_LOGGING ? log : ""));

         }

+ 0 - 5
src/Loading/sceneLoader.ts
Näytä tiedosto 

@@ -901,8 +901,6 @@ export class SceneLoader {
 
             return null;

         }

 

-        scene._blockEntityCollection = true;

-

         const fileInfo = SceneLoader._getFileInfo(rootUrl, sceneFilename);

         if (!fileInfo) {

             return null;

@@ -916,8 +914,6 @@ export class SceneLoader {
 
         };

 

         var errorHandler = (message: Nullable<string>, exception?: any) => {

-            scene._blockEntityCollection = false;

-

             let errorMessage = "Unable to load assets from " + fileInfo.url + (message ? ": " + message : "");

 

             if (exception && exception.message) {

@@ -944,7 +940,6 @@ export class SceneLoader {
 
         } : undefined;

 

         var successHandler = (assets: AssetContainer) => {

-            scene._blockEntityCollection = false;

             if (onSuccess) {

                 try {

                     onSuccess(assets);

+ 0 - 3
src/Materials/Background/backgroundMaterial.ts
Näytä tiedosto 

@@ -129,7 +129,6 @@ class BackgroundMaterialDefines extends MaterialDefines implements IImageProcess
 
     public REFLECTIONMAP_CUBIC = false;

     public REFLECTIONMAP_PROJECTION = false;

     public REFLECTIONMAP_SKYBOX = false;

-    public REFLECTIONMAP_SKYBOX_TRANSFORMED = false;

     public REFLECTIONMAP_EXPLICIT = false;

     public REFLECTIONMAP_EQUIRECTANGULAR = false;

     public REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;

@@ -738,7 +737,6 @@ export class BackgroundMaterial extends PushMaterial {
 
                             break;

                         case Texture.SKYBOX_MODE:

                             defines.REFLECTIONMAP_SKYBOX = true;

-                            defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = !reflectionTexture.getReflectionTextureMatrix().isIdentity();

                             break;

                         case Texture.SPHERICAL_MODE:

                             defines.REFLECTIONMAP_SPHERICAL = true;

@@ -783,7 +781,6 @@ export class BackgroundMaterial extends PushMaterial {
 
                     defines.REFLECTIONMAP_CUBIC = false;

                     defines.REFLECTIONMAP_PROJECTION = false;

                     defines.REFLECTIONMAP_SKYBOX = false;

-                    defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = false;

                     defines.REFLECTIONMAP_EXPLICIT = false;

                     defines.REFLECTIONMAP_EQUIRECTANGULAR = false;

                     defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;

+ 0 - 6
src/Materials/PBR/pbrBaseMaterial.ts
Näytä tiedosto 

@@ -126,7 +126,6 @@ export class PBRMaterialDefines extends MaterialDefines
 
     public USE_LOCAL_REFLECTIONMAP_CUBIC = false;

     public REFLECTIONMAP_PROJECTION = false;

     public REFLECTIONMAP_SKYBOX = false;

-    public REFLECTIONMAP_SKYBOX_TRANSFORMED = false;

     public REFLECTIONMAP_EXPLICIT = false;

     public REFLECTIONMAP_EQUIRECTANGULAR = false;

     public REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;

@@ -1334,7 +1333,6 @@ export abstract class PBRBaseMaterial extends PushMaterial {
 
                     defines.REFLECTIONMAP_EQUIRECTANGULAR = false;

                     defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;

                     defines.REFLECTIONMAP_MIRROREDEQUIRECTANGULAR_FIXED = false;

-                    defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = false;

 

                     switch (reflectionTexture.coordinatesMode) {

                         case Texture.EXPLICIT_MODE:

@@ -1386,9 +1384,6 @@ export abstract class PBRBaseMaterial extends PushMaterial {
 
                             }

                         }

                     }

-                    else {

-                        defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = !reflectionTexture.getReflectionTextureMatrix().isIdentity();

-                    }

                 } else {

                     defines.REFLECTION = false;

                     defines.REFLECTIONMAP_3D = false;

@@ -1398,7 +1393,6 @@ export abstract class PBRBaseMaterial extends PushMaterial {
 
                     defines.USE_LOCAL_REFLECTIONMAP_CUBIC = false;

                     defines.REFLECTIONMAP_PROJECTION = false;

                     defines.REFLECTIONMAP_SKYBOX = false;

-                    defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = false;

                     defines.REFLECTIONMAP_EXPLICIT = false;

                     defines.REFLECTIONMAP_EQUIRECTANGULAR = false;

                     defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;

+ 0 - 2
src/Materials/standardMaterial.ts
Näytä tiedosto 

@@ -96,7 +96,6 @@ export class StandardMaterialDefines extends MaterialDefines implements IImagePr
 
     public USE_LOCAL_REFLECTIONMAP_CUBIC = false;

     public REFLECTIONMAP_PROJECTION = false;

     public REFLECTIONMAP_SKYBOX = false;

-    public REFLECTIONMAP_SKYBOX_TRANSFORMED = false;

     public REFLECTIONMAP_EXPLICIT = false;

     public REFLECTIONMAP_EQUIRECTANGULAR = false;

     public REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;

@@ -864,7 +863,6 @@ export class StandardMaterial extends PushMaterial {
 
                                 break;

                             case Texture.SKYBOX_MODE:

                                 defines.setReflectionMode("REFLECTIONMAP_SKYBOX");

-                                defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = !this._reflectionTexture.getReflectionTextureMatrix().isIdentity();

                                 break;

                             case Texture.SPHERICAL_MODE:

                                 defines.setReflectionMode("REFLECTIONMAP_SPHERICAL");

+ 3 - 0
src/Misc/brdfTextureTools.ts
Näytä tiedosto 

@@ -18,7 +18,10 @@ export class BRDFTextureTools {
 
             var useDelayedTextureLoading = scene.useDelayedTextureLoading;

             scene.useDelayedTextureLoading = false;

 

+            const previousState = scene._blockEntityCollection;

+            scene._blockEntityCollection = false;

             var texture = Texture.CreateFromBase64String(this._environmentBRDFBase64Texture, "EnvironmentBRDFTexture", scene, true, false, Texture.BILINEAR_SAMPLINGMODE);

+            scene._blockEntityCollection = previousState;

             // BRDF Texture should not be cached here due to pre processing and redundant scene caches.

             var texturesCache = scene.getEngine().getLoadedTexturesCache();

             var index = texturesCache.indexOf(texture.getInternalTexture()!);

+ 1 - 5
src/Shaders/background.vertex.fx
Näytä tiedosto 

@@ -53,11 +53,7 @@ varying vec3 vDirectionW;
 
 void main(void) {

 

 #ifdef REFLECTIONMAP_SKYBOX

-    #ifdef REFLECTIONMAP_SKYBOX_TRANSFORMED

-        vPositionUVW = (reflectionMatrix * vec4(position, 1.0)).xyz;

-    #else

-        vPositionUVW = position;

-    #endif

+    vPositionUVW = position;

 #endif 

 

 #include<instancesVertex>

+ 1 - 5
src/Shaders/default.vertex.fx
Näytä tiedosto 

@@ -112,11 +112,7 @@ void main(void) {
 
 #include<morphTargetsVertex>[0..maxSimultaneousMorphTargets]

 

 #ifdef REFLECTIONMAP_SKYBOX

-	#ifdef REFLECTIONMAP_SKYBOX_TRANSFORMED

-		vPositionUVW = (reflectionMatrix * vec4(positionUpdated, 1.0)).xyz;

-	#else

-		vPositionUVW = positionUpdated;

-	#endif

+	vPositionUVW = positionUpdated;

 #endif 

 

 #define CUSTOM_VERTEX_UPDATE_POSITION

+ 1 - 5
src/Shaders/pbr.vertex.fx
Näytä tiedosto 

@@ -153,11 +153,7 @@ void main(void) {
 
 #include<morphTargetsVertex>[0..maxSimultaneousMorphTargets]
 
 
 #ifdef REFLECTIONMAP_SKYBOX
 
-    #ifdef REFLECTIONMAP_SKYBOX_TRANSFORMED
 
-        vPositionUVW = (reflectionMatrix * vec4(positionUpdated, 1.0)).xyz;
 
-    #else
 
-        vPositionUVW = positionUpdated;
 
-    #endif
 
+    vPositionUVW = positionUpdated;
 
 #endif 
 
 #define CUSTOM_VERTEX_UPDATE_POSITION

+ 13 - 0
src/assetContainer.ts
Näytä tiedosto 

@@ -42,6 +42,8 @@ export class InstantiatedEntries {
 
  * Container with a set of assets that can be added or removed from a scene.

  */

 export class AssetContainer extends AbstractScene {

+    private _wasAddedToScene = false;

+

     /**

      * The scene the AssetContainer belongs to.

      */

@@ -60,6 +62,12 @@ export class AssetContainer extends AbstractScene {
 
         this["lensFlareSystems"] = [];

         this["proceduralTextures"] = [];

         this["reflectionProbes"] = [];

+

+        scene.onDisposeObservable.add(() => {

+            if (!this._wasAddedToScene) {

+                this.dispose();

+            }

+        });

     }

 

     /**

@@ -221,6 +229,8 @@ export class AssetContainer extends AbstractScene {
 
      * Adds all the assets from the container to the scene.

      */

     public addAllToScene() {

+        this._wasAddedToScene = true;

+

         this.cameras.forEach((o) => {

             this.scene.addCamera(o);

         });

@@ -277,6 +287,8 @@ export class AssetContainer extends AbstractScene {
 
      * Removes all the assets in the container from the scene

      */

     public removeAllFromScene() {

+        this._wasAddedToScene = false;

+

         this.cameras.forEach((o) => {

             this.scene.removeCamera(o);

         });

@@ -430,6 +442,7 @@ export class AssetContainer extends AbstractScene {
 
      * @param keepAssets Set of assets to keep in the scene. (default: empty)

      */

     public moveAllFromScene(keepAssets?: KeepAssets): void {

+        this._wasAddedToScene = false;

 

         if (keepAssets === undefined) {

             keepAssets = new KeepAssets();

+ 18 - 3
src/scene.ts
Näytä tiedosto 

@@ -2041,10 +2041,12 @@ export class Scene extends AbstractScene implements IAnimatable {
 
      * @param recursive if all child meshes should also be added to the scene

      */

     public addMesh(newMesh: AbstractMesh, recursive = false) {

-        if (!this._blockEntityCollection) {

-            this.meshes.push(newMesh);

+        if (this._blockEntityCollection) {

+            return;

         }

 

+        this.meshes.push(newMesh);

+

         newMesh._resyncLightSources();

 

         if (!newMesh.parent) {

@@ -2092,6 +2094,9 @@ export class Scene extends AbstractScene implements IAnimatable {
 
      * @param newTransformNode defines the transform node to add

      */

     public addTransformNode(newTransformNode: TransformNode) {

+        if (this._blockEntityCollection) {

+            return;

+        }

         newTransformNode._indexInSceneTransformNodesArray = this.transformNodes.length;

         this.transformNodes.push(newTransformNode);

 

@@ -2334,6 +2339,9 @@ export class Scene extends AbstractScene implements IAnimatable {
 
      * @param newLight The light to add

      */

     public addLight(newLight: Light): void {

+        if (this._blockEntityCollection) {

+            return;

+        }

         this.lights.push(newLight);

         this.sortLightsByPriority();

 

@@ -2341,7 +2349,7 @@ export class Scene extends AbstractScene implements IAnimatable {
 
             newLight._addToSceneRootNodes();

         }

 

-        // Add light to all meshes (To support if the light is removed and then readded)

+        // Add light to all meshes (To support if the light is removed and then re-added)

         for (var mesh of this.meshes) {

             if (mesh.lightSources.indexOf(newLight) === -1) {

                 mesh.lightSources.push(newLight);

@@ -2366,6 +2374,10 @@ export class Scene extends AbstractScene implements IAnimatable {
 
      * @param newCamera The camera to add

      */

     public addCamera(newCamera: Camera): void {

+        if (this._blockEntityCollection) {

+            return;

+        }

+

         this.cameras.push(newCamera);

         this.onNewCameraAddedObservable.notifyObservers(newCamera);

 

@@ -2484,6 +2496,9 @@ export class Scene extends AbstractScene implements IAnimatable {
 
      * @param newTexture The texture to add

      */

     public addTexture(newTexture: BaseTexture): void {

+        if (this._blockEntityCollection) {

+            return;

+        }

         this.textures.push(newTexture);

         this.onNewTextureAddedObservable.notifyObservers(newTexture);

     }

BIN
tests/validation/ReferenceImages/pointLightShadows.png
Näytä tiedosto