首頁 探索 說明
註冊 登入
zhangyupeng
/
Babylon.js
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'master' into newBloom

Trevor Baron 7 年之前
父節點
9fbd1f8be9 8e48d57c9a
當前提交
81faaaa24d
共有 85 個文件被更改，包括 918761 次插入 和 25170 次删除
分割檢視 顯示文件統計
  1. 4356 4353
      Playground/babylon.d.txt
  2. 399 301
      Playground/index-local.html
  3. 417 416
      Playground/index.html
  4. 413 316
      Playground/indexStable.html
  5. 892574 0
      Playground/scenes/dummy2.babylon
  6. 二進制
      Playground/sounds/cellolong.wav
  7. 二進制
      Playground/sounds/violons18.wav
  8. 13 1
      Tools/Gulp/config.json
  9. 57 32
      Tools/Gulp/gulp-addModuleExports.js
  10. 11 7
      Tools/Gulp/gulpfile.js
  11. 14 8
      Viewer/src/configuration/loader.ts
  12. 4 0
      Viewer/src/configuration/mappers.ts
  13. 4 0
      Viewer/src/eventManager.ts
  14. 10 3
      Viewer/src/index.ts
  15. 3 2
      Viewer/src/model/modelAnimation.ts
  16. 1 1
      Viewer/src/model/viewerModel.ts
  17. 21 1
      Viewer/src/templateManager.ts
  18. 1 1
      Viewer/src/viewer/defaultViewer.ts
  19. 41 2
      Viewer/src/viewer/viewer.ts
  20. 14 2
      Viewer/src/viewer/viewerManager.ts
  21. 3 1
      Viewer/webpack.config.js
  22. 1 1
      dist/preview release/Oimo.js
  23. 9669 9670
      dist/preview release/babylon.d.ts
  24. 57 57
      dist/preview release/babylon.js
  25. 171 110
      dist/preview release/babylon.max.js
  26. 58 58
      dist/preview release/babylon.worker.js
  27. 8863 8864
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts
  28. 59 59
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js
  29. 169 110
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js
  30. 128 88
      dist/preview release/customConfigurations/minimalGLTFViewer/es6.js
  31. 130 88
      dist/preview release/es6.js
  32. 1 1
      dist/preview release/gltf2Interface/package.json
  33. 4 0
      dist/preview release/gui/babylon.gui.d.ts
  34. 74 21
      dist/preview release/gui/babylon.gui.js
  35. 4 4
      dist/preview release/gui/babylon.gui.min.js
  36. 4 0
      dist/preview release/gui/babylon.gui.module.d.ts
  37. 1 1
      dist/preview release/gui/package.json
  38. 4 4
      dist/preview release/inspector/babylon.inspector.bundle.js
  39. 1 1
      dist/preview release/inspector/package.json
  40. 4 2
      dist/preview release/loaders/babylon.glTF2FileLoader.js
  41. 1 1
      dist/preview release/loaders/babylon.glTF2FileLoader.min.js
  42. 4 2
      dist/preview release/loaders/babylon.glTFFileLoader.js
  43. 1 1
      dist/preview release/loaders/babylon.glTFFileLoader.min.js
  44. 28 23
      dist/preview release/loaders/babylonjs.loaders.js
  45. 3 3
      dist/preview release/loaders/babylonjs.loaders.min.js
  46. 2 2
      dist/preview release/loaders/package.json
  47. 24 21
      dist/preview release/materialsLibrary/babylonjs.materials.js
  48. 2 2
      dist/preview release/materialsLibrary/babylonjs.materials.min.js
  49. 1 1
      dist/preview release/materialsLibrary/package.json
  50. 24 21
      dist/preview release/postProcessesLibrary/babylonjs.postProcess.js
  51. 1 1
      dist/preview release/postProcessesLibrary/babylonjs.postProcess.min.js
  52. 1 1
      dist/preview release/postProcessesLibrary/package.json
  53. 24 21
      dist/preview release/proceduralTexturesLibrary/babylonjs.proceduralTextures.js
  54. 1 1
      dist/preview release/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js
  55. 1 1
      dist/preview release/proceduralTexturesLibrary/package.json
  56. 24 21
      dist/preview release/serializers/babylonjs.serializers.js
  57. 1 1
      dist/preview release/serializers/babylonjs.serializers.min.js
  58. 2 2
      dist/preview release/serializers/package.json
  59. 5 0
      dist/preview release/viewer/babylon.viewer.d.ts
  60. 65 65
      dist/preview release/viewer/babylon.viewer.js
  61. 367 203
      dist/preview release/viewer/babylon.viewer.max.js
  62. 1 1
      dist/preview release/viewer/package.json
  63. 2 1
      dist/preview release/what's new.md
  64. 56 0
      gui/src/controls/container.ts
  65. 1 2
      gui/src/tsconfig.json
  66. 1 1
      loaders/src/glTF/2.0/Extensions/MSFT_lod.ts
  67. 1 4
      package.json
  68. 1 11
      sandbox/index-local.html
  69. 3 6
      sandbox/index.html
  70. 137 64
      sandbox/index.js
  71. 88 73
      src/Audio/babylon.sound.ts
  72. 18 2
      src/Layer/babylon.effectLayer.ts
  73. 18 2
      src/Lights/Shadows/babylon.shadowGenerator.ts
  74. 1 1
      src/Mesh/babylon.mesh.ts
  75. 1 1
      src/Particles/EmitterTypes/babylon.coneParticleEmitter.ts
  76. 8 2
      src/Particles/babylon.gpuParticleSystem.ts
  77. 1 1
      src/Particles/babylon.particleSystem.ts
  78. 3 3
      src/Physics/Plugins/babylon.cannonJSPlugin.ts
  79. 1 2
      src/Physics/Plugins/babylon.oimoJSPlugin.ts
  80. 0 3
      src/PostProcess/babylon.vrDistortionCorrectionPostProcess.ts
  81. 8 2
      src/Shaders/glowMapGeneration.vertex.fx
  82. 1 1
      src/Shaders/gpuUpdateParticles.vertex.fx
  83. 8 1
      src/Shaders/shadowMap.vertex.fx
  84. 4 6
      src/Tools/babylon.promise.ts
  85. 58 0
      tests/unit/babylon/src/Tools/babylon.promise.tests.ts

File diff suppressed because it is too large
+ 4356 - 4353
Playground/babylon.d.txt


+ 399 - 301
Playground/index-local.html
查看文件 

@@ -1,376 +1,474 @@
 
 <!DOCTYPE html>

 <html>

 

-<head>

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

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

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

-    <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>

-

-    <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>

-    <!--Monaco-->

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

-    <!-- Babylon.js -->

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

-    <script src="../dist/preview%20release/draco_decoder.js" type="text/x-draco-decoder"></script>

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

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

-

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

-</head>

-

-<body>

-    <div class="navbar navBar1600">

-        <div class="title">

-            Babylon.js Playground

-        </div>

-        <div class="version" id="mainTitle">

-        </div>

+    <head>

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

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

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

+        <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>

+

+        <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>

+        <!-- Physics -->

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

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

+        <!--Monaco-->

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

+        <!-- Babylon.js -->

+        <script src="../dist/preview%20release/draco_decoder.js" type="text/x-draco-decoder"></script>

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

+

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

+    </head>

+

+    <body>

+        <div class="navbar navBar1600">

+            <div class="title">

+                Babylon.js Playground

+            </div>

+            <div class="version" id="mainTitle">

+            </div>

 

-        <div class="category">

-            <div class="button run" id="runButton1600">Run <i class="fa fa-play" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button run" id="runButton1600">Run

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

+                </div>

+            </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1600">New<i class="fa fa-file" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="clearButton1600">Clear<i class="fa fa-trash" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="newButton1600">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1600">Clear

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1600">Save <i class="fa fa-floppy-o" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="zipButton1600">Zip<i class="fa fa-download" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="saveButton1600">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1600">Zip

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1600">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1600">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect"><span id="currentFontSize1600">Font: 14</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1600">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

+                        </div>

+                        <div class="option" id="safemodeToggle1600">Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1600">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1600">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1600">Minimap

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

                         </div>

-                    </div>

-                    <div class="option" id="safemodeToggle1600">Safe mode <i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option checked" id="editorButton1600">Editor <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option" id="fullscreenButton1600">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle1600">Minimap

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

                     </div>

                 </div>

-            </div>

 

-            <div class="button uncheck" id="debugButton1600">Debug layer <i class="fa fa-square-o" aria-hidden="true"></i></div>

-            <div class="button" id="metadataButton1600">Metadata</div>

-        </div>

+                <div class="button uncheck" id="debugButton1600">Debug layer

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

+                </div>

+                <div class="button" id="metadataButton1600">Metadata</div>

+            </div>

 

 

 

-        <div class="category right">

-            <div class="button select"><span id="currentVersion1600">Version: Latest</span>

-                <div class="toDisplay">

-                    <div class="option" onclick="setVersion('latest');">Latest</div>

-                    <div class="option" onclick="setVersion('2.5');">2.5</div>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentVersion1600">Version: Latest</span>

+                    <div class="toDisplay">

+                        <div class="option" onclick="setVersion('latest');">Latest</div>

+                        <div class="option" onclick="setVersion('2.5');">2.5</div>

+                    </div>

                 </div>

-            </div>

-            <div class="button select"> <span id="currentScript1600">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1600">

-                    </ul>

+                <div class="button select">

+                    <span id="currentScript1600">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1600">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

 

-    <div class="navbar navBar1475">

-        <div class="title">

-            Babylon.js Playground

-        </div>

-        <div class="version" id="mainTitle">

-        </div>

+        <div class="navbar navBar1475">

+            <div class="title">

+                Babylon.js Playground

+            </div>

+            <div class="version" id="mainTitle">

+            </div>

 

-        <div class="category">

-            <div class="button run" id="runButton1475">Run <i class="fa fa-play" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button run" id="runButton1475">Run

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

+                </div>

+            </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1475">New<i class="fa fa-file" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="clearButton1475">Clear<i class="fa fa-trash" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="newButton1475">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1475">Clear

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1475">Save <i class="fa fa-floppy-o" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="zipButton1475">Zip<i class="fa fa-download" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="saveButton1475">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1475">Zip

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1475">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1475">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect"><span id="currentFontSize1475">Font: 14</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1475">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option" id='safemodeToggle1475'>Safe mode <i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option checked" id="editorButton1475">Editor <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option" id="fullscreenButton1475">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle1475">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton1475">Debug layer<i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option" id="metadataButton1475">Metadata</div>

-                    <div class="option subSelect"><span id="currentVersion1475">Vers. : Latest</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('2.5');">2.5</div>

+                        <div class="option" id='safemodeToggle1475'>Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1475">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1475">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1475">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton1475">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton1475">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion1475">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('2.5');">2.5</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select"> <span id="currentScript1475">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1475">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript1475">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1475">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

 

-    <div class="navbar navBar1030">

-        <div class="category">

-            <div class="button run" id="runButton1030">Run <i class="fa fa-play" aria-hidden="true"></i></div>

-        </div>

+        <div class="navbar navBar1030">

+            <div class="category">

+                <div class="button run" id="runButton1030">Run

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

+                </div>

+            </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1030">New<i class="fa fa-file" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="clearButton1030">Clear<i class="fa fa-trash" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="newButton1030">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1030">Clear

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1030">Save <i class="fa fa-floppy-o" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="zipButton1030">Zip<i class="fa fa-download" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="saveButton1030">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1030">Zip

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1030">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1030">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect"><span id="currentFontSize1030">Font: 14</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1030">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option" id="safemodeToggle1030">Safe mode <i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option checked" id="editorButton1030">Editor <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option" id="fullscreenButton1030">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle1030">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton1030">Debug layer<i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option" id="metadataButton1030">Metadata</div>

-                    <div class="option subSelect"><span id="currentVersion1030">Vers. : Latest</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('2.5');">2.5</div>

+                        <div class="option" id="safemodeToggle1030">Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1030">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1030">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1030">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton1030">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton1030">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion1030">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('2.5');">2.5</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select"> <span id="currentScript1030">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1030">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript1030">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1030">

+                        </ul>

+                    </div>

                 </div>

             </div>

-        </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

-

-    <div class="navbar navBar750">

-        <div class="category">

-            <div class="button select">File

-                <div class="toDisplay">

-                    <div class="option" id="runButton750">Run <i class="fa fa-play" aria-hidden="true"></i></div>

-                    <div class="option" id="newButton750">New <i class="fa fa-file" aria-hidden="true"></i></div>

-                    <div class="option" id="clearButton750">Clear <i class="fa fa-trash" aria-hidden="true"></i></div>

-                    <div class="option" id="saveButton750">Save <i class="fa fa-floppy-o" aria-hidden="true"></i></div>

-                    <div class="option" id="zipButton750">Zip <i class="fa fa-download" aria-hidden="true"></i></div>

-                </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

             </div>

         </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme750">Dark</div>

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

+        <div class="navbar navBar750">

+            <div class="category">

+                <div class="button select">File

+                    <div class="toDisplay">

+                        <div class="option" id="runButton750">Run

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

                         </div>

-                    </div>

-                    <div class="option subSelect"><span id="currentFontSize750">Font: 14</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option" id="newButton750">New

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

+                        </div>

+                        <div class="option" id="clearButton750">Clear

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

+                        </div>

+                        <div class="option" id="saveButton750">Save

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

+                        </div>

+                        <div class="option" id="zipButton750">Zip

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

                         </div>

                     </div>

-                    <div class="option" id="safemodeToggle750">Safe mode <i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div style="display:none;" class="option checked" id="editorButton750">Editor <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option" id="fullscreenButton750">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle750">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton750">Debug layer<i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option" id="metadataButton750">Metadata</div>

-                    <div class="option subSelect"><span id="currentVersion750">Vers. : Latest</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('2.5');">2.5</div>

+                </div>

+            </div>

+

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme750">Dark</div>

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

+                            </div>

+                        </div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize750">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

+                        </div>

+                        <div class="option" id="safemodeToggle750">Safe mode

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

+                        </div>

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

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

+                        </div>

+                        <div class="option" id="fullscreenButton750">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle750">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton750">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton750">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion750">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('2.5');">2.5</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select"> <span id="currentScript750">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList750">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript750">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList750">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

+

+        <div class="wrapper">

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

+            <div id="canvasZone">

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

+            </div>

         </div>

-    </div>

-

-    <div class="wrapper">

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

-        <div id="canvasZone">

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

-        </div>          

-    </div>

-

-    <span class="label" id="fpsLabel">FPS</span>

-

-    <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="http://www.html5gamedevs.com/forum/16-babylonjs/">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>

+

+        <span class="label" id="fpsLabel">FPS</span>

+

+        <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="http://www.html5gamedevs.com/forum/16-babylonjs/">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="saveLayer" class="save-layer">

-        <div class="save-form">

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

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

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

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

+            <div class="save-form">

+                <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="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>

+                <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 class="save-form-buttons" id="saveFormButtons">

 

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

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

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

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

+                </div>

             </div>

         </div>

-    </div>

-

-    <div id="waitDiv">

-        <span id="waitTitle">Babylon.js Playground<BR><BR><BR></span>

-        <img src="waitlogo.png" id="waitLogo"/>

-    </div>   

-

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

-

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

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

-    <script>

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

-            .load();

-    </script>

-</body>

+

+        <div id="waitDiv">

+            <span id="waitTitle">Babylon.js Playground

+                <BR>

+                <BR>

+                <BR>

+            </span>

+            <img src="waitlogo.png" id="waitLogo" />

+        </div>

+

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

+

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

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

+        <script>

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

+                .load();

+        </script>

+    </body>

 

 </html>

+ 417 - 416
Playground/index.html
查看文件 

@@ -1,506 +1,507 @@
 
 <!DOCTYPE html>

 <html>

 

-<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/img/favicon/favicon.ico">

-    <link rel="apple-touch-icon" sizes="57x57" href="https://www.babylonjs.com/img/favicon/apple-icon-57x57.png">

-    <link rel="apple-touch-icon" sizes="60x60" href="https://www.babylonjs.com/img/favicon/apple-icon-60x60.png">

-    <link rel="apple-touch-icon" sizes="72x72" href="https://www.babylonjs.com/img/favicon/apple-icon-72x72.png">

-    <link rel="apple-touch-icon" sizes="76x76" href="https://www.babylonjs.com/img/favicon/apple-icon-76x76.png">

-    <link rel="apple-touch-icon" sizes="114x114" href="https://www.babylonjs.com/img/favicon/apple-icon-114x114.png">

-    <link rel="apple-touch-icon" sizes="120x120" href="https://www.babylonjs.com/img/favicon/apple-icon-120x120.png">

-    <link rel="apple-touch-icon" sizes="144x144" href="https://www.babylonjs.com/img/favicon/apple-icon-144x144.png">

-    <link rel="apple-touch-icon" sizes="152x152" href="https://www.babylonjs.com/img/favicon/apple-icon-152x152.png">

-    <link rel="apple-touch-icon" sizes="180x180" href="https://www.babylonjs.com/img/favicon/apple-icon-180x180.png">

-    <link rel="icon" type="image/png" sizes="192x192" href="https://www.babylonjs.com/img/favicon/android-icon-192x192.png">

-    <link rel="icon" type="image/png" sizes="32x32" href="https://www.babylonjs.com/img/favicon/favicon-32x32.png">

-    <link rel="icon" type="image/png" sizes="96x96" href="https://www.babylonjs.com/img/favicon/favicon-96x96.png">

-    <link rel="icon" type="image/png" sizes="16x16" href="https://www.babylonjs.com/img/favicon/favicon-16x16.png">

-    <link rel="manifest" href="https://www.babylonjs.com/img/favicon/manifest.json">

-    <meta name="msapplication-TileColor" content="#ffffff">

-    <meta name="msapplication-TileImage" content="https://www.babylonjs.com/img/favicon/ms-icon-144x144.png">

-    <meta name="msapplication-config" content="https://www.babylonjs.com/img/favicon/browserconfig.xml">

-    <meta name="theme-color" content="#ffffff">

-

-    <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>

-

-    <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>

-    <!--Monaco-->

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

-    <!-- Babylon.js -->

-    <script src="https://preview.babylonjs.com/cannon.js"></script>

-    <script src="https://preview.babylonjs.com/draco_decoder.js" type="text/x-draco-decoder"></script>

-    <script src="https://preview.babylonjs.com/Oimo.js"></script>

-    <script src="https://preview.babylonjs.com/babylon.js"></script>

-    <script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

-

-    <script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>

-

-    <script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>

-

-    <script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>

-

-    <script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.js"></script>

-

-    <script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>

-

-    <script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>

-

-    <script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

-    <script src="https://rawgit.com/BabylonJS/Extensions/master/canvas2D/dist/preview%20release/babylon.canvas2d.min.js"></script>

-    <script src="https://rawgit.com/BabylonJS/Extensions/master/CompoundShader/src/babylonx.CompoundShader.js"></script>

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

-</head>

-

-<body>

-    <div class="navbar navBar1600">

-        <div class="title">

-            Babylon.js Playground

-        </div>

-        <div class="version" id="mainTitle">

-        </div>

-

-        <div class="category">

-            <div class="button run" id="runButton1600">Run

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

+    <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/img/favicon/favicon.ico">

+        <link rel="apple-touch-icon" sizes="57x57" href="https://www.babylonjs.com/img/favicon/apple-icon-57x57.png">

+        <link rel="apple-touch-icon" sizes="60x60" href="https://www.babylonjs.com/img/favicon/apple-icon-60x60.png">

+        <link rel="apple-touch-icon" sizes="72x72" href="https://www.babylonjs.com/img/favicon/apple-icon-72x72.png">

+        <link rel="apple-touch-icon" sizes="76x76" href="https://www.babylonjs.com/img/favicon/apple-icon-76x76.png">

+        <link rel="apple-touch-icon" sizes="114x114" href="https://www.babylonjs.com/img/favicon/apple-icon-114x114.png">

+        <link rel="apple-touch-icon" sizes="120x120" href="https://www.babylonjs.com/img/favicon/apple-icon-120x120.png">

+        <link rel="apple-touch-icon" sizes="144x144" href="https://www.babylonjs.com/img/favicon/apple-icon-144x144.png">

+        <link rel="apple-touch-icon" sizes="152x152" href="https://www.babylonjs.com/img/favicon/apple-icon-152x152.png">

+        <link rel="apple-touch-icon" sizes="180x180" href="https://www.babylonjs.com/img/favicon/apple-icon-180x180.png">

+        <link rel="icon" type="image/png" sizes="192x192" href="https://www.babylonjs.com/img/favicon/android-icon-192x192.png">

+        <link rel="icon" type="image/png" sizes="32x32" href="https://www.babylonjs.com/img/favicon/favicon-32x32.png">

+        <link rel="icon" type="image/png" sizes="96x96" href="https://www.babylonjs.com/img/favicon/favicon-96x96.png">

+        <link rel="icon" type="image/png" sizes="16x16" href="https://www.babylonjs.com/img/favicon/favicon-16x16.png">

+        <link rel="manifest" href="https://www.babylonjs.com/img/favicon/manifest.json">

+        <meta name="msapplication-TileColor" content="#ffffff">

+        <meta name="msapplication-TileImage" content="https://www.babylonjs.com/img/favicon/ms-icon-144x144.png">

+        <meta name="msapplication-config" content="https://www.babylonjs.com/img/favicon/browserconfig.xml">

+        <meta name="theme-color" content="#ffffff">

+

+        <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>

+

+        <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>

+        <!-- Physics -->

+        <script src="https://preview.babylonjs.com/cannon.js"></script>

+        <script src="https://preview.babylonjs.com/Oimo.js"></script>

+        <!--Monaco-->

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

+        <!-- Babylon.js -->

+        <script src="https://preview.babylonjs.com/draco_decoder.js" type="text/x-draco-decoder"></script>

+        <script src="https://preview.babylonjs.com/babylon.js"></script>

+        <script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

+

+        <script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>

+

+        <script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>

+

+        <script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>

+

+        <script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.js"></script>

+

+        <script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>

+

+        <script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>

+

+        <script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

+        <script src="https://rawgit.com/BabylonJS/Extensions/master/canvas2D/dist/preview%20release/babylon.canvas2d.min.js"></script>

+        <script src="https://rawgit.com/BabylonJS/Extensions/master/CompoundShader/src/babylonx.CompoundShader.js"></script>

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

+    </head>

+

+    <body>

+        <div class="navbar navBar1600">

+            <div class="title">

+                Babylon.js Playground

+            </div>

+            <div class="version" id="mainTitle">

+            </div>

+

+            <div class="category">

+                <div class="button run" id="runButton1600">Run

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

+                </div>

             </div>

-        </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1600">New

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

-            </div>

-            <div class="button removeOnPhone" id="clearButton1600">Clear

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

+            <div class="category">

+                <div class="button" id="newButton1600">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1600">Clear

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

+                </div>

             </div>

-        </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1600">Save

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

-            </div>

-            <div class="button removeOnPhone" id="zipButton1600">Zip

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

+            <div class="category">

+                <div class="button" id="saveButton1600">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1600">Zip

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

+                </div>

             </div>

-        </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

-                    <div class="option subSelect">Theme

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1600">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1600">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect">

-                        <span id="currentFontSize1600">Font: 14</span>

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

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1600">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

+                        </div>

+                        <div class="option" id="safemodeToggle1600">Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1600">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1600">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1600">Minimap

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

                         </div>

-                    </div>

-                    <div class="option" id="safemodeToggle1600">Safe mode

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

-                    </div>

-                    <div class="option checked" id="editorButton1600">Editor

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

-                    </div>

-                    <div class="option" id="fullscreenButton1600">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle1600">Minimap

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

                     </div>

                 </div>

-            </div>

 

-            <div class="button uncheck" id="debugButton1600">Debug layer

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

+                <div class="button uncheck" id="debugButton1600">Debug layer

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

+                </div>

+                <div class="button" id="metadataButton1600">Metadata</div>

             </div>

-            <div class="button" id="metadataButton1600">Metadata</div>

-        </div>

 

 

 

-        <div class="category right">

-            <div class="button select">

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

-                <div class="toDisplay">

-                    <div class="option" onclick="setVersion('latest');">Latest</div>

-                    <div class="option" onclick="setVersion('stable');">Stable</div>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentVersion1600">Version: Latest</span>

+                    <div class="toDisplay">

+                        <div class="option" onclick="setVersion('latest');">Latest</div>

+                        <div class="option" onclick="setVersion('stable');">Stable</div>

+                    </div>

                 </div>

-            </div>

-            <div class="button select">

-                <span id="currentScript1600">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1600">

-                    </ul>

+                <div class="button select">

+                    <span id="currentScript1600">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1600">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

 

-    <div class="navbar navBar1475">

-        <div class="title">

-            Babylon.js Playground

-        </div>

-        <div class="version" id="mainTitle">

-        </div>

+        <div class="navbar navBar1475">

+            <div class="title">

+                Babylon.js Playground

+            </div>

+            <div class="version" id="mainTitle">

+            </div>

 

-        <div class="category">

-            <div class="button run" id="runButton1475">Run

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

+            <div class="category">

+                <div class="button run" id="runButton1475">Run

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

+                </div>

             </div>

-        </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1475">New

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

-            </div>

-            <div class="button removeOnPhone" id="clearButton1475">Clear

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

+            <div class="category">

+                <div class="button" id="newButton1475">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1475">Clear

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

+                </div>

             </div>

-        </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1475">Save

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

-            </div>

-            <div class="button removeOnPhone" id="zipButton1475">Zip

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

+            <div class="category">

+                <div class="button" id="saveButton1475">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1475">Zip

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

+                </div>

             </div>

-        </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

-                    <div class="option subSelect">Theme

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1475">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1475">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect">

-                        <span id="currentFontSize1475">Font: 14</span>

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

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1475">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option" id='safemodeToggle1475'>Safe mode

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

-                    </div>

-                    <div class="option checked" id="editorButton1475">Editor

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

-                    </div>

-                    <div class="option" id="fullscreenButton1475">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle1475">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton1475">Debug layer

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

-                    </div>

-                    <div class="option" id="metadataButton1475">Metadata</div>

-                    <div class="option subSelect">

-                        <span id="currentVersion1475">Vers. : Latest</span>

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

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('stable');">Stable</div>

+                        <div class="option" id='safemodeToggle1475'>Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1475">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1475">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1475">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton1475">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton1475">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion1475">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('stable');">Stable</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select">

-                <span id="currentScript1475">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1475">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript1475">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1475">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

 

-    <div class="navbar navBar1030">

-        <div class="category">

-            <div class="button run" id="runButton1030">Run

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

+        <div class="navbar navBar1030">

+            <div class="category">

+                <div class="button run" id="runButton1030">Run

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

+                </div>

             </div>

-        </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1030">New

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

-            </div>

-            <div class="button removeOnPhone" id="clearButton1030">Clear

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

+            <div class="category">

+                <div class="button" id="newButton1030">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1030">Clear

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

+                </div>

             </div>

-        </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1030">Save

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

-            </div>

-            <div class="button removeOnPhone" id="zipButton1030">Zip

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

+            <div class="category">

+                <div class="button" id="saveButton1030">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1030">Zip

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

+                </div>

             </div>

-        </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

-                    <div class="option subSelect">Theme

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1030">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1030">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect">

-                        <span id="currentFontSize1030">Font: 14</span>

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

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1030">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option" id="safemodeToggle1030">Safe mode

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

-                    </div>

-                    <div class="option checked" id="editorButton1030">Editor

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

-                    </div>

-                    <div class="option" id="fullscreenButton1030">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle1030">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton1030">Debug layer

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

-                    </div>

-                    <div class="option" id="metadataButton1030">Metadata</div>

-                    <div class="option subSelect">

-                        <span id="currentVersion1030">Vers. : Latest</span>

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

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('stable');">Stable</div>

+                        <div class="option" id="safemodeToggle1030">Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1030">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1030">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1030">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton1030">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton1030">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion1030">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('stable');">Stable</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select">

-                <span id="currentScript1030">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1030">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript1030">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1030">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

-

-    <div class="navbar navBar750">

-        <div class="category">

-            <div class="button select">File

-                <div class="toDisplay">

-                    <div class="option" id="runButton750">Run

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

-                    </div>

-                    <div class="option" id="newButton750">New

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

-                    </div>

-                    <div class="option" id="clearButton750">Clear

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

-                    </div>

-                    <div class="option" id="saveButton750">Save

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

-                    </div>

-                    <div class="option" id="zipButton750">Zip

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

+

+        <div class="navbar navBar750">

+            <div class="category">

+                <div class="button select">File

+                    <div class="toDisplay">

+                        <div class="option" id="runButton750">Run

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

+                        </div>

+                        <div class="option" id="newButton750">New

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

+                        </div>

+                        <div class="option" id="clearButton750">Clear

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

+                        </div>

+                        <div class="option" id="saveButton750">Save

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

+                        </div>

+                        <div class="option" id="zipButton750">Zip

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

+                        </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

-                    <div class="option subSelect">Theme

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme750">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme750">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect">

-                        <span id="currentFontSize750">Font: 14</span>

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

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize750">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option" id="safemodeToggle750">Safe mode

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

-                    </div>

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

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

-                    </div>

-                    <div class="option" id="fullscreenButton750">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle750">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton750">Debug layer

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

-                    </div>

-                    <div class="option" id="metadataButton750">Metadata</div>

-                    <div class="option subSelect">

-                        <span id="currentVersion750">Vers. : Latest</span>

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

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('stable');">Stable</div>

+                        <div class="option" id="safemodeToggle750">Safe mode

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

+                        </div>

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

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

+                        </div>

+                        <div class="option" id="fullscreenButton750">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle750">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton750">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton750">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion750">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('stable');">Stable</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select">

-                <span id="currentScript750">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList750">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript750">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList750">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

 

-    <div class="wrapper">

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

-        <div id="canvasZone">

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

+        <div class="wrapper">

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

+            <div id="canvasZone">

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

+            </div>

         </div>

-    </div>

 

-    <span class="label" id="fpsLabel">FPS</span>

+        <span class="label" id="fpsLabel">FPS</span>

 

-    <div id="errorZone">

-    </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="http://www.html5gamedevs.com/forum/16-babylonjs/">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 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="http://www.html5gamedevs.com/forum/16-babylonjs/">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="saveLayer" class="save-layer">

-        <div class="save-form">

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

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

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

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

+            <div class="save-form">

+                <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="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>

+                <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 class="save-form-buttons" id="saveFormButtons">

 

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

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

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

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

+                </div>

             </div>

         </div>

-    </div>

-

-    <div id="waitDiv">

-        <span id="waitTitle">Babylon.js Playground

-            <BR>

-            <BR>

-            <BR>

-        </span>

-        <img src="waitlogo.png" id="waitLogo" />

-    </div>

-

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

-

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

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

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

-</body>

+

+        <div id="waitDiv">

+            <span id="waitTitle">Babylon.js Playground

+                <BR>

+                <BR>

+                <BR>

+            </span>

+            <img src="waitlogo.png" id="waitLogo" />

+        </div>

+

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

+

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

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

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

+    </body>

 

 </html>

+ 413 - 316
Playground/indexStable.html
查看文件 

@@ -1,395 +1,492 @@
 
 <!DOCTYPE html>

 <html>

 

-<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/img/favicon/favicon.ico">

-	<link rel="apple-touch-icon" sizes="57x57" href="https://www.babylonjs.com/img/favicon/apple-icon-57x57.png">

-	<link rel="apple-touch-icon" sizes="60x60" href="https://www.babylonjs.com/img/favicon/apple-icon-60x60.png">

-	<link rel="apple-touch-icon" sizes="72x72" href="https://www.babylonjs.com/img/favicon/apple-icon-72x72.png">

-	<link rel="apple-touch-icon" sizes="76x76" href="https://www.babylonjs.com/img/favicon/apple-icon-76x76.png">

-	<link rel="apple-touch-icon" sizes="114x114" href="https://www.babylonjs.com/img/favicon/apple-icon-114x114.png">

-	<link rel="apple-touch-icon" sizes="120x120" href="https://www.babylonjs.com/img/favicon/apple-icon-120x120.png">

-	<link rel="apple-touch-icon" sizes="144x144" href="https://www.babylonjs.com/img/favicon/apple-icon-144x144.png">

-	<link rel="apple-touch-icon" sizes="152x152" href="https://www.babylonjs.com/img/favicon/apple-icon-152x152.png">

-	<link rel="apple-touch-icon" sizes="180x180" href="https://www.babylonjs.com/img/favicon/apple-icon-180x180.png">

-	<link rel="icon" type="image/png" sizes="192x192"  href="https://www.babylonjs.com/img/favicon/android-icon-192x192.png">

-	<link rel="icon" type="image/png" sizes="32x32" href="https://www.babylonjs.com/img/favicon/favicon-32x32.png">

-	<link rel="icon" type="image/png" sizes="96x96" href="https://www.babylonjs.com/img/favicon/favicon-96x96.png">

-	<link rel="icon" type="image/png" sizes="16x16" href="https://www.babylonjs.com/img/favicon/favicon-16x16.png">

-	<link rel="manifest" href="https://www.babylonjs.com/img/favicon/manifest.json">

-	<meta name="msapplication-TileColor" content="#ffffff">

-	<meta name="msapplication-TileImage" content="https://www.babylonjs.com/img/favicon/ms-icon-144x144.png">

-	<meta name="msapplication-config" content="https://www.babylonjs.com/img/favicon/browserconfig.xml">

-	<meta name="theme-color" content="#ffffff">

-

-    <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>

-

-    <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>

-    <!--Monaco-->

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

-    <!-- Babylon.js -->

-    <script src="https://cdn.babylonjs.com/cannon.js"></script>

-    <script src="https://cdn.babylonjs.com/draco_decoder.js" type="text/x-draco-decoder"></script>

-    <script src="https://cdn.babylonjs.com/Oimo.js"></script>

-    <script src="https://cdn.babylonjs.com/babylon.js"></script>

-    <script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

-

-    <script src="https://cdn.babylonjs.com/loaders/babylon.glTFFileLoader.js"></script>

-    <script src="https://cdn.babylonjs.com/loaders/babylon.objFileLoader.js"></script>

-    <script src="https://cdn.babylonjs.com/loaders/babylon.stlFileLoader.js"></script>

-

-    <script src="https://cdn.babylonjs.com/gui/babylon.gui.min.js"></script>    

-

-    <script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

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

-</head>

-

-<body>

-    <div class="navbar navBar1600">

-        <div class="title">

-            Babylon.js Playground

-        </div>

-        <div class="version" id="mainTitle">

-        </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/img/favicon/favicon.ico">

+        <link rel="apple-touch-icon" sizes="57x57" href="https://www.babylonjs.com/img/favicon/apple-icon-57x57.png">

+        <link rel="apple-touch-icon" sizes="60x60" href="https://www.babylonjs.com/img/favicon/apple-icon-60x60.png">

+        <link rel="apple-touch-icon" sizes="72x72" href="https://www.babylonjs.com/img/favicon/apple-icon-72x72.png">

+        <link rel="apple-touch-icon" sizes="76x76" href="https://www.babylonjs.com/img/favicon/apple-icon-76x76.png">

+        <link rel="apple-touch-icon" sizes="114x114" href="https://www.babylonjs.com/img/favicon/apple-icon-114x114.png">

+        <link rel="apple-touch-icon" sizes="120x120" href="https://www.babylonjs.com/img/favicon/apple-icon-120x120.png">

+        <link rel="apple-touch-icon" sizes="144x144" href="https://www.babylonjs.com/img/favicon/apple-icon-144x144.png">

+        <link rel="apple-touch-icon" sizes="152x152" href="https://www.babylonjs.com/img/favicon/apple-icon-152x152.png">

+        <link rel="apple-touch-icon" sizes="180x180" href="https://www.babylonjs.com/img/favicon/apple-icon-180x180.png">

+        <link rel="icon" type="image/png" sizes="192x192" href="https://www.babylonjs.com/img/favicon/android-icon-192x192.png">

+        <link rel="icon" type="image/png" sizes="32x32" href="https://www.babylonjs.com/img/favicon/favicon-32x32.png">

+        <link rel="icon" type="image/png" sizes="96x96" href="https://www.babylonjs.com/img/favicon/favicon-96x96.png">

+        <link rel="icon" type="image/png" sizes="16x16" href="https://www.babylonjs.com/img/favicon/favicon-16x16.png">

+        <link rel="manifest" href="https://www.babylonjs.com/img/favicon/manifest.json">

+        <meta name="msapplication-TileColor" content="#ffffff">

+        <meta name="msapplication-TileImage" content="https://www.babylonjs.com/img/favicon/ms-icon-144x144.png">

+        <meta name="msapplication-config" content="https://www.babylonjs.com/img/favicon/browserconfig.xml">

+        <meta name="theme-color" content="#ffffff">

+

+        <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>

+

+        <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>

+        <!-- Physics -->

+        <script src="https://cdn.babylonjs.com/cannon.js"></script>

+        <script src="https://cdn.babylonjs.com/Oimo.js"></script>

+        <!--Monaco-->

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

+        <!-- Babylon.js -->

+        <script src="https://cdn.babylonjs.com/draco_decoder.js" type="text/x-draco-decoder"></script>

+        <script src="https://cdn.babylonjs.com/babylon.js"></script>

+        <script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

+

+        <script src="https://cdn.babylonjs.com/loaders/babylon.glTFFileLoader.js"></script>

+        <script src="https://cdn.babylonjs.com/loaders/babylon.objFileLoader.js"></script>

+        <script src="https://cdn.babylonjs.com/loaders/babylon.stlFileLoader.js"></script>

+

+        <script src="https://cdn.babylonjs.com/gui/babylon.gui.min.js"></script>

+

+        <script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

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

+    </head>

+

+    <body>

+        <div class="navbar navBar1600">

+            <div class="title">

+                Babylon.js Playground

+            </div>

+            <div class="version" id="mainTitle">

+            </div>

 

-        <div class="category">

-            <div class="button run" id="runButton1600">Run <i class="fa fa-play" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button run" id="runButton1600">Run

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

+                </div>

+            </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1600">New<i class="fa fa-file" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="clearButton1600">Clear<i class="fa fa-trash" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="newButton1600">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1600">Clear

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1600">Save <i class="fa fa-floppy-o" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="zipButton1600">Zip<i class="fa fa-download" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="saveButton1600">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1600">Zip

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1600">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1600">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect"><span id="currentFontSize1600">Font: 14</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1600">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

+                        </div>

+                        <div class="option" id="safemodeToggle1600">Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1600">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1600">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1600">Minimap

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

                         </div>

-                    </div>

-                    <div class="option" id="safemodeToggle1600">Safe mode <i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option checked" id="editorButton1600">Editor <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option" id="fullscreenButton1600">Fullscreen</div>

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

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

-                    <div class="option" id="minimapToggle1600">Minimap

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

                     </div>

                 </div>

-            </div>

-

-            <div class="button uncheck" id="debugButton1600">Debug layer <i class="fa fa-square-o" aria-hidden="true"></i></div>

-            <div class="button" id="metadataButton1600">Metadata</div>

-        </div>

 

-        <div class="category right">

-            <div class="button select"><span id="currentVersion1600">Version: Latest</span>

-                <div class="toDisplay">

-                    <div class="option" onclick="setVersion('latest');">Latest</div>

-                    <div class="option" onclick="setVersion('stable');">Stable</div>

+                <div class="button uncheck" id="debugButton1600">Debug layer

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

                 </div>

+                <div class="button" id="metadataButton1600">Metadata</div>

             </div>

-            <div class="button select"> <span id="currentScript1600">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1600">

-                    </ul>

+

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentVersion1600">Version: Latest</span>

+                    <div class="toDisplay">

+                        <div class="option" onclick="setVersion('latest');">Latest</div>

+                        <div class="option" onclick="setVersion('stable');">Stable</div>

+                    </div>

+                </div>

+                <div class="button select">

+                    <span id="currentScript1600">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1600">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

 

-    <div class="navbar navBar1475">

-        <div class="title">

-            Babylon.js Playground

-        </div>

-        <div class="version" id="mainTitle">

-        </div>

+        <div class="navbar navBar1475">

+            <div class="title">

+                Babylon.js Playground

+            </div>

+            <div class="version" id="mainTitle">

+            </div>

 

-        <div class="category">

-            <div class="button run" id="runButton1475">Run <i class="fa fa-play" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button run" id="runButton1475">Run

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

+                </div>

+            </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1475">New<i class="fa fa-file" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="clearButton1475">Clear<i class="fa fa-trash" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="newButton1475">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1475">Clear

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1475">Save <i class="fa fa-floppy-o" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="zipButton1475">Zip<i class="fa fa-download" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="saveButton1475">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1475">Zip

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1475">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1475">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect"><span id="currentFontSize1475">Font: 14</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1475">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option" id='safemodeToggle1475'>Safe mode <i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option checked" id="editorButton1475">Editor <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option" id="fullscreenButton1475">Fullscreen</div>

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

-                    <div class="option" id="formatButton1475">Format code</div><div class="option" id="minimapToggle1475">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton1475">Debug layer<i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option" id="metadataButton1475">Metadata</div>

-                    <div class="option subSelect"><span id="currentVersion1475">Vers. : Latest</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('stable');">Stable</div>

+                        <div class="option" id='safemodeToggle1475'>Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1475">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1475">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1475">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton1475">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton1475">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion1475">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('stable');">Stable</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select"> <span id="currentScript1475">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1475">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript1475">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1475">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

 

-    <div class="navbar navBar1030">

-        <div class="category">

-            <div class="button run" id="runButton1030">Run <i class="fa fa-play" aria-hidden="true"></i></div>

-        </div>

+        <div class="navbar navBar1030">

+            <div class="category">

+                <div class="button run" id="runButton1030">Run

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

+                </div>

+            </div>

 

 

-        <div class="category">

-            <div class="button" id="newButton1030">New<i class="fa fa-file" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="clearButton1030">Clear<i class="fa fa-trash" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="newButton1030">New

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

+                </div>

+                <div class="button removeOnPhone" id="clearButton1030">Clear

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button" id="saveButton1030">Save <i class="fa fa-floppy-o" aria-hidden="true"></i></div>

-            <div class="button removeOnPhone" id="zipButton1030">Zip<i class="fa fa-download" aria-hidden="true"></i></div>

-        </div>

+            <div class="category">

+                <div class="button" id="saveButton1030">Save

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

+                </div>

+                <div class="button removeOnPhone" id="zipButton1030">Zip

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

+                </div>

+            </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme1030">Dark</div>

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

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme1030">Dark</div>

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

+                            </div>

                         </div>

-                    </div>

-                    <div class="option subSelect"><span id="currentFontSize1030">Font: 14</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize1030">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

                         </div>

-                    </div>

-                    <div class="option" id="safemodeToggle1030">Safe mode <i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option checked" id="editorButton1030">Editor <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option" id="fullscreenButton1030">Fullscreen</div>

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

-                    <div class="option" id="formatButton1030">Format code</div><div class="option" id="minimapToggle1030">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton1030">Debug layer<i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option" id="metadataButton1030">Metadata</div>

-                    <div class="option subSelect"><span id="currentVersion1030">Vers. : Latest</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('stable');">Stable</div>

+                        <div class="option" id="safemodeToggle1030">Safe mode

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

+                        </div>

+                        <div class="option checked" id="editorButton1030">Editor

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

+                        </div>

+                        <div class="option" id="fullscreenButton1030">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle1030">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton1030">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton1030">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion1030">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('stable');">Stable</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select"> <span id="currentScript1030">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList1030">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript1030">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList1030">

+                        </ul>

+                    </div>

                 </div>

             </div>

-        </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

-

-    <div class="navbar navBar750">

-        <div class="category">

-            <div class="button select">File

-                <div class="toDisplay">

-                    <div class="option" id="runButton750">Run <i class="fa fa-play" aria-hidden="true"></i></div>

-                    <div class="option" id="newButton750">New <i class="fa fa-file" aria-hidden="true"></i></div>

-                    <div class="option" id="clearButton750">Clear <i class="fa fa-trash" aria-hidden="true"></i></div>

-                    <div class="option" id="saveButton750">Save <i class="fa fa-floppy-o" aria-hidden="true"></i></div>

-                    <div class="option" id="zipButton750">Zip <i class="fa fa-download" aria-hidden="true"></i></div>

-                </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

             </div>

         </div>

 

-        <div class="category">

-            <div class="button select">Settings

-                <div class="toDisplay">

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

-                        <div class="toDisplaySub">

-                            <div class="option" id="darkTheme750">Dark</div>

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

+        <div class="navbar navBar750">

+            <div class="category">

+                <div class="button select">File

+                    <div class="toDisplay">

+                        <div class="option" id="runButton750">Run

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

                         </div>

-                    </div>

-                    <div class="option subSelect"><span id="currentFontSize750">Font: 14</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setFontSize(12);">12</div>

-                            <div class="option" onclick="setFontSize(14);">14</div>

-                            <div class="option" onclick="setFontSize(16);">16</div>

-                            <div class="option" onclick="setFontSize(18);">18</div>

-                            <div class="option" onclick="setFontSize(20);">20</div>

-                            <div class="option" onclick="setFontSize(22);">22</div>

+                        <div class="option" id="newButton750">New

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

+                        </div>

+                        <div class="option" id="clearButton750">Clear

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

+                        </div>

+                        <div class="option" id="saveButton750">Save

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

+                        </div>

+                        <div class="option" id="zipButton750">Zip

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

                         </div>

                     </div>

-                    <div class="option" id="safemodeToggle750">Safe mode <i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div style="display:none;" class="option checked" id="editorButton750">Editor <i class="fa fa-check-square" aria-hidden="true"></i>

-                    </div>

-                    <div class="option" id="fullscreenButton750">Fullscreen</div>

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

-                    <div class="option" id="formatButton750">Format code</div><div class="option" id="minimapToggle750">Minimap

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

-                    </div>

-                    <div class="option" id="debugButton750">Debug layer<i class="fa fa-square-o" aria-hidden="true"></i></div>

-                    <div class="option" id="metadataButton750">Metadata</div>

-                    <div class="option subSelect"><span id="currentVersion750">Vers. : Latest</span><i class="fa fa-chevron-right" aria-hidden="true"></i>

-                        <div class="toDisplaySub">

-                            <div class="option" onclick="setVersion('latest');">Latest</div>

-                            <div class="option" onclick="setVersion('stable');">Stable</div>

+                </div>

+            </div>

+

+            <div class="category">

+                <div class="button select">Settings

+                    <div class="toDisplay">

+                        <div class="option subSelect">Theme

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

+                            <div class="toDisplaySub">

+                                <div class="option" id="darkTheme750">Dark</div>

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

+                            </div>

+                        </div>

+                        <div class="option subSelect">

+                            <span id="currentFontSize750">Font: 14</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setFontSize(12);">12</div>

+                                <div class="option" onclick="setFontSize(14);">14</div>

+                                <div class="option" onclick="setFontSize(16);">16</div>

+                                <div class="option" onclick="setFontSize(18);">18</div>

+                                <div class="option" onclick="setFontSize(20);">20</div>

+                                <div class="option" onclick="setFontSize(22);">22</div>

+                            </div>

+                        </div>

+                        <div class="option" id="safemodeToggle750">Safe mode

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

+                        </div>

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

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

+                        </div>

+                        <div class="option" id="fullscreenButton750">Fullscreen</div>

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

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

+                        <div class="option" id="minimapToggle750">Minimap

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

+                        </div>

+                        <div class="option" id="debugButton750">Debug layer

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

+                        </div>

+                        <div class="option" id="metadataButton750">Metadata</div>

+                        <div class="option subSelect">

+                            <span id="currentVersion750">Vers. : Latest</span>

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

+                            <div class="toDisplaySub">

+                                <div class="option" onclick="setVersion('latest');">Latest</div>

+                                <div class="option" onclick="setVersion('stable');">Stable</div>

+                            </div>

                         </div>

                     </div>

                 </div>

             </div>

-        </div>

 

-        <div class="category right">

-            <div class="button select"> <span id="currentScript750">Scenes</span>

-                <div class="toDisplayBig">

-                    <ul id="scriptsList750">

-                    </ul>

+            <div class="category right">

+                <div class="button select">

+                    <span id="currentScript750">Scenes</span>

+                    <div class="toDisplayBig">

+                        <ul id="scriptsList750">

+                        </ul>

+                    </div>

                 </div>

             </div>

+            <div class="save-message" id="saveMessage">

+                This PG has missing metadata. Click save to add them.

+            </div>

         </div>

-        <div class="save-message" id="saveMessage">

-            This PG has missing metadata. Click save to add them.

-        </div>

-    </div>

 

-    <div class="wrapper">

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

-        <div id="canvasZone">

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

+        <div class="wrapper">

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

+            <div id="canvasZone">

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

+            </div>

         </div>

-    </div>

 

-    <span class="label" id="fpsLabel">FPS</span>

+        <span class="label" id="fpsLabel">FPS</span>

 

-    <div id="errorZone">

-    </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="http://www.html5gamedevs.com/forum/16-babylonjs/">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 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="http://www.html5gamedevs.com/forum/16-babylonjs/">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="saveLayer" class="save-layer">

-        <div class="save-form">

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

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

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

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

+            <div class="save-form">

+                <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="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>

+                <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 class="save-form-buttons" id="saveFormButtons">

 

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

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

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

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

+                </div>

             </div>

         </div>

-    </div>

 

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

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

 

-    <script>

-        Split(['#jsEditor', '#canvasZone']);

-    </script>

+        <script>

+            Split(['#jsEditor', '#canvasZone']);

+        </script>

 

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

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

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

-</body>

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

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

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

+    </body>

 

-</html>

+</html>

File diff suppressed because it is too large
+ 892574 - 0
Playground/scenes/dummy2.babylon


二進制
Playground/sounds/cellolong.wav
查看文件


二進制
Playground/sounds/violons18.wav
查看文件


+ 13 - 1
Tools/Gulp/config.json
查看文件 

@@ -16,7 +16,19 @@
 
         "srcOutputDirectory": "../../src/",
 
         "currentConfig": "all",
 
         "typedocJSON": "../../.temp/babylon.typedoc.json",
 
-        "typedocValidationBaseline": "../../dist/preview release/typedocValidationBaseline.json"
 
+        "typedocValidationBaseline": "../../dist/preview release/typedocValidationBaseline.json",
 
+        "dependencies": [
 
+            {
 
+                "name": "CANNON",
 
+                "module": "cannon",
 
+                "optional": true
 
+            },
 
+            {
 
+                "name": "OIMO",
 
+                "module": "oimo",
 
+                "optional": true
 
+            }
 
+        ]
 
     },
 
     "buildConfigurations": {
 
         "all": [

+ 57 - 32
Tools/Gulp/gulp-addModuleExports.js
查看文件 

@@ -5,8 +5,10 @@ var through = require('through2');
 
  * The parameters for this function has grown during development.

  * Eventually, this function will need to be reorganized. 

  */

-module.exports = function (varName, subModule, extendsRoot, externalUsingBabylon, noBabylonInit) {

+//  subModule, extendsRoot, externalUsingBabylon, noBabylonInit

+module.exports = function (varName, config) {

     return through.obj(function (file, enc, cb) {

+        config = config || {};

         if (typeof varName === 'string') {

             varName = {

                 name: varName,

@@ -16,51 +18,76 @@ module.exports = function (varName, subModule, extendsRoot, externalUsingBabylon
 
                 varName.module = 'babylonjs';

             }

         }

+        if (!config.dependencies) {

+            if (config.subModule || config.extendsRoot) {

+                config.dependencies = [

+                    {

+                        name: "BABYLON",

+                        module: "babylonjs",

+                        optional: false

+                    }

+                ]

+            }

+        }

 

         function moduleExportAddition(varName) {

 

-            let base = subModule ? 'BABYLON' : varName.name;

+            let dependenciesDefinition = `var amdDependencies = [];`;

+            let functionVariables = '';

+            if (config.dependencies) {

+                config.dependencies.forEach(dep => {

+                    if (functionVariables) functionVariables += ',';

+                    functionVariables += dep.name;

+                    dependenciesDefinition += `

+    var ${dep.name} = root. ${dep.name};

+    if(!${dep.name}) {

+        if(typeof exports === 'object') {

+            ${dep.optional ? ' try { ' : ''} ${dep.name} = require("${dep.module}"); ${dep.optional ? ' } catch(e) {} ' : ''}

+        } else if(typeof define === 'function' && define.amd) {

+            ${dep.optional ? ' if(require.specified && require.specified("' + dep.module + '"))' : ''} amdDependencies.push("${dep.module}");

+        }

+    } else {

+        if(typeof define === 'function' && define.amd) {

+            if(!(require.specified && require.specified("' + dep.module + '"))) {

+                try { define("${dep.module}", [], function () { return ${dep.name}; }); } catch(e) { }

+            }

+            amdDependencies.push("${dep.module}");

+        }

+    }

+`

+                });

+

+            }

+

+            let base = config.subModule ? 'BABYLON' : varName.name;

 

             return `\n\n(function universalModuleDefinition(root, factory) {

+    ${dependenciesDefinition}

     if(typeof exports === 'object' && typeof module === 'object')

-        module.exports = factory(${subModule || extendsRoot ? 'require("babylonjs")' : ''});

+        module.exports = factory(${functionVariables});

     else if(typeof define === 'function' && define.amd)

-        define("${varName.module}", ${subModule || extendsRoot ? '["babylonjs"],' : '[],'} factory);

+        define("${varName.module}", amdDependencies, factory);

     else if(typeof exports === 'object')

-        exports["${varName.module}"] = factory(${subModule || extendsRoot ? 'require("babylonjs")' : ''});

+        exports["${varName.module}"] = factory(${functionVariables});

     else {

-        root["${base}"]${(subModule && !extendsRoot) ? '["' + varName.name + '"]' : ''} = factory(root["BABYLON"]);

+        root["${base}"]${(config.subModule && !config.extendsRoot) ? '["' + varName.name + '"]' : ''} = factory(${functionVariables});

     }

-})(this, function(${varName.name === 'BABYLON' || noBabylonInit ? '' : 'BABYLON'}) {

+})(this, function(${functionVariables}) {

     ${String(file.contents)}

     ${varName.name === 'BABYLON' || varName.name === 'INSPECTOR' ? `

 var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : this);

 globalObject["${varName.name}"] = ${varName.name}` : ''}

-    return ${base}${(subModule && !extendsRoot) ? '.' + varName.name : ''};

+    return ${base}${(config.subModule && !config.extendsRoot) ? '.' + varName.name : ''};

 });

 `;

         }

 

         var extendsAddition =

-            `var __extends = (this && this.__extends) || (function () {

-            var extendStatics = Object.setPrototypeOf ||

-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||

-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };

-            return function (d, b) {

-                extendStatics(d, b);

-                function __() { this.constructor = d; }

-                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

-            };

-        })();

-        `;

+            `var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,o){t.__proto__=o}||function(t,o){for(var n in o)o.hasOwnProperty(n)&&(t[n]=o[n])};return function(o,n){function r(){this.constructor=o}t(o,n),o.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();

+`;

 

-        var decorateAddition =

-            'var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n' +

-            'var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n' +

-            'if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);\n' +

-            'else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n' +

-            'return c > 3 && r && Object.defineProperty(target, key, r), r;\n' +

-            '};\n';

+        var decorateAddition = `var __decorate=this&&this.__decorate||function(e,t,r,c){var o,f=arguments.length,n=f<3?t:null===c?c=Object.getOwnPropertyDescriptor(t,r):c;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,c);else for(var l=e.length-1;l>=0;l--)(o=e[l])&&(n=(f<3?o(n):f>3?o(t,r,n):o(t,r))||n);return f>3&&n&&Object.defineProperty(t,r,n),n};

+`;

 

         if (file.isNull()) {

             cb(null, file);

@@ -72,14 +99,12 @@ globalObject["${varName.name}"] = ${varName.name}` : ''}
 
             return;

         }

 

-        var optionalRequire = '';

-

         try {

-            if (externalUsingBabylon) {

-                file.contents = new Buffer(optionalRequire.concat(new Buffer(String('').concat(moduleExportAddition(varName)))));

+            if (config.externalUsingBabylon) {

+                file.contents = new Buffer(String('').concat(moduleExportAddition(varName)));

             } else {

-                let pretext = subModule ? optionalRequire : '';

-                file.contents = new Buffer(pretext.concat(decorateAddition).concat(new Buffer(extendsAddition.concat(String('')).concat(moduleExportAddition(varName)))));

+                let pretext = '';

+                file.contents = new Buffer(decorateAddition.concat(new Buffer(extendsAddition.concat(String('')).concat(moduleExportAddition(varName)))));

             }

             this.push(file);

         } catch (err) {

+ 11 - 7
Tools/Gulp/gulpfile.js
查看文件 

@@ -217,7 +217,9 @@ gulp.task("buildWorker", ["workers", "shaders"], function () {
 
         .pipe(cleants())
 
         .pipe(replace(extendsSearchRegex, ""))
 
         .pipe(replace(decorateSearchRegex, ""))
 
-        .pipe(addModuleExports("BABYLON"))
 
+        .pipe(addModuleExports("BABYLON", {
 
+            dependencies: config.build.dependencies
 
+        }))
 
         .pipe(uglify())
 
         .pipe(optimisejs())
 
         .pipe(gulp.dest(config.build.outputDirectory));
 
@@ -239,7 +241,9 @@ gulp.task("build", ["shaders"], function () {
 
             .pipe(cleants())
 
             .pipe(replace(extendsSearchRegex, ""))
 
             .pipe(replace(decorateSearchRegex, ""))
 
-            .pipe(addModuleExports("BABYLON"))
 
+            .pipe(addModuleExports("BABYLON", {
 
+                dependencies: config.build.dependencies
 
+            }))
 
             .pipe(gulp.dest(config.build.outputDirectory))
 
             .pipe(rename(config.build.minFilename))
 
             .pipe(uglify())
 
@@ -316,7 +320,7 @@ var buildExternalLibraries = function (settings) {
 
                 .pipe(replace(extendsSearchRegex, ""))
 
                 .pipe(replace(decorateSearchRegex, ""))
 
                 .pipe(replace(referenceSearchRegex, ""))
 
-                .pipe(addModuleExports(settings.build.moduleDeclaration, true, settings.build.extendsRoot))
 
+                .pipe(addModuleExports(settings.build.moduleDeclaration, { subModule: true, extendsRoot: settings.build.extendsRoot }))
 
                 .pipe(gulp.dest(outputDirectory))
 
                 .pipe(cleants())
 
                 .pipe(rename({ extname: ".min.js" }))
 
@@ -395,7 +399,7 @@ var buildExternalLibrary = function (library, settings, watch) {
 
         if (library.buildAsModule) {
 
             code = code.pipe(replace(extendsSearchRegex, ""))
 
                 .pipe(replace(decorateSearchRegex, ""))
 
-                .pipe(addModuleExports(library.moduleDeclaration, true, library.extendsRoot))
 
+                .pipe(addModuleExports(library.moduleDeclaration, { subModule: true, extendsRoot: library.extendsRoot }))
 
         }
 
 
         code = code.pipe(gulp.dest(outputDirectory))
 
@@ -433,7 +437,7 @@ var buildExternalLibrary = function (library, settings, watch) {
 
             let wpBuild = webpack(require(library.webpack));
 
             if (settings.build.outputs) {
 
                 let build = wpBuild
 
-                    .pipe(addModuleExports(library.moduleDeclaration, false, false, true, library.babylonIncluded));
 
+                    .pipe(addModuleExports(library.moduleDeclaration, { subModule: false, extendsRoot: false, externalUsingBabylon: true, noBabylonInit: library.babylonIncluded }));
 
 
                 let unminifiedOutpus = [];
 
                 let minifiedOutputs = [];
 
@@ -482,7 +486,7 @@ var buildExternalLibrary = function (library, settings, watch) {
 
                 sequence.push(
 
                     wpBuild
 
                         .pipe(rename(library.output.replace(".js", library.noBundleInName ? '.js' : ".bundle.js")))
 
-                        .pipe(addModuleExports(library.moduleDeclaration, false, library.extendsRoot, true))
 
+                        .pipe(addModuleExports(library.moduleDeclaration, { subModule: false, extendsRoot: library.extendsRoot, externalUsingBabylon: true }))
 
                         .pipe(uglify())
 
                         .pipe(optimisejs())
 
                         .pipe(gulp.dest(outputDirectory))
 
@@ -625,7 +629,7 @@ gulp.task("webserver", function () {
 
     var options = {
 
         port: 1338,
 
         livereload: false,
 
-        
+
 
     };
 
 
     if (commandLineOptions.public) {

+ 14 - 8
Viewer/src/configuration/loader.ts
查看文件 

@@ -11,7 +11,7 @@ export class ConfigurationLoader {
 
 

     private loadRequests: Array<IFileRequest>;

 

-    constructor() {

+    constructor(private _enableCache: boolean = false) {

         this.configurationCache = {};

         this.loadRequests = [];

     }

@@ -73,24 +73,30 @@ export class ConfigurationLoader {
 
         this.loadRequests.forEach(request => {

             request.abort();

         });

+        this.loadRequests.length = 0;

     }

 

     private loadFile(url: string): Promise<any> {

         let cacheReference = this.configurationCache;

-        if (cacheReference[url]) {

+        if (this._enableCache && cacheReference[url]) {

             return Promise.resolve(cacheReference[url]);

         }

 

         return new Promise((resolve, reject) => {

-            let fileRequest = Tools.LoadFile(url, resolve, undefined, undefined, false, (request, error: any) => {

+            let fileRequest = Tools.LoadFile(url, (result) => {

+                let idx = this.loadRequests.indexOf(fileRequest);

+                if (idx !== -1)

+                    this.loadRequests.splice(idx, 1);

+                if (this._enableCache) cacheReference[url] = result;

+                resolve(result);

+            }, undefined, undefined, false, (request, error: any) => {

+                let idx = this.loadRequests.indexOf(fileRequest);

+                if (idx !== -1)

+                    this.loadRequests.splice(idx, 1);

                 reject(error);

             });

             this.loadRequests.push(fileRequest);

         });

     }

 

-}

-

-export let configurationLoader = new ConfigurationLoader();

-

-export default configurationLoader;
 
+}

+ 4 - 0
Viewer/src/configuration/mappers.ts
查看文件 

@@ -118,6 +118,10 @@ export class MapperManager {
 
         this.mappers[type] = mapper;

     }

 

+    public dispose() {

+        this.mappers = {};

+    }

+

 }

 

 export let mapperManager = new MapperManager();

+ 4 - 0
Viewer/src/eventManager.ts
查看文件 

@@ -37,4 +37,8 @@ export class EventManager {
 
             callbackDef.callback(data);

         });

     }

+

+    public dispose() {

+        this.callbacksContainer = {};

+    }

 }

+ 10 - 3
Viewer/src/index.ts
查看文件 

@@ -22,10 +22,17 @@ import { InitTags } from './initializer';
 
 PromisePolyfill.Apply();

 

 export let disableInit: boolean = false;

-document.addEventListener("DOMContentLoaded", function (event) {

+document.addEventListener("DOMContentLoaded", init);

+function init(event) {

+    document.removeEventListener("DOMContentLoaded", init);

     if (disableInit) return;

     InitTags();

-});

+}

+

+function disposeAll() {

+    viewerManager.dispose();

+    mapperManager.dispose();

+}

 

 // public API for initialization

-export { InitTags, DefaultViewer, AbstractViewer, viewerManager, mapperManager };

+export { InitTags, DefaultViewer, AbstractViewer, viewerManager, mapperManager, disposeAll };

+ 3 - 2
Viewer/src/model/modelAnimation.ts
查看文件 

@@ -1,4 +1,4 @@
 
-import { AnimationGroup, Animatable, Skeleton, IDisposable } from "babylonjs";

+import { AnimationGroup, Animatable, Skeleton } from "babylonjs";

 

 export enum AnimationPlayMode {

     ONCE,

@@ -13,7 +13,7 @@ export enum AnimationState {
 
     ENDED

 }

 

-export interface IModelAnimation extends IDisposable {

+export interface IModelAnimation {

     readonly state: AnimationState;

     readonly name: string;

     readonly frames: number;

@@ -27,6 +27,7 @@ export interface IModelAnimation extends IDisposable {
 
     reset();

     restart();

     goToFrame(frameNumber: number);

+    dispose();

 }

 

 export class GroupModelAnimation implements IModelAnimation {

+ 1 - 1
Viewer/src/model/viewerModel.ts
查看文件 

@@ -100,7 +100,7 @@ export class ViewerModel implements IDisposable {
 
                 })

             } else {

                 skeletons.forEach((skeleton, idx) => {

-                    let ag = new BABYLON.AnimationGroup("animation-" + idx, this._scene);

+                    let ag = new AnimationGroup("animation-" + idx, this._scene);

                     skeleton.getAnimatables().forEach(a => {

                         if (a.animations[0]) {

                             ag.addTargetedAnimation(a.animations[0], a);

+ 21 - 1
Viewer/src/templateManager.ts
查看文件 

@@ -163,6 +163,8 @@ export class TemplateManager {
 
         Object.keys(this.templates).forEach(template => {

             this.templates[template].dispose();

         });

+        this.templates = {};

+        this.eventManager.dispose();

 

         this.onInit.clear();

         this.onAllLoaded.clear();

@@ -355,11 +357,23 @@ export class Template {
 
         this.onStateChange.clear();

         this.isLoaded = false;

         // remove from parent

-        this.parent.removeChild(this.fragment);

+        try {

+            this.parent.removeChild(this.fragment);

+        } catch (e) {

+            //noop

+        }

 

         this.loadRequests.forEach(request => {

             request.abort();

         });

+

+        if (this.registeredEvents) {

+            this.registeredEvents.forEach(evt => {

+                evt.htmlElement.removeEventListener(evt.eventName, evt.function);

+            });

+        }

+

+        delete this.fragment;

     }

 

     private getTemplateAsHtml(templateConfig: ITemplateConfiguration): Promise<string> {

@@ -410,7 +424,13 @@ export class Template {
 
 

                     // if boolean, set the parent as the event listener

                     if (typeof this._configuration.events[eventName] === 'boolean') {

+                        let binding = functionToFire.bind(this, '#' + this.parent.id);

                         this.parent.addEventListener(eventName, functionToFire.bind(this, '#' + this.parent.id), false);

+                        this.registeredEvents.push({

+                            htmlElement: this.parent,

+                            eventName: eventName,

+                            function: binding

+                        });

                     } else if (typeof this._configuration.events[eventName] === 'object') {

                         let selectorsArray: Array<string> = Object.keys(this._configuration.events[eventName] || {});

                         // strict null checl is working incorrectly, must override:

+ 1 - 1
Viewer/src/viewer/defaultViewer.ts
查看文件 

@@ -246,7 +246,7 @@ export class DefaultViewer extends AbstractViewer {
 
         super.configureLights(lightsConfiguration, model);

         // labs feature - flashlight

         if (this.configuration.lab && this.configuration.lab.flashlight) {

-            let pointerPosition = BABYLON.Vector3.Zero();

+            let pointerPosition = Vector3.Zero();

             let lightTarget;

             let angle = 0.5;

             let exponent = Math.PI / 2;

+ 41 - 2
Viewer/src/viewer/viewer.ts
查看文件 

@@ -1,6 +1,6 @@
 
 import { viewerManager } from './viewerManager';

 import { TemplateManager } from './../templateManager';

-import configurationLoader from './../configuration/loader';

+import { ConfigurationLoader } from './../configuration/loader';

 import { CubeTexture, Color3, IEnvironmentHelperOptions, EnvironmentHelper, Effect, SceneOptimizer, SceneOptimizerOptions, Observable, Engine, Scene, ArcRotateCamera, Vector3, SceneLoader, AbstractMesh, Mesh, HemisphericLight, Database, SceneLoaderProgressEvent, ISceneLoaderPlugin, ISceneLoaderPluginAsync, Quaternion, Light, ShadowLight, ShadowGenerator, Tags, AutoRotationBehavior, BouncingBehavior, FramingBehavior, Behavior, Tools } from 'babylonjs';

 import { ViewerConfiguration, ISceneConfiguration, ISceneOptimizerConfiguration, IObserversConfiguration, IModelConfiguration, ISkyboxConfiguration, IGroundConfiguration, ILightConfiguration, ICameraConfiguration } from '../configuration/configuration';

 

@@ -33,6 +33,8 @@ export abstract class AbstractViewer {
 
     protected maxShadows: number;

     private _hdrSupport: boolean;

 

+    protected _isDisposed: boolean = false;

+

     public get isHdrSupported() {

         return this._hdrSupport;

     }

@@ -50,6 +52,7 @@ export abstract class AbstractViewer {
 
     public canvas: HTMLCanvasElement;

 

     protected registeredOnBeforerenderFunctions: Array<() => void>;

+    protected _configurationLoader: ConfigurationLoader;

 

     constructor(public containerElement: HTMLElement, initialConfiguration: ViewerConfiguration = {}) {

         // if exists, use the container id. otherwise, generate a random string.

@@ -79,7 +82,8 @@ export abstract class AbstractViewer {
 
         this.prepareContainerElement();

 

         // extend the configuration

-        configurationLoader.loadConfiguration(initialConfiguration, (configuration) => {

+        this._configurationLoader = new ConfigurationLoader();

+        this._configurationLoader.loadConfiguration(initialConfiguration, (configuration) => {

             this.configuration = deepmerge(this.configuration || {}, configuration);

             if (this.configuration.observers) {

                 this.configureObservers(this.configuration.observers);

@@ -619,20 +623,55 @@ export abstract class AbstractViewer {
 
     }

 

     public dispose() {

+        if (this._isDisposed) {

+            return;

+        }

         window.removeEventListener('resize', this.resize);

         if (this.sceneOptimizer) {

             this.sceneOptimizer.stop();

             this.sceneOptimizer.dispose();

         }

 

+        if (this.environmentHelper) {

+            this.environmentHelper.dispose();

+        }

+

+        if (this._configurationLoader) {

+            this._configurationLoader.dispose();

+        }

+

+        //observers

+        this.onEngineInitObservable.clear();

+        delete this.onEngineInitObservable;

+        this.onInitDoneObservable.clear();

+        delete this.onInitDoneObservable;

+        this.onLoaderInitObservable.clear();

+        delete this.onLoaderInitObservable;

+        this.onModelLoadedObservable.clear();

+        delete this.onModelLoadedObservable;

+        this.onModelLoadErrorObservable.clear();

+        delete this.onModelLoadErrorObservable;

+        this.onModelLoadProgressObservable.clear();

+        delete this.onModelLoadProgressObservable;

+        this.onSceneInitObservable.clear();

+        delete this.onSceneInitObservable;

+

         if (this.scene.activeCamera) {

             this.scene.activeCamera.detachControl(this.canvas);

         }

 

+        this.models.forEach(model => {

+            model.dispose();

+        });

+

+        this.models.length = 0;

+

         this.scene.dispose();

         this.engine.dispose();

 

         this.templateManager.dispose();

+        viewerManager.removeViewer(this);

+        this._isDisposed = true;

     }

 

     protected abstract prepareContainerElement();

+ 14 - 2
Viewer/src/viewer/viewerManager.ts
查看文件 

@@ -1,5 +1,3 @@
 
-/// <reference path="../../../dist/preview release/babylon.d.ts"/>

-

 import { Observable } from 'babylonjs';

 import { AbstractViewer } from './viewer';

 

@@ -9,10 +7,12 @@ export class ViewerManager {
 
 

     public onViewerAdded: (viewer: AbstractViewer) => void;

     public onViewerAddedObservable: Observable<AbstractViewer>;

+    public onViewerRemovedObservable: Observable<string>;

 

     constructor() {

         this.viewers = {};

         this.onViewerAddedObservable = new Observable();

+        this.onViewerRemovedObservable = new Observable();

     }

 

     public addViewer(viewer: AbstractViewer) {

@@ -20,6 +20,12 @@ export class ViewerManager {
 
         this._onViewerAdded(viewer);

     }

 

+    public removeViewer(viewer: AbstractViewer) {

+        let id = viewer.getBaseId();

+        delete this.viewers[id];

+        this.onViewerRemovedObservable.notifyObservers(id);

+    }

+

     public getViewerById(id: string): AbstractViewer {

         return this.viewers[id];

     }

@@ -52,6 +58,12 @@ export class ViewerManager {
 
         this.onViewerAdded && this.onViewerAdded(viewer);

         this.onViewerAddedObservable.notifyObservers(viewer);

     }

+

+    public dispose() {

+        for (let id in this.viewers) {

+            this.viewers[id].dispose();

+        }

+    }

 }

 

 export let viewerManager = new ViewerManager();

+ 3 - 1
Viewer/webpack.config.js
查看文件 

@@ -24,7 +24,9 @@ module.exports = {
 
     },

     externals: {

         // until physics will be integrated in the viewer, ignore cannon

-        cannon: 'CANNON'

+        cannon: 'CANNON',

+        oimo: 'OIMO',

+        './Oimo': 'OIMO'

     },

     devtool: 'source-map',

     plugins: [

+ 1 - 1
dist/preview release/Oimo.js
查看文件 

@@ -1,6 +1,6 @@
 
 (function (global, factory) {

 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :

-	typeof define === 'function' && define.amd ? define("oimo", ['exports'], factory) :

+	typeof define === 'function' && define.amd ? define(['exports'], factory) :

 	(factory((global.OIMO = global.OIMO || {})));

 }(this, (function (exports) { 'use strict';

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


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


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


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


File diff suppressed because it is too large
+ 8863 - 8864
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


File diff suppressed because it is too large
+ 59 - 59
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


File diff suppressed because it is too large
+ 169 - 110
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js


File diff suppressed because it is too large
+ 128 - 88
dist/preview release/customConfigurations/minimalGLTFViewer/es6.js


File diff suppressed because it is too large
+ 130 - 88
dist/preview release/es6.js


+ 1 - 1
dist/preview release/gltf2Interface/package.json
查看文件 

@@ -1,7 +1,7 @@
 
 {
 
     "name": "babylonjs-gltf2interface",
 
     "description": "A typescript declaration of babylon's gltf2 inteface.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 4 - 0
dist/preview release/gui/babylon.gui.d.ts
查看文件 

@@ -357,6 +357,10 @@ declare module BABYLON.GUI {
 
         protected _children: Control[];
 
         protected _measureForChildren: Measure;
 
         protected _background: string;
 
+        protected _adaptWidthToChildren: boolean;
 
+        protected _adaptHeightToChildren: boolean;
 
+        adaptHeightToChildren: boolean;
 
+        adaptWidthToChildren: boolean;
 
         background: string;
 
         readonly children: Control[];
 
         constructor(name?: string | undefined);

+ 74 - 21
dist/preview release/gui/babylon.gui.js
查看文件 

@@ -1,30 +1,33 @@
 
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
 
-var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 
-if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
 
-else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
 
-return c > 3 && r && Object.defineProperty(target, key, r), r;
 
-};
 
-var __extends = (this && this.__extends) || (function () {
 
-            var extendStatics = Object.setPrototypeOf ||
 
-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
 
-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
 
-            return function (d, b) {
 
-                extendStatics(d, b);
 
-                function __() { this.constructor = d; }
 
-                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 
-            };
 
-        })();
 
-        
+var __decorate=this&&this.__decorate||function(e,t,r,c){var o,f=arguments.length,n=f<3?t:null===c?c=Object.getOwnPropertyDescriptor(t,r):c;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,c);else for(var l=e.length-1;l>=0;l--)(o=e[l])&&(n=(f<3?o(n):f>3?o(t,r,n):o(t,r))||n);return f>3&&n&&Object.defineProperty(t,r,n),n};
 
+var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,o){t.__proto__=o}||function(t,o){for(var n in o)o.hasOwnProperty(n)&&(t[n]=o[n])};return function(o,n){function r(){this.constructor=o}t(o,n),o.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();
 
+
 
 
 (function universalModuleDefinition(root, factory) {
 
+    var amdDependencies = [];
 
+    var BABYLON = root. BABYLON;
 
+    if(!BABYLON) {
 
+        if(typeof exports === 'object') {
 
+             BABYLON = require("babylonjs"); 
+        } else if(typeof define === 'function' && define.amd) {
 
+             amdDependencies.push("babylonjs");
 
+        }
 
+    } else {
 
+        if(typeof define === 'function' && define.amd) {
 
+            if(!(require.specified && require.specified("' + dep.module + '"))) {
 
+                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
 
+            }
 
+            amdDependencies.push("babylonjs");
 
+        }
 
+    }
 
+
 
     if(typeof exports === 'object' && typeof module === 'object')
 
-        module.exports = factory(require("babylonjs"));
 
+        module.exports = factory(BABYLON);
 
     else if(typeof define === 'function' && define.amd)
 
-        define("babylonjs-gui", ["babylonjs"], factory);
 
+        define("babylonjs-gui", amdDependencies, factory);
 
     else if(typeof exports === 'object')
 
-        exports["babylonjs-gui"] = factory(require("babylonjs"));
 
+        exports["babylonjs-gui"] = factory(BABYLON);
 
     else {
 
-        root["BABYLON"]["GUI"] = factory(root["BABYLON"]);
 
+        root["BABYLON"]["GUI"] = factory(BABYLON);
 
     }
 
 })(this, function(BABYLON) {
 
     "use strict";
 
@@ -1994,8 +1997,44 @@ var BABYLON;
 
                 _this.name = name;
 
                 _this._children = new Array();
 
                 _this._measureForChildren = GUI.Measure.Empty();
 
+                _this._adaptWidthToChildren = false;
 
+                _this._adaptHeightToChildren = false;
 
                 return _this;
 
             }
 
+            Object.defineProperty(Container.prototype, "adaptHeightToChildren", {
 
+                get: function () {
 
+                    return this._adaptHeightToChildren;
 
+                },
 
+                set: function (value) {
 
+                    if (this._adaptHeightToChildren === value) {
 
+                        return;
 
+                    }
 
+                    this._adaptHeightToChildren = value;
 
+                    if (value) {
 
+                        this.height = "100%";
 
+                    }
 
+                    this._markAsDirty();
 
+                },
 
+                enumerable: true,
 
+                configurable: true
 
+            });
 
+            Object.defineProperty(Container.prototype, "adaptWidthToChildren", {
 
+                get: function () {
 
+                    return this._adaptWidthToChildren;
 
+                },
 
+                set: function (value) {
 
+                    if (this._adaptWidthToChildren === value) {
 
+                        return;
 
+                    }
 
+                    this._adaptWidthToChildren = value;
 
+                    if (value) {
 
+                        this.width = "100%";
 
+                    }
 
+                    this._markAsDirty();
 
+                },
 
+                enumerable: true,
 
+                configurable: true
 
+            });
 
             Object.defineProperty(Container.prototype, "background", {
 
                 get: function () {
 
                     return this._background;
 
@@ -2119,6 +2158,8 @@ var BABYLON;
 
                 if (this._processMeasures(parentMeasure, context)) {
 
                     this._localDraw(context);
 
                     this._clipForChildren(context);
 
+                    var computedWidth = -1;
 
+                    var computedHeight = -1;
 
                     for (var _i = 0, _a = this._children; _i < _a.length; _i++) {
 
                         var child = _a[_i];
 
                         if (child.isVisible && !child.notRenderable) {
 
@@ -2127,8 +2168,20 @@ var BABYLON;
 
                             if (child.onAfterDrawObservable.hasObservers()) {
 
                                 child.onAfterDrawObservable.notifyObservers(child);
 
                             }
 
+                            if (this.adaptWidthToChildren && child._width.isPixel) {
 
+                                computedWidth = Math.max(computedWidth, child._currentMeasure.width);
 
+                            }
 
+                            if (this.adaptHeightToChildren && child._height.isPixel) {
 
+                                computedHeight = Math.max(computedHeight, child._currentMeasure.height);
 
+                            }
 
                         }
 
                     }
 
+                    if (this.adaptWidthToChildren && computedWidth >= 0) {
 
+                        this.width = computedWidth + "px";
 
+                    }
 
+                    if (this.adaptHeightToChildren && computedHeight >= 0) {
 
+                        this.height = computedHeight + "px";
 
+                    }
 
                 }
 
                 context.restore();
 
                 if (this.onAfterDrawObservable.hasObservers()) {

File diff suppressed because it is too large
+ 4 - 4
dist/preview release/gui/babylon.gui.min.js


+ 4 - 0
dist/preview release/gui/babylon.gui.module.d.ts
查看文件 

@@ -363,6 +363,10 @@ declare module BABYLON.GUI {
 
         protected _children: Control[];
 
         protected _measureForChildren: Measure;
 
         protected _background: string;
 
+        protected _adaptWidthToChildren: boolean;
 
+        protected _adaptHeightToChildren: boolean;
 
+        adaptHeightToChildren: boolean;
 
+        adaptWidthToChildren: boolean;
 
         background: string;
 
         readonly children: Control[];
 
         constructor(name?: string | undefined);

+ 1 - 1
dist/preview release/gui/package.json
查看文件 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-gui",
 
     "description": "The Babylon.js GUI library is an extension you can use to generate interactive user interface. It is build on top of the DynamicTexture.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"

File diff suppressed because it is too large
+ 4 - 4
dist/preview release/inspector/babylon.inspector.bundle.js


+ 1 - 1
dist/preview release/inspector/package.json
查看文件 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-inspector",
 
     "description": "The Babylon.js inspector.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 4 - 2
dist/preview release/loaders/babylon.glTF2FileLoader.js
查看文件 

@@ -1792,7 +1792,9 @@ var BABYLON;
 
                 return (BABYLON.Tools.IsBase64(uri) || uri.indexOf("..") === -1);
 
             };
 
             GLTFLoader._GetDrawMode = function (context, mode) {
 
-                mode = mode || 4 /* TRIANGLES */;
 
+                if (mode == undefined) {
 
+                    mode = 4 /* TRIANGLES */;
 
+                }
 
                 switch (mode) {
 
                     case 0 /* POINTS */: return BABYLON.Material.PointListDrawMode;
 
                     case 1 /* LINES */: return BABYLON.Material.LineListDrawMode;
 
@@ -2020,7 +2022,7 @@ var BABYLON;
 
                                 if (indexLOD !== 0) {
 
                                     var previousNodeLOD = nodeLODs[indexLOD - 1];
 
                                     if (previousNodeLOD._babylonMesh) {
 
-                                        previousNodeLOD._babylonMesh.dispose();
 
+                                        previousNodeLOD._babylonMesh.dispose(false, true);
 
                                         delete previousNodeLOD._babylonMesh;
 
                                     }
 
                                 }

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/loaders/babylon.glTF2FileLoader.min.js


+ 4 - 2
dist/preview release/loaders/babylon.glTFFileLoader.js
查看文件 

@@ -3990,7 +3990,9 @@ var BABYLON;
 
                 return (BABYLON.Tools.IsBase64(uri) || uri.indexOf("..") === -1);
 
             };
 
             GLTFLoader._GetDrawMode = function (context, mode) {
 
-                mode = mode || 4 /* TRIANGLES */;
 
+                if (mode == undefined) {
 
+                    mode = 4 /* TRIANGLES */;
 
+                }
 
                 switch (mode) {
 
                     case 0 /* POINTS */: return BABYLON.Material.PointListDrawMode;
 
                     case 1 /* LINES */: return BABYLON.Material.LineListDrawMode;
 
@@ -4218,7 +4220,7 @@ var BABYLON;
 
                                 if (indexLOD !== 0) {
 
                                     var previousNodeLOD = nodeLODs[indexLOD - 1];
 
                                     if (previousNodeLOD._babylonMesh) {
 
-                                        previousNodeLOD._babylonMesh.dispose();
 
+                                        previousNodeLOD._babylonMesh.dispose(false, true);
 
                                         delete previousNodeLOD._babylonMesh;
 
                                     }
 
                                 }

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/loaders/babylon.glTFFileLoader.min.js


+ 28 - 23
dist/preview release/loaders/babylonjs.loaders.js
查看文件 

@@ -1,30 +1,33 @@
 
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
 
-var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 
-if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
 
-else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
 
-return c > 3 && r && Object.defineProperty(target, key, r), r;
 
-};
 
-var __extends = (this && this.__extends) || (function () {
 
-            var extendStatics = Object.setPrototypeOf ||
 
-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
 
-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
 
-            return function (d, b) {
 
-                extendStatics(d, b);
 
-                function __() { this.constructor = d; }
 
-                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 
-            };
 
-        })();
 
-        
+var __decorate=this&&this.__decorate||function(e,t,r,c){var o,f=arguments.length,n=f<3?t:null===c?c=Object.getOwnPropertyDescriptor(t,r):c;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,c);else for(var l=e.length-1;l>=0;l--)(o=e[l])&&(n=(f<3?o(n):f>3?o(t,r,n):o(t,r))||n);return f>3&&n&&Object.defineProperty(t,r,n),n};
 
+var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,o){t.__proto__=o}||function(t,o){for(var n in o)o.hasOwnProperty(n)&&(t[n]=o[n])};return function(o,n){function r(){this.constructor=o}t(o,n),o.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();
 
+
 
 
 (function universalModuleDefinition(root, factory) {
 
+    var amdDependencies = [];
 
+    var BABYLON = root. BABYLON;
 
+    if(!BABYLON) {
 
+        if(typeof exports === 'object') {
 
+             BABYLON = require("babylonjs"); 
+        } else if(typeof define === 'function' && define.amd) {
 
+             amdDependencies.push("babylonjs");
 
+        }
 
+    } else {
 
+        if(typeof define === 'function' && define.amd) {
 
+            if(!(require.specified && require.specified("' + dep.module + '"))) {
 
+                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
 
+            }
 
+            amdDependencies.push("babylonjs");
 
+        }
 
+    }
 
+
 
     if(typeof exports === 'object' && typeof module === 'object')
 
-        module.exports = factory(require("babylonjs"));
 
+        module.exports = factory(BABYLON);
 
     else if(typeof define === 'function' && define.amd)
 
-        define("babylonjs-loaders", ["babylonjs"], factory);
 
+        define("babylonjs-loaders", amdDependencies, factory);
 
     else if(typeof exports === 'object')
 
-        exports["babylonjs-loaders"] = factory(require("babylonjs"));
 
+        exports["babylonjs-loaders"] = factory(BABYLON);
 
     else {
 
-        root["BABYLON"] = factory(root["BABYLON"]);
 
+        root["BABYLON"] = factory(BABYLON);
 
     }
 
 })(this, function(BABYLON) {
 
     "use strict";
 
@@ -4973,7 +4976,9 @@ var BABYLON;
 
                 return (BABYLON.Tools.IsBase64(uri) || uri.indexOf("..") === -1);
 
             };
 
             GLTFLoader._GetDrawMode = function (context, mode) {
 
-                mode = mode || 4 /* TRIANGLES */;
 
+                if (mode == undefined) {
 
+                    mode = 4 /* TRIANGLES */;
 
+                }
 
                 switch (mode) {
 
                     case 0 /* POINTS */: return BABYLON.Material.PointListDrawMode;
 
                     case 1 /* LINES */: return BABYLON.Material.LineListDrawMode;
 
@@ -5192,7 +5197,7 @@ var BABYLON;
 
                                 if (indexLOD !== 0) {
 
                                     var previousNodeLOD = nodeLODs[indexLOD - 1];
 
                                     if (previousNodeLOD._babylonMesh) {
 
-                                        previousNodeLOD._babylonMesh.dispose();
 
+                                        previousNodeLOD._babylonMesh.dispose(false, true);
 
                                         delete previousNodeLOD._babylonMesh;
 
                                     }
 
                                 }

File diff suppressed because it is too large
+ 3 - 3
dist/preview release/loaders/babylonjs.loaders.min.js


+ 2 - 2
dist/preview release/loaders/package.json
查看文件 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-loaders",
 
     "description": "The Babylon.js file loaders library is an extension you can use to load different 3D file types into a Babylon scene.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"
 
@@ -27,7 +27,7 @@
 
     ],
 
     "license": "Apache-2.0",
 
     "dependencies": {
 
-        "babylonjs-gltf2interface": "3.2.0-alphaC"
 
+        "babylonjs-gltf2interface": "3.2.0-beta.1"
 
     },
 
     "peerDependencies": {
 
         "babylonjs": ">=3.2.0-alpha"

+ 24 - 21
dist/preview release/materialsLibrary/babylonjs.materials.js
查看文件 

@@ -1,30 +1,33 @@
 
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
 
-var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 
-if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
 
-else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
 
-return c > 3 && r && Object.defineProperty(target, key, r), r;
 
-};
 
-var __extends = (this && this.__extends) || (function () {
 
-            var extendStatics = Object.setPrototypeOf ||
 
-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
 
-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
 
-            return function (d, b) {
 
-                extendStatics(d, b);
 
-                function __() { this.constructor = d; }
 
-                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 
-            };
 
-        })();
 
-        
+var __decorate=this&&this.__decorate||function(e,t,r,c){var o,f=arguments.length,n=f<3?t:null===c?c=Object.getOwnPropertyDescriptor(t,r):c;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,c);else for(var l=e.length-1;l>=0;l--)(o=e[l])&&(n=(f<3?o(n):f>3?o(t,r,n):o(t,r))||n);return f>3&&n&&Object.defineProperty(t,r,n),n};
 
+var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,o){t.__proto__=o}||function(t,o){for(var n in o)o.hasOwnProperty(n)&&(t[n]=o[n])};return function(o,n){function r(){this.constructor=o}t(o,n),o.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();
 
+
 
 
 (function universalModuleDefinition(root, factory) {
 
+    var amdDependencies = [];
 
+    var BABYLON = root. BABYLON;
 
+    if(!BABYLON) {
 
+        if(typeof exports === 'object') {
 
+             BABYLON = require("babylonjs"); 
+        } else if(typeof define === 'function' && define.amd) {
 
+             amdDependencies.push("babylonjs");
 
+        }
 
+    } else {
 
+        if(typeof define === 'function' && define.amd) {
 
+            if(!(require.specified && require.specified("' + dep.module + '"))) {
 
+                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
 
+            }
 
+            amdDependencies.push("babylonjs");
 
+        }
 
+    }
 
+
 
     if(typeof exports === 'object' && typeof module === 'object')
 
-        module.exports = factory(require("babylonjs"));
 
+        module.exports = factory(BABYLON);
 
     else if(typeof define === 'function' && define.amd)
 
-        define("babylonjs-materials", ["babylonjs"], factory);
 
+        define("babylonjs-materials", amdDependencies, factory);
 
     else if(typeof exports === 'object')
 
-        exports["babylonjs-materials"] = factory(require("babylonjs"));
 
+        exports["babylonjs-materials"] = factory(BABYLON);
 
     else {
 
-        root["BABYLON"] = factory(root["BABYLON"]);
 
+        root["BABYLON"] = factory(BABYLON);
 
     }
 
 })(this, function(BABYLON) {
 
     "use strict";

File diff suppressed because it is too large
+ 2 - 2
dist/preview release/materialsLibrary/babylonjs.materials.min.js


+ 1 - 1
dist/preview release/materialsLibrary/package.json
查看文件 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-materials",
 
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 24 - 21
dist/preview release/postProcessesLibrary/babylonjs.postProcess.js
查看文件 

@@ -1,30 +1,33 @@
 
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
 
-var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 
-if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
 
-else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
 
-return c > 3 && r && Object.defineProperty(target, key, r), r;
 
-};
 
-var __extends = (this && this.__extends) || (function () {
 
-            var extendStatics = Object.setPrototypeOf ||
 
-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
 
-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
 
-            return function (d, b) {
 
-                extendStatics(d, b);
 
-                function __() { this.constructor = d; }
 
-                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 
-            };
 
-        })();
 
-        
+var __decorate=this&&this.__decorate||function(e,t,r,c){var o,f=arguments.length,n=f<3?t:null===c?c=Object.getOwnPropertyDescriptor(t,r):c;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,c);else for(var l=e.length-1;l>=0;l--)(o=e[l])&&(n=(f<3?o(n):f>3?o(t,r,n):o(t,r))||n);return f>3&&n&&Object.defineProperty(t,r,n),n};
 
+var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,o){t.__proto__=o}||function(t,o){for(var n in o)o.hasOwnProperty(n)&&(t[n]=o[n])};return function(o,n){function r(){this.constructor=o}t(o,n),o.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();
 
+
 
 
 (function universalModuleDefinition(root, factory) {
 
+    var amdDependencies = [];
 
+    var BABYLON = root. BABYLON;
 
+    if(!BABYLON) {
 
+        if(typeof exports === 'object') {
 
+             BABYLON = require("babylonjs"); 
+        } else if(typeof define === 'function' && define.amd) {
 
+             amdDependencies.push("babylonjs");
 
+        }
 
+    } else {
 
+        if(typeof define === 'function' && define.amd) {
 
+            if(!(require.specified && require.specified("' + dep.module + '"))) {
 
+                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
 
+            }
 
+            amdDependencies.push("babylonjs");
 
+        }
 
+    }
 
+
 
     if(typeof exports === 'object' && typeof module === 'object')
 
-        module.exports = factory(require("babylonjs"));
 
+        module.exports = factory(BABYLON);
 
     else if(typeof define === 'function' && define.amd)
 
-        define("babylonjs-post-process", ["babylonjs"], factory);
 
+        define("babylonjs-post-process", amdDependencies, factory);
 
     else if(typeof exports === 'object')
 
-        exports["babylonjs-post-process"] = factory(require("babylonjs"));
 
+        exports["babylonjs-post-process"] = factory(BABYLON);
 
     else {
 
-        root["BABYLON"] = factory(root["BABYLON"]);
 
+        root["BABYLON"] = factory(BABYLON);
 
     }
 
 })(this, function(BABYLON) {
 
     "use strict";

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/postProcessesLibrary/babylonjs.postProcess.min.js


+ 1 - 1
dist/preview release/postProcessesLibrary/package.json
查看文件 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-post-process",
 
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 24 - 21
dist/preview release/proceduralTexturesLibrary/babylonjs.proceduralTextures.js
查看文件 

@@ -1,30 +1,33 @@
 
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
 
-var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 
-if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
 
-else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
 
-return c > 3 && r && Object.defineProperty(target, key, r), r;
 
-};
 
-var __extends = (this && this.__extends) || (function () {
 
-            var extendStatics = Object.setPrototypeOf ||
 
-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
 
-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
 
-            return function (d, b) {
 
-                extendStatics(d, b);
 
-                function __() { this.constructor = d; }
 
-                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 
-            };
 
-        })();
 
-        
+var __decorate=this&&this.__decorate||function(e,t,r,c){var o,f=arguments.length,n=f<3?t:null===c?c=Object.getOwnPropertyDescriptor(t,r):c;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,c);else for(var l=e.length-1;l>=0;l--)(o=e[l])&&(n=(f<3?o(n):f>3?o(t,r,n):o(t,r))||n);return f>3&&n&&Object.defineProperty(t,r,n),n};
 
+var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,o){t.__proto__=o}||function(t,o){for(var n in o)o.hasOwnProperty(n)&&(t[n]=o[n])};return function(o,n){function r(){this.constructor=o}t(o,n),o.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();
 
+
 
 
 (function universalModuleDefinition(root, factory) {
 
+    var amdDependencies = [];
 
+    var BABYLON = root. BABYLON;
 
+    if(!BABYLON) {
 
+        if(typeof exports === 'object') {
 
+             BABYLON = require("babylonjs"); 
+        } else if(typeof define === 'function' && define.amd) {
 
+             amdDependencies.push("babylonjs");
 
+        }
 
+    } else {
 
+        if(typeof define === 'function' && define.amd) {
 
+            if(!(require.specified && require.specified("' + dep.module + '"))) {
 
+                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
 
+            }
 
+            amdDependencies.push("babylonjs");
 
+        }
 
+    }
 
+
 
     if(typeof exports === 'object' && typeof module === 'object')
 
-        module.exports = factory(require("babylonjs"));
 
+        module.exports = factory(BABYLON);
 
     else if(typeof define === 'function' && define.amd)
 
-        define("babylonjs-procedural-textures", ["babylonjs"], factory);
 
+        define("babylonjs-procedural-textures", amdDependencies, factory);
 
     else if(typeof exports === 'object')
 
-        exports["babylonjs-procedural-textures"] = factory(require("babylonjs"));
 
+        exports["babylonjs-procedural-textures"] = factory(BABYLON);
 
     else {
 
-        root["BABYLON"] = factory(root["BABYLON"]);
 
+        root["BABYLON"] = factory(BABYLON);
 
     }
 
 })(this, function(BABYLON) {
 
     "use strict";

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js


+ 1 - 1
dist/preview release/proceduralTexturesLibrary/package.json
查看文件 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-procedural-textures",
 
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 24 - 21
dist/preview release/serializers/babylonjs.serializers.js
查看文件 

@@ -1,30 +1,33 @@
 
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
 
-var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 
-if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
 
-else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
 
-return c > 3 && r && Object.defineProperty(target, key, r), r;
 
-};
 
-var __extends = (this && this.__extends) || (function () {
 
-            var extendStatics = Object.setPrototypeOf ||
 
-                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
 
-                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
 
-            return function (d, b) {
 
-                extendStatics(d, b);
 
-                function __() { this.constructor = d; }
 
-                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 
-            };
 
-        })();
 
-        
+var __decorate=this&&this.__decorate||function(e,t,r,c){var o,f=arguments.length,n=f<3?t:null===c?c=Object.getOwnPropertyDescriptor(t,r):c;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,c);else for(var l=e.length-1;l>=0;l--)(o=e[l])&&(n=(f<3?o(n):f>3?o(t,r,n):o(t,r))||n);return f>3&&n&&Object.defineProperty(t,r,n),n};
 
+var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,o){t.__proto__=o}||function(t,o){for(var n in o)o.hasOwnProperty(n)&&(t[n]=o[n])};return function(o,n){function r(){this.constructor=o}t(o,n),o.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();
 
+
 
 
 (function universalModuleDefinition(root, factory) {
 
+    var amdDependencies = [];
 
+    var BABYLON = root. BABYLON;
 
+    if(!BABYLON) {
 
+        if(typeof exports === 'object') {
 
+             BABYLON = require("babylonjs"); 
+        } else if(typeof define === 'function' && define.amd) {
 
+             amdDependencies.push("babylonjs");
 
+        }
 
+    } else {
 
+        if(typeof define === 'function' && define.amd) {
 
+            if(!(require.specified && require.specified("' + dep.module + '"))) {
 
+                try { define("babylonjs", [], function () { return BABYLON; }); } catch(e) { }
 
+            }
 
+            amdDependencies.push("babylonjs");
 
+        }
 
+    }
 
+
 
     if(typeof exports === 'object' && typeof module === 'object')
 
-        module.exports = factory(require("babylonjs"));
 
+        module.exports = factory(BABYLON);
 
     else if(typeof define === 'function' && define.amd)
 
-        define("babylonjs-serializers", ["babylonjs"], factory);
 
+        define("babylonjs-serializers", amdDependencies, factory);
 
     else if(typeof exports === 'object')
 
-        exports["babylonjs-serializers"] = factory(require("babylonjs"));
 
+        exports["babylonjs-serializers"] = factory(BABYLON);
 
     else {
 
-        root["BABYLON"] = factory(root["BABYLON"]);
 
+        root["BABYLON"] = factory(BABYLON);
 
     }
 
 })(this, function(BABYLON) {
 
     "use strict";

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/serializers/babylonjs.serializers.min.js


+ 2 - 2
dist/preview release/serializers/package.json
查看文件 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-serializers",
 
     "description": "The Babylon.js serializers library is an extension you can use to serialize Babylon scenes.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"
 
@@ -27,7 +27,7 @@
 
     ],
 
     "license": "Apache-2.0",
 
     "dependencies": {
 
-        "babylonjs-gltf2interface": "3.2.0-alphaC"
 
+        "babylonjs-gltf2interface": "3.2.0-beta.1"
 
     },
 
     "peerDependencies": {
 
         "babylonjs": ">=3.2.0-alpha"

+ 5 - 0
dist/preview release/viewer/babylon.viewer.d.ts
查看文件 

@@ -2,6 +2,8 @@ declare module BabylonViewer {
 
 

     export let disableInit: boolean;

 

+    export function disposeAll(): void;

+

     export interface ITemplateConfiguration {

         location?: string;

         html?: string;

@@ -91,7 +93,9 @@ declare module BabylonViewer {
 
     interface ViewerManager {

         onViewerAdded: (viewer: AbstractViewer) => void;

         onViewerAddedObservable: BABYLON.Observable<AbstractViewer>;

+        onViewerRemovedObservable: BABYLON.Observable<string>;

         addViewer(viewer: AbstractViewer): void;

+        removeViewer(viewer: AbstractViewer): void;

         getViewerById(id: string): AbstractViewer;

         getViewerByHTMLElement(element: HTMLElement): AbstractViewer | undefined;

         getViewerPromiseById(id: string): Promise<AbstractViewer>;

@@ -462,6 +466,7 @@ declare module BabylonViewer {
 
         protected defaultPipelineTextureType: number;

         protected maxShadows: number;

         readonly isHdrSupported: boolean;

+        protected _isDisposed: boolean;

         onSceneInitObservable: BABYLON.Observable<BABYLON.Scene>;

         onEngineInitObservable: BABYLON.Observable<BABYLON.Engine>;

         onModelLoadedObservable: BABYLON.Observable<ViewerModel>;

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


File diff suppressed because it is too large
+ 367 - 203
dist/preview release/viewer/babylon.viewer.max.js


+ 1 - 1
dist/preview release/viewer/package.json
查看文件 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-viewer",
 
     "description": "A simple-to-use viewer based on BabylonJS to display 3D elements natively",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 2 - 1
dist/preview release/what's new.md
查看文件 

@@ -14,7 +14,7 @@
 
 - Added [GlowLayer](https://doc.babylonjs.com/how_to/glow_layer) to easily support glow from emissive materials. Demo [here](http://www.babylonjs.com/demos/GlowLayer/) ([sebavan](https://github.com/sebavan))

 - New [AssetContainer](http://doc.babylonjs.com/how_to/how_to_use_assetcontainer) class and loading methods ([trevordev](https://github.com/trevordev))

 - Added [depth of field](https://www.babylonjs-playground.com/frame.html#8F5HYV#5), sharpening, MSAA, chromatic aberration and grain effect to the default pipeline ([trevordev](https://github.com/trevordev))

-- Added support for [animation weights](http://doc.babylonjs.com/babylon101/animations#animation-weights). Demo [here](https://www.babylonjs-playground.com/#IQN716#3) ([deltakosh](https://github.com/deltakosh))

+- Added support for [animation weights](http://doc.babylonjs.com/babylon101/animations#animation-weights). Demo [here](https://www.babylonjs-playground.com/#IQN716#8) ([deltakosh](https://github.com/deltakosh))

 - Added [sub emitters for particle system](http://doc.babylonjs.com/babylon101/particles#sub-emitters) which will spawn new particle systems when particles dies. Demo [here](https://www.babylonjs-playground.com/frame.html#9NHBCC#1) ([IbraheemOsama](https://github.com/IbraheemOsama))

 - New [Babylon.js](http://doc.babylonjs.com/resources/maya) and [glTF](http://doc.babylonjs.com/resources/maya_to_gltf) exporter for Autodesk Maya ([Noalak](https://github.com/Noalak))

 - New glTF [serializer](https://github.com/BabylonJS/Babylon.js/tree/master/serializers/src/glTF/2.0). You can now export glTF or glb files directly from a Babylon scene ([kcoley](https://github.com/kcoley))

@@ -99,6 +99,7 @@
 
 - Added setTextureFromPostProcessOutput to bind the output of a postprocess into an effect ([trevordev](https://github.com/trevordev))

 - Added support for primitive modes to glTF 2.0 loader. ([bghgary](https://github.com/bghgary)]

 - Updated bloom effect to only bloom areas of the image above a luminance threshold ([trevordev](https://github.com/trevordev))

+- Cannon and Oimo are optional dependencies ([RaananW](https://github.com/RaananW))

 

 ## Bug fixes

+ 56 - 0
gui/src/controls/container.ts
查看文件 

@@ -5,6 +5,44 @@ module BABYLON.GUI {
 
         protected _children = new Array<Control>();

         protected _measureForChildren = Measure.Empty();  

         protected _background: string;   

+        protected _adaptWidthToChildren = false;

+        protected _adaptHeightToChildren = false;

+

+        public get adaptHeightToChildren(): boolean {

+            return this._adaptHeightToChildren;

+        }

+

+        public set adaptHeightToChildren(value: boolean) {

+            if (this._adaptHeightToChildren === value) {

+                return;

+            }

+

+            this._adaptHeightToChildren = value;

+

+            if (value) {

+                this.height = "100%";

+            }

+

+            this._markAsDirty();

+        }       

+        

+        public get adaptWidthToChildren(): boolean {

+            return this._adaptWidthToChildren;

+        }

+

+        public set adaptWidthToChildren(value: boolean) {

+            if (this._adaptWidthToChildren === value) {

+                return;

+            }

+

+            this._adaptWidthToChildren = value;

+

+            if (value) {

+                this.width = "100%";

+            }

+

+            this._markAsDirty();

+        }           

 

         public get background(): string {

             return this._background;

@@ -159,6 +197,10 @@ module BABYLON.GUI {
 
                 this._localDraw(context);

 

                 this._clipForChildren(context);

+

+                let computedWidth = -1;

+                let computedHeight = -1;

+

                 for (var child of this._children) {

                     if (child.isVisible && !child.notRenderable) {

                         child._tempParentMeasure.copyFrom(this._measureForChildren);

@@ -167,8 +209,22 @@ module BABYLON.GUI {
 
                         if (child.onAfterDrawObservable.hasObservers()) {

                             child.onAfterDrawObservable.notifyObservers(child);

                         }

+

+                        if (this.adaptWidthToChildren && child._width.isPixel) {

+                            computedWidth = Math.max(computedWidth, child._currentMeasure.width);

+                        }

+                        if (this.adaptHeightToChildren && child._height.isPixel) {

+                            computedHeight = Math.max(computedHeight, child._currentMeasure.height);

+                        }                        

                     }

                 }

+

+                if (this.adaptWidthToChildren && computedWidth >= 0) {

+                    this.width = computedWidth + "px";

+                }

+                if (this.adaptHeightToChildren && computedHeight >= 0) {

+                    this.height = computedHeight + "px";

+                }                

             }

             context.restore();

+ 1 - 2
gui/src/tsconfig.json
查看文件 

@@ -7,7 +7,6 @@
 
     "noImplicitReturns": true,

     "noImplicitThis": true,

     "noUnusedLocals": true,    

-    "strictNullChecks": true,

-    "strict": true

+    "strictNullChecks": true    

   }

 }

+ 1 - 1
loaders/src/glTF/2.0/Extensions/MSFT_lod.ts
查看文件 

@@ -43,7 +43,7 @@ module BABYLON.GLTF2.Extensions {
 
                         if (indexLOD !== 0) {
 
                             const previousNodeLOD = nodeLODs[indexLOD - 1];
 
                             if (previousNodeLOD._babylonMesh) {
 
-                                previousNodeLOD._babylonMesh.dispose();
 
+                                previousNodeLOD._babylonMesh.dispose(false, true);
 
                                 delete previousNodeLOD._babylonMesh;
 
                             }
 
                         }

+ 1 - 4
package.json
查看文件 

@@ -9,7 +9,7 @@
 
     ],
 
     "name": "babylonjs",
 
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
 
-    "version": "3.2.0-alphaC",
 
+    "version": "3.2.0-beta.1",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"
 
@@ -33,9 +33,6 @@
 
         "webgl"
 
     ],
 
     "license": "Apache-2.0",
 
-    "dependencies": {
 
-        "cannon": "0.6.2"
 
-    },
 
     "engines": {
 
         "node": "*"
 
     },

+ 1 - 11
sandbox/index-local.html
查看文件 

@@ -19,16 +19,7 @@
 
     <div id="help02" class="help2">

         <span class="helpText">Or directly drag'n'drop your files in the browser</span>

     </div>

-    <div id="perf" class="perffooter">

-        <div class="footerLeft">

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

-        </div>

-        <div class="footerRight">

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

-            <img id="btnDownArrow" src="./Assets/FlecheDown.png" />

-        </div>

-    </div>

-    <div class="footer">

+    <div id="footer" class="footer">

         <div class="footerLeft">

             Powered by <a href="http://www.babylonjs.com/" target="_blank">Babylon.js</a><br />

         </div>

@@ -48,7 +39,6 @@
 
             </ul>

         </div>

     </div>

-    <div id="loadingText" class="loadingText"></div>

     <div id="errorZone"></div>

     <script>

         BABYLONDEVTOOLS.Loader.require('index.js')

+ 3 - 6
sandbox/index.html
查看文件 

@@ -47,11 +47,9 @@
 
     <div id="help02" class="help2">

         <span class="helpText">Or directly drag'n'drop your files in the browser</span>

     </div>

-    <div class="footer">

+    <div id="footer" class="footer">

         <div class="footerLeft">

-            Powered by

-            <a href="http://www.babylonjs.com/" target="_blank">Babylon.js</a>

-            <br />

+            Powered by <a href="http://www.babylonjs.com/" target="_blank">Babylon.js</a><br />

         </div>

         <div class="footerRight">

             <ul>

@@ -59,7 +57,7 @@
 
                     <img src="./Assets/BtnFullscreen.png" alt="Switch the scene to full screen" title="Switch the scene to full screen" />

                 </li>

                 <li id="btnPerf">

-                    <img src="./Assets/BtnPerf.png" alt="Display debug & performance layer" title="Display debug & performance layer" />

+                    <img src="./Assets/BtnPerf.png" alt="Display inspector" title="Display inspector" />

                 </li>

                 <li id="btnFiles">

                     <div class="custom-upload" title="Open your scene from your hard drive (.babylon, .gltf, .glb, .obj)">

@@ -69,7 +67,6 @@
 
             </ul>

         </div>

     </div>

-    <div id="loadingText" class="loadingText"></div>

     <div id="errorZone"></div>

     <script src="index.js"></script>

 </body>

+ 137 - 64
sandbox/index.js
查看文件 

@@ -1,19 +1,42 @@
 
 /// <reference path="../dist/preview release/babylon.d.ts" />

 /// <reference path="../dist/preview release/loaders/babylon.glTFFileLoader.d.ts" />

 

+var assetUrl;

+var cameraPosition;

+var kiosk;

+

+var indexOf = location.href.indexOf("?");

+if (indexOf !== -1) {

+    var params = location.href.substr(indexOf + 1).split("&");

+    for (var index = 0; index < params.length; index++) {

+        var [name, value] = params[index].split("=");

+        switch (name) {

+            case "assetUrl": {

+                assetUrl = value;

+                break;

+            }

+            case "cameraPosition": {

+                cameraPosition = BABYLON.Vector3.FromArray(value.split(",").map(component => +component));

+                break;

+            }

+            case "kiosk": {

+                kiosk = value === "true" ? true : false;

+                break;

+            }

+        }

+    }

+}

+

 if (BABYLON.Engine.isSupported()) {

     var canvas = document.getElementById("renderCanvas");

     var engine = new BABYLON.Engine(canvas, true);

-    var divFps = document.getElementById("fps");

     var htmlInput = document.getElementById("files");

+    var footer = document.getElementById("footer");

     var btnFullScreen = document.getElementById("btnFullscreen");

-    var btnDownArrow = document.getElementById("btnDownArrow");

-    var perffooter = document.getElementById("perf");

     var btnPerf = document.getElementById("btnPerf");

-    var miscCounters = document.getElementById("miscCounters");

     var help01 = document.getElementById("help01");

     var help02 = document.getElementById("help02");

-    var loadingText = document.getElementById("loadingText");

+    var errorZone = document.getElementById("errorZone");

     var filesInput;

     var currentHelpCounter;

     var currentScene;

@@ -54,13 +77,13 @@ if (BABYLON.Engine.isSupported()) {
 
             enableDebugLayer = false;

             currentScene.debugLayer.hide();

         };

-

-        if (enableDebugLayer) {

+    

+            if (enableDebugLayer) {

             hideDebugLayerAndLogs();

         }

 

         // Clear the error

-        document.getElementById("errorZone").style.display = 'none';

+        errorZone.style.display = 'none';

 

         currentScene = babylonScene;

         document.title = "BabylonJS - " + sceneFile.name;

@@ -75,17 +98,28 @@ if (BABYLON.Engine.isSupported()) {
 
         // Attach camera to canvas inputs

         if (!currentScene.activeCamera || currentScene.lights.length === 0) {

             currentScene.createDefaultCameraOrLight(true);

-            // Enable camera's behaviors

-            currentScene.activeCamera.useFramingBehavior = true;

-

-            var framingBehavior = currentScene.activeCamera.getBehaviorByName("Framing");

-            framingBehavior.framingTime = 0;

-            framingBehavior.elevationReturnTime = -1;

 

-            if (currentScene.meshes.length) {

-                var worldExtends = currentScene.getWorldExtends();

-                currentScene.activeCamera.lowerRadiusLimit = null;

-                framingBehavior.zoomOnBoundingInfo(worldExtends.min, worldExtends.max);

+            if (cameraPosition) {

+                currentScene.activeCamera.setPosition(cameraPosition);

+            }

+            else {

+                if (currentPluginName === "gltf") {

+                    // glTF assets use a +Z forward convention while the default camera faces +Z. Rotate the camera to look at the front of the asset.

+                    currentScene.activeCamera.alpha += Math.PI;

+                }

+

+                // Enable camera's behaviors

+                currentScene.activeCamera.useFramingBehavior = true;

+

+                var framingBehavior = currentScene.activeCamera.getBehaviorByName("Framing");

+                framingBehavior.framingTime = 0;

+                framingBehavior.elevationReturnTime = -1;

+

+                if (currentScene.meshes.length) {

+                    var worldExtends = currentScene.getWorldExtends();

+                    currentScene.activeCamera.lowerRadiusLimit = null;

+                    framingBehavior.zoomOnBoundingInfo(worldExtends.min, worldExtends.max);

+                }

             }

 

             currentScene.activeCamera.pinchPrecision = 200 / currentScene.activeCamera.radius;

@@ -101,9 +135,6 @@ if (BABYLON.Engine.isSupported()) {
 
         if (currentPluginName === "gltf") {

             var hdrTexture = BABYLON.CubeTexture.CreateFromPrefilteredData(skyboxPath, currentScene);

             currentSkybox = currentScene.createDefaultSkybox(hdrTexture, true, (currentScene.activeCamera.maxZ - currentScene.activeCamera.minZ) / 2, 0.3);

-

-            // glTF assets use a +Z forward convention while the default camera faces +Z. Rotate the camera to look at the front of the asset.

-            currentScene.activeCamera.alpha += Math.PI;

         }

 

         // In case of error during loading, meshes will be empty and clearColor is set to red

@@ -138,47 +169,85 @@ if (BABYLON.Engine.isSupported()) {
 
 

         var errorContent = '<div class="alert alert-error"><button type="button" class="close" data-dismiss="alert">&times;</button>' + message.replace("file:[object File]", "'" + sceneFile.name + "'") + '</div>';

 

-        document.getElementById("errorZone").style.display = 'block';

-        document.getElementById("errorZone").innerHTML = errorContent;

+        errorZone.style.display = 'block';

+        errorZone.innerHTML = errorContent;

 

         // Close button error

-        document.getElementById("errorZone").querySelector('.close').addEventListener('click', function () {

-            document.getElementById("errorZone").style.display = 'none';

+        errorZone.querySelector('.close').addEventListener('click', function () {

+            errorZone.style.display = 'none';

         });

     };

 

-    filesInput = new BABYLON.FilesInput(engine, null, sceneLoaded, null, null, null, function () { BABYLON.Tools.ClearLogCache() }, null, sceneError);

-    filesInput.onProcessFileCallback = (function (file, name, extension) {

-        if (filesInput._filesToLoad && filesInput._filesToLoad.length === 1 && extension && extension.toLowerCase() === "dds") {

-            BABYLON.FilesInput.FilesToLoad[name] = file;

-            skyboxPath = "file:" + file.correctName;

-            return false;

-        }

-        return true;

-    }).bind(this);

-    filesInput.monitorElementForDragNDrop(canvas);

+    if (assetUrl) {

+        var rootUrl = BABYLON.Tools.GetFolderPath(assetUrl);

+        var fileName = BABYLON.Tools.GetFilename(assetUrl);

+        BABYLON.SceneLoader.LoadAsync(rootUrl, fileName, engine).then(function (scene) {

+            sceneLoaded({ name: fileName }, scene);

+            scene.whenReadyAsync().then(function () {

+                engine.runRenderLoop(function ()  {

+                    scene.render();

+                });

+            });

+        }).catch(function (reason) {

+            sceneError({ name: fileName }, null, reason);

+        });

+    }

+    else {

+        filesInput = new BABYLON.FilesInput(engine, null, sceneLoaded, null, null, null, function () { BABYLON.Tools.ClearLogCache() }, null, sceneError);

+        filesInput.onProcessFileCallback = (function (file, name, extension) {

+            if (filesInput._filesToLoad && filesInput._filesToLoad.length === 1 && extension && extension.toLowerCase() === "dds") {

+                BABYLON.FilesInput.FilesToLoad[name] = file;

+                skyboxPath = "file:" + file.correctName;

+                return false;

+            }

+            return true;

+        }).bind(this);

+        filesInput.monitorElementForDragNDrop(canvas);

+

+        window.addEventListener("keydown", function (evt) {

+            // Press R to reload

+            if (evt.keyCode === 82) {

+                filesInput.reload();

+            }

+        });

 

-    window.addEventListener("keydown", function (evt) {

-        // Press R to reload

-        if (evt.keyCode === 82) {

-            filesInput.reload();

-        }

-    });

-    htmlInput.addEventListener('change', function (event) {

-        var filestoLoad;

-        // Handling data transfer via drag'n'drop

-        if (event && event.dataTransfer && event.dataTransfer.files) {

-            filesToLoad = event.dataTransfer.files;

-        }

-        // Handling files from input files

-        if (event && event.target && event.target.files) {

-            filesToLoad = event.target.files;

+        htmlInput.addEventListener('change', function (event) {

+            var filestoLoad;

+            // Handling data transfer via drag'n'drop

+            if (event && event.dataTransfer && event.dataTransfer.files) {

+                filesToLoad = event.dataTransfer.files;

+            }

+            // Handling files from input files

+            if (event && event.target && event.target.files) {

+                filesToLoad = event.target.files;

+            }

+            filesInput.loadFiles(event);

+        }, false);

+    }

+

+    if (kiosk) {

+        footer.style.display = "none";

+    }

+    else {

+        // The help tips will be displayed only 5 times

+        if (currentHelpCounter < 5) {

+            help01.className = "help shown";

+

+            setTimeout(function () {

+                help01.className = "help";

+                help02.className = "help2 shown";

+                setTimeout(function () {

+                    help02.className = "help2";

+                    localStorage.setItem("helpcounter", currentHelpCounter + 1);

+                }, 5000);

+            }, 5000);

         }

-        filesInput.loadFiles(event);

-    }, false);

+    }

+

     btnFullScreen.addEventListener('click', function () {

         engine.switchFullscreen(true);

     }, false);

+

     btnPerf.addEventListener('click', function () {

         if (currentScene) {

             if (!enableDebugLayer) {

@@ -191,19 +260,23 @@ if (BABYLON.Engine.isSupported()) {
 
             }

         }

     }, false);

-    // The help tips will be displayed only 5 times

-    if (currentHelpCounter < 5) {

-        help01.className = "help shown";

 

-        setTimeout(function () {

-            help01.className = "help";

-            help02.className = "help2 shown";

-            setTimeout(function () {

-                help02.className = "help2";

-                localStorage.setItem("helpcounter", currentHelpCounter + 1);

-            }, 5000);

-        }, 5000);

-    }

+    window.addEventListener("keydown", function (evt) {

+        // Press Esc to toggle footer

+        if (evt.keyCode === 27) {

+            if (footer.style.display === "none") {

+                footer.style.display = "block";

+            }

+            else {

+                footer.style.display = "none";

+                errorZone.style.display = "none";

+                if (enableDebugLayer) {

+                    currentScene.debugLayer.hide();

+                    enableDebugLayer = false;

+                }

+            }

+        }

+    });

 

     sizeScene();

+ 88 - 73
src/Audio/babylon.sound.ts
查看文件 

@@ -91,89 +91,104 @@ module BABYLON {
 
                 }

                 this._scene.mainSoundTrack.AddSound(this);

                 var validParameter = true;

+

                 // if no parameter is passed, you need to call setAudioBuffer yourself to prepare the sound

                 if (urlOrArrayBuffer) {

-                    if (typeof (urlOrArrayBuffer) === "string") this._urlType = "String";

-                    if (Array.isArray(urlOrArrayBuffer)) this._urlType = "Array";

-                    if (urlOrArrayBuffer instanceof ArrayBuffer) this._urlType = "ArrayBuffer";

-

-                    var urls: string[] = [];

-                    var codecSupportedFound = false;

-

-                    switch (this._urlType) {

-                        case "ArrayBuffer":

-                            if ((<ArrayBuffer>urlOrArrayBuffer).byteLength > 0) {

-                                codecSupportedFound = true;

-                                this._soundLoaded(urlOrArrayBuffer);

-                            }

-                            break;

-                        case "String":

-                            urls.push(urlOrArrayBuffer);

-                        case "Array":

-                            if (urls.length === 0) urls = urlOrArrayBuffer;

-                            // If we found a supported format, we load it immediately and stop the loop

-                            for (var i = 0; i < urls.length; i++) {

-                                var url = urls[i];

-                                if (url.indexOf(".mp3", url.length - 4) !== -1 && Engine.audioEngine.isMP3supported) {

-                                    codecSupportedFound = true;

-                                }

-                                if (url.indexOf(".ogg", url.length - 4) !== -1 && Engine.audioEngine.isOGGsupported) {

-                                    codecSupportedFound = true;

-                                }

-                                if (url.indexOf(".wav", url.length - 4) !== -1) {

-                                    codecSupportedFound = true;

-                                }

-                                if (url.indexOf("blob:") !== -1) {

+                    try {

+                        if (typeof (urlOrArrayBuffer) === "string") this._urlType = "String";

+                        if (Array.isArray(urlOrArrayBuffer)) this._urlType = "Array";

+                        if (urlOrArrayBuffer instanceof ArrayBuffer) this._urlType = "ArrayBuffer";

+

+                        var urls: string[] = [];

+                        var codecSupportedFound = false;

+

+                        switch (this._urlType) {

+                            case "ArrayBuffer":

+                                if ((<ArrayBuffer>urlOrArrayBuffer).byteLength > 0) {

                                     codecSupportedFound = true;

+                                    this._soundLoaded(urlOrArrayBuffer);

                                 }

-                                if (codecSupportedFound) {

-                                    // Loading sound using XHR2

-                                    if (!this._streaming) {

-                                        this._scene._loadFile(url, (data) => { this._soundLoaded(data as ArrayBuffer); }, undefined, true, true);

+                                break;

+                            case "String":

+                                urls.push(urlOrArrayBuffer);

+                            case "Array":

+                                if (urls.length === 0) urls = urlOrArrayBuffer;

+                                // If we found a supported format, we load it immediately and stop the loop

+                                for (var i = 0; i < urls.length; i++) {

+                                    var url = urls[i];

+                                    if (url.indexOf(".mp3", url.length - 4) !== -1 && Engine.audioEngine.isMP3supported) {

+                                        codecSupportedFound = true;

+                                    }

+                                    if (url.indexOf(".ogg", url.length - 4) !== -1 && Engine.audioEngine.isOGGsupported) {

+                                        codecSupportedFound = true;

                                     }

-                                    // Streaming sound using HTML5 Audio tag

-                                    else {

-                                        this._htmlAudioElement = new Audio(url);

-                                        this._htmlAudioElement.controls = false;

-                                        this._htmlAudioElement.loop = this.loop;

-                                        Tools.SetCorsBehavior(url, this._htmlAudioElement);

-                                        this._htmlAudioElement.preload = "auto";

-                                        this._htmlAudioElement.addEventListener("canplaythrough", () => {

-                                            this._isReadyToPlay = true;

-                                            if (this.autoplay) {

-                                                this.play();

-                                            }

-                                            if (this._readyToPlayCallback) {

-                                                this._readyToPlayCallback();

-                                            }

-                                        });

-                                        document.body.appendChild(this._htmlAudioElement);

+                                    if (url.indexOf(".wav", url.length - 4) !== -1) {

+                                        codecSupportedFound = true;

+                                    }

+                                    if (url.indexOf("blob:") !== -1) {

+                                        codecSupportedFound = true;

+                                    }

+                                    if (codecSupportedFound) {

+                                        // Loading sound using XHR2

+                                        if (!this._streaming) {

+                                            this._scene._loadFile(url, (data) => { 

+                                                this._soundLoaded(data as ArrayBuffer); 

+                                            }, undefined, true, true, (exception) => {

+                                                if (exception) {

+                                                    Tools.Error("XHR " + exception.status + " error on: " + url + ".");

+                                                }

+                                                Tools.Error("Sound creation aborted.");

+                                                this._scene.mainSoundTrack.RemoveSound(this);

+                                            });

+                                        }

+                                        // Streaming sound using HTML5 Audio tag

+                                        else {

+                                            this._htmlAudioElement = new Audio(url);

+                                            this._htmlAudioElement.controls = false;

+                                            this._htmlAudioElement.loop = this.loop;

+                                            Tools.SetCorsBehavior(url, this._htmlAudioElement);

+                                            this._htmlAudioElement.preload = "auto";

+                                            this._htmlAudioElement.addEventListener("canplaythrough", () => {

+                                                this._isReadyToPlay = true;

+                                                if (this.autoplay) {

+                                                    this.play();

+                                                }

+                                                if (this._readyToPlayCallback) {

+                                                    this._readyToPlayCallback();

+                                                }

+                                            });

+                                            document.body.appendChild(this._htmlAudioElement);

+                                        }

+                                        break;

                                     }

-                                    break;

                                 }

-                            }

-                            break;

-                        default:

-                            validParameter = false;

-                            break;

-                    }

+                                break;

+                            default:

+                                validParameter = false;

+                                break;

+                        }

 

-                    if (!validParameter) {

-                        Tools.Error("Parameter must be a URL to the sound, an Array of URLs (.mp3 & .ogg) or an ArrayBuffer of the sound.");

-                    }

-                    else {

-                        if (!codecSupportedFound) {

-                            this._isReadyToPlay = true;

-                            // Simulating a ready to play event to avoid breaking code path

-                            if (this._readyToPlayCallback) {

-                                window.setTimeout(() => {

-                                    if (this._readyToPlayCallback) {

-                                        this._readyToPlayCallback();

-                                    }

-                                }, 1000);

+                        if (!validParameter) {

+                            Tools.Error("Parameter must be a URL to the sound, an Array of URLs (.mp3 & .ogg) or an ArrayBuffer of the sound.");

+                        }

+                        else {

+                            if (!codecSupportedFound) {

+                                this._isReadyToPlay = true;

+                                // Simulating a ready to play event to avoid breaking code path

+                                if (this._readyToPlayCallback) {

+                                    window.setTimeout(() => {

+                                        if (this._readyToPlayCallback) {

+                                            this._readyToPlayCallback();

+                                        }

+                                    }, 1000);

+                                }

                             }

                         }

                     }

+                    catch (ex) {

+                        Tools.Error("Unexpected error. Sound creation aborted.");

+                        this._scene.mainSoundTrack.RemoveSound(this);

+                    }

                 }

             }

             else {

@@ -195,7 +210,7 @@ module BABYLON {
 
         }

 

         public dispose() {

-            if (Engine.audioEngine.canUseWebAudio && this._isReadyToPlay) {

+            if (Engine.audioEngine.canUseWebAudio) { 

                 if (this.isPlaying) {

                     this.stop();

                 }

+ 18 - 2
src/Layer/babylon.effectLayer.ts
查看文件 

@@ -372,6 +372,18 @@
 
                 defines.push("#define NUM_BONE_INFLUENCERS 0");

             }

 

+            // Morph targets         

+            var manager = (<Mesh>mesh).morphTargetManager;

+            let morphInfluencers = 0;

+            if (manager) {

+                if (manager.numInfluencers > 0) {

+                    defines.push("#define MORPHTARGETS");

+                    morphInfluencers = manager.numInfluencers;

+                    defines.push("#define NUM_MORPH_INFLUENCERS " + morphInfluencers);

+                    MaterialHelper.PrepareAttributesForMorphTargets(attribs, mesh, {"NUM_MORPH_INFLUENCERS": morphInfluencers });

+                }

+            }            

+

             // Instances

             if (useInstances) {

                 defines.push("#define INSTANCES");

@@ -387,8 +399,9 @@
 
                 this._cachedDefines = join;

                 this._effectLayerMapGenerationEffect = this._scene.getEngine().createEffect("glowMapGeneration",

                     attribs,

-                    ["world", "mBones", "viewProjection", "diffuseMatrix", "color", "emissiveMatrix"],

-                    ["diffuseSampler", "emissiveSampler"], join);

+                    ["world", "mBones", "viewProjection", "diffuseMatrix", "color", "emissiveMatrix", "morphTargetInfluences"],

+                    ["diffuseSampler", "emissiveSampler"], join,

+                    undefined, undefined, undefined, { maxSimultaneousMorphTargets: morphInfluencers });

             }

 

             return this._effectLayerMapGenerationEffect.isReady();

@@ -558,6 +571,9 @@
 
                     this._effectLayerMapGenerationEffect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));

                 }

 

+                // Morph targets

+                MaterialHelper.BindMorphTargetParameters(mesh, this._effectLayerMapGenerationEffect);

+

                 // Draw

                 mesh._processRendering(subMesh, this._effectLayerMapGenerationEffect, Material.TriangleFillMode, batch, hardwareInstancedRendering,

                     (isInstance, world) => this._effectLayerMapGenerationEffect.setMatrix("world", world));

+ 18 - 2
src/Lights/Shadows/babylon.shadowGenerator.ts
查看文件 

@@ -902,6 +902,9 @@
 
                     this._effect.setMatrices("mBones", (<Skeleton>mesh.skeleton).getTransformMatrices((mesh)));

                 }

 

+                // Morph targets

+                MaterialHelper.BindMorphTargetParameters(mesh, this._effect);

+

                 if (this.forceBackFacesOnly) {

                     engine.setState(true, 0, false, true);

                 }

@@ -1075,6 +1078,18 @@
 
                 defines.push("#define NUM_BONE_INFLUENCERS 0");

             }

 

+            // Morph targets         

+            var manager = (<Mesh>mesh).morphTargetManager;

+            let morphInfluencers = 0;

+            if (manager) {

+                if (manager.numInfluencers > 0) {

+                    defines.push("#define MORPHTARGETS");

+                    morphInfluencers = manager.numInfluencers;

+                    defines.push("#define NUM_MORPH_INFLUENCERS " + morphInfluencers);

+                    MaterialHelper.PrepareAttributesForMorphTargets(attribs, mesh, {"NUM_MORPH_INFLUENCERS": morphInfluencers });

+                }

+            }

+

             // Instances

             if (useInstances) {

                 defines.push("#define INSTANCES");

@@ -1090,8 +1105,9 @@
 
                 this._cachedDefines = join;

                 this._effect = this._scene.getEngine().createEffect("shadowMap",

                     attribs,

-                    ["world", "mBones", "viewProjection", "diffuseMatrix", "lightData", "depthValues", "biasAndScale"],

-                    ["diffuseSampler"], join);

+                    ["world", "mBones", "viewProjection", "diffuseMatrix", "lightData", "depthValues", "biasAndScale", "morphTargetInfluences"],

+                    ["diffuseSampler"], join,

+                    undefined, undefined, undefined, { maxSimultaneousMorphTargets: morphInfluencers });

             }

 

             if (!this._effect.isReady()) {

+ 1 - 1
src/Mesh/babylon.mesh.ts
查看文件 

@@ -187,7 +187,7 @@
 
 

                 // Deep copy

                 Tools.DeepCopy(source, this, ["name", "material", "skeleton", "instances", "parent", "uniqueId", 

-                                              "source", "metadata", "hasLODLevels", "geometry", "isBlocked"], 

+                                              "source", "metadata", "hasLODLevels", "geometry", "isBlocked", "areNormalsFrozen"], 

                                               ["_poseMatrix", "_source"]);

 

                 // Metadata

+ 1 - 1
src/Particles/EmitterTypes/babylon.coneParticleEmitter.ts
查看文件 

@@ -84,7 +84,7 @@ module BABYLON {
 
             // Better distribution in a cone at normal angles.

             h = 1 - h * h;

             var radius = Scalar.RandomRange(0, this._radius);

-            radius = radius * h / this._height;

+            radius = radius * h;

 

             var randX = radius * Math.sin(s);

             var randZ = radius * Math.cos(s);

+ 8 - 2
src/Particles/babylon.gpuParticleSystem.ts
查看文件 

@@ -262,8 +262,14 @@
 
          * @return true if the system is ready

          */

         public isReady(): boolean {

-            if (!this.emitter || !this._updateEffect || !this._renderEffect || 

-                !this._updateEffect.isReady() || !this._renderEffect.isReady() || !this.particleTexture || !this.particleTexture.isReady()) {

+            if (!this._updateEffect) {

+                this._recreateUpdateEffect();

+                this._recreateRenderEffect();

+                return false;

+            }

+

+

+            if (!this.emitter || !this._updateEffect.isReady() || !this._renderEffect.isReady() || !this.particleTexture || !this.particleTexture.isReady()) {

                 return false;

             }

+ 1 - 1
src/Particles/babylon.particleSystem.ts
查看文件 

@@ -997,11 +997,11 @@
 
          */

         public createBoxEmitter(direction1: Vector3, direction2: Vector3, minEmitBox: Vector3, maxEmitBox: Vector3): BoxParticleEmitter {

             var particleEmitter = new BoxParticleEmitter();

+            this.particleEmitterType = particleEmitter;

             this.direction1 = direction1;

             this.direction2 = direction2;

             this.minEmitBox = minEmitBox;

             this.maxEmitBox = maxEmitBox;

-            this.particleEmitterType = particleEmitter;

             return particleEmitter;

         }

+ 3 - 3
src/Physics/Plugins/babylon.cannonJSPlugin.ts
查看文件 

@@ -1,15 +1,15 @@
 
 module BABYLON {

-    declare var require: any;

+    //declare var require: any;

     declare var CANNON: any;

 

     export class CannonJSPlugin implements IPhysicsEnginePlugin {

 

-        public world: any; //this.BJSCANNON.World

+        public world: any;

         public name: string = "CannonJSPlugin";

         private _physicsMaterials = new Array();

         private _fixedTimeStep: number = 1 / 60;

         //See https://github.com/schteppe/CANNON.js/blob/gh-pages/demos/collisionFilter.html

-        public BJSCANNON = typeof CANNON !== 'undefined' ? CANNON : (typeof require !== 'undefined' ? require('cannon') : undefined);

+        public BJSCANNON = CANNON;

+ 1 - 2
src/Physics/Plugins/babylon.oimoJSPlugin.ts
查看文件 

@@ -1,5 +1,4 @@
 
 module BABYLON {

-    declare var require: any;

     declare var OIMO: any;

 

     export class OimoJSPlugin implements IPhysicsEnginePlugin {

@@ -10,7 +9,7 @@ module BABYLON {
 
 

 

         constructor(iterations?: number) {

-            this.BJSOIMO = typeof OIMO !== 'undefined' ? OIMO : (typeof require !== 'undefined' ? require('./Oimo') : undefined);

+            this.BJSOIMO = OIMO;

             this.world = new this.BJSOIMO.World({

                 iterations: iterations

             });

+ 0 - 3
src/PostProcess/babylon.vrDistortionCorrectionPostProcess.ts
查看文件 

@@ -1,7 +1,5 @@
 
 module BABYLON {

     export class VRDistortionCorrectionPostProcess extends PostProcess {

-        public aspectRatio: number;

-

         private _isRightEye: boolean;

         private _distortionFactors: number[];

         private _postProcessScaleFactor: number;

@@ -25,7 +23,6 @@
 
             this.adaptScaleToCurrentViewport = true;

 

             this.onSizeChangedObservable.add(() => {

-                this.aspectRatio = this.width * .5 / this.height;

                 this._scaleIn = new Vector2(2, 2 / this.aspectRatio);

                 this._scaleFactor = new Vector2(.5 * (1 / this._postProcessScaleFactor), .5 * (1 / this._postProcessScaleFactor) * this.aspectRatio);

                 this._lensCenter = new Vector2(this._isRightEye ? 0.5 - this._lensCenterOffset * 0.5 : 0.5 + this._lensCenterOffset * 0.5, 0.5);

+ 8 - 2
src/Shaders/glowMapGeneration.vertex.fx
查看文件 

@@ -3,6 +3,9 @@ attribute vec3 position;
 
 

 #include<bonesDeclaration>

 

+#include<morphTargetsVertexGlobalDeclaration>

+#include<morphTargetsVertexDeclaration>[0..maxSimultaneousMorphTargets]

+

 // Uniforms

 #include<instancesDeclaration>

 

@@ -30,14 +33,17 @@ attribute vec2 uv2;
 
 

 void main(void)

 {

+	vec3 positionUpdated = position;

+

+#include<morphTargetsVertex>[0..maxSimultaneousMorphTargets]

 #include<instancesVertex>

 #include<bonesVertex>

 

 #ifdef CUBEMAP

-	vPosition = finalWorld * vec4(position, 1.0);

+	vPosition = finalWorld * vec4(positionUpdated, 1.0);

 	gl_Position = viewProjection * finalWorld * vec4(position, 1.0);

 #else

-	vPosition = viewProjection * finalWorld * vec4(position, 1.0);

+	vPosition = viewProjection * finalWorld * vec4(positionUpdated, 1.0);

 	gl_Position = vPosition;

 #endif

+ 1 - 1
src/Shaders/gpuUpdateParticles.vertex.fx
查看文件 

@@ -133,7 +133,7 @@ void main() {
 
     // Better distribution in a cone at normal angles.

     h = 1. - h * h;

     float lRadius = radius * randoms2.z;

-    lRadius = lRadius * h / height;

+    lRadius = lRadius * h;

 

     float randX = lRadius * sin(s);

     float randZ = lRadius * cos(s);

+ 8 - 1
src/Shaders/shadowMap.vertex.fx
查看文件 

@@ -8,6 +8,9 @@ attribute vec3 position;
 
 

 #include<bonesDeclaration>

 

+#include<morphTargetsVertexGlobalDeclaration>

+#include<morphTargetsVertexDeclaration>[0..maxSimultaneousMorphTargets]

+

 // Uniforms

 #include<instancesDeclaration>

 #include<helperFunctions>

@@ -31,10 +34,14 @@ attribute vec2 uv2;
 
 

 void main(void)

 {

+vec3 positionUpdated = position;

+

+#include<morphTargetsVertex>[0..maxSimultaneousMorphTargets]

+

 #include<instancesVertex>

 #include<bonesVertex>

 

-vec4 worldPos = finalWorld * vec4(position, 1.0);

+vec4 worldPos = finalWorld * vec4(positionUpdated, 1.0);

 

 // Normal inset Bias.

 #ifdef NORMAL

+ 4 - 6
src/Tools/babylon.promise.ts
查看文件 

@@ -91,10 +91,9 @@ module BABYLON {
 
             }

         }

 

-        private _resolve(value?: Nullable<T>): Nullable<InternalPromise<T>> | T {

+        private _resolve(value?: Nullable<T>): void {

             try {

                 this._state = PromiseStates.Fulfilled;

-                this._result = value;

                 let returnedValue: Nullable<InternalPromise<T>> | T = null;

 

                 if (this._onFulfilled) {

@@ -107,11 +106,14 @@ module BABYLON {
 
                         let returnedPromise = returnedValue as InternalPromise<T>;

 

                         returnedPromise._moveChildren(this._children);

+                        value = returnedPromise._result;

                     } else {

                         value = <T>returnedValue;

                     }

                 }

 

+                this._result = value;

+

                 for (var child of this._children) {

                     child._resolve(value);

                 }

@@ -119,13 +121,9 @@ module BABYLON {
 
                 this._children.length = 0;

                 delete this._onFulfilled;

                 delete this._onRejected;

-

-                return returnedValue;

             } catch (e) {

                 this._reject(e, true);

             }

-

-            return null;

         }

 

         private _reject(reason: any, onLocalThrow = false): void {

+ 58 - 0
tests/unit/babylon/src/Tools/babylon.promise.tests.ts
查看文件 

@@ -122,6 +122,64 @@ describe('Babylon.Promise', function () {
 
 

             tempString += " second";

         });

+

+        it('should chain promises correctly #5', (done) => {

+            var tempString = "";

+            var promise = new Promise(function (resolve) {

+                setTimeout(function () {

+                    resolve(44);

+                }, 100);

+            });

+        

+            promise = promise.then(function () {

+                return 55;

+            });

+        

+            promise.then(function (value) {

+                tempString += "1: " + value;

+                setTimeout(function () {

+                    promise.then(function (value) {

+                        tempString += " 2: " + value;

+                        try {

+                            expect(tempString).to.eq("1: 55 2: 55");

+                            done();

+                        }

+                        catch(error) {

+                            done(error);

+                        }                        

+                    });

+                }, 0);

+            });

+        });

+

+        it('should chain promises correctly #6', (done) => {

+            var tempString = "";

+            var promise = new Promise(function (resolve) {

+                setTimeout(function () {

+                    resolve(44);

+                }, 100);

+            });

+        

+            promise = promise.then(function () {

+                return Promise.resolve(55);

+            });

+        

+            promise.then(function (value) {

+                tempString += "1: " + value;

+                setTimeout(function () {

+                    promise.then(function (value) {

+                        tempString += " 2: " + value;

+                        try {

+                            expect(tempString).to.eq("1: 55 2: 55");

+                            done();

+                        }

+                        catch(error) {

+                            done(error);

+                        }                        

+                    });

+                }, 0);

+            });

+        });

     });

 

     describe('#Promise.all', () => {