Startsida Utforska Hjälp
Registrera dig Logga in
zhangyupeng
/
Babylon.js
1
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

Merge pull request #6671 from sebavan/WebGPU

Web gpu
sebavan 6 år sedan
förälder
80c990f091 a395c1fd53
incheckning
31bff310fb
100 ändrade filer med 263235 tillägg och 157056 borttagningar
Delad Vy Visa Diff Statistik
  1. 1 1
      .github/ISSUE_TEMPLATE.md
  2. 2 1
      .vscode/settings.json
  3. 6 1
      .vscode/tasks.json
  4. BIN
      Playground/LogoPBT.png
  5. 37662 33574
      Playground/babylon.d.txt
  6. 4 1
      Playground/css/index.css
  7. 430 420
      Playground/debug.html
  8. 82 73
      Playground/frame.html
  9. 51 53
      Playground/full.html
  10. 1 0
      Playground/index-local.html
  11. 4 1
      Playground/index.html
  12. 1 1
      Playground/js/index.js
  13. BIN
      Playground/scenes/Box/Box_extras.bin
  14. 242 0
      Playground/scenes/Box/Box_extras.gltf
  15. 12 0
      Playground/scenes/StanfordBunny.mtl
  16. 13637 7474
      Playground/scenes/StanfordBunny.obj
  17. BIN
      Playground/sounds/6sounds.mp3
  18. 6 0
      Playground/sounds/6sounds_lengths.txt
  19. BIN
      Playground/sounds/bounce.wav
  20. BIN
      Playground/textures/houseWithAlpha.basis
  21. BIN
      Playground/textures/plane.basis
  22. BIN
      Playground/textures/sidexside.jpg
  23. BIN
      Playground/textures/topbottom.jpg
  24. 492 0
      Playground/ts-local.html
  25. 402 405
      Playground/ts.html
  26. 62 3
      Tools/Config/config.json
  27. 1 1
      Tools/Gulp/gulpfile.js
  28. 15 15
      Tools/Gulp/helpers/gulp-validateImports.js
  29. 6 0
      Tools/Gulp/tasks/gulpTasks-intellisense.js
  30. 29 8
      Tools/Gulp/tasks/gulpTasks-libraries.js
  31. 1 0
      Tools/Publisher/tasks/processEs6Packages.js
  32. 2 2
      Tools/Publisher/tasks/versionNumberManager.js
  33. 16 0
      Tools/WebpackPlugins/babylonExternals.js
  34. 6 5
      Viewer/src/configuration/renderOnlyLoader.ts
  35. 9 9
      Viewer/src/labs/viewerLabs.ts
  36. 3 2
      Viewer/src/templating/templateManager.ts
  37. BIN
      assets/meshes/controllers/oculusQuest/OculusQuestTouchControllerTexture.png
  38. 1 0
      assets/meshes/controllers/oculusQuest/left.babylon
  39. 1 0
      assets/meshes/controllers/oculusQuest/right.babylon
  40. 4 4
      azure-pipelines.yml
  41. 37 38
      bower.json
  42. 0 1
      contributing.md
  43. 32 657
      dist/ammo.js
  44. 40 665
      dist/preview release/ammo.js
  45. 23 0
      dist/preview release/ammo.wasm.js
  46. BIN
      dist/preview release/ammo.wasm.wasm
  47. 36530 32441
      dist/preview release/babylon.d.ts
  48. 2 2
      dist/preview release/babylon.js
  49. 21714 9825
      dist/preview release/babylon.max.js
  50. 1 1
      dist/preview release/babylon.max.js.map
  51. 78363 70410
      dist/preview release/babylon.module.d.ts
  52. 1 0
      dist/preview release/basisTranscoder/basis_transcoder.js
  53. BIN
      dist/preview release/basisTranscoder/basis_transcoder.wasm
  54. 70823 0
      dist/preview release/documentation.d.ts
  55. 1 1
      dist/preview release/glTF2Interface/package.json
  56. 6 0
      dist/preview release/gui/babylon.gui.d.ts
  57. 117 65
      dist/preview release/gui/babylon.gui.js
  58. 1 1
      dist/preview release/gui/babylon.gui.js.map
  59. 1 1
      dist/preview release/gui/babylon.gui.min.js
  60. 15 3
      dist/preview release/gui/babylon.gui.module.d.ts
  61. 2 2
      dist/preview release/gui/package.json
  62. 8 8
      dist/preview release/inspector/babylon.inspector.bundle.js
  63. 1092 358
      dist/preview release/inspector/babylon.inspector.bundle.max.js
  64. 1 1
      dist/preview release/inspector/babylon.inspector.bundle.max.js.map
  65. 123 72
      dist/preview release/inspector/babylon.inspector.d.ts
  66. 263 152
      dist/preview release/inspector/babylon.inspector.module.d.ts
  67. 10 7
      dist/preview release/inspector/package.json
  68. 15 4
      dist/preview release/loaders/babylon.glTF1FileLoader.js
  69. 1 1
      dist/preview release/loaders/babylon.glTF1FileLoader.js.map
  70. 165 55
      dist/preview release/loaders/babylon.glTF2FileLoader.js
  71. 1 1
      dist/preview release/loaders/babylon.glTF2FileLoader.js.map
  72. 1 1
      dist/preview release/loaders/babylon.glTF2FileLoader.min.js
  73. 180 59
      dist/preview release/loaders/babylon.glTFFileLoader.js
  74. 1 1
      dist/preview release/loaders/babylon.glTFFileLoader.js.map
  75. 2 2
      dist/preview release/loaders/babylon.glTFFileLoader.min.js
  76. 26 1
      dist/preview release/loaders/babylonjs.loaders.d.ts
  77. 180 59
      dist/preview release/loaders/babylonjs.loaders.js
  78. 1 1
      dist/preview release/loaders/babylonjs.loaders.js.map
  79. 2 2
      dist/preview release/loaders/babylonjs.loaders.min.js
  80. 61 3
      dist/preview release/loaders/babylonjs.loaders.module.d.ts
  81. 3 3
      dist/preview release/loaders/package.json
  82. 21 10
      dist/preview release/materialsLibrary/babylon.cellMaterial.js
  83. 1 1
      dist/preview release/materialsLibrary/babylon.cellMaterial.js.map
  84. 20 9
      dist/preview release/materialsLibrary/babylon.customMaterial.js
  85. 1 1
      dist/preview release/materialsLibrary/babylon.customMaterial.js.map
  86. 1 1
      dist/preview release/materialsLibrary/babylon.customMaterial.min.js
  87. 21 10
      dist/preview release/materialsLibrary/babylon.fireMaterial.js
  88. 1 1
      dist/preview release/materialsLibrary/babylon.fireMaterial.js.map
  89. 22 10
      dist/preview release/materialsLibrary/babylon.furMaterial.js
  90. 1 1
      dist/preview release/materialsLibrary/babylon.furMaterial.js.map
  91. 21 10
      dist/preview release/materialsLibrary/babylon.gradientMaterial.js
  92. 1 1
      dist/preview release/materialsLibrary/babylon.gradientMaterial.js.map
  93. 22 10
      dist/preview release/materialsLibrary/babylon.gridMaterial.js
  94. 1 1
      dist/preview release/materialsLibrary/babylon.gridMaterial.js.map
  95. 21 10
      dist/preview release/materialsLibrary/babylon.lavaMaterial.js
  96. 1 1
      dist/preview release/materialsLibrary/babylon.lavaMaterial.js.map
  97. 21 10
      dist/preview release/materialsLibrary/babylon.mixMaterial.js
  98. 1 1
      dist/preview release/materialsLibrary/babylon.mixMaterial.js.map
  99. 21 10
      dist/preview release/materialsLibrary/babylon.normalMaterial.js
  100. 0 0
      dist/preview release/materialsLibrary/babylon.normalMaterial.js.map

+ 1 - 1
.github/ISSUE_TEMPLATE.md
Visa fil 

@@ -1,4 +1,4 @@
 
-**Use Github issues ONLY for validated bugs**

+**Use Github issues ONLY for validated bugs. PLEASE DISCUSS THEM ON THE FORUM FIRST!**

 

 We have a really active forum to help answering questions (https://forum.babylonjs.com/)

+ 2 - 1
.vscode/settings.json
Visa fil 

@@ -56,5 +56,6 @@
 
         "assets": true
 
     },
 
     "editor.tabSize": 4,
 
-    "typescript.tsdk": "node_modules\\typescript\\lib"
 
+    "typescript.tsdk": "node_modules\\typescript\\lib",
 
+    "typescript.preferences.importModuleSpecifier": "relative"
 
 }

+ 6 - 1
.vscode/tasks.json
Visa fil 

@@ -3,7 +3,9 @@
 
     // for the documentation about the tasks.json format
 
     "version": "2.0.0",
 
     "command": "gulp",
 
-    "args": ["--max-old-space-size=8192"],
 
+    "args": [
 
+        "--max-old-space-size=8192"
 
+    ],
 
     "type": "shell",
 
     "options": {
 
         "cwd": "${workspaceRoot}/Tools/Gulp"
 
@@ -17,6 +19,9 @@
 
     "tasks": [
 
         {
 
             "label": "run",
 
+            "args": [
 
+                "run"
 
+            ],
 
             "group": {
 
                 "kind": "build",
 
                 "isDefault": true

BIN
Playground/LogoPBT.png
Visa fil


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 37662 - 33574
Playground/babylon.d.txt


+ 4 - 1
Playground/css/index.css
Visa fil 

@@ -28,12 +28,15 @@ body {
 
     display: grid;

     grid-template-rows: 100%;

     grid-template-columns: 100%;

+    align-items: center;

 }

 

 #waitLogo {

     grid-column: 1;

     grid-row: 1;

-    margin: 25%;

+    margin: auto;

+    width: 40%;

+    height: 40%;

 }

 

 #waitSpinner {

+ 430 - 420
Playground/debug.html
Visa fil 

@@ -1,507 +1,517 @@
 
 <!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>

-

-        <!-- Babylon.js -->

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

-

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

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

-

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

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

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

-

-

-

-        <script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.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/CompoundShader/src/babylonx.CompoundShader.js"></script>

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

-

-        <!-- Monaco -->

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

-

-    </head>

-

-    <body>

-        <div class="navbar navBar1600">

-            <div class="title">

-                Babylon.js Playground

-            </div>

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

-                v3.0-alpha

-            </div>

+<head>

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

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

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

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

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

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

+

+    <!-- Babylon.js -->

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

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

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

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

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

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

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

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

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

+

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+    <script

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

+    <script

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

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

+    <script

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

+    <script

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

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

+    <script

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

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

+

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

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

+

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

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

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

+

+

+

+    <script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.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/CompoundShader/src/babylonx.CompoundShader.js"></script>

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

+

+    <!-- Monaco -->

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

+

+</head>

+

+<body>

+    <div class="navbar navBar1600">

+        <div class="title">

+            Babylon.js Playground

+        </div>

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

+            v3.0-alpha

+        </div>

 

-            <div class="category">

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

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

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

+        <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 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="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </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="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

                 </div>

-

-                <div class="button uncheck" id="debugButton1600">Inspector</div>

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

             </div>

 

+            <div class="button uncheck" id="debugButton1600">Inspector</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>

-                </div>

-                <div class="button select">

-                    <span class="examplesButton">Examples</span>

+

+        <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 class="button select">

+                <span class="examplesButton">Examples</span>

+            </div>

         </div>

+    </div>

 

-        <div class="navbar navBar1475">

-            <div class="title">

-                Babylon.js Playground

-            </div>

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

-                v3.0-alpha

-            </div>

+    <div class="navbar navBar1475">

+        <div class="title">

+            Babylon.js Playground

+        </div>

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

+            v3.0-alpha

+        </div>

 

-            <div class="category">

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

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

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

+        <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 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 class="option" id='safemodeToggle1475'>Safe mode

-                            <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </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 class="option" id="debugButton1475">Inspector</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 class="option" id='safemodeToggle1475'>Safe mode

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton1475">Inspector</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 class="category right">

-                <div class="button select">

-                    <span class="examplesButton">Examples</span>

-                </div>

+        <div class="category right">

+            <div class="button select">

+                <span class="examplesButton">Examples</span>

             </div>

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

+        <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 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 class="option" id="safemodeToggle1030">Safe mode

-                            <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </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 class="option" id="debugButton1030">Inspector</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 class="option" id="safemodeToggle1030">Safe mode

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton1030">Inspector</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 class="category right">

-                <div class="button select">

-                    <span class="examplesButton">Examples</span>

-                </div>

+        <div class="category right">

+            <div class="button select">

+                <span class="examplesButton">Examples</span>

             </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="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 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="far fa-square" 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 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 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="far fa-square" aria-hidden="true"></i>

+                    </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 class="option" id="debugButton750">Inspector</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="option" id="safemodeToggle750">Safe mode

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton750">Inspector</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 class="category right">

-                <div class="button select">

-                    <span class="examplesButton">Examples</span>

-                </div>

-            </div>

         </div>

 

-        <div class="wrapper">

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

-            <div id="canvasZone">

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

-            </div>

-        </div>

-        <div id="exampleList">

-            <div id="exampleBanner">

-                <h1>Examples</h1>

+        <div class="category right">

+            <div class="button select">

+                <span class="examplesButton">Examples</span>

             </div>

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

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

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

         </div>

+    </div>

 

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

-

-        <div id="errorZone">

+    <div class="wrapper">

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

+        <div id="canvasZone">

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

         </div>

-

-        <div class="navbarBottom">

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

-            <div class="links">

-                <div class='link'>

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

-                </div>

-                <div class='link'>

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

-                </div>

-                <div class='link'>

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

-                </div>

-                <div class='link'>

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

-                </div>

-                <div class='link'>

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

-                </div>

+    </div>

+    <div id="exampleList">

+        <div id="exampleBanner">

+            <h1>Examples</h1>

+        </div>

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

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

+        <img id="filterBarClear"

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

+    </div>

+

+    <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="https://forum.babylonjs.com/">Forum</a>

+            </div>

+            <div class='link'>

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

+            </div>

+            <div class='link'>

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

+            </div>

+            <div class='link'>

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

             </div>

         </div>

+    </div>

 

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

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

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

             </div>

         </div>

+    </div>

 

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

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

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

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

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

 

-        <!-- Global site tag (gtag.js) - Google Analytics -->

-        <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

-        <script>

-            window.dataLayer = window.dataLayer || [];

-            function gtag() { dataLayer.push(arguments); }

-            gtag('js', new Date());

+    <!-- Global site tag (gtag.js) - Google Analytics -->

+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

+    <script>

+        window.dataLayer = window.dataLayer || [];

+        function gtag() { dataLayer.push(arguments); }

+        gtag('js', new Date());

 

-            gtag('config', 'UA-41767310-2');

-        </script>

-    </body>

+        gtag('config', 'UA-41767310-2');

+    </script>

+</body>

 

-</html>

+</html>

+ 82 - 73
Playground/frame.html
Visa fil 

@@ -1,93 +1,102 @@
 
 <!DOCTYPE html>

 <html>

 

-    <head>

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

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

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

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

+<head>

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

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

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

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

 

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

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

 

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

-        <!-- Babylon.js -->

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

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

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

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

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

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

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

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

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

+    <!-- Babylon.js -->

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

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

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

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

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

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

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

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

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

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

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

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

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

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

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

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

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

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

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

+    <script

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

+    <script

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

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

+    <script

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

+    <script

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

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

+    <script

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

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

 

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

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

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

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

 

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

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

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

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

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

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

 

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

+    <script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.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/CompoundShader/src/babylonx.CompoundShader.js"></script>

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

-    </head>

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

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

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

+</head>

 

-    <body>

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

+<body>

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

 

-        <div class="footer">

+    <div class="footer">

         <span id="fpsLabel">FPS</span>

         <div class="footerRight">

-                <a href="javascript:void(null);">

-                    <img id="refresh" src="textures/icons/refresh.png"  width="36" height="36" alt="Reload page" title="Reload page"/>

-                </a>

-                <a id="edit" href="#" target="_blank">

-                    <img src="textures/icons/edit.png" width="36" height="36" alt="Edit in playground" title="Edit in playground"/>

-                </a>

-        </div>

+            <a href="javascript:void(null);">

+                <img id="refresh" src="textures/icons/refresh.png" width="36" height="36" alt="Reload page"

+                    title="Reload page" />

+            </a>

+            <a id="edit" href="#" target="_blank">

+                <img src="textures/icons/edit.png" width="36" height="36" alt="Edit in playground"

+                    title="Edit in playground" />

+            </a>

         </div>

+    </div>

 

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

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

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

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

 

-        <!-- Global site tag (gtag.js) - Google Analytics -->

-        <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

-        <script>

-            window.dataLayer = window.dataLayer || [];

-            function gtag() { dataLayer.push(arguments); }

-            gtag('js', new Date());

+    <!-- Global site tag (gtag.js) - Google Analytics -->

+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

+    <script>

+        window.dataLayer = window.dataLayer || [];

+        function gtag() { dataLayer.push(arguments); }

+        gtag('js', new Date());

 

-            gtag('config', 'UA-41767310-2');

-        </script>

-    </body>

+        gtag('config', 'UA-41767310-2');

+    </script>

+</body>

 

-</html>

+</html>

+ 51 - 53
Playground/full.html
Visa fil 

@@ -1,56 +1,54 @@
 
 <!DOCTYPE html>

 <html>

 

-    <head>

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

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

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

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

-

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

-        <!-- Babylon.js -->

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

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

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

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

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

-        <script src="https://preview.babylonjs.com/gui/babylon.gui.min.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://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

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

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

-    </head>

-

-    <body>

-        <!-- Override frame style -->

-        <canvas touch-action="none" id="renderCanvas" tabindex="1" style="height: 100%"></canvas>

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

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

-

-        <!-- Global site tag (gtag.js) - Google Analytics -->

-        <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

-        <script>

-            window.dataLayer = window.dataLayer || [];

-            function gtag() { dataLayer.push(arguments); }

-            gtag('js', new Date());

-

-            gtag('config', 'UA-41767310-2');

-        </script>

-    </body>

-

-</html>

+<head>

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

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

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

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

+

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

+    <!-- Babylon.js -->

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

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

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

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

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

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

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

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

+    <script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.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://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

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

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

+</head>

+

+<body>

+    <!-- Override frame style -->

+    <canvas touch-action="none" id="renderCanvas" tabindex="1" style="height: 100%"></canvas>

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

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

+

+    <!-- Global site tag (gtag.js) - Google Analytics -->

+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

+    <script>

+        window.dataLayer = window.dataLayer || [];

+        function gtag() { dataLayer.push(arguments); }

+        gtag('js', new Date());

+

+        gtag('config', 'UA-41767310-2');

+    </script>

+</body>

+

+</html>

+ 1 - 0
Playground/index-local.html
Visa fil 

@@ -18,6 +18,7 @@
 
     <script src="js/libs/fileSaver.js"></script>

     <!-- Dependencies -->

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

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

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

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

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

+ 4 - 1
Playground/index.html
Visa fil 

@@ -19,6 +19,7 @@
 
     <script src="js/libs/fileSaver.js"></script>

     <!-- Dependencies -->

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

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

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

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

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

@@ -27,6 +28,7 @@
 
     <script src="https://preview.babylonjs.com/babylon.js"></script>

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

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

+    <script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.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>

@@ -118,7 +120,8 @@
 
                     <div class="option subSelect" id="qrCodeHover" onmouseover="showQRCode();">QR Code Link

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

                         <div class="toDisplaySub">

-                            <div class="option" style="height:auto;padding: 20px;background: white;" id="qrCodeImage">QR Code Image</div>

+                            <div class="option" style="height:auto;padding: 20px;background: white;" id="qrCodeImage">QR

+                                Code Image</div>

                         </div>

                     </div>

                 </div>

+ 1 - 1
Playground/js/index.js
Visa fil 

@@ -183,7 +183,7 @@ function showError(errorMessage, errorEvent) {
 
                     window.location.href = location.protocol + "//" + location.host + "/ts.html" + window.location.hash;
 
                     return false;
 
                 }
 
-                else if (filename !== "ts.html") {
 
+                else if (filename !== "ts.html" && filename !== "ts-local.html") {
 
                     window.location.href = location.protocol + "//" + location.host + location.pathname.replace(filename, "ts.html") + window.location.hash;
 
                     return false;
 
                 }

BIN
Playground/scenes/Box/Box_extras.bin
Visa fil


+ 242 - 0
Playground/scenes/Box/Box_extras.gltf
Visa fil 

@@ -0,0 +1,242 @@
 
+{
 
+    "asset" : {
 
+        "generator" : "Khronos glTF Blender I/O v0.9.28",
 
+        "version" : "2.0"
 
+    },
 
+    "extensionsUsed" : [
 
+        "KHR_lights_punctual"
 
+    ],
 
+    "extensionsRequired" : [
 
+        "KHR_lights_punctual"
 
+    ],
 
+    "extensions" : {
 
+        "KHR_lights_punctual" : {
 
+            "lights" : [
 
+                {
 
+                    "color" : [
 
+                        1,
 
+                        1,
 
+                        1
 
+                    ],
 
+                    "intensity" : 1000,
 
+                    "type" : "point",
 
+                    "name" : "Light"
 
+                }
 
+            ]
 
+        }
 
+    },
 
+    "scene" : 0,
 
+    "scenes" : [
 
+        {
 
+            "extras" : {
 
+                "custom" : "sceneProp"
 
+            },
 
+            "name" : "Scene",
 
+            "nodes" : [
 
+                1,
 
+                3,
 
+                4
 
+            ]
 
+        }
 
+    ],
 
+    "nodes" : [
 
+        {
 
+            "extensions" : {
 
+                "KHR_lights_punctual" : {
 
+                    "light" : 0
 
+                }
 
+            },
 
+            "name" : "Light_Orientation",
 
+            "rotation" : [
 
+                -0.7071067690849304,
 
+                0,
 
+                0,
 
+                0.7071067690849304
 
+            ]
 
+        },
 
+        {
 
+            "children" : [
 
+                0
 
+            ],
 
+            "name" : "Light",
 
+            "rotation" : [
 
+                0.16907575726509094,
 
+                0.7558803558349609,
 
+                -0.27217137813568115,
 
+                0.570947527885437
 
+            ],
 
+            "translation" : [
 
+                4.076245307922363,
 
+                5.903861999511719,
 
+                -1.0054539442062378
 
+            ]
 
+        },
 
+        {
 
+            "camera" : 0,
 
+            "name" : "Camera_Orientation",
 
+            "rotation" : [
 
+                -0.7071067690849304,
 
+                0,
 
+                0,
 
+                0.7071067690849304
 
+            ]
 
+        },
 
+        {
 
+            "children" : [
 
+                2
 
+            ],
 
+            "name" : "Camera",
 
+            "rotation" : [
 
+                0.483536034822464,
 
+                0.33687159419059753,
 
+                -0.20870360732078552,
 
+                0.7804827094078064
 
+            ],
 
+            "translation" : [
 
+                7.358891487121582,
 
+                4.958309173583984,
 
+                6.925790786743164
 
+            ]
 
+        },
 
+        {
 
+            "extras" : {
 
+                "kind" : "nice cube",
 
+                "magic" : 42
 
+            },
 
+            "mesh" : 0,
 
+            "name" : "Box001",
 
+            "rotation" : [
 
+                1,
 
+                0,
 
+                0,
 
+                -1.3435885648505064e-07
 
+            ]
 
+        }
 
+    ],
 
+    "cameras" : [
 
+        {
 
+            "extras" : {
 
+                "custom" : "cameraProp"
 
+            },
 
+            "name" : "Camera",
 
+            "perspective" : {
 
+                "yfov" : 0.39959652046304894,
 
+                "zfar" : 100,
 
+                "znear" : 0.10000000149011612
 
+            },
 
+            "type" : "perspective"
 
+        }
 
+    ],
 
+    "materials" : [
 
+        {
 
+            "doubleSided" : true,
 
+            "extras" : {
 
+                "custom" : "materialProp"
 
+            },
 
+            "name" : "01___Default",
 
+            "pbrMetallicRoughness" : {
 
+                "baseColorTexture" : {
 
+                    "index" : 0,
 
+                    "texCoord" : 0
 
+                },
 
+                "metallicFactor" : 0,
 
+                "roughnessFactor" : 0.8945907354354858
 
+            }
 
+        }
 
+    ],
 
+    "meshes" : [
 
+        {
 
+            "extras" : {
 
+                "custom" : "meshProp"
 
+            },
 
+            "name" : "Box001",
 
+            "primitives" : [
 
+                {
 
+                    "attributes" : {
 
+                        "POSITION" : 0,
 
+                        "NORMAL" : 1,
 
+                        "TEXCOORD_0" : 2
 
+                    },
 
+                    "indices" : 3,
 
+                    "material" : 0
 
+                }
 
+            ]
 
+        }
 
+    ],
 
+    "textures" : [
 
+        {
 
+            "source" : 0
 
+        }
 
+    ],
 
+    "images" : [
 
+        {
 
+            "mimeType" : "image/png",
 
+            "name" : "20140615_192225",
 
+            "uri" : "20140615_192225.png"
 
+        }
 
+    ],
 
+    "accessors" : [
 
+        {
 
+            "bufferView" : 0,
 
+            "componentType" : 5126,
 
+            "count" : 24,
 
+            "max" : [
 
+                13.23270034790039,
 
+                0,
 
+                16.17329978942871
 
+            ],
 
+            "min" : [
 
+                -13.83899974822998,
 
+                -23.56559944152832,
 
+                -16.098499298095703
 
+            ],
 
+            "type" : "VEC3"
 
+        },
 
+        {
 
+            "bufferView" : 1,
 
+            "componentType" : 5126,
 
+            "count" : 24,
 
+            "type" : "VEC3"
 
+        },
 
+        {
 
+            "bufferView" : 2,
 
+            "componentType" : 5126,
 
+            "count" : 24,
 
+            "type" : "VEC2"
 
+        },
 
+        {
 
+            "bufferView" : 3,
 
+            "componentType" : 5123,
 
+            "count" : 36,
 
+            "type" : "SCALAR"
 
+        }
 
+    ],
 
+    "bufferViews" : [
 
+        {
 
+            "buffer" : 0,
 
+            "byteLength" : 288,
 
+            "byteOffset" : 0
 
+        },
 
+        {
 
+            "buffer" : 0,
 
+            "byteLength" : 288,
 
+            "byteOffset" : 288
 
+        },
 
+        {
 
+            "buffer" : 0,
 
+            "byteLength" : 192,
 
+            "byteOffset" : 576
 
+        },
 
+        {
 
+            "buffer" : 0,
 
+            "byteLength" : 72,
 
+            "byteOffset" : 768
 
+        }
 
+    ],
 
+    "buffers" : [
 
+        {
 
+            "byteLength" : 840,
 
+            "uri" : "Box_extras.bin"
 
+        }
 
+    ]
 
+}

+ 12 - 0
Playground/scenes/StanfordBunny.mtl
Visa fil 

@@ -0,0 +1,12 @@
 
+# Blender MTL File: 'None'
 
+# Material Count: 1
 
+
 
+newmtl StanfordBunny
 
+Ns 225.000000
 
+Ka 1.000000 1.000000 1.000000
 
+Kd 0.800000 0.800000 0.800000
 
+Ks 0.500000 0.500000 0.500000
 
+Ke 0.0 0.0 0.0
 
+Ni 1.450000
 
+d 1.000000
 
+illum 2

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 13637 - 7474
Playground/scenes/StanfordBunny.obj


BIN
Playground/sounds/6sounds.mp3
Visa fil


+ 6 - 0
Playground/sounds/6sounds_lengths.txt
Visa fil 

@@ -0,0 +1,6 @@
 
+church : 0, 5000

+foghorn : 5100, 6600

+scream : 12000, 1600

+manwalk : 14000, 9200

+womanwalk : 23000, 7900

+door : 31000, 2800

BIN
Playground/sounds/bounce.wav
Visa fil


BIN
Playground/textures/houseWithAlpha.basis
Visa fil


BIN
Playground/textures/plane.basis
Visa fil


BIN
Playground/textures/sidexside.jpg
Visa fil


BIN
Playground/textures/topbottom.jpg
Visa fil


+ 492 - 0
Playground/ts-local.html
Visa fil 

@@ -0,0 +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/favicon.ico">

+

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

+

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

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

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

+

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

+    <!-- jszip -->

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

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

+    <!-- Dependencies -->

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

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

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

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

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

+    <!-- Babylon.js -->

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

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

+    <script src="../dist/preview%20release/inspector/babylon.inspector.bundle.js"></script>

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

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

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

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

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

+

+    <!-- Monaco -->

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

+

+    <!-- Extensions -->

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

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

+        async></script>

+

+    <!-- Scene Manager -->

+    <script src="https://mackeyk24.github.io/toolkit/babylon.manager.js"></script>

+    <script src="https://mackeyk24.github.io/toolkit/babylon.navmesh.js"></script>

+

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

+    <link href="css/color_ts.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" 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 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 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="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option subSelect" id="qrCodeHover" onmouseover="showQRCode();">QR Code Link

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

+                        <div class="toDisplaySub">

+                            <div class="option" style="height:auto;padding: 20px;background: white;" id="qrCodeImage">QR

+                                Code Image</div>

+                        </div>

+                    </div>

+                </div>

+            </div>

+

+            <div class="button uncheck" id="debugButton1600">Inspector</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>

+            </div>

+            <div class="button select">

+                <span class="examplesButton">Examples</span>

+            </div>

+        </div>

+    </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" 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 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 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 class="option" id='safemodeToggle1475'>Safe mode

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton1475">Inspector</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 class="category right">

+            <div class="button select">

+                <span class="examplesButton">Examples</span>

+            </div>

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

+                    </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 class="option" id="safemodeToggle1030">Safe mode

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton1030">Inspector</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 class="category right">

+            <div class="button select">

+                <span class="examplesButton">Examples</span>

+            </div>

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

+        </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="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton750">Inspector</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 class="category right">

+            <div class="button select">

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

+            </div>

+        </div>

+    </div>

+

+    <div class="wrapper">

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

+        <div id="canvasZone">

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

+        </div>

+    </div>

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

+        <div id="exampleBanner">

+            <h1>Examples</h1>

+        </div>

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

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

+        <img id="filterBarClear"

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

+    </div>

+

+    <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="https://forum.babylonjs.com/">Forum</a>

+            </div>

+            <div class='link'>

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

+            </div>

+            <div class='link'>

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

+            </div>

+            <div class='link'>

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

+            </div>

+        </div>

+    </div>

+

+    <div 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="saveFormTags">TAGS (separated by comma)</label>

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

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

+

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

+

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

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

+            </div>

+        </div>

+    </div>

+

+    <div id="waitDiv">

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

+            <BR>

+            <BR>

+            <BR>

+        </span>

+        <div id="logo-part">

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

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

+        </div>

+    </div>

+

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

+    <script src="js/jquery.qrcode.js"></script>

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

+

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

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

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

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

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

+

+    <!-- Global site tag (gtag.js) - Google Analytics -->

+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

+    <script>

+        window.dataLayer = window.dataLayer || [];

+        function gtag() { dataLayer.push(arguments); }

+        gtag('js', new Date());

+

+        gtag('config', 'UA-41767310-2');

+    </script>

+</body>

+

+</html>

+ 402 - 405
Playground/ts.html
Visa fil 

@@ -1,495 +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="js/libs/pep.min.js"></script>

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

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

-

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

-        <!-- jszip -->

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

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

-        <!-- Dependencies -->

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

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

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

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

-        <!-- Babylon.js -->

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

-        <script src="https://preview.babylonjs.com/gui/babylon.gui.min.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>

-

-        <!-- Monaco -->

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

-

-        <!-- Extensions -->

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

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

-

-        <!-- Scene Manager -->

-        <script src="https://mackeyk24.github.io/toolkit/babylon.manager.js"></script>

-        <script src="https://mackeyk24.github.io/toolkit/babylon.navmesh.js"></script>

-

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

-        <link href="css/color_ts.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/favicon.ico">

+

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

+

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

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

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

+

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

+    <!-- jszip -->

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

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

+    <!-- Dependencies -->

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

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

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

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

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

+    <!-- Babylon.js -->

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

+    <script src="https://preview.babylonjs.com/gui/babylon.gui.min.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.min.js"></script>

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

+

+    <!-- Monaco -->

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

+

+    <!-- Extensions -->

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

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

+        async></script>

+

+    <!-- Scene Manager -->

+    <script src="https://mackeyk24.github.io/toolkit/babylon.manager.js"></script>

+    <script src="https://mackeyk24.github.io/toolkit/babylon.navmesh.js"></script>

+

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

+    <link href="css/color_ts.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 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 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 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>

+        <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 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="far fa-square" 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 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 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="far fa-square" aria-hidden="true"></i>

+                    </div>

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

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option subSelect" id="qrCodeHover" onmouseover="showQRCode();">QR Code Link

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

+                        <div class="toDisplaySub">

+                            <div class="option" style="height:auto;padding: 20px;background: white;" id="qrCodeImage">QR

+                                Code Image</div>

                         </div>

                     </div>

                 </div>

-

-                <div class="button uncheck" id="debugButton1600">Inspector</div>

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

             </div>

 

+            <div class="button uncheck" id="debugButton1600">Inspector</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>

-                </div>

-                <div class="button select">

-                    <span class="examplesButton">Examples</span>

+

+        <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 class="examplesButton">Examples</span>

+            </div>

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

-                        </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 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 class="option" id='safemodeToggle1475'>Safe mode

-                            <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </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 class="option" id="debugButton1475">Inspector</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 class="option" id='safemodeToggle1475'>Safe mode

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton1475">Inspector</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 class="category right">

-                <div class="button select">

-                    <span class="examplesButton">Examples</span>

-                </div>

+        <div class="category right">

+            <div class="button select">

+                <span class="examplesButton">Examples</span>

             </div>

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

-                        </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 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 class="option" id="safemodeToggle1030">Safe mode

-                            <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </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 class="option" id="debugButton1030">Inspector</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 class="option" id="safemodeToggle1030">Safe mode

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton1030">Inspector</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 class="category right">

-                <div class="button select">

-                    <span class="examplesButton">Examples</span>

-                </div>

+        <div class="category right">

+            <div class="button select">

+                <span class="examplesButton">Examples</span>

             </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="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 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 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 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="far fa-square" 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="far fa-square" aria-hidden="true"></i>

-                        </div>

-                        <div class="option" id="debugButton750">Inspector</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="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 class="option subSelect" id="qrCodeHover" onmouseover="showQRCode();">QR Code Link

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

-                            <div class="toDisplaySub">

-                                <div class="option" style="height:auto;padding: 20px;background: white;" id="qrCodeImage">QR Code Image</div>

-                            </div>

+                    </div>

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

+                        <i class="far fa-square" 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="far fa-square" aria-hidden="true"></i>

+                    </div>

+                    <div class="option" id="debugButton750">Inspector</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 class="wrapper">

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

-            <div id="canvasZone">

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

-            </div>

-        </div>

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

-            <div id="exampleBanner">

-                <h1>Examples</h1>

+        <div class="category right">

+            <div class="button select">

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

             </div>

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

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

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

         </div>

+    </div>

 

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

-

-        <div id="errorZone">

+    <div class="wrapper">

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

+        <div id="canvasZone">

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

         </div>

-

-        <div class="navbarBottom">

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

-            <div class="links">

-                <div class='link'>

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

-                </div>

-                <div class='link'>

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

-                </div>

-                <div class='link'>

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

-                </div>

-                <div class='link'>

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

-                </div>

-                <div class='link'>

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

-                </div>

+    </div>

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

+        <div id="exampleBanner">

+            <h1>Examples</h1>

+        </div>

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

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

+        <img id="filterBarClear"

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

+    </div>

+

+    <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="https://forum.babylonjs.com/">Forum</a>

+            </div>

+            <div class='link'>

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

+            </div>

+            <div class='link'>

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

+            </div>

+            <div class='link'>

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

             </div>

         </div>

+    </div>

 

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

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

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

             </div>

         </div>

-

-        <div id="waitDiv">

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

-                <BR>

-                <BR>

-                <BR>

-            </span>

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

+    </div>

+

+    <div id="waitDiv">

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

+            <BR>

+            <BR>

+            <BR>

+        </span>

+        <div id="logo-part">

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

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

         </div>

+    </div>

+

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

+    <script src="js/jquery.qrcode.js"></script>

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

+

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

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

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

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

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

 

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

-        <script src="js/jquery.qrcode.js"></script>

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

-

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

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

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

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

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

-        

-        <!-- Global site tag (gtag.js) - Google Analytics -->

-        <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

-        <script>

+    <!-- Global site tag (gtag.js) - Google Analytics -->

+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>

+    <script>

         window.dataLayer = window.dataLayer || [];

-        function gtag(){dataLayer.push(arguments);}

+        function gtag() { dataLayer.push(arguments); }

         gtag('js', new Date());

 

         gtag('config', 'UA-41767310-2');

-        </script>        

-    </body>

+    </script>

+</body>

 

-</html>

+</html>

+ 62 - 3
Tools/Config/config.json
Visa fil 

@@ -13,6 +13,7 @@
 
         "packageES6DevFolderName": "packageES6Dev",
 
         "playgroundDirectory": "../../Playground/",
 
         "intellisenseFile": "babylon.d.txt",
 
+        "documentationFile": "documentation.d.ts",
 
         "intellisenseSources": [
 
             "../../dist/preview release/babylon.d.ts",
 
             "../../dist/preview release/gui/babylon.gui.d.ts",
 
@@ -45,7 +46,8 @@
 
         "loaders",
 
         "serializers",
 
         "gui",
 
-        "inspector"
 
+        "inspector",
 
+        "nodeEditor"
 
     ],
 
     "es6modules": [
 
         "core",
 
@@ -56,7 +58,8 @@
 
         "serializers",
 
         "gui",
 
         "inspector",
 
-        "viewer"
 
+        "viewer",
 
+        "nodeEditor"
 
     ],
 
     "lintModules": [
 
         "core",
 
@@ -117,7 +120,9 @@
 
                             "namespace": "BABYLON.Debug"
 
                         }
 
                     ],
 
-                    "hiddenConsts": ["Debug"]
 
+                    "hiddenConsts": [
 
+                        "Debug"
 
+                    ]
 
                 },
 
                 "requiredFiles": [
 
                     "readme.md"
 
@@ -547,11 +552,13 @@
 
                         "babylonjs": "BABYLON",
 
                         "babylonjs-loaders": "BABYLON",
 
                         "babylonjs-serializers": "BABYLON",
 
+                        "babylonjs-materials": "BABYLON",
 
                         "babylonjs-gltf2interface": "BABYLON.GLTF2",
 
                         "react": "React",
 
                         "babylonjs-gui": "BABYLON.GUI",
 
                         "@babylonjs/core": "BABYLON",
 
                         "@babylonjs/loaders": "BABYLON",
 
+                        "@babylonjs/materials": "BABYLON",
 
                         "@babylonjs/serializers": "BABYLON",
 
                         "@babylonjs/gui": "BABYLON.GUI",
 
                         "@fortawesome": false,
 
@@ -578,6 +585,58 @@
 
             }
 
         }
 
     },
 
+    "nodeEditor": {
 
+        "libraries": [
 
+            {
 
+                "output": "babylon.nodeEditor.js",
 
+                "entry": "./legacy/legacy.ts"
 
+            }
 
+        ],
 
+        "build": {
 
+            "ignoreInTestMode": true,
 
+            "mainFolder": "./nodeEditor/",
 
+            "uncheckedLintImports": [
 
+                "react",
 
+                "react-dom",
 
+                "dagre",
 
+                "re-resizable",
 
+                "glTF"
 
+            ],
 
+            "umd": {
 
+                "packageName": "babylonjs-node-editor",
 
+                "webpackRoot": "NODEEDITOR",
 
+                "processDeclaration": {
 
+                    "filename": "babylon.nodeEditor.module.d.ts",
 
+                    "moduleName": "NODEEDITOR",
 
+                    "importsToRemove": [],
 
+                    "classMap": {
 
+                        "babylonjs": "BABYLON",
 
+                        "react": "React",
 
+                        "@babylonjs/core": "BABYLON",
 
+                        "@fortawesome": false,
 
+                        "react-contextmenu": false
 
+                    }
 
+                }
 
+            },
 
+            "es6": {
 
+                "webpackBuild": true,
 
+                "buildDependencies": [
 
+                    "node_modules/re-resizable/lib/index.es5.js",
 
+                    "Tools/**/*"
 
+                ],
 
+                "packageName": "@babylonjs/node-editor",
 
+                "readme": "dist/preview release/nodeEditor/readme-es6.md",
 
+                "packagesFiles": [
 
+                    "babylon.nodeEditor.max.js",
 
+                    "babylon.nodeEditor.max.js.map",
 
+                    "babylon.nodeEditor.module.d.ts",
 
+                    "readme.md"
 
+                ],
 
+                "typings": "babylon.nodeEditor.module.d.ts",
 
+                "index": "babylon.nodeEditor.max.js"
 
+            }
 
+        }
 
+    },
 
     "viewer": {
 
         "libraries": [
 
             {

+ 1 - 1
Tools/Gulp/gulpfile.js
Visa fil 

@@ -90,4 +90,4 @@ gulp.task("npmPackages", gulp.series("npmPackages-all"));
 
 /**
 
  * The default task, concat and min the main BJS files.
 
  */
 
-gulp.task("default", gulp.series("cleanup", "tsLint", "importLint", "circularDependencies", "typescript-all", "intellisense", "typedoc-all", "tests-all"));
 
+gulp.task("default", gulp.series("cleanup", "tsLint", "importLint", "circularDependencies", "typescript-all", "intellisense", "documentation", "typedoc-all", "tests-all"));

+ 15 - 15
Tools/Gulp/helpers/gulp-validateImports.js
Visa fil 

@@ -10,7 +10,7 @@ var config = require("../../Config/config");
 
 const indexExlclusion = ["States", "EmitterTypes"];

 const forbiddenImports = ["meshBuilder"];

 

-const mapping = { };

+const mapping = {};

 config.modules.forEach(moduleName => {

     mapping[config[moduleName].build.umd.packageName] = moduleName;

 });

@@ -196,7 +196,7 @@ var validateImports = function(data, fileLocation, options) {
 
 function gulpValidateImports(options) {

     var globalErrors = [];

 

-    return through.obj(function (file, enc, cb) {

+    return through.obj(function(file, enc, cb) {

         if (file.isNull()) {

             cb(null, file);

             return;

@@ -204,7 +204,7 @@ function gulpValidateImports(options) {
 
         if (file.isStream()) {

             cb(new PluginError("Validate imports", "Streaming not supported."));

         }

-        

+

         let data = file.contents.toString();

         let result = validateImports(data, file.path, options);

 

@@ -218,20 +218,20 @@ function gulpValidateImports(options) {
 
         }

 

         return cb();

-    }, 

-    function endStream(cb) {

-        if (globalErrors.length > 0) {

-            for (let error of globalErrors) {

-                colorConsole.error(error.message + " " + error.path);

-            }

-            colorConsole.error(`Import validation failed with ${globalErrors.length} errors.`);

+    },

+        function endStream(cb) {

+            if (globalErrors.length > 0) {

+                for (let error of globalErrors) {

+                    colorConsole.error(error.message + " " + error.path);

+                }

+                colorConsole.error(`Import validation failed with ${globalErrors.length} errors.`);

 

-            var finalMessage = new PluginError('gulp-validateImports', `gulp-validateImports: ${globalErrors.length} errors found.`);

-            this.emit('error', finalMessage);

-        }

+                var finalMessage = new PluginError('gulp-validateImports', `gulp-validateImports: ${globalErrors.length} errors found.`);

+                this.emit('error', finalMessage);

+            }

 

-        cb();

-    });

+            cb();

+        });

 }

 

 module.exports = gulpValidateImports;

+ 6 - 0
Tools/Gulp/tasks/gulpTasks-intellisense.js
Visa fil 

@@ -18,4 +18,10 @@ gulp.task("intellisense", function() {
 
         .pipe(replace(/^\s* _/gm, "private _"))

         .pipe(replace(/^\s*_/gm, "private _"))

         .pipe(gulp.dest(config.build.playgroundDirectory));

+});

+

+gulp.task("documentation", function() {

+    return gulp.src(config.build.intellisenseSources)

+        .pipe(concat(config.build.documentationFile))

+        .pipe(gulp.dest(config.build.outputDirectory));

 });

+ 29 - 8
Tools/Gulp/tasks/gulpTasks-libraries.js
Visa fil 

@@ -106,11 +106,24 @@ var buildAMDDTSFiles = function(libraries, settings, cb) {
 
 /**

  * Append Lose DTS Files allowing isolated Modules build

  */

-var appendLoseDTSFiles = function(settings) {

+var appendLoseDTSFiles = function(settings, moduleFile) {

     if (settings.build.loseDTSFiles) {

-        return gulp.src([config.computed.tempTypingsFilePath, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles.glob)])

-            .pipe(concat(config.computed.tempTypingsFileName))

-            .pipe(gulp.dest(config.computed.tempFolder));

+        let library = settings.libraries[0];

+        if (!library.preventLoadLibrary) {

+            // Convert Module to Namespace for globals

+            var outputDirectory = settings.computed.distDirectory;

+

+            // Find declaration path.

+            let fileName = settings.build.umd.processDeclaration.filename;

+            if (!moduleFile) {

+                fileName = fileName.replace(".module", "");

+            }

+

+            let fileLocation = path.join(outputDirectory, fileName);

+            return gulp.src([fileLocation, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles.glob)])

+                .pipe(concat(fileName))

+                .pipe(gulp.dest(outputDirectory));

+        }

     }

     return Promise.resolve();

 }

@@ -139,10 +152,15 @@ var processDTSFiles = function(libraries, settings, cb) {
 
 

         // Convert Module to Namespace for globals

         if (!commandLineOptions.noNamespace) {

-            processModuleDeclarationToNamespace(fileLocation, settings.build.umd.packageName, settings.build.umd.processDeclaration);

+            processModuleDeclarationToNamespace(fileLocation, settings.build.umd.packageName, settings.build.umd.processDeclaration, cb);

+        }

+        else {

+            cb();

         }

     }

-    cb();

+    else {

+        cb();

+    }

 }

 

 /**

@@ -158,10 +176,13 @@ function buildExternalLibraries(settings) {
 
     var buildMax = function() { return buildExternalLibrariesMultiEntry(settings.libraries, settings, false) };

 

     var buildAMDDTS = function(cb) { return buildAMDDTSFiles(settings.libraries, settings, cb) };

-    var appendLoseDTS = function() { return appendLoseDTSFiles(settings) };

     var processDTS = function(cb) { return processDTSFiles(settings.libraries, settings, cb) };

+    var appendLoseDTS = [function() { return appendLoseDTSFiles(settings, true) }];

+    if (!commandLineOptions.noNamespace) {

+        appendLoseDTS.push(function() { return appendLoseDTSFiles(settings, false) });

+    }

 

-    tasks.push(cleanup, shaders, buildMin, buildMax, buildAMDDTS, appendLoseDTS, processDTS);

+    tasks.push(cleanup, shaders, buildMin, buildMax, buildAMDDTS, processDTS, ...appendLoseDTS);

 

     return gulp.series.apply(this, tasks);

 }

+ 1 - 0
Tools/Publisher/tasks/processEs6Packages.js
Visa fil 

@@ -98,6 +98,7 @@ function processEs6Packages(version) {
 
         var mainPackageJSON = fs.readJSONSync(mainPackageJSONPath);

         var tslibSemver = mainPackageJSON["devDependencies"]["tslib"];

         colorConsole.log("    Adding tslib version: ", tslibSemver.yellow);

+        umdPackageJson["dependencies"] = umdPackageJson["dependencies"] || {};

         umdPackageJson["dependencies"]["tslib"] = tslibSemver;

 

         let packageJSONPath = path.join(packagePath, "package.json");

+ 2 - 2
Tools/Publisher/tasks/versionNumberManager.js
Visa fil 

@@ -11,10 +11,10 @@ const enginePath = path.join(config.core.computed.mainDirectory, "Engines/engine
 
  * Get the version from the engine class for Babylon

  */

 function getEngineVersion() {

-    colorConsole.log("Get version from engine.ts");

+    colorConsole.log("Get version from engine.ts", enginePath);

     const engineContent = fs.readFileSync(enginePath).toString();

 

-    const versionRegex = new RegExp(`public static get Version\\(\\): string {[\\s\\S]*return "([\\s\\S]*?)";[\\s\\S]*}`, "gm");

+    const versionRegex = new RegExp(`public static get Version\\(\\): string {\\s*return "(\\S*)";\\s*}`, "gm");

     const match = versionRegex.exec(engineContent);

     if (match && match.length) {

         const version = match[1];

+ 16 - 0
Tools/WebpackPlugins/babylonExternals.js
Visa fil 

@@ -27,6 +27,14 @@ module.exports = function nodeExternals(options) {
 
                 amd: "babylonjs-gui"

             });

         }

+        else if (/^babylonjs-materials.*$/i.test(request)) {

+            callback(null, {

+                root: "BABYLON",

+                commonjs: "babylonjs-materials",

+                commonjs2: "babylonjs-materials",

+                amd: "babylonjs-materials"

+            });

+        }

         else if (/^babylonjs.*$/i.test(request)) {

             callback(null, {

                 root: "BABYLON",

@@ -59,6 +67,14 @@ module.exports = function nodeExternals(options) {
 
                 amd: "@babylonjs/gui"

             });

         }

+        else if (/^@babylonjs\/materials.*$/i.test(request)) {

+            callback(null, {

+                root: ["BABYLON", "MATERIALS"],

+                commonjs: "@babylonjs/materials",

+                commonjs2: "@babylonjs/materials",

+                amd: "@babylonjs/materials"

+            });

+        }

         else if (/^@babylonjs\/core.*$/i.test(request)) {

             callback(null, {

                 root: "BABYLON",

+ 6 - 5
Viewer/src/configuration/renderOnlyLoader.ts
Visa fil 

@@ -3,9 +3,10 @@ import { ViewerConfiguration } from './configuration';
 
 import { processConfigurationCompatibility } from './configurationCompatibility';

 

 import { deepmerge } from '../helper';

-import { IFileRequest, Tools } from 'babylonjs/Misc/tools';

+import { Tools } from 'babylonjs/Misc/tools';

 import { extendedConfiguration } from './types/extended';

 import { renderOnlyDefaultConfiguration } from './types/renderOnlyDefault';

+import { IFileRequest } from 'babylonjs/Misc/fileRequest';

 

 /**

  * The configuration loader will load the configuration object from any source and will use the defined mapper to

@@ -23,7 +24,7 @@ export class RenderOnlyConfigurationLoader {
 
         this._loadRequests = [];

     }

 

-    private _getConfigurationTypeExcludeTemplate (types: string): ViewerConfiguration {

+    private _getConfigurationTypeExcludeTemplate(types: string): ViewerConfiguration {

         let config: ViewerConfiguration = {};

         let typesSeparated = types.split(",");

         typesSeparated.forEach((type) => {

@@ -45,7 +46,7 @@ export class RenderOnlyConfigurationLoader {
 
         return config;

     };

 

-    protected getExtendedConfig(type:string|undefined){

+    protected getExtendedConfig(type: string | undefined) {

         return this._getConfigurationTypeExcludeTemplate(type || "extended");

     }

 

@@ -61,7 +62,7 @@ export class RenderOnlyConfigurationLoader {
 
 

         let loadedConfig: ViewerConfiguration = deepmerge({}, initConfig);

         this._processInitialConfiguration(loadedConfig);

-        

+

         let extendedConfiguration = this.getExtendedConfig(loadedConfig.extends);

 

         if (loadedConfig.configuration) {

@@ -160,5 +161,5 @@ export class RenderOnlyConfigurationLoader {
 
             this._loadRequests.push(fileRequest);

         });

     }

-    

+

 }

+ 9 - 9
Viewer/src/labs/viewerLabs.ts
Visa fil 

@@ -1,6 +1,6 @@
 
 import { PBREnvironment, EnvironmentDeserializer } from "./environmentSerializer";

 import { Scene } from "babylonjs/scene";

-import { Vector3, Quaternion, Axis, Matrix, Tmp } from "babylonjs/Maths/math";

+import { Vector3, Quaternion, Axis, Matrix, TmpVectors } from "babylonjs/Maths/math";

 import { SphericalPolynomial } from "babylonjs/Maths/sphericalPolynomial";

 import { ShadowLight } from "babylonjs/Lights/shadowLight";

 import { TextureUtils } from "./texture";

@@ -146,16 +146,16 @@ export class ViewerLabs {
 
 

     public rotateShadowLight(shadowLight: ShadowLight, amount: number, point = Vector3.Zero(), axis = Axis.Y, target = Vector3.Zero()) {

         axis.normalize();

-        point.subtractToRef(shadowLight.position, Tmp.Vector3[0]);

-        Matrix.TranslationToRef(Tmp.Vector3[0].x, Tmp.Vector3[0].y, Tmp.Vector3[0].z, Tmp.Matrix[0]);

-        Tmp.Matrix[0].invertToRef(Tmp.Matrix[2]);

-        Matrix.RotationAxisToRef(axis, amount, Tmp.Matrix[1]);

-        Tmp.Matrix[2].multiplyToRef(Tmp.Matrix[1], Tmp.Matrix[2]);

-        Tmp.Matrix[2].multiplyToRef(Tmp.Matrix[0], Tmp.Matrix[2]);

+        point.subtractToRef(shadowLight.position, TmpVectors.Vector3[0]);

+        Matrix.TranslationToRef(TmpVectors.Vector3[0].x, TmpVectors.Vector3[0].y, TmpVectors.Vector3[0].z, TmpVectors.Matrix[0]);

+        TmpVectors.Matrix[0].invertToRef(TmpVectors.Matrix[2]);

+        Matrix.RotationAxisToRef(axis, amount, TmpVectors.Matrix[1]);

+        TmpVectors.Matrix[2].multiplyToRef(TmpVectors.Matrix[1], TmpVectors.Matrix[2]);

+        TmpVectors.Matrix[2].multiplyToRef(TmpVectors.Matrix[0], TmpVectors.Matrix[2]);

 

-        Tmp.Matrix[2].decompose(Tmp.Vector3[0], Tmp.Quaternion[0], Tmp.Vector3[1]);

+        TmpVectors.Matrix[2].decompose(TmpVectors.Vector3[0], TmpVectors.Quaternion[0], TmpVectors.Vector3[1]);

 

-        shadowLight.position.addInPlace(Tmp.Vector3[1]);

+        shadowLight.position.addInPlace(TmpVectors.Vector3[1]);

 

         shadowLight.setDirectionToTarget(target);

     }

+ 3 - 2
Viewer/src/templating/templateManager.ts
Visa fil 

@@ -1,11 +1,12 @@
 
 import { Observable } from 'babylonjs/Misc/observable';

-import { IFileRequest, Tools } from 'babylonjs/Misc/tools';

+import { Tools } from 'babylonjs/Misc/tools';

 import { isUrl, camelToKebab, kebabToCamel } from '../helper';

 

 import * as Handlebars from 'handlebars/dist/handlebars';

 import { EventManager } from './eventManager';

 import { ITemplateConfiguration } from '../configuration/interfaces';

 import { deepmerge } from '../helper/';

+import { IFileRequest } from 'babylonjs/Misc/fileRequest';

 

 /**

  * The object sent when an event is triggered

@@ -604,7 +605,7 @@ export class Template {
 
                             function: binding

                         });

                     } else if (typeof this._configuration.events[eventName] === 'object') {

-                        let selectorsArray: Array<string> = Object.keys(this._configuration.events[eventName] || {});

+                        let selectorsArray: Array<string> = Object.keys((this._configuration.events[eventName] as object) || {});

                         // strict null checl is working incorrectly, must override:

                         let event = this._configuration.events[eventName] || {};

                         selectorsArray.filter((selector) => event[selector]).forEach((selector) => {

BIN
assets/meshes/controllers/oculusQuest/OculusQuestTouchControllerTexture.png
Visa fil


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
assets/meshes/controllers/oculusQuest/left.babylon


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
assets/meshes/controllers/oculusQuest/right.babylon


+ 4 - 4
azure-pipelines.yml
Visa fil 

@@ -19,7 +19,7 @@ jobs:
 
     inputs:
 
       workingDir: Tools/Gulp
 
       verbose: false
 
-  - script: 'gulp tests-whatsnew'
 
+  - script: 'gulp tests-whatsnew --max-old-space-size=8192'
 
     workingDirectory: Tools/Gulp
 
     displayName: 'Whats new'
 
     env:
 
@@ -37,7 +37,7 @@ jobs:
 
     inputs:
 
       workingDir: Tools/Gulp
 
       verbose: false
 
-  - script: 'gulp typedoc-check'
 
+  - script: 'gulp typedoc-check --max-old-space-size=8192'
 
     workingDirectory: Tools/Gulp
 
     displayName: 'Typedoc check'
 
 
@@ -52,7 +52,7 @@ jobs:
 
     inputs:
 
       workingDir: Tools/Gulp
 
       verbose: false
 
-  - script: 'gulp fullLint'
 
+  - script: 'gulp fullLint --max-old-space-size=8192'
 
     workingDirectory: Tools/Gulp
 
     displayName: 'Full Lint'
 
 
@@ -207,4 +207,4 @@ jobs:
 
     condition: succeededOrFailed()
 
     inputs:
 
       testRunner: JUnit
 
-      testResultsFiles: '.temp/testResults/ViewerValidationTests.xml'
 
+      testResultsFiles: '.temp/testResults/ViewerValidationTests.xml'

+ 37 - 38
bower.json
Visa fil 

@@ -1,39 +1,38 @@
 
 {
 
-  "name": "babylonjs",
 
-  "description": "Babylon.js is a complete JavaScript framework for building 3D games with HTML 5 and WebGL",
 
-  "main": "./dist/babylon.2.5.js",
 
-  "homepage": "https://www.babylonjs.com",
 
-  "repository": {
 
-    "type": "git",
 
-    "url": "git://github.com/BabylonJS/Babylon.js.git"
 
-  },
 
-  "authors": [
 
-    "David Catuhe",
 
-    "David Rousset"
 
-  ],
 
-  "keywords": [
 
-    "3D",
 
-    "WebGL",
 
-    "WebAudio",
 
-    "Shaders",
 
-    "Realtime"
 
-  ],
 
-  "license": "Apache-2.0",
 
-  "ignore": [
 
-    "**/.*",
 
-    "node_modules",
 
-    "Babylon",
 
-    "Exporters",
 
-    "Loaders",
 
-    "Previous releases",
 
-    "/Tools",
 
-    "gulpfile.js",
 
-    "package.json",
 
-    "babylon.2.1*.*",
 
-    "*.md",
 
-    "*.yml",
 
-    "cannon.js",
 
-    "Oimo.js",
 
-    "poly2tri.js"
 
-  ]
 
-}
 
+    "name": "babylonjs",
 
+    "description": "Babylon.js is a complete JavaScript framework for building 3D games with HTML 5 and WebGL",
 
+    "main": "./dist/babylon.js",
 
+    "homepage": "https://www.babylonjs.com",
 
+    "repository": {
 
+        "type": "git",
 
+        "url": "git://github.com/BabylonJS/Babylon.js.git"
 
+    },
 
+    "authors": [
 
+        "David Catuhe"
 
+    ],
 
+    "keywords": [
 
+        "3D",
 
+        "WebGL",
 
+        "WebAudio",
 
+        "Shaders",
 
+        "Realtime"
 
+    ],
 
+    "license": "Apache-2.0",
 
+    "ignore": [
 
+        "**/.*",
 
+        "node_modules",
 
+        "Babylon",
 
+        "Exporters",
 
+        "Loaders",
 
+        "Previous releases",
 
+        "/Tools",
 
+        "gulpfile.js",
 
+        "package.json",
 
+        "babylon.2.1*.*",
 
+        "*.md",
 
+        "*.yml",
 
+        "cannon.js",
 
+        "Oimo.js",
 
+        "poly2tri.js"
 
+    ]
 
+}

+ 0 - 1
contributing.md
Visa fil 

@@ -41,7 +41,6 @@ We are not complicated people, but we still have some [coding guidelines](http:/
 
 Before submitting your PR, just check that everything goes well by [creating the minified version](http://doc.babylonjs.com/resources/creating_the_mini-fied_version)

 

 You should read the [how to contribute documentation](http://doc.babylonjs.com/how_to/how_to_start) before working on your PR.

-We also have a [forum thread](http://www.html5gamedevs.com/topic/20456-contributing-on-babylonjs/) for assistance from our very helpful family.

   

 To validate your PR, please follow these steps:

 - Run "gulp" locally and make sure that no error is generated

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 32 - 657
dist/ammo.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 40 - 665
dist/preview release/ammo.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 23 - 0
dist/preview release/ammo.wasm.js


BIN
dist/preview release/ammo.wasm.wasm
Visa fil


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 36530 - 32441
dist/preview release/babylon.d.ts


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 2
dist/preview release/babylon.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 21714 - 9825
dist/preview release/babylon.max.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/babylon.max.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 78363 - 70410
dist/preview release/babylon.module.d.ts


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
dist/preview release/basisTranscoder/basis_transcoder.js


BIN
dist/preview release/basisTranscoder/basis_transcoder.wasm
Visa fil


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 70823 - 0
dist/preview release/documentation.d.ts


+ 1 - 1
dist/preview release/glTF2Interface/package.json
Visa fil 

@@ -1,7 +1,7 @@
 
 {
 
     "name": "babylonjs-gltf2interface",
 
     "description": "A typescript declaration of babylon's gltf2 inteface.",
 
-    "version": "4.1.0-alpha.0",
 
+    "version": "4.1.0-alpha.13",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 6 - 0
dist/preview release/gui/babylon.gui.d.ts
Visa fil 

@@ -1565,6 +1565,10 @@ declare module BABYLON.GUI {
 
          * Function called to generate a pointer up animation

          */

         pointerUpAnimation: () => void;

+        /**

+         * Gets or sets a boolean indicating that the button will let internal controls handle picking instead of doing it directly using its bounding info

+         */

+        delegatePickingToChildren: boolean;

         private _image;

         /**

          * Returns the image part of the button (if any)

@@ -1833,6 +1837,8 @@ declare module BABYLON.GUI {
 
         _connectedVirtualKeyboard: BABYLON.Nullable<VirtualKeyboard>;

         /** Gets or sets a string representing the message displayed on mobile when the control gets the focus */

         promptMessage: string;

+        /** Force disable prompt on mobile device */

+        disableMobilePrompt: boolean;

         /** BABYLON.Observable raised when the text changes */

         onTextChangedObservable: BABYLON.Observable<InputText>;

         /** BABYLON.Observable raised just before an entered character is to be added */

+ 117 - 65
dist/preview release/gui/babylon.gui.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-gui"] = factory(require("babylonjs"));
 
 	else
 
 		root["BABYLON"] = root["BABYLON"] || {}, root["BABYLON"]["GUI"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_tools__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_perfCounter__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -355,8 +366,8 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AdvancedDynamicTextureInstrumentation", function() { return AdvancedDynamicTextureInstrumentation; });
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/tools");
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__);
 
+/* harmony import */ var babylonjs_Misc_perfCounter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/perfCounter */ "babylonjs/Misc/perfCounter");
 
+/* harmony import */ var babylonjs_Misc_perfCounter__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_perfCounter__WEBPACK_IMPORTED_MODULE_0__);
 
 

 /**

  * This class can be used to get instrumentation data from a AdvancedDynamicTexture object

@@ -374,9 +385,9 @@ var AdvancedDynamicTextureInstrumentation = /** @class */ (function () {
 
     texture) {

         this.texture = texture;

         this._captureRenderTime = false;

-        this._renderTime = new babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__["PerfCounter"]();

+        this._renderTime = new babylonjs_Misc_perfCounter__WEBPACK_IMPORTED_MODULE_0__["PerfCounter"]();

         this._captureLayoutTime = false;

-        this._layoutTime = new babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_0__["PerfCounter"]();

+        this._layoutTime = new babylonjs_Misc_perfCounter__WEBPACK_IMPORTED_MODULE_0__["PerfCounter"]();

         // Observers

         this._onBeginRenderObserver = null;

         this._onEndRenderObserver = null;

@@ -498,7 +509,7 @@ var AdvancedDynamicTextureInstrumentation = /** @class */ (function () {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AdvancedDynamicTexture", function() { return AdvancedDynamicTexture; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _controls_container__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./controls/container */ "./2D/controls/container.ts");
 
 /* harmony import */ var _style__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./style */ "./2D/style.ts");
 
@@ -1053,7 +1064,7 @@ var AdvancedDynamicTexture = /** @class */ (function (_super) {
 
                     });

                     continue;

                 }

-                var position = mesh.getBoundingInfo ? mesh.getBoundingInfo().boundingSphere.center : mesh.getAbsolutePosition();

+                var position = mesh.getBoundingInfo ? mesh.getBoundingInfo().boundingSphere.center : babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__["Vector3"].ZeroReadOnly;

                 var projectedPosition = babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__["Vector3"].Project(position, mesh.getWorldMatrix(), scene.getTransformMatrix(), globalViewport);

                 if (projectedPosition.z < 0 || projectedPosition.z > 1) {

                     control.notRenderable = true;

@@ -1425,6 +1436,10 @@ var Button = /** @class */ (function (_super) {
 
     function Button(name) {

         var _this = _super.call(this, name) || this;

         _this.name = name;

+        /**

+         * Gets or sets a boolean indicating that the button will let internal controls handle picking instead of doing it directly using its bounding info

+         */

+        _this.delegatePickingToChildren = false;

         _this.thickness = 1;

         _this.isPointerBlocker = true;

         var alphaStore = null;

@@ -1479,6 +1494,19 @@ var Button = /** @class */ (function (_super) {
 
         if (!_super.prototype.contains.call(this, x, y)) {

             return false;

         }

+        if (this.delegatePickingToChildren) {

+            var contains = false;

+            for (var index = this._children.length - 1; index >= 0; index--) {

+                var child = this._children[index];

+                if (child.isEnabled && child.isHitTestVisible && child.isVisible && !child.notRenderable && child.contains(x, y)) {

+                    contains = true;

+                    break;

+                }

+            }

+            if (!contains) {

+                return false;

+            }

+        }

         this._processObservables(type, x, y, pointerId, buttonIndex);

         return true;

     };

@@ -1619,7 +1647,7 @@ var Button = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Checkbox", function() { return Checkbox; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
 /* harmony import */ var _stackPanel__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./stackPanel */ "./2D/controls/stackPanel.ts");
 
@@ -1800,7 +1828,7 @@ var Checkbox = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ColorPicker", function() { return ColorPicker; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
 /* harmony import */ var _inputText__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./inputText */ "./2D/controls/inputText.ts");
 
@@ -3187,7 +3215,7 @@ var ColorPicker = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Container", function() { return Container; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/logger */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/logger */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_logger__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_logger__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
 /* harmony import */ var _measure__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../measure */ "./2D/measure.ts");
 
@@ -3592,7 +3620,7 @@ var Container = /** @class */ (function (_super) {
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Control", function() { return Control; });
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__);
 
 /* harmony import */ var _valueAndUnit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../valueAndUnit */ "./2D/valueAndUnit.ts");
 
 /* harmony import */ var _measure__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../measure */ "./2D/measure.ts");
 
@@ -5783,7 +5811,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony import */ var _container__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./container */ "./2D/controls/container.ts");
 
 /* harmony import */ var _valueAndUnit__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../valueAndUnit */ "./2D/valueAndUnit.ts");
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_4__);
 
 

 

@@ -6239,7 +6267,7 @@ var Grid = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Image", function() { return Image; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
 

@@ -7014,7 +7042,7 @@ var InputPassword = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "InputText", function() { return InputText; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
 /* harmony import */ var _valueAndUnit__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../valueAndUnit */ "./2D/valueAndUnit.ts");
 
@@ -7065,6 +7093,8 @@ var InputText = /** @class */ (function (_super) {
 
         _this._isPointerDown = false;

         /** Gets or sets a string representing the message displayed on mobile when the control gets the focus */

         _this.promptMessage = "Please enter text:";

+        /** Force disable prompt on mobile device */

+        _this.disableMobilePrompt = false;

         /** Observable raised when the text changes */

         _this.onTextChangedObservable = new babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]();

         /** Observable raised just before an entered character is to be added */

@@ -7396,7 +7426,7 @@ var InputText = /** @class */ (function (_super) {
 
         this._cursorOffset = 0;

         this._markAsDirty();

         this.onFocusObservable.notifyObservers(this);

-        if (navigator.userAgent.indexOf("Mobile") !== -1) {

+        if (navigator.userAgent.indexOf("Mobile") !== -1 && !this.disableMobilePrompt) {

             var value = prompt(this.promptMessage);

             if (value !== null) {

                 this.text = value;

@@ -8023,7 +8053,7 @@ var InputText = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Line", function() { return Line; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
 /* harmony import */ var _valueAndUnit__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../valueAndUnit */ "./2D/valueAndUnit.ts");
 
@@ -8216,8 +8246,8 @@ var Line = /** @class */ (function (_super) {
 
         context.lineWidth = this._lineWidth;

         context.setLineDash(this._dash);

         context.beginPath();

-        context.moveTo(this._cachedParentMeasure.left + this._x1.getValue(this._host), this._cachedParentMeasure.left + this._y1.getValue(this._host));

-        context.lineTo(this._cachedParentMeasure.left + this._effectiveX2, this._cachedParentMeasure.left + this._effectiveY2);

+        context.moveTo(this._cachedParentMeasure.left + this._x1.getValue(this._host), this._cachedParentMeasure.top + this._y1.getValue(this._host));

+        context.lineTo(this._cachedParentMeasure.left + this._effectiveX2, this._cachedParentMeasure.top + this._effectiveY2);

         context.stroke();

         context.restore();

     };

@@ -8291,7 +8321,7 @@ var Line = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MultiLine", function() { return MultiLine; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Meshes_abstractMesh__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Meshes/abstractMesh */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Meshes_abstractMesh__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Meshes/abstractMesh */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Meshes_abstractMesh__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Meshes_abstractMesh__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
 /* harmony import */ var _multiLinePoint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../multiLinePoint */ "./2D/multiLinePoint.ts");
 
@@ -8558,7 +8588,7 @@ var MultiLine = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RadioButton", function() { return RadioButton; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
 /* harmony import */ var _stackPanel__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./stackPanel */ "./2D/controls/stackPanel.ts");
 
@@ -8903,7 +8933,7 @@ var Rectangle = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ScrollViewer", function() { return ScrollViewer; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Events_pointerEvents__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Events/pointerEvents */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Events_pointerEvents__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Events/pointerEvents */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Events_pointerEvents__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Events_pointerEvents__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _rectangle__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../rectangle */ "./2D/controls/rectangle.ts");
 
 /* harmony import */ var _grid__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../grid */ "./2D/controls/grid.ts");
 
@@ -9994,7 +10024,7 @@ var SelectionPanel = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BaseSlider", function() { return BaseSlider; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../control */ "./2D/controls/control.ts");
 
 /* harmony import */ var _valueAndUnit__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../valueAndUnit */ "./2D/valueAndUnit.ts");
 
@@ -10895,7 +10925,7 @@ var Slider = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "StackPanel", function() { return StackPanel; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _container__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./container */ "./2D/controls/container.ts");
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
@@ -11153,7 +11183,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TextWrapping", function() { return TextWrapping; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TextBlock", function() { return TextBlock; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _valueAndUnit__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../valueAndUnit */ "./2D/valueAndUnit.ts");
 
 /* harmony import */ var _control__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./control */ "./2D/controls/control.ts");
 
@@ -11416,6 +11446,16 @@ var TextBlock = /** @class */ (function (_super) {
 
                 }

             }

             var newHeight = this.paddingTopInPixels + this.paddingBottomInPixels + this._fontOffset.height * this._lines.length;

+            if (this._lines.length > 0 && this._lineSpacing.internalValue !== 0) {

+                var lineSpacing = 0;

+                if (this._lineSpacing.isPixel) {

+                    lineSpacing = this._lineSpacing.getValue(this._host);

+                }

+                else {

+                    lineSpacing = (this._lineSpacing.getValue(this._host) * this._height.getValueInPixel(this._host, this._cachedParentMeasure.height));

+                }

+                newHeight += (this._lines.length - 1) * lineSpacing;

+            }

             if (newHeight !== this._height.internalValue) {

                 this._height.updateInPlace(newHeight, _valueAndUnit__WEBPACK_IMPORTED_MODULE_2__["ValueAndUnit"].UNITMODE_PIXEL);

                 this._rebuildLayout = true;

@@ -11565,7 +11605,18 @@ var TextBlock = /** @class */ (function (_super) {
 
                     this._fontOffset = _control__WEBPACK_IMPORTED_MODULE_3__["Control"]._GetFontOffset(context_1.font);

                 }

                 var lines = this._lines ? this._lines : this._breakLines(this.widthInPixels - this.paddingLeftInPixels - this.paddingRightInPixels, context_1);

-                return this.paddingTopInPixels + this.paddingBottomInPixels + this._fontOffset.height * lines.length;

+                var newHeight = this.paddingTopInPixels + this.paddingBottomInPixels + this._fontOffset.height * lines.length;

+                if (this._lines.length > 0 && this._lineSpacing.internalValue !== 0) {

+                    var lineSpacing = 0;

+                    if (this._lineSpacing.isPixel) {

+                        lineSpacing = this._lineSpacing.getValue(this._host);

+                    }

+                    else {

+                        lineSpacing = (this._lineSpacing.getValue(this._host) * this._height.getValueInPixel(this._host, this._cachedParentMeasure.height));

+                    }

+                    newHeight += (lines.length - 1) * lineSpacing;

+                }

+                return newHeight;

             }

         }

         return 0;

@@ -11593,7 +11644,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "KeyPropertySet", function() { return KeyPropertySet; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualKeyboard", function() { return VirtualKeyboard; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _stackPanel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./stackPanel */ "./2D/controls/stackPanel.ts");
 
 /* harmony import */ var _button__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./button */ "./2D/controls/button.ts");
 
@@ -11974,7 +12025,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Vector2WithInfo", function() { return Vector2WithInfo; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Matrix2D", function() { return Matrix2D; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__);
 
 

 

@@ -12198,7 +12249,7 @@ var Matrix2D = /** @class */ (function () {
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Measure", function() { return Measure; });
 
-/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -12331,7 +12382,7 @@ var Measure = /** @class */ (function () {
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MultiLinePoint", function() { return MultiLinePoint; });
 
-/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_0__);
 
 /* harmony import */ var _valueAndUnit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./valueAndUnit */ "./2D/valueAndUnit.ts");
 
 

@@ -12474,7 +12525,7 @@ var MultiLinePoint = /** @class */ (function () {
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Style", function() { return Style; });
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__);
 
 /* harmony import */ var _valueAndUnit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./valueAndUnit */ "./2D/valueAndUnit.ts");
 
 

@@ -12781,7 +12832,7 @@ var ValueAndUnit = /** @class */ (function () {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AbstractButton3D", function() { return AbstractButton3D; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Meshes_transformNode__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Meshes/transformNode */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Meshes_transformNode__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Meshes/transformNode */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Meshes_transformNode__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Meshes_transformNode__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control3D__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control3D */ "./3D/controls/control3D.ts");
 
 

@@ -12824,7 +12875,7 @@ var AbstractButton3D = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Button3D", function() { return Button3D; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _abstractButton3D__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./abstractButton3D */ "./3D/controls/abstractButton3D.ts");
 
 /* harmony import */ var _2D_advancedDynamicTexture__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../2D/advancedDynamicTexture */ "./2D/advancedDynamicTexture.ts");
 
@@ -13001,7 +13052,7 @@ var Button3D = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Container3D", function() { return Container3D; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Meshes_transformNode__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Meshes/transformNode */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Meshes_transformNode__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Meshes/transformNode */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Meshes_transformNode__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Meshes_transformNode__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _control3D__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./control3D */ "./3D/controls/control3D.ts");
 
 

@@ -13158,7 +13209,7 @@ var Container3D = /** @class */ (function (_super) {
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Control3D", function() { return Control3D; });
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__);
 
 /* harmony import */ var _vector3WithInfo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../vector3WithInfo */ "./3D/vector3WithInfo.ts");
 
 

@@ -13564,7 +13615,7 @@ var Control3D = /** @class */ (function () {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CylinderPanel", function() { return CylinderPanel; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _volumeBasedPanel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./volumeBasedPanel */ "./3D/controls/volumeBasedPanel.ts");
 
 /* harmony import */ var _container3D__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./container3D */ "./3D/controls/container3D.ts");
 
@@ -13573,6 +13624,7 @@ __webpack_require__.r(__webpack_exports__);
 
 

 

 

+

 /**

  * Class used to create a container panel deployed on the surface of a cylinder

  */

@@ -13627,8 +13679,8 @@ var CylinderPanel = /** @class */ (function (_super) {
 
     CylinderPanel.prototype._cylindricalMapping = function (source) {

         var newPos = new babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"](0, source.y, this._radius);

         var yAngle = (source.x / this._radius);

-        babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Matrix"].RotationYawPitchRollToRef(yAngle, 0, 0, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Matrix[0]);

-        return babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"].TransformNormal(newPos, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Matrix[0]);

+        babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Matrix"].RotationYawPitchRollToRef(yAngle, 0, 0, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Matrix[0]);

+        return babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"].TransformNormal(newPos, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Matrix[0]);

     };

     return CylinderPanel;

 }(_volumeBasedPanel__WEBPACK_IMPORTED_MODULE_2__["VolumeBasedPanel"]));

@@ -13649,7 +13701,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HolographicButton", function() { return HolographicButton; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
 /* harmony import */ var _button3D__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./button3D */ "./3D/controls/button3D.ts");
 
-/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_2__);
 
 /* harmony import */ var _materials_fluentMaterial__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../materials/fluentMaterial */ "./3D/materials/fluentMaterial.ts");
 
 /* harmony import */ var _2D_controls_stackPanel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../2D/controls/stackPanel */ "./2D/controls/stackPanel.ts");
 
@@ -14125,7 +14177,7 @@ var MeshButton3D = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PlanePanel", function() { return PlanePanel; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _container3D__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./container3D */ "./3D/controls/container3D.ts");
 
 /* harmony import */ var _volumeBasedPanel__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./volumeBasedPanel */ "./3D/controls/volumeBasedPanel.ts");
 
@@ -14147,7 +14199,7 @@ var PlanePanel = /** @class */ (function (_super) {
 
             return;

         }

         control.position = nodePosition.clone();

-        var target = babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Vector3[0];

+        var target = babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Vector3[0];

         target.copyFrom(nodePosition);

         switch (this.orientation) {

             case _container3D__WEBPACK_IMPORTED_MODULE_2__["Container3D"].FACEORIGIN_ORIENTATION:

@@ -14180,7 +14232,7 @@ var PlanePanel = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ScatterPanel", function() { return ScatterPanel; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _volumeBasedPanel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./volumeBasedPanel */ "./3D/controls/volumeBasedPanel.ts");
 
 /* harmony import */ var _container3D__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./container3D */ "./3D/controls/container3D.ts");
 
@@ -14265,8 +14317,8 @@ var ScatterPanel = /** @class */ (function (_super) {
 
             });

             var radiusPaddingSquared = Math.pow(this.margin, 2.0);

             var cellSize = Math.max(this._cellWidth, this._cellHeight);

-            var difference2D = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Vector2[0];

-            var difference = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Vector3[0];

+            var difference2D = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Vector2[0];

+            var difference = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Vector3[0];

             for (var i = 0; i < meshes.length - 1; i++) {

                 for (var j = i + 1; j < meshes.length; j++) {

                     if (i != j) {

@@ -14307,7 +14359,7 @@ var ScatterPanel = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SpherePanel", function() { return SpherePanel; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _volumeBasedPanel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./volumeBasedPanel */ "./3D/controls/volumeBasedPanel.ts");
 
 /* harmony import */ var _container3D__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./container3D */ "./3D/controls/container3D.ts");
 
@@ -14371,8 +14423,8 @@ var SpherePanel = /** @class */ (function (_super) {
 
         var newPos = new babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"](0, 0, this._radius);

         var xAngle = (source.y / this._radius);

         var yAngle = -(source.x / this._radius);

-        babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Matrix"].RotationYawPitchRollToRef(yAngle, xAngle, 0, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Matrix[0]);

-        return babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"].TransformNormal(newPos, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Matrix[0]);

+        babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Matrix"].RotationYawPitchRollToRef(yAngle, xAngle, 0, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Matrix[0]);

+        return babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"].TransformNormal(newPos, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Matrix[0]);

     };

     return SpherePanel;

 }(_volumeBasedPanel__WEBPACK_IMPORTED_MODULE_2__["VolumeBasedPanel"]));

@@ -14392,7 +14444,7 @@ var SpherePanel = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "StackPanel3D", function() { return StackPanel3D; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _container3D__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./container3D */ "./3D/controls/container3D.ts");
 
 

@@ -14453,9 +14505,9 @@ var StackPanel3D = /** @class */ (function (_super) {
 
             }

             controlCount++;

             child.mesh.computeWorldMatrix(true);

-            child.mesh.getWorldMatrix().multiplyToRef(currentInverseWorld, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Matrix[0]);

+            child.mesh.getWorldMatrix().multiplyToRef(currentInverseWorld, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Matrix[0]);

             var boundingBox = child.mesh.getBoundingInfo().boundingBox;

-            var extendSize = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"].TransformNormal(boundingBox.extendSize, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Matrix[0]);

+            var extendSize = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"].TransformNormal(boundingBox.extendSize, babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Matrix[0]);

             extendSizes.push(extendSize);

             if (this._isVertical) {

                 height += extendSize.y;

@@ -14517,7 +14569,7 @@ var StackPanel3D = /** @class */ (function (_super) {
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VolumeBasedPanel", function() { return VolumeBasedPanel; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/tools */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _container3D__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./container3D */ "./3D/controls/container3D.ts");
 
 

@@ -14632,8 +14684,8 @@ var VolumeBasedPanel = /** @class */ (function (_super) {
 
             child.mesh.computeWorldMatrix(true);

             //   child.mesh.getWorldMatrix().multiplyToRef(currentInverseWorld, Tmp.Matrix[0]);

             var boundingBox = child.mesh.getHierarchyBoundingVectors();

-            var extendSize = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Vector3[0];

-            var diff = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Vector3[1];

+            var extendSize = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Vector3[0];

+            var diff = babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Vector3[1];

             boundingBox.max.subtractToRef(boundingBox.min, diff);

             diff.scaleInPlace(0.5);

             babylonjs_Misc_tools__WEBPACK_IMPORTED_MODULE_1__["Vector3"].TransformNormalToRef(diff, currentInverseWorld, extendSize);

@@ -14708,7 +14760,7 @@ var VolumeBasedPanel = /** @class */ (function (_super) {
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GUI3DManager", function() { return GUI3DManager; });
 
-/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Misc/observable */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_0__);
 
 /* harmony import */ var _controls_container3D__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./controls/container3D */ "./3D/controls/container3D.ts");
 
 

@@ -14975,7 +15027,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FluentMaterialDefines", function() { return FluentMaterialDefines; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FluentMaterial", function() { return FluentMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _shaders_fluent_vertex__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./shaders/fluent.vertex */ "./3D/materials/shaders/fluent.vertex.ts");
 
 /* harmony import */ var _shaders_fluent_fragment__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./shaders/fluent.fragment */ "./3D/materials/shaders/fluent.fragment.ts");
 
@@ -15172,8 +15224,8 @@ var FluentMaterial = /** @class */ (function (_super) {
 
                 this._activeEffect.setFloat("borderWidth", this.borderWidth);

                 this._activeEffect.setFloat("edgeSmoothingValue", this.edgeSmoothingValue);

                 this._activeEffect.setFloat("borderMinValue", this.borderMinValue);

-                mesh.getBoundingInfo().boundingBox.extendSize.multiplyToRef(mesh.scaling, babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Vector3[0]);

-                this._activeEffect.setVector3("scaleFactor", babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["Tmp"].Vector3[0]);

+                mesh.getBoundingInfo().boundingBox.extendSize.multiplyToRef(mesh.scaling, babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Vector3[0]);

+                this._activeEffect.setVector3("scaleFactor", babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["TmpVectors"].Vector3[0]);

             }

             if (defines.HOVERLIGHT) {

                 this._activeEffect.setDirectColor4("hoverColor", this.hoverColor);

@@ -15297,7 +15349,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fluentPixelShader", function() { return fluentPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 var name = 'fluentPixelShader';

@@ -15319,7 +15371,7 @@ var fluentPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fluentVertexShader", function() { return fluentVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 var name = 'fluentVertexShader';

@@ -15342,7 +15394,7 @@ var fluentVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Vector3WithInfo", function() { return Vector3WithInfo; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/tools");
 
+/* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Maths/math */ "babylonjs/Misc/perfCounter");
 
 /* harmony import */ var babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Maths_math__WEBPACK_IMPORTED_MODULE_1__);
 
 

 

@@ -15636,14 +15688,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Misc/tools":
 
+/***/ "babylonjs/Misc/perfCounter":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_tools__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_perfCounter__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/gui/babylon.gui.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/gui/babylon.gui.min.js


+ 15 - 3
dist/preview release/gui/babylon.gui.module.d.ts
Visa fil 

@@ -1614,6 +1614,10 @@ declare module "babylonjs-gui/2D/controls/button" {
 
          * Function called to generate a pointer up animation

          */

         pointerUpAnimation: () => void;

+        /**

+         * Gets or sets a boolean indicating that the button will let internal controls handle picking instead of doing it directly using its bounding info

+         */

+        delegatePickingToChildren: boolean;

         private _image;

         /**

          * Returns the image part of the button (if any)

@@ -1898,6 +1902,8 @@ declare module "babylonjs-gui/2D/controls/inputText" {
 
         _connectedVirtualKeyboard: Nullable<VirtualKeyboard>;

         /** Gets or sets a string representing the message displayed on mobile when the control gets the focus */

         promptMessage: string;

+        /** Force disable prompt on mobile device */

+        disableMobilePrompt: boolean;

         /** Observable raised when the text changes */

         onTextChangedObservable: Observable<InputText>;

         /** Observable raised just before an entered character is to be added */

@@ -3012,7 +3018,7 @@ declare module "babylonjs-gui/2D/controls/index" {
 
     export * from "babylonjs-gui/2D/controls/statics";

 }

 declare module "babylonjs-gui/2D/adtInstrumentation" {

-    import { PerfCounter } from "babylonjs/Misc/tools";

+    import { PerfCounter } from "babylonjs/Misc/perfCounter";

     import { IDisposable } from "babylonjs/scene";

     import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";

     /**

@@ -3472,7 +3478,7 @@ declare module "babylonjs-gui/3D/controls/button3D" {
 
     }

 }

 declare module "babylonjs-gui/3D/controls/volumeBasedPanel" {

-    import { Vector3 } from "babylonjs/Maths/math";

+    import { Vector3 } from "babylonjs/Maths/math.vector";

     import { int } from "babylonjs/types";

     import { Container3D } from "babylonjs-gui/3D/controls/container3D";

     import { Control3D } from "babylonjs-gui/3D/controls/control3D";

@@ -3523,7 +3529,7 @@ declare module "babylonjs-gui/3D/controls/volumeBasedPanel" {
 
     }

 }

 declare module "babylonjs-gui/3D/controls/cylinderPanel" {

-    import { Vector3 } from "babylonjs/Maths/math";

+    import { Vector3 } from "babylonjs/Maths/math.vector";

     import { float } from "babylonjs/types";

     import { VolumeBasedPanel } from "babylonjs-gui/3D/controls/volumeBasedPanel";

     import { Control3D } from "babylonjs-gui/3D/controls/control3D";

@@ -5420,6 +5426,10 @@ declare module BABYLON.GUI {
 
          * Function called to generate a pointer up animation

          */

         pointerUpAnimation: () => void;

+        /**

+         * Gets or sets a boolean indicating that the button will let internal controls handle picking instead of doing it directly using its bounding info

+         */

+        delegatePickingToChildren: boolean;

         private _image;

         /**

          * Returns the image part of the button (if any)

@@ -5688,6 +5698,8 @@ declare module BABYLON.GUI {
 
         _connectedVirtualKeyboard: BABYLON.Nullable<VirtualKeyboard>;

         /** Gets or sets a string representing the message displayed on mobile when the control gets the focus */

         promptMessage: string;

+        /** Force disable prompt on mobile device */

+        disableMobilePrompt: boolean;

         /** BABYLON.Observable raised when the text changes */

         onTextChangedObservable: BABYLON.Observable<InputText>;

         /** BABYLON.Observable raised just before an entered character is to be added */

+ 2 - 2
dist/preview release/gui/package.json
Visa fil 

@@ -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": "4.1.0-alpha.0",
 
+    "version": "4.1.0-alpha.13",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"
 
@@ -28,7 +28,7 @@
 
     ],
 
     "license": "Apache-2.0",
 
     "dependencies": {
 
-        "babylonjs": "4.1.0-alpha.0"
 
+        "babylonjs": "4.1.0-alpha.13"
 
     },
 
     "engines": {
 
         "node": "*"

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 8 - 8
dist/preview release/inspector/babylon.inspector.bundle.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1092 - 358
dist/preview release/inspector/babylon.inspector.bundle.max.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/inspector/babylon.inspector.bundle.max.js.map


+ 123 - 72
dist/preview release/inspector/babylon.inspector.d.ts
Visa fil 

@@ -18,6 +18,15 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    export class Tools {

+        static StoreLocalBooleanSettings(key: string, value: boolean): void;

+        static ReadLocalBooleanSettings(key: string, defaultValue: boolean): boolean;

+        static LookForItem(item: any, selectedEntity: any): boolean;

+        private static _RecursiveRemoveHiddenMeshesAndHoistChildren;

+        static SortAndFilter(parent: any, items: any[]): any[];

+    }

+}

+declare module INSPECTOR {

     export class GlobalState {

         onSelectionChangedObservable: BABYLON.Observable<any>;

         onPropertyChangedObservable: BABYLON.Observable<PropertyChangedEvent>;

@@ -38,6 +47,10 @@ declare module INSPECTOR {
 
         blockMutationUpdates: boolean;

         selectedLineContainerTitle: string;

         recorder: ReplayRecorder;

+        private _onlyUseEulers;

+        onlyUseEulers: boolean;

+        private _ignoreBackfacesForPicking;

+        ignoreBackfacesForPicking: boolean;

         init(propertyChangedObservable: BABYLON.Observable<PropertyChangedEvent>): void;

         prepareGLTFPlugin(loader: BABYLON.GLTFFileLoader): void;

         lightGizmos: Array<BABYLON.LightGizmo>;

@@ -90,7 +103,7 @@ declare module INSPECTOR {
 
 }

 declare module INSPECTOR {

     interface ILineContainerComponentProps {

-        globalState: GlobalState;

+        globalState?: GlobalState;

         title: string;

         children: any[] | any;

         closed?: boolean;

@@ -199,6 +212,7 @@ declare module INSPECTOR {
 
         maximum: number;

         step: number;

         directValue?: number;

+        useEuler?: boolean;

         onChange?: (value: number) => void;

         onInput?: (value: number) => void;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

@@ -214,6 +228,7 @@ declare module INSPECTOR {
 
         }): boolean;

         onChange(newValueString: any): void;

         onInput(newValueString: any): void;

+        prepareDataToRead(value: number): number;

         render(): JSX.Element;

     }

 }

@@ -310,6 +325,7 @@ declare module INSPECTOR {
 
         propertyName: string;

         step?: number;

         onChange?: (newvalue: BABYLON.Vector3) => void;

+        useEuler?: boolean;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

     }

     export class Vector3LineComponent extends React.Component<IVector3LineComponentProps, {

@@ -321,6 +337,7 @@ declare module INSPECTOR {
 
         };

         private _localChange;

         constructor(props: IVector3LineComponentProps);

+        getCurrentValue(): any;

         shouldComponentUpdate(nextProps: IVector3LineComponentProps, nextState: {

             isExpanded: boolean;

             value: BABYLON.Vector3;

@@ -338,12 +355,14 @@ declare module INSPECTOR {
 
     interface IQuaternionLineComponentProps {

         label: string;

         target: any;

+        useEuler?: boolean;

         propertyName: string;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

     }

     export class QuaternionLineComponent extends React.Component<IQuaternionLineComponentProps, {

         isExpanded: boolean;

         value: BABYLON.Quaternion;

+        eulerValue: BABYLON.Vector3;

     }> {

         private _localChange;

         constructor(props: IQuaternionLineComponentProps);

@@ -358,6 +377,34 @@ declare module INSPECTOR {
 
         updateStateY(value: number): void;

         updateStateZ(value: number): void;

         updateStateW(value: number): void;

+        updateQuaternionFromEuler(): void;

+        updateStateEulerX(value: number): void;

+        updateStateEulerY(value: number): void;

+        updateStateEulerZ(value: number): void;

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

+    interface ITextInputLineComponentProps {

+        label: string;

+        lockObject: LockObject;

+        target?: any;

+        propertyName?: string;

+        value?: string;

+        onChange?: (value: string) => void;

+        onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

+    }

+    export class TextInputLineComponent extends React.Component<ITextInputLineComponentProps, {

+        value: string;

+    }> {

+        private _localChange;

+        constructor(props: ITextInputLineComponentProps);

+        componentWillUnmount(): void;

+        shouldComponentUpdate(nextProps: ITextInputLineComponentProps, nextState: {

+            value: string;

+        }): boolean;

+        raiseOnPropertyChanged(newValue: string, previousValue: string): void;

+        updateValue(value: string): void;

         render(): JSX.Element;

     }

 }

@@ -365,6 +412,7 @@ declare module INSPECTOR {
 
     interface ICustomPropertyGridComponentProps {

         globalState: GlobalState;

         target: any;

+        lockObject: LockObject;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

     }

     export class CustomPropertyGridComponent extends React.Component<ICustomPropertyGridComponentProps, {

@@ -400,12 +448,28 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    interface IFileButtonLineComponentProps {

+        label: string;

+        onClick: (file: File) => void;

+        accept: string;

+    }

+    export class FileButtonLineComponent extends React.Component<IFileButtonLineComponentProps> {

+        private static _IDGenerator;

+        private _id;

+        constructor(props: IFileButtonLineComponentProps);

+        onChange(evt: any): void;

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

     export interface ITextureLinkLineComponentProps {

         label: string;

         texture: BABYLON.Nullable<BABYLON.BaseTexture>;

         material?: BABYLON.Material;

         onSelectionChangedObservable?: BABYLON.Observable<any>;

         onDebugSelectionChangeObservable?: BABYLON.Observable<BABYLON.BaseTexture>;

+        propertyName?: string;

+        customDebugAction?: (state: boolean) => void;

     }

     export class TextureLinkLineComponent extends React.Component<ITextureLinkLineComponentProps, {

         isDebugSelected: boolean;

@@ -416,6 +480,7 @@ declare module INSPECTOR {
 
         componentWillUnmount(): void;

         debugTexture(): void;

         onLink(): void;

+        updateTexture(file: File): void;

         render(): JSX.Element | null;

     }

 }

@@ -430,7 +495,7 @@ declare module INSPECTOR {
 
     export class StandardMaterialPropertyGridComponent extends React.Component<IStandardMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IStandardMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -439,21 +504,23 @@ declare module INSPECTOR {
 
         texture: BABYLON.BaseTexture;

         width: number;

         height: number;

-        globalState: GlobalState;

+        globalState?: GlobalState;

+        hideChannelSelect?: boolean;

+    }

+    enum ChannelToDisplay {

+        R = 0,

+        G = 1,

+        B = 2,

+        A = 3,

+        All = 4

     }

     export class TextureLineComponent extends React.Component<ITextureLineComponentProps, {

-        displayRed: boolean;

-        displayGreen: boolean;

-        displayBlue: boolean;

-        displayAlpha: boolean;

+        channel: ChannelToDisplay;

         face: number;

     }> {

         constructor(props: ITextureLineComponentProps);

         shouldComponentUpdate(nextProps: ITextureLineComponentProps, nextState: {

-            displayRed: boolean;

-            displayGreen: boolean;

-            displayBlue: boolean;

-            displayAlpha: boolean;

+            channel: ChannelToDisplay;

             face: number;

         }): boolean;

         componentDidMount(): void;

@@ -472,6 +539,9 @@ declare module INSPECTOR {
 
         isInteger?: boolean;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

         additionalClass?: string;

+        step?: string;

+        digits?: number;

+        useEuler?: boolean;

     }

     export class FloatLineComponent extends React.Component<IFloatLineComponentProps, {

         value: string;

@@ -491,18 +561,6 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

-    interface IFileButtonLineComponentProps {

-        label: string;

-        onClick: (file: File) => void;

-        accept: string;

-    }

-    export class FileButtonLineComponent extends React.Component<IFileButtonLineComponentProps> {

-        constructor(props: IFileButtonLineComponentProps);

-        onChange(evt: any): void;

-        render(): JSX.Element;

-    }

-}

-declare module INSPECTOR {

     interface ITexturePropertyGridComponentProps {

         texture: BABYLON.BaseTexture;

         lockObject: LockObject;

@@ -558,7 +616,9 @@ declare module INSPECTOR {
 
     export class PBRMaterialPropertyGridComponent extends React.Component<IPBRMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRMaterialPropertyGridComponentProps);

-        renderTextures(onDebugSelectionChangeObservable: BABYLON.Observable<BABYLON.BaseTexture>): JSX.Element | null;

+        switchAmbientMode(state: boolean): void;

+        switchMetallicMode(state: boolean): void;

+        renderTextures(onDebugSelectionChangeObservable: BABYLON.Observable<BABYLON.BaseTexture>): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -595,6 +655,16 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    export interface IButtonLineComponentProps {

+        label: string;

+        onClick: () => void;

+    }

+    export class ButtonLineComponent extends React.Component<IButtonLineComponentProps> {

+        constructor(props: IButtonLineComponentProps);

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

     interface IScenePropertyGridComponentProps {

         globalState: GlobalState;

         scene: BABYLON.Scene;

@@ -611,6 +681,7 @@ declare module INSPECTOR {
 
         updateEnvironmentTexture(file: File): void;

         updateGravity(newValue: BABYLON.Vector3): void;

         updateTimeStep(newValue: number): void;

+        normalizeScene(): void;

         render(): JSX.Element;

     }

 }

@@ -647,6 +718,7 @@ declare module INSPECTOR {
 
     }

     export class CommonShadowLightPropertyGridComponent extends React.Component<ICommonShadowLightPropertyGridComponentProps> {

         constructor(props: ICommonShadowLightPropertyGridComponentProps);

+        createShadowGenerator(): void;

         render(): JSX.Element;

     }

 }

@@ -749,30 +821,6 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

-    interface ITextInputLineComponentProps {

-        label: string;

-        lockObject: LockObject;

-        target?: any;

-        propertyName?: string;

-        value?: string;

-        onChange?: (value: string) => void;

-        onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

-    }

-    export class TextInputLineComponent extends React.Component<ITextInputLineComponentProps, {

-        value: string;

-    }> {

-        private _localChange;

-        constructor(props: ITextInputLineComponentProps);

-        componentWillUnmount(): void;

-        shouldComponentUpdate(nextProps: ITextInputLineComponentProps, nextState: {

-            value: string;

-        }): boolean;

-        raiseOnPropertyChanged(newValue: string, previousValue: string): void;

-        updateValue(value: string): void;

-        render(): JSX.Element;

-    }

-}

-declare module INSPECTOR {

     interface ICommonControlPropertyGridComponentProps {

         globalState: GlobalState;

         control: BABYLON.GUI.Control;

@@ -834,16 +882,6 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

-    export interface IButtonLineComponentProps {

-        label: string;

-        onClick: () => void;

-    }

-    export class ButtonLineComponent extends React.Component<IButtonLineComponentProps> {

-        constructor(props: IButtonLineComponentProps);

-        render(): JSX.Element;

-    }

-}

-declare module INSPECTOR {

     interface IAnimationGroupGridComponentProps {

         globalState: GlobalState;

         animationGroup: BABYLON.AnimationGroup;

@@ -1004,7 +1042,7 @@ declare module INSPECTOR {
 
     export class PBRMetallicRoughnessMaterialPropertyGridComponent extends React.Component<IPBRMetallicRoughnessMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRMetallicRoughnessMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -1019,7 +1057,7 @@ declare module INSPECTOR {
 
     export class PBRSpecularGlossinessMaterialPropertyGridComponent extends React.Component<IPBRSpecularGlossinessMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRSpecularGlossinessMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -1211,6 +1249,20 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    interface INodeMaterialPropertyGridComponentProps {

+        globalState: GlobalState;

+        material: BABYLON.NodeMaterial;

+        lockObject: LockObject;

+        onSelectionChangedObservable?: BABYLON.Observable<any>;

+        onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

+    }

+    export class NodeMaterialPropertyGridComponent extends React.Component<INodeMaterialPropertyGridComponentProps> {

+        constructor(props: INodeMaterialPropertyGridComponentProps);

+        edit(): void;

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

     export class PropertyGridTabComponent extends PaneComponent {

         private _timerIntervalId;

         private _lockObject;

@@ -1286,8 +1338,14 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    export class SettingsTabComponent extends PaneComponent {

+        constructor(props: IPaneComponentProps);

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

     interface IActionTabsComponentProps {

-        scene: BABYLON.Scene;

+        scene?: BABYLON.Scene;

         noCommands?: boolean;

         noHeader?: boolean;

         noExpand?: boolean;

@@ -1295,7 +1353,7 @@ declare module INSPECTOR {
 
         popupMode?: boolean;

         onPopup?: () => void;

         onClose?: () => void;

-        globalState: GlobalState;

+        globalState?: GlobalState;

     }

     export class ActionTabsComponent extends React.Component<IActionTabsComponentProps, {

         selectedEntity: any;

@@ -1308,7 +1366,7 @@ declare module INSPECTOR {
 
         componentWillMount(): void;

         componentWillUnmount(): void;

         changeSelectedTab(index: number): void;

-        renderContent(): JSX.Element;

+        renderContent(): JSX.Element | null;

         onClose(): void;

         onPopup(): void;

         render(): JSX.Element;

@@ -1528,13 +1586,6 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

-    export class Tools {

-        static LookForItem(item: any, selectedEntity: any): boolean;

-        private static _RecursiveRemoveHiddenMeshesAndHoistChildren;

-        static SortAndFilter(parent: any, items: any[]): any[];

-    }

-}

-declare module INSPECTOR {

     export interface ITreeItemSelectableComponentProps {

         entity: any;

         selectedEntity?: any;

@@ -1711,11 +1762,11 @@ declare module INSPECTOR {
 
         private static _CreateSceneExplorer;

         private static _CreateActionTabs;

         private static _CreateEmbedHost;

-        private static _CreatePopup;

+        static _CreatePopup(title: string, windowVariableName: string, width?: number, height?: number): BABYLON.Nullable<HTMLDivElement>;

         static readonly IsVisible: boolean;

         static EarlyAttachToLoader(): void;

         static Show(scene: BABYLON.Scene, userOptions: Partial<BABYLON.IInspectorOptions>): void;

-        private static _CreateCanvasContainer;

+        static _CreateCanvasContainer(parentControl: HTMLElement): void;

         private static _DestroyCanvasContainer;

         private static _Cleanup;

         private static _RemoveElementFromDOM;

+ 263 - 152
dist/preview release/inspector/babylon.inspector.module.d.ts
Visa fil 

@@ -18,6 +18,15 @@ declare module "babylonjs-inspector/components/replayRecorder" {
 
         export(): void;

     }

 }

+declare module "babylonjs-inspector/tools" {

+    export class Tools {

+        static StoreLocalBooleanSettings(key: string, value: boolean): void;

+        static ReadLocalBooleanSettings(key: string, defaultValue: boolean): boolean;

+        static LookForItem(item: any, selectedEntity: any): boolean;

+        private static _RecursiveRemoveHiddenMeshesAndHoistChildren;

+        static SortAndFilter(parent: any, items: any[]): any[];

+    }

+}

 declare module "babylonjs-inspector/components/globalState" {

     import { GLTFFileLoader, IGLTFLoaderExtension } from "babylonjs-loaders/glTF/index";

     import { IGLTFValidationResults } from "babylonjs-gltf2interface";

@@ -49,6 +58,10 @@ declare module "babylonjs-inspector/components/globalState" {
 
         blockMutationUpdates: boolean;

         selectedLineContainerTitle: string;

         recorder: ReplayRecorder;

+        private _onlyUseEulers;

+        onlyUseEulers: boolean;

+        private _ignoreBackfacesForPicking;

+        ignoreBackfacesForPicking: boolean;

         init(propertyChangedObservable: Observable<PropertyChangedEvent>): void;

         prepareGLTFPlugin(loader: GLTFFileLoader): void;

         lightGizmos: Array<LightGizmo>;

@@ -111,7 +124,7 @@ declare module "babylonjs-inspector/components/actionTabs/lineContainerComponent
 
     import * as React from "react";

     import { GlobalState } from "babylonjs-inspector/components/globalState";

     interface ILineContainerComponentProps {

-        globalState: GlobalState;

+        globalState?: GlobalState;

         title: string;

         children: any[] | any;

         closed?: boolean;

@@ -233,6 +246,7 @@ declare module "babylonjs-inspector/components/actionTabs/lines/sliderLineCompon
 
         maximum: number;

         step: number;

         directValue?: number;

+        useEuler?: boolean;

         onChange?: (value: number) => void;

         onInput?: (value: number) => void;

         onPropertyChangedObservable?: Observable<PropertyChangedEvent>;

@@ -248,6 +262,7 @@ declare module "babylonjs-inspector/components/actionTabs/lines/sliderLineCompon
 
         }): boolean;

         onChange(newValueString: any): void;

         onInput(newValueString: any): void;

+        prepareDataToRead(value: number): number;

         render(): JSX.Element;

     }

 }

@@ -356,6 +371,7 @@ declare module "babylonjs-inspector/components/actionTabs/lines/vector3LineCompo
 
         propertyName: string;

         step?: number;

         onChange?: (newvalue: Vector3) => void;

+        useEuler?: boolean;

         onPropertyChangedObservable?: Observable<PropertyChangedEvent>;

     }

     export class Vector3LineComponent extends React.Component<IVector3LineComponentProps, {

@@ -367,6 +383,7 @@ declare module "babylonjs-inspector/components/actionTabs/lines/vector3LineCompo
 
         };

         private _localChange;

         constructor(props: IVector3LineComponentProps);

+        getCurrentValue(): any;

         shouldComponentUpdate(nextProps: IVector3LineComponentProps, nextState: {

             isExpanded: boolean;

             value: Vector3;

@@ -383,17 +400,19 @@ declare module "babylonjs-inspector/components/actionTabs/lines/vector3LineCompo
 
 declare module "babylonjs-inspector/components/actionTabs/lines/quaternionLineComponent" {

     import * as React from "react";

     import { Observable } from "babylonjs/Misc/observable";

-    import { Quaternion } from "babylonjs/Maths/math";

+    import { Quaternion, Vector3 } from "babylonjs/Maths/math";

     import { PropertyChangedEvent } from "babylonjs-inspector/components/propertyChangedEvent";

     interface IQuaternionLineComponentProps {

         label: string;

         target: any;

+        useEuler?: boolean;

         propertyName: string;

         onPropertyChangedObservable?: Observable<PropertyChangedEvent>;

     }

     export class QuaternionLineComponent extends React.Component<IQuaternionLineComponentProps, {

         isExpanded: boolean;

         value: Quaternion;

+        eulerValue: Vector3;

     }> {

         private _localChange;

         constructor(props: IQuaternionLineComponentProps);

@@ -408,6 +427,38 @@ declare module "babylonjs-inspector/components/actionTabs/lines/quaternionLineCo
 
         updateStateY(value: number): void;

         updateStateZ(value: number): void;

         updateStateW(value: number): void;

+        updateQuaternionFromEuler(): void;

+        updateStateEulerX(value: number): void;

+        updateStateEulerY(value: number): void;

+        updateStateEulerZ(value: number): void;

+        render(): JSX.Element;

+    }

+}

+declare module "babylonjs-inspector/components/actionTabs/lines/textInputLineComponent" {

+    import * as React from "react";

+    import { Observable } from "babylonjs/Misc/observable";

+    import { PropertyChangedEvent } from "babylonjs-inspector/components/propertyChangedEvent";

+    import { LockObject } from "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/lockObject";

+    interface ITextInputLineComponentProps {

+        label: string;

+        lockObject: LockObject;

+        target?: any;

+        propertyName?: string;

+        value?: string;

+        onChange?: (value: string) => void;

+        onPropertyChangedObservable?: Observable<PropertyChangedEvent>;

+    }

+    export class TextInputLineComponent extends React.Component<ITextInputLineComponentProps, {

+        value: string;

+    }> {

+        private _localChange;

+        constructor(props: ITextInputLineComponentProps);

+        componentWillUnmount(): void;

+        shouldComponentUpdate(nextProps: ITextInputLineComponentProps, nextState: {

+            value: string;

+        }): boolean;

+        raiseOnPropertyChanged(newValue: string, previousValue: string): void;

+        updateValue(value: string): void;

         render(): JSX.Element;

     }

 }

@@ -417,9 +468,11 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/cus
 
     import { PropertyChangedEvent } from "babylonjs-inspector/components/propertyChangedEvent";

     import { GlobalState } from "babylonjs-inspector/components/globalState";

     import { IInspectable } from 'babylonjs/Misc/iInspectable';

+    import { LockObject } from "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/lockObject";

     interface ICustomPropertyGridComponentProps {

         globalState: GlobalState;

         target: any;

+        lockObject: LockObject;

         onPropertyChangedObservable?: Observable<PropertyChangedEvent>;

     }

     export class CustomPropertyGridComponent extends React.Component<ICustomPropertyGridComponentProps, {

@@ -466,6 +519,21 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/mat
 
         render(): JSX.Element;

     }

 }

+declare module "babylonjs-inspector/components/actionTabs/lines/fileButtonLineComponent" {

+    import * as React from "react";

+    interface IFileButtonLineComponentProps {

+        label: string;

+        onClick: (file: File) => void;

+        accept: string;

+    }

+    export class FileButtonLineComponent extends React.Component<IFileButtonLineComponentProps> {

+        private static _IDGenerator;

+        private _id;

+        constructor(props: IFileButtonLineComponentProps);

+        onChange(evt: any): void;

+        render(): JSX.Element;

+    }

+}

 declare module "babylonjs-inspector/components/actionTabs/lines/textureLinkLineComponent" {

     import * as React from "react";

     import { Nullable } from "babylonjs/types";

@@ -478,6 +546,8 @@ declare module "babylonjs-inspector/components/actionTabs/lines/textureLinkLineC
 
         material?: Material;

         onSelectionChangedObservable?: Observable<any>;

         onDebugSelectionChangeObservable?: Observable<BaseTexture>;

+        propertyName?: string;

+        customDebugAction?: (state: boolean) => void;

     }

     export class TextureLinkLineComponent extends React.Component<ITextureLinkLineComponentProps, {

         isDebugSelected: boolean;

@@ -488,6 +558,7 @@ declare module "babylonjs-inspector/components/actionTabs/lines/textureLinkLineC
 
         componentWillUnmount(): void;

         debugTexture(): void;

         onLink(): void;

+        updateTexture(file: File): void;

         render(): JSX.Element | null;

     }

 }

@@ -508,7 +579,7 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/mat
 
     export class StandardMaterialPropertyGridComponent extends React.Component<IStandardMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IStandardMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -520,21 +591,23 @@ declare module "babylonjs-inspector/components/actionTabs/lines/textureLineCompo
 
         texture: BaseTexture;

         width: number;

         height: number;

-        globalState: GlobalState;

+        globalState?: GlobalState;

+        hideChannelSelect?: boolean;

+    }

+    enum ChannelToDisplay {

+        R = 0,

+        G = 1,

+        B = 2,

+        A = 3,

+        All = 4

     }

     export class TextureLineComponent extends React.Component<ITextureLineComponentProps, {

-        displayRed: boolean;

-        displayGreen: boolean;

-        displayBlue: boolean;

-        displayAlpha: boolean;

+        channel: ChannelToDisplay;

         face: number;

     }> {

         constructor(props: ITextureLineComponentProps);

         shouldComponentUpdate(nextProps: ITextureLineComponentProps, nextState: {

-            displayRed: boolean;

-            displayGreen: boolean;

-            displayBlue: boolean;

-            displayAlpha: boolean;

+            channel: ChannelToDisplay;

             face: number;

         }): boolean;

         componentDidMount(): void;

@@ -557,6 +630,9 @@ declare module "babylonjs-inspector/components/actionTabs/lines/floatLineCompone
 
         isInteger?: boolean;

         onPropertyChangedObservable?: Observable<PropertyChangedEvent>;

         additionalClass?: string;

+        step?: string;

+        digits?: number;

+        useEuler?: boolean;

     }

     export class FloatLineComponent extends React.Component<IFloatLineComponentProps, {

         value: string;

@@ -575,19 +651,6 @@ declare module "babylonjs-inspector/components/actionTabs/lines/floatLineCompone
 
         render(): JSX.Element;

     }

 }

-declare module "babylonjs-inspector/components/actionTabs/lines/fileButtonLineComponent" {

-    import * as React from "react";

-    interface IFileButtonLineComponentProps {

-        label: string;

-        onClick: (file: File) => void;

-        accept: string;

-    }

-    export class FileButtonLineComponent extends React.Component<IFileButtonLineComponentProps> {

-        constructor(props: IFileButtonLineComponentProps);

-        onChange(evt: any): void;

-        render(): JSX.Element;

-    }

-}

 declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/materials/texturePropertyGridComponent" {

     import * as React from "react";

     import { Observable } from "babylonjs/Misc/observable";

@@ -661,7 +724,9 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/mat
 
     export class PBRMaterialPropertyGridComponent extends React.Component<IPBRMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRMaterialPropertyGridComponentProps);

-        renderTextures(onDebugSelectionChangeObservable: Observable<BaseTexture>): JSX.Element | null;

+        switchAmbientMode(state: boolean): void;

+        switchMetallicMode(state: boolean): void;

+        renderTextures(onDebugSelectionChangeObservable: Observable<BaseTexture>): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -705,6 +770,17 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/fog
 
         render(): JSX.Element;

     }

 }

+declare module "babylonjs-inspector/components/actionTabs/lines/buttonLineComponent" {

+    import * as React from "react";

+    export interface IButtonLineComponentProps {

+        label: string;

+        onClick: () => void;

+    }

+    export class ButtonLineComponent extends React.Component<IButtonLineComponentProps> {

+        constructor(props: IButtonLineComponentProps);

+        render(): JSX.Element;

+    }

+}

 declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/scenePropertyGridComponent" {

     import * as React from "react";

     import { Observable } from "babylonjs/Misc/observable";

@@ -729,6 +805,7 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/sce
 
         updateEnvironmentTexture(file: File): void;

         updateGravity(newValue: Vector3): void;

         updateTimeStep(newValue: number): void;

+        normalizeScene(): void;

         render(): JSX.Element;

     }

 }

@@ -783,6 +860,7 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/lig
 
     }

     export class CommonShadowLightPropertyGridComponent extends React.Component<ICommonShadowLightPropertyGridComponentProps> {

         constructor(props: ICommonShadowLightPropertyGridComponentProps);

+        createShadowGenerator(): void;

         render(): JSX.Element;

     }

 }

@@ -926,34 +1004,6 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/mat
 
         render(): JSX.Element;

     }

 }

-declare module "babylonjs-inspector/components/actionTabs/lines/textInputLineComponent" {

-    import * as React from "react";

-    import { Observable } from "babylonjs/Misc/observable";

-    import { PropertyChangedEvent } from "babylonjs-inspector/components/propertyChangedEvent";

-    import { LockObject } from "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/lockObject";

-    interface ITextInputLineComponentProps {

-        label: string;

-        lockObject: LockObject;

-        target?: any;

-        propertyName?: string;

-        value?: string;

-        onChange?: (value: string) => void;

-        onPropertyChangedObservable?: Observable<PropertyChangedEvent>;

-    }

-    export class TextInputLineComponent extends React.Component<ITextInputLineComponentProps, {

-        value: string;

-    }> {

-        private _localChange;

-        constructor(props: ITextInputLineComponentProps);

-        componentWillUnmount(): void;

-        shouldComponentUpdate(nextProps: ITextInputLineComponentProps, nextState: {

-            value: string;

-        }): boolean;

-        raiseOnPropertyChanged(newValue: string, previousValue: string): void;

-        updateValue(value: string): void;

-        render(): JSX.Element;

-    }

-}

 declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/gui/commonControlPropertyGridComponent" {

     import * as React from "react";

     import { Observable } from "babylonjs/Misc/observable";

@@ -1045,17 +1095,6 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/gui
 
         render(): JSX.Element;

     }

 }

-declare module "babylonjs-inspector/components/actionTabs/lines/buttonLineComponent" {

-    import * as React from "react";

-    export interface IButtonLineComponentProps {

-        label: string;

-        onClick: () => void;

-    }

-    export class ButtonLineComponent extends React.Component<IButtonLineComponentProps> {

-        constructor(props: IButtonLineComponentProps);

-        render(): JSX.Element;

-    }

-}

 declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/animationGroupPropertyGridComponent" {

     import * as React from "react";

     import { Observable } from "babylonjs/Misc/observable";

@@ -1290,7 +1329,7 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/mat
 
     export class PBRMetallicRoughnessMaterialPropertyGridComponent extends React.Component<IPBRMetallicRoughnessMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRMetallicRoughnessMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -1311,7 +1350,7 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/mat
 
     export class PBRSpecularGlossinessMaterialPropertyGridComponent extends React.Component<IPBRSpecularGlossinessMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRSpecularGlossinessMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -1466,7 +1505,7 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/ani
 
     import { PropertyChangedEvent } from "babylonjs-inspector/components/propertyChangedEvent";

     import { LockObject } from "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/lockObject";

     import { GlobalState } from "babylonjs-inspector/components/globalState";

-    import { IAnimatable } from 'babylonjs/Misc/tools';

+    import { IAnimatable } from 'babylonjs/Animations/animatable.interface';

     interface IAnimationGridComponentProps {

         globalState: GlobalState;

         animatable: IAnimatable;

@@ -1587,6 +1626,26 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/pos
 
         render(): JSX.Element;

     }

 }

+declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/materials/nodeMaterialPropertyGridComponent" {

+    import * as React from "react";

+    import { Observable } from "babylonjs/Misc/observable";

+    import { NodeMaterial } from "babylonjs/Materials/Node/nodeMaterial";

+    import { PropertyChangedEvent } from "babylonjs-inspector/components/propertyChangedEvent";

+    import { LockObject } from "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/lockObject";

+    import { GlobalState } from "babylonjs-inspector/components/globalState";

+    interface INodeMaterialPropertyGridComponentProps {

+        globalState: GlobalState;

+        material: NodeMaterial;

+        lockObject: LockObject;

+        onSelectionChangedObservable?: Observable<any>;

+        onPropertyChangedObservable?: Observable<PropertyChangedEvent>;

+    }

+    export class NodeMaterialPropertyGridComponent extends React.Component<INodeMaterialPropertyGridComponentProps> {

+        constructor(props: INodeMaterialPropertyGridComponentProps);

+        edit(): void;

+        render(): JSX.Element;

+    }

+}

 declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGridTabComponent" {

     import { PaneComponent, IPaneComponentProps } from "babylonjs-inspector/components/actionTabs/paneComponent";

     export class PropertyGridTabComponent extends PaneComponent {

@@ -1671,12 +1730,19 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/toolsTabComponent
 
         render(): JSX.Element | null;

     }

 }

+declare module "babylonjs-inspector/components/actionTabs/tabs/settingsTabComponent" {

+    import { PaneComponent, IPaneComponentProps } from "babylonjs-inspector/components/actionTabs/paneComponent";

+    export class SettingsTabComponent extends PaneComponent {

+        constructor(props: IPaneComponentProps);

+        render(): JSX.Element;

+    }

+}

 declare module "babylonjs-inspector/components/actionTabs/actionTabsComponent" {

     import * as React from "react";

     import { Scene } from "babylonjs/scene";

     import { GlobalState } from "babylonjs-inspector/components/globalState";

     interface IActionTabsComponentProps {

-        scene: Scene;

+        scene?: Scene;

         noCommands?: boolean;

         noHeader?: boolean;

         noExpand?: boolean;

@@ -1684,7 +1750,7 @@ declare module "babylonjs-inspector/components/actionTabs/actionTabsComponent" {
 
         popupMode?: boolean;

         onPopup?: () => void;

         onClose?: () => void;

-        globalState: GlobalState;

+        globalState?: GlobalState;

     }

     export class ActionTabsComponent extends React.Component<IActionTabsComponentProps, {

         selectedEntity: any;

@@ -1697,7 +1763,7 @@ declare module "babylonjs-inspector/components/actionTabs/actionTabsComponent" {
 
         componentWillMount(): void;

         componentWillUnmount(): void;

         changeSelectedTab(index: number): void;

-        renderContent(): JSX.Element;

+        renderContent(): JSX.Element | null;

         onClose(): void;

         onPopup(): void;

         render(): JSX.Element;

@@ -1963,13 +2029,6 @@ declare module "babylonjs-inspector/components/sceneExplorer/treeItemSpecialized
 
         render(): JSX.Element;

     }

 }

-declare module "babylonjs-inspector/tools" {

-    export class Tools {

-        static LookForItem(item: any, selectedEntity: any): boolean;

-        private static _RecursiveRemoveHiddenMeshesAndHoistChildren;

-        static SortAndFilter(parent: any, items: any[]): any[];

-    }

-}

 declare module "babylonjs-inspector/components/sceneExplorer/treeItemSelectableComponent" {

     import { Nullable } from "babylonjs/types";

     import { IExplorerExtensibilityGroup } from "babylonjs/Debug/debugLayer";

@@ -2150,6 +2209,7 @@ declare module "babylonjs-inspector/components/embedHost/embedHostComponent" {
 
 }

 declare module "babylonjs-inspector/inspector" {

     import { IInspectorOptions } from "babylonjs/Debug/debugLayer";

+    import { Nullable } from "babylonjs/types";

     import { Observable } from "babylonjs/Misc/observable";

     import { Scene } from "babylonjs/scene";

     import { PropertyChangedEvent } from "babylonjs-inspector/components/propertyChangedEvent";

@@ -2172,11 +2232,11 @@ declare module "babylonjs-inspector/inspector" {
 
         private static _CreateSceneExplorer;

         private static _CreateActionTabs;

         private static _CreateEmbedHost;

-        private static _CreatePopup;

+        static _CreatePopup(title: string, windowVariableName: string, width?: number, height?: number): Nullable<HTMLDivElement>;

         static readonly IsVisible: boolean;

         static EarlyAttachToLoader(): void;

         static Show(scene: Scene, userOptions: Partial<IInspectorOptions>): void;

-        private static _CreateCanvasContainer;

+        static _CreateCanvasContainer(parentControl: HTMLElement): void;

         private static _DestroyCanvasContainer;

         private static _Cleanup;

         private static _RemoveElementFromDOM;

@@ -2212,6 +2272,15 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    export class Tools {

+        static StoreLocalBooleanSettings(key: string, value: boolean): void;

+        static ReadLocalBooleanSettings(key: string, defaultValue: boolean): boolean;

+        static LookForItem(item: any, selectedEntity: any): boolean;

+        private static _RecursiveRemoveHiddenMeshesAndHoistChildren;

+        static SortAndFilter(parent: any, items: any[]): any[];

+    }

+}

+declare module INSPECTOR {

     export class GlobalState {

         onSelectionChangedObservable: BABYLON.Observable<any>;

         onPropertyChangedObservable: BABYLON.Observable<PropertyChangedEvent>;

@@ -2232,6 +2301,10 @@ declare module INSPECTOR {
 
         blockMutationUpdates: boolean;

         selectedLineContainerTitle: string;

         recorder: ReplayRecorder;

+        private _onlyUseEulers;

+        onlyUseEulers: boolean;

+        private _ignoreBackfacesForPicking;

+        ignoreBackfacesForPicking: boolean;

         init(propertyChangedObservable: BABYLON.Observable<PropertyChangedEvent>): void;

         prepareGLTFPlugin(loader: BABYLON.GLTFFileLoader): void;

         lightGizmos: Array<BABYLON.LightGizmo>;

@@ -2284,7 +2357,7 @@ declare module INSPECTOR {
 
 }

 declare module INSPECTOR {

     interface ILineContainerComponentProps {

-        globalState: GlobalState;

+        globalState?: GlobalState;

         title: string;

         children: any[] | any;

         closed?: boolean;

@@ -2393,6 +2466,7 @@ declare module INSPECTOR {
 
         maximum: number;

         step: number;

         directValue?: number;

+        useEuler?: boolean;

         onChange?: (value: number) => void;

         onInput?: (value: number) => void;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

@@ -2408,6 +2482,7 @@ declare module INSPECTOR {
 
         }): boolean;

         onChange(newValueString: any): void;

         onInput(newValueString: any): void;

+        prepareDataToRead(value: number): number;

         render(): JSX.Element;

     }

 }

@@ -2504,6 +2579,7 @@ declare module INSPECTOR {
 
         propertyName: string;

         step?: number;

         onChange?: (newvalue: BABYLON.Vector3) => void;

+        useEuler?: boolean;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

     }

     export class Vector3LineComponent extends React.Component<IVector3LineComponentProps, {

@@ -2515,6 +2591,7 @@ declare module INSPECTOR {
 
         };

         private _localChange;

         constructor(props: IVector3LineComponentProps);

+        getCurrentValue(): any;

         shouldComponentUpdate(nextProps: IVector3LineComponentProps, nextState: {

             isExpanded: boolean;

             value: BABYLON.Vector3;

@@ -2532,12 +2609,14 @@ declare module INSPECTOR {
 
     interface IQuaternionLineComponentProps {

         label: string;

         target: any;

+        useEuler?: boolean;

         propertyName: string;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

     }

     export class QuaternionLineComponent extends React.Component<IQuaternionLineComponentProps, {

         isExpanded: boolean;

         value: BABYLON.Quaternion;

+        eulerValue: BABYLON.Vector3;

     }> {

         private _localChange;

         constructor(props: IQuaternionLineComponentProps);

@@ -2552,6 +2631,34 @@ declare module INSPECTOR {
 
         updateStateY(value: number): void;

         updateStateZ(value: number): void;

         updateStateW(value: number): void;

+        updateQuaternionFromEuler(): void;

+        updateStateEulerX(value: number): void;

+        updateStateEulerY(value: number): void;

+        updateStateEulerZ(value: number): void;

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

+    interface ITextInputLineComponentProps {

+        label: string;

+        lockObject: LockObject;

+        target?: any;

+        propertyName?: string;

+        value?: string;

+        onChange?: (value: string) => void;

+        onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

+    }

+    export class TextInputLineComponent extends React.Component<ITextInputLineComponentProps, {

+        value: string;

+    }> {

+        private _localChange;

+        constructor(props: ITextInputLineComponentProps);

+        componentWillUnmount(): void;

+        shouldComponentUpdate(nextProps: ITextInputLineComponentProps, nextState: {

+            value: string;

+        }): boolean;

+        raiseOnPropertyChanged(newValue: string, previousValue: string): void;

+        updateValue(value: string): void;

         render(): JSX.Element;

     }

 }

@@ -2559,6 +2666,7 @@ declare module INSPECTOR {
 
     interface ICustomPropertyGridComponentProps {

         globalState: GlobalState;

         target: any;

+        lockObject: LockObject;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

     }

     export class CustomPropertyGridComponent extends React.Component<ICustomPropertyGridComponentProps, {

@@ -2594,12 +2702,28 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    interface IFileButtonLineComponentProps {

+        label: string;

+        onClick: (file: File) => void;

+        accept: string;

+    }

+    export class FileButtonLineComponent extends React.Component<IFileButtonLineComponentProps> {

+        private static _IDGenerator;

+        private _id;

+        constructor(props: IFileButtonLineComponentProps);

+        onChange(evt: any): void;

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

     export interface ITextureLinkLineComponentProps {

         label: string;

         texture: BABYLON.Nullable<BABYLON.BaseTexture>;

         material?: BABYLON.Material;

         onSelectionChangedObservable?: BABYLON.Observable<any>;

         onDebugSelectionChangeObservable?: BABYLON.Observable<BABYLON.BaseTexture>;

+        propertyName?: string;

+        customDebugAction?: (state: boolean) => void;

     }

     export class TextureLinkLineComponent extends React.Component<ITextureLinkLineComponentProps, {

         isDebugSelected: boolean;

@@ -2610,6 +2734,7 @@ declare module INSPECTOR {
 
         componentWillUnmount(): void;

         debugTexture(): void;

         onLink(): void;

+        updateTexture(file: File): void;

         render(): JSX.Element | null;

     }

 }

@@ -2624,7 +2749,7 @@ declare module INSPECTOR {
 
     export class StandardMaterialPropertyGridComponent extends React.Component<IStandardMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IStandardMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -2633,21 +2758,23 @@ declare module INSPECTOR {
 
         texture: BABYLON.BaseTexture;

         width: number;

         height: number;

-        globalState: GlobalState;

+        globalState?: GlobalState;

+        hideChannelSelect?: boolean;

+    }

+    enum ChannelToDisplay {

+        R = 0,

+        G = 1,

+        B = 2,

+        A = 3,

+        All = 4

     }

     export class TextureLineComponent extends React.Component<ITextureLineComponentProps, {

-        displayRed: boolean;

-        displayGreen: boolean;

-        displayBlue: boolean;

-        displayAlpha: boolean;

+        channel: ChannelToDisplay;

         face: number;

     }> {

         constructor(props: ITextureLineComponentProps);

         shouldComponentUpdate(nextProps: ITextureLineComponentProps, nextState: {

-            displayRed: boolean;

-            displayGreen: boolean;

-            displayBlue: boolean;

-            displayAlpha: boolean;

+            channel: ChannelToDisplay;

             face: number;

         }): boolean;

         componentDidMount(): void;

@@ -2666,6 +2793,9 @@ declare module INSPECTOR {
 
         isInteger?: boolean;

         onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

         additionalClass?: string;

+        step?: string;

+        digits?: number;

+        useEuler?: boolean;

     }

     export class FloatLineComponent extends React.Component<IFloatLineComponentProps, {

         value: string;

@@ -2685,18 +2815,6 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

-    interface IFileButtonLineComponentProps {

-        label: string;

-        onClick: (file: File) => void;

-        accept: string;

-    }

-    export class FileButtonLineComponent extends React.Component<IFileButtonLineComponentProps> {

-        constructor(props: IFileButtonLineComponentProps);

-        onChange(evt: any): void;

-        render(): JSX.Element;

-    }

-}

-declare module INSPECTOR {

     interface ITexturePropertyGridComponentProps {

         texture: BABYLON.BaseTexture;

         lockObject: LockObject;

@@ -2752,7 +2870,9 @@ declare module INSPECTOR {
 
     export class PBRMaterialPropertyGridComponent extends React.Component<IPBRMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRMaterialPropertyGridComponentProps);

-        renderTextures(onDebugSelectionChangeObservable: BABYLON.Observable<BABYLON.BaseTexture>): JSX.Element | null;

+        switchAmbientMode(state: boolean): void;

+        switchMetallicMode(state: boolean): void;

+        renderTextures(onDebugSelectionChangeObservable: BABYLON.Observable<BABYLON.BaseTexture>): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -2789,6 +2909,16 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    export interface IButtonLineComponentProps {

+        label: string;

+        onClick: () => void;

+    }

+    export class ButtonLineComponent extends React.Component<IButtonLineComponentProps> {

+        constructor(props: IButtonLineComponentProps);

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

     interface IScenePropertyGridComponentProps {

         globalState: GlobalState;

         scene: BABYLON.Scene;

@@ -2805,6 +2935,7 @@ declare module INSPECTOR {
 
         updateEnvironmentTexture(file: File): void;

         updateGravity(newValue: BABYLON.Vector3): void;

         updateTimeStep(newValue: number): void;

+        normalizeScene(): void;

         render(): JSX.Element;

     }

 }

@@ -2841,6 +2972,7 @@ declare module INSPECTOR {
 
     }

     export class CommonShadowLightPropertyGridComponent extends React.Component<ICommonShadowLightPropertyGridComponentProps> {

         constructor(props: ICommonShadowLightPropertyGridComponentProps);

+        createShadowGenerator(): void;

         render(): JSX.Element;

     }

 }

@@ -2943,30 +3075,6 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

-    interface ITextInputLineComponentProps {

-        label: string;

-        lockObject: LockObject;

-        target?: any;

-        propertyName?: string;

-        value?: string;

-        onChange?: (value: string) => void;

-        onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

-    }

-    export class TextInputLineComponent extends React.Component<ITextInputLineComponentProps, {

-        value: string;

-    }> {

-        private _localChange;

-        constructor(props: ITextInputLineComponentProps);

-        componentWillUnmount(): void;

-        shouldComponentUpdate(nextProps: ITextInputLineComponentProps, nextState: {

-            value: string;

-        }): boolean;

-        raiseOnPropertyChanged(newValue: string, previousValue: string): void;

-        updateValue(value: string): void;

-        render(): JSX.Element;

-    }

-}

-declare module INSPECTOR {

     interface ICommonControlPropertyGridComponentProps {

         globalState: GlobalState;

         control: BABYLON.GUI.Control;

@@ -3028,16 +3136,6 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

-    export interface IButtonLineComponentProps {

-        label: string;

-        onClick: () => void;

-    }

-    export class ButtonLineComponent extends React.Component<IButtonLineComponentProps> {

-        constructor(props: IButtonLineComponentProps);

-        render(): JSX.Element;

-    }

-}

-declare module INSPECTOR {

     interface IAnimationGroupGridComponentProps {

         globalState: GlobalState;

         animationGroup: BABYLON.AnimationGroup;

@@ -3198,7 +3296,7 @@ declare module INSPECTOR {
 
     export class PBRMetallicRoughnessMaterialPropertyGridComponent extends React.Component<IPBRMetallicRoughnessMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRMetallicRoughnessMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -3213,7 +3311,7 @@ declare module INSPECTOR {
 
     export class PBRSpecularGlossinessMaterialPropertyGridComponent extends React.Component<IPBRSpecularGlossinessMaterialPropertyGridComponentProps> {

         private _onDebugSelectionChangeObservable;

         constructor(props: IPBRSpecularGlossinessMaterialPropertyGridComponentProps);

-        renderTextures(): JSX.Element | null;

+        renderTextures(): JSX.Element;

         render(): JSX.Element;

     }

 }

@@ -3405,6 +3503,20 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    interface INodeMaterialPropertyGridComponentProps {

+        globalState: GlobalState;

+        material: BABYLON.NodeMaterial;

+        lockObject: LockObject;

+        onSelectionChangedObservable?: BABYLON.Observable<any>;

+        onPropertyChangedObservable?: BABYLON.Observable<PropertyChangedEvent>;

+    }

+    export class NodeMaterialPropertyGridComponent extends React.Component<INodeMaterialPropertyGridComponentProps> {

+        constructor(props: INodeMaterialPropertyGridComponentProps);

+        edit(): void;

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

     export class PropertyGridTabComponent extends PaneComponent {

         private _timerIntervalId;

         private _lockObject;

@@ -3480,8 +3592,14 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

+    export class SettingsTabComponent extends PaneComponent {

+        constructor(props: IPaneComponentProps);

+        render(): JSX.Element;

+    }

+}

+declare module INSPECTOR {

     interface IActionTabsComponentProps {

-        scene: BABYLON.Scene;

+        scene?: BABYLON.Scene;

         noCommands?: boolean;

         noHeader?: boolean;

         noExpand?: boolean;

@@ -3489,7 +3607,7 @@ declare module INSPECTOR {
 
         popupMode?: boolean;

         onPopup?: () => void;

         onClose?: () => void;

-        globalState: GlobalState;

+        globalState?: GlobalState;

     }

     export class ActionTabsComponent extends React.Component<IActionTabsComponentProps, {

         selectedEntity: any;

@@ -3502,7 +3620,7 @@ declare module INSPECTOR {
 
         componentWillMount(): void;

         componentWillUnmount(): void;

         changeSelectedTab(index: number): void;

-        renderContent(): JSX.Element;

+        renderContent(): JSX.Element | null;

         onClose(): void;

         onPopup(): void;

         render(): JSX.Element;

@@ -3722,13 +3840,6 @@ declare module INSPECTOR {
 
     }

 }

 declare module INSPECTOR {

-    export class Tools {

-        static LookForItem(item: any, selectedEntity: any): boolean;

-        private static _RecursiveRemoveHiddenMeshesAndHoistChildren;

-        static SortAndFilter(parent: any, items: any[]): any[];

-    }

-}

-declare module INSPECTOR {

     export interface ITreeItemSelectableComponentProps {

         entity: any;

         selectedEntity?: any;

@@ -3905,11 +4016,11 @@ declare module INSPECTOR {
 
         private static _CreateSceneExplorer;

         private static _CreateActionTabs;

         private static _CreateEmbedHost;

-        private static _CreatePopup;

+        static _CreatePopup(title: string, windowVariableName: string, width?: number, height?: number): BABYLON.Nullable<HTMLDivElement>;

         static readonly IsVisible: boolean;

         static EarlyAttachToLoader(): void;

         static Show(scene: BABYLON.Scene, userOptions: Partial<BABYLON.IInspectorOptions>): void;

-        private static _CreateCanvasContainer;

+        static _CreateCanvasContainer(parentControl: HTMLElement): void;

         private static _DestroyCanvasContainer;

         private static _Cleanup;

         private static _RemoveElementFromDOM;

+ 10 - 7
dist/preview release/inspector/package.json
Visa fil 

@@ -4,7 +4,7 @@
 
     },
 
     "name": "babylonjs-inspector",
 
     "description": "The Babylon.js inspector.",
 
-    "version": "4.1.0-alpha.0",
 
+    "version": "4.1.0-alpha.13",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"
 
@@ -29,13 +29,16 @@
 
     ],
 
     "license": "Apache-2.0",
 
     "dependencies": {
 
+        "babylonjs": "4.1.0-alpha.13",
 
+        "babylonjs-gui": "4.1.0-alpha.13",
 
+        "babylonjs-loaders": "4.1.0-alpha.13",
 
+        "babylonjs-materials": "4.1.0-alpha.13",
 
+        "babylonjs-serializers": "4.1.0-alpha.13",
 
+        "babylonjs-gltf2interface": "4.1.0-alpha.13"
 
+    },
 
+    "devDependencies": {
 
         "@types/react": "~16.7.3",
 
-        "@types/react-dom": "~16.0.9",
 
-        "babylonjs": "4.1.0-alpha.0",
 
-        "babylonjs-gui": "4.1.0-alpha.0",
 
-        "babylonjs-loaders": "4.1.0-alpha.0",
 
-        "babylonjs-serializers": "4.1.0-alpha.0",
 
-        "babylonjs-gltf2interface": "4.1.0-alpha.0"
 
+        "@types/react-dom": "~16.0.9"
 
     },
 
     "engines": {
 
         "node": "*"

+ 15 - 4
dist/preview release/loaders/babylon.glTF1FileLoader.js
Visa fil 

@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/loaders/babylon.glTF1FileLoader.js.map


+ 165 - 55
dist/preview release/loaders/babylon.glTF2FileLoader.js
Visa fil 

@@ -249,6 +249,72 @@ _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].RegisterExtension(NAME, f
 
 
 /***/ }),
 
 
+/***/ "./glTF/2.0/Extensions/ExtrasAsMetadata.ts":
 
+/*!*************************************************!*\
 
+  !*** ./glTF/2.0/Extensions/ExtrasAsMetadata.ts ***!
 
+  \*************************************************/
 
+/*! exports provided: ExtrasAsMetadata */
 
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+
 
+"use strict";
 
+__webpack_require__.r(__webpack_exports__);
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return ExtrasAsMetadata; });
 
+/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../glTFLoader */ "./glTF/2.0/glTFLoader.ts");
 
+

+var NAME = "ExtrasAsMetadata";

+/**

+ * Store glTF extras (if present) in BJS objects' metadata

+ */

+var ExtrasAsMetadata = /** @class */ (function () {

+    /** @hidden */

+    function ExtrasAsMetadata(loader) {

+        /** The name of this extension. */

+        this.name = NAME;

+        /** Defines whether this extension is enabled. */

+        this.enabled = true;

+        this._loader = loader;

+    }

+    ExtrasAsMetadata.prototype._assignExtras = function (babylonObject, gltfProp) {

+        if (gltfProp.extras && Object.keys(gltfProp.extras).length > 0) {

+            var metadata = (babylonObject.metadata = babylonObject.metadata || {});

+            var gltf = (metadata.gltf = metadata.gltf || {});

+            gltf.extras = gltfProp.extras;

+        }

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.dispose = function () {

+        delete this._loader;

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.loadNodeAsync = function (context, node, assign) {

+        var _this = this;

+        return this._loader.loadNodeAsync(context, node, function (babylonTransformNode) {

+            _this._assignExtras(babylonTransformNode, node);

+            assign(babylonTransformNode);

+        });

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.loadCameraAsync = function (context, camera, assign) {

+        var _this = this;

+        return this._loader.loadCameraAsync(context, camera, function (babylonCamera) {

+            _this._assignExtras(babylonCamera, camera);

+            assign(babylonCamera);

+        });

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.createMaterial = function (context, material, babylonDrawMode) {

+        var babylonMaterial = this._loader.createMaterial(context, material, babylonDrawMode);

+        this._assignExtras(babylonMaterial, material);

+        return babylonMaterial;

+    };

+    return ExtrasAsMetadata;

+}());

+

+_glTFLoader__WEBPACK_IMPORTED_MODULE_0__["GLTFLoader"].RegisterExtension(NAME, function (loader) { return new ExtrasAsMetadata(loader); });

+
 
+
 
+/***/ }),
 
+
 
 /***/ "./glTF/2.0/Extensions/KHR_draco_mesh_compression.ts":
 
 /*!***********************************************************!*\
 
   !*** ./glTF/2.0/Extensions/KHR_draco_mesh_compression.ts ***!
 
@@ -1275,7 +1341,7 @@ _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].RegisterExtension(NAME, f
 
 /*!**************************************!*\
 
   !*** ./glTF/2.0/Extensions/index.ts ***!
 
   \**************************************/
 
-/*! exports provided: EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors */
 
+/*! exports provided: EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors, ExtrasAsMetadata */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -1310,6 +1376,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony import */ var _MSFT_sRGBFactors__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./MSFT_sRGBFactors */ "./glTF/2.0/Extensions/MSFT_sRGBFactors.ts");
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MSFT_sRGBFactors", function() { return _MSFT_sRGBFactors__WEBPACK_IMPORTED_MODULE_9__["MSFT_sRGBFactors"]; });
 
 
+/* harmony import */ var _ExtrasAsMetadata__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./ExtrasAsMetadata */ "./glTF/2.0/Extensions/ExtrasAsMetadata.ts");
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return _ExtrasAsMetadata__WEBPACK_IMPORTED_MODULE_10__["ExtrasAsMetadata"]; });
 
+
 
+

 

 

 

@@ -1359,6 +1429,7 @@ __webpack_require__.r(__webpack_exports__);
 
 

 

 

+

 /**

  * Helper class for working with arrays when loading the glTF asset

  */

@@ -2062,10 +2133,10 @@ var GLTFLoader = /** @class */ (function () {
 
         else if (primitive.targets.length !== node._numMorphTargets) {

             throw new Error(context + ": Primitives do not have the same number of targets");

         }

-        babylonMesh.morphTargetManager = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTargetManager"]();

+        babylonMesh.morphTargetManager = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTargetManager"](babylonMesh.getScene());

         for (var index = 0; index < primitive.targets.length; index++) {

             var weight = node.weights ? node.weights[index] : mesh.weights ? mesh.weights[index] : 0;

-            babylonMesh.morphTargetManager.addTarget(new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTarget"]("morphTarget" + index, weight));

+            babylonMesh.morphTargetManager.addTarget(new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTarget"]("morphTarget" + index, weight, babylonMesh.getScene()));

             // TODO: tell the target whether it has positions, normals, tangents

         }

     };

@@ -2098,28 +2169,32 @@ var GLTFLoader = /** @class */ (function () {
 
             }));

         };

         loadAttribute("POSITION", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].PositionKind, function (babylonVertexBuffer, data) {

+            var positions = new Float32Array(data.length);

             babylonVertexBuffer.forEach(data.length, function (value, index) {

-                data[index] += value;

+                positions[index] = data[index] + value;

             });

-            babylonMorphTarget.setPositions(data);

+            babylonMorphTarget.setPositions(positions);

         });

         loadAttribute("NORMAL", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].NormalKind, function (babylonVertexBuffer, data) {

-            babylonVertexBuffer.forEach(data.length, function (value, index) {

-                data[index] += value;

+            var normals = new Float32Array(data.length);

+            babylonVertexBuffer.forEach(normals.length, function (value, index) {

+                normals[index] = data[index] + value;

             });

-            babylonMorphTarget.setNormals(data);

+            babylonMorphTarget.setNormals(normals);

         });

         loadAttribute("TANGENT", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].TangentKind, function (babylonVertexBuffer, data) {

+            var tangents = new Float32Array(data.length / 3 * 4);

             var dataIndex = 0;

             babylonVertexBuffer.forEach(data.length / 3 * 4, function (value, index) {

                 // Tangent data for morph targets is stored as xyz delta.

                 // The vertexData.tangent is stored as xyzw.

                 // So we need to skip every fourth vertexData.tangent.

                 if (((index + 1) % 4) !== 0) {

-                    data[dataIndex++] += value;

+                    tangents[dataIndex] = data[dataIndex] + value;

+                    dataIndex++;

                 }

             });

-            babylonMorphTarget.setTangents(data);

+            babylonMorphTarget.setTangents(tangents);

         });

         return Promise.all(promises).then(function () { });

     };

@@ -2541,48 +2616,36 @@ var GLTFLoader = /** @class */ (function () {
 
         });

         return bufferView._data;

     };

-    GLTFLoader.prototype._loadIndicesAccessorAsync = function (context, accessor) {

-        if (accessor.type !== "SCALAR" /* SCALAR */) {

-            throw new Error(context + "/type: Invalid value " + accessor.type);

-        }

-        if (accessor.componentType !== 5121 /* UNSIGNED_BYTE */ &&

-            accessor.componentType !== 5123 /* UNSIGNED_SHORT */ &&

-            accessor.componentType !== 5125 /* UNSIGNED_INT */) {

-            throw new Error(context + "/componentType: Invalid value " + accessor.componentType);

-        }

-        if (accessor._data) {

-            return accessor._data;

-        }

-        var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-        accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

-            return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, accessor.count);

-        });

-        return accessor._data;

-    };

-    GLTFLoader.prototype._loadFloatAccessorAsync = function (context, accessor) {

-        // TODO: support normalized and stride

+    GLTFLoader.prototype._loadAccessorAsync = function (context, accessor, constructor) {

         var _this = this;

-        if (accessor.componentType !== 5126 /* FLOAT */) {

-            throw new Error("Invalid component type " + accessor.componentType);

-        }

         if (accessor._data) {

             return accessor._data;

         }

         var numComponents = GLTFLoader._GetNumComponents(context, accessor.type);

+        var byteStride = numComponents * babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].GetTypeByteLength(accessor.componentType);

         var length = numComponents * accessor.count;

         if (accessor.bufferView == undefined) {

-            accessor._data = Promise.resolve(new Float32Array(length));

+            accessor._data = Promise.resolve(new constructor(length));

         }

         else {

-            var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

-                return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, length);

+            var bufferView_1 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView_1.index, bufferView_1).then(function (data) {

+                if (accessor.componentType === 5126 /* FLOAT */ && !accessor.normalized) {

+                    return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, length);

+                }

+                else {

+                    var typedArray_1 = new constructor(length);

+                    babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].ForEach(data, accessor.byteOffset || 0, bufferView_1.byteStride || byteStride, numComponents, accessor.componentType, typedArray_1.length, accessor.normalized || false, function (value, index) {

+                        typedArray_1[index] = value;

+                    });

+                    return typedArray_1;

+                }

             });

         }

         if (accessor.sparse) {

             var sparse_1 = accessor.sparse;

-            accessor._data = accessor._data.then(function (view) {

-                var data = view;

+            accessor._data = accessor._data.then(function (data) {

+                var typedArray = data;

                 var indicesBufferView = ArrayItem.Get(context + "/sparse/indices/bufferView", _this._gltf.bufferViews, sparse_1.indices.bufferView);

                 var valuesBufferView = ArrayItem.Get(context + "/sparse/values/bufferView", _this._gltf.bufferViews, sparse_1.values.bufferView);

                 return Promise.all([

@@ -2591,20 +2654,58 @@ var GLTFLoader = /** @class */ (function () {
 
                 ]).then(function (_a) {

                     var indicesData = _a[0], valuesData = _a[1];

                     var indices = GLTFLoader._GetTypedArray(context + "/sparse/indices", sparse_1.indices.componentType, indicesData, sparse_1.indices.byteOffset, sparse_1.count);

-                    var values = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, numComponents * sparse_1.count);

+                    var sparseLength = numComponents * sparse_1.count;

+                    var values;

+                    if (accessor.componentType === 5126 /* FLOAT */ && !accessor.normalized) {

+                        values = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, sparseLength);

+                    }

+                    else {

+                        var sparseData = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, sparseLength);

+                        values = new constructor(sparseLength);

+                        babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].ForEach(sparseData, 0, byteStride, numComponents, accessor.componentType, values.length, accessor.normalized || false, function (value, index) {

+                            values[index] = value;

+                        });

+                    }

                     var valuesIndex = 0;

                     for (var indicesIndex = 0; indicesIndex < indices.length; indicesIndex++) {

                         var dataIndex = indices[indicesIndex] * numComponents;

                         for (var componentIndex = 0; componentIndex < numComponents; componentIndex++) {

-                            data[dataIndex++] = values[valuesIndex++];

+                            typedArray[dataIndex++] = values[valuesIndex++];

                         }

                     }

-                    return data;

+                    return typedArray;

                 });

             });

         }

         return accessor._data;

     };

+    GLTFLoader.prototype._loadFloatAccessorAsync = function (context, accessor) {

+        return this._loadAccessorAsync(context, accessor, Float32Array);

+    };

+    GLTFLoader.prototype._loadIndicesAccessorAsync = function (context, accessor) {

+        if (accessor.type !== "SCALAR" /* SCALAR */) {

+            throw new Error(context + "/type: Invalid value " + accessor.type);

+        }

+        if (accessor.componentType !== 5121 /* UNSIGNED_BYTE */ &&

+            accessor.componentType !== 5123 /* UNSIGNED_SHORT */ &&

+            accessor.componentType !== 5125 /* UNSIGNED_INT */) {

+            throw new Error(context + "/componentType: Invalid value " + accessor.componentType);

+        }

+        if (accessor._data) {

+            return accessor._data;

+        }

+        if (accessor.sparse) {

+            var constructor = GLTFLoader._GetTypedArrayConstructor(context + "/componentType", accessor.componentType);

+            accessor._data = this._loadAccessorAsync(context, accessor, constructor);

+        }

+        else {

+            var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

+                return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, accessor.count);

+            });

+        }

+        return accessor._data;

+    };

     GLTFLoader.prototype._loadVertexBufferViewAsync = function (bufferView, kind) {

         var _this = this;

         if (bufferView._babylonBuffer) {

@@ -2633,10 +2734,10 @@ var GLTFLoader = /** @class */ (function () {
 
             });

         }

         else {

-            var bufferView_1 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-            accessor._babylonVertexBuffer = this._loadVertexBufferViewAsync(bufferView_1, kind).then(function (babylonBuffer) {

+            var bufferView_2 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._babylonVertexBuffer = this._loadVertexBufferViewAsync(bufferView_2, kind).then(function (babylonBuffer) {

                 var size = GLTFLoader._GetNumComponents(context, accessor.type);

-                return new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"](_this._babylonScene.getEngine(), babylonBuffer, kind, false, false, bufferView_1.byteStride, false, accessor.byteOffset, size, accessor.componentType, accessor.normalized, true);

+                return new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"](_this._babylonScene.getEngine(), babylonBuffer, kind, false, false, bufferView_2.byteStride, false, accessor.byteOffset, size, accessor.componentType, accessor.normalized, true);

             });

         }

         return accessor._babylonVertexBuffer;

@@ -2856,6 +2957,9 @@ var GLTFLoader = /** @class */ (function () {
 
             return extensionPromise;

         }

         this.logOpen("" + context);

+        if (textureInfo.texCoord >= 2) {

+            throw new Error(context + "/texCoord: Invalid value (" + textureInfo.texCoord + ")");

+        }

         var texture = ArrayItem.Get(context + "/index", this._gltf.textures, textureInfo.index);

         var promise = this._loadTextureAsync("/textures/" + textureInfo.index, texture, function (babylonTexture) {

             babylonTexture.coordinatesIndex = textureInfo.texCoord || 0;

@@ -3073,19 +3177,23 @@ var GLTFLoader = /** @class */ (function () {
 
             }

         }

     };

+    GLTFLoader._GetTypedArrayConstructor = function (context, componentType) {

+        switch (componentType) {

+            case 5120 /* BYTE */: return Int8Array;

+            case 5121 /* UNSIGNED_BYTE */: return Uint8Array;

+            case 5122 /* SHORT */: return Int16Array;

+            case 5123 /* UNSIGNED_SHORT */: return Uint16Array;

+            case 5125 /* UNSIGNED_INT */: return Uint32Array;

+            case 5126 /* FLOAT */: return Float32Array;

+            default: throw new Error(context + ": Invalid component type " + componentType);

+        }

+    };

     GLTFLoader._GetTypedArray = function (context, componentType, bufferView, byteOffset, length) {

         var buffer = bufferView.buffer;

         byteOffset = bufferView.byteOffset + (byteOffset || 0);

+        var constructor = GLTFLoader._GetTypedArrayConstructor(context + "/componentType", componentType);

         try {

-            switch (componentType) {

-                case 5120 /* BYTE */: return new Int8Array(buffer, byteOffset, length);

-                case 5121 /* UNSIGNED_BYTE */: return new Uint8Array(buffer, byteOffset, length);

-                case 5122 /* SHORT */: return new Int16Array(buffer, byteOffset, length);

-                case 5123 /* UNSIGNED_SHORT */: return new Uint16Array(buffer, byteOffset, length);

-                case 5125 /* UNSIGNED_INT */: return new Uint32Array(buffer, byteOffset, length);

-                case 5126 /* FLOAT */: return new Float32Array(buffer, byteOffset, length);

-                default: throw new Error("Invalid component type " + componentType);

-            }

+            return new constructor(buffer, byteOffset, length);

         }

         catch (e) {

             throw new Error(context + ": " + e);

@@ -3339,7 +3447,7 @@ _glTFFileLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFFileLoader"]._CreateGLTF2Loade
 
 /*!***************************!*\
 
   !*** ./glTF/2.0/index.ts ***!
 
   \***************************/
 
-/*! exports provided: ArrayItem, GLTFLoader, EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors */
 
+/*! exports provided: ArrayItem, GLTFLoader, EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors, ExtrasAsMetadata */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -3370,6 +3478,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MSFT_sRGBFactors", function() { return _Extensions__WEBPACK_IMPORTED_MODULE_1__["MSFT_sRGBFactors"]; });
 
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return _Extensions__WEBPACK_IMPORTED_MODULE_1__["ExtrasAsMetadata"]; });
 
+

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/loaders/babylon.glTF2FileLoader.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/loaders/babylon.glTF2FileLoader.min.js


+ 180 - 59
dist/preview release/loaders/babylon.glTFFileLoader.js
Visa fil 

@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -2798,6 +2809,72 @@ _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].RegisterExtension(NAME, f
 
 
 /***/ }),
 
 
+/***/ "./glTF/2.0/Extensions/ExtrasAsMetadata.ts":
 
+/*!*************************************************!*\
 
+  !*** ./glTF/2.0/Extensions/ExtrasAsMetadata.ts ***!
 
+  \*************************************************/
 
+/*! exports provided: ExtrasAsMetadata */
 
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+
 
+"use strict";
 
+__webpack_require__.r(__webpack_exports__);
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return ExtrasAsMetadata; });
 
+/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../glTFLoader */ "./glTF/2.0/glTFLoader.ts");
 
+

+var NAME = "ExtrasAsMetadata";

+/**

+ * Store glTF extras (if present) in BJS objects' metadata

+ */

+var ExtrasAsMetadata = /** @class */ (function () {

+    /** @hidden */

+    function ExtrasAsMetadata(loader) {

+        /** The name of this extension. */

+        this.name = NAME;

+        /** Defines whether this extension is enabled. */

+        this.enabled = true;

+        this._loader = loader;

+    }

+    ExtrasAsMetadata.prototype._assignExtras = function (babylonObject, gltfProp) {

+        if (gltfProp.extras && Object.keys(gltfProp.extras).length > 0) {

+            var metadata = (babylonObject.metadata = babylonObject.metadata || {});

+            var gltf = (metadata.gltf = metadata.gltf || {});

+            gltf.extras = gltfProp.extras;

+        }

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.dispose = function () {

+        delete this._loader;

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.loadNodeAsync = function (context, node, assign) {

+        var _this = this;

+        return this._loader.loadNodeAsync(context, node, function (babylonTransformNode) {

+            _this._assignExtras(babylonTransformNode, node);

+            assign(babylonTransformNode);

+        });

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.loadCameraAsync = function (context, camera, assign) {

+        var _this = this;

+        return this._loader.loadCameraAsync(context, camera, function (babylonCamera) {

+            _this._assignExtras(babylonCamera, camera);

+            assign(babylonCamera);

+        });

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.createMaterial = function (context, material, babylonDrawMode) {

+        var babylonMaterial = this._loader.createMaterial(context, material, babylonDrawMode);

+        this._assignExtras(babylonMaterial, material);

+        return babylonMaterial;

+    };

+    return ExtrasAsMetadata;

+}());

+

+_glTFLoader__WEBPACK_IMPORTED_MODULE_0__["GLTFLoader"].RegisterExtension(NAME, function (loader) { return new ExtrasAsMetadata(loader); });

+
 
+
 
+/***/ }),
 
+
 
 /***/ "./glTF/2.0/Extensions/KHR_draco_mesh_compression.ts":
 
 /*!***********************************************************!*\
 
   !*** ./glTF/2.0/Extensions/KHR_draco_mesh_compression.ts ***!
 
@@ -3824,7 +3901,7 @@ _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].RegisterExtension(NAME, f
 
 /*!**************************************!*\
 
   !*** ./glTF/2.0/Extensions/index.ts ***!
 
   \**************************************/
 
-/*! exports provided: EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors */
 
+/*! exports provided: EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors, ExtrasAsMetadata */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -3859,6 +3936,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony import */ var _MSFT_sRGBFactors__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./MSFT_sRGBFactors */ "./glTF/2.0/Extensions/MSFT_sRGBFactors.ts");
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MSFT_sRGBFactors", function() { return _MSFT_sRGBFactors__WEBPACK_IMPORTED_MODULE_9__["MSFT_sRGBFactors"]; });
 
 
+/* harmony import */ var _ExtrasAsMetadata__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./ExtrasAsMetadata */ "./glTF/2.0/Extensions/ExtrasAsMetadata.ts");
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return _ExtrasAsMetadata__WEBPACK_IMPORTED_MODULE_10__["ExtrasAsMetadata"]; });
 
+
 
+

 

 

 

@@ -3908,6 +3989,7 @@ __webpack_require__.r(__webpack_exports__);
 
 

 

 

+

 /**

  * Helper class for working with arrays when loading the glTF asset

  */

@@ -4611,10 +4693,10 @@ var GLTFLoader = /** @class */ (function () {
 
         else if (primitive.targets.length !== node._numMorphTargets) {

             throw new Error(context + ": Primitives do not have the same number of targets");

         }

-        babylonMesh.morphTargetManager = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTargetManager"]();

+        babylonMesh.morphTargetManager = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTargetManager"](babylonMesh.getScene());

         for (var index = 0; index < primitive.targets.length; index++) {

             var weight = node.weights ? node.weights[index] : mesh.weights ? mesh.weights[index] : 0;

-            babylonMesh.morphTargetManager.addTarget(new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTarget"]("morphTarget" + index, weight));

+            babylonMesh.morphTargetManager.addTarget(new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTarget"]("morphTarget" + index, weight, babylonMesh.getScene()));

             // TODO: tell the target whether it has positions, normals, tangents

         }

     };

@@ -4647,28 +4729,32 @@ var GLTFLoader = /** @class */ (function () {
 
             }));

         };

         loadAttribute("POSITION", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].PositionKind, function (babylonVertexBuffer, data) {

+            var positions = new Float32Array(data.length);

             babylonVertexBuffer.forEach(data.length, function (value, index) {

-                data[index] += value;

+                positions[index] = data[index] + value;

             });

-            babylonMorphTarget.setPositions(data);

+            babylonMorphTarget.setPositions(positions);

         });

         loadAttribute("NORMAL", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].NormalKind, function (babylonVertexBuffer, data) {

-            babylonVertexBuffer.forEach(data.length, function (value, index) {

-                data[index] += value;

+            var normals = new Float32Array(data.length);

+            babylonVertexBuffer.forEach(normals.length, function (value, index) {

+                normals[index] = data[index] + value;

             });

-            babylonMorphTarget.setNormals(data);

+            babylonMorphTarget.setNormals(normals);

         });

         loadAttribute("TANGENT", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].TangentKind, function (babylonVertexBuffer, data) {

+            var tangents = new Float32Array(data.length / 3 * 4);

             var dataIndex = 0;

             babylonVertexBuffer.forEach(data.length / 3 * 4, function (value, index) {

                 // Tangent data for morph targets is stored as xyz delta.

                 // The vertexData.tangent is stored as xyzw.

                 // So we need to skip every fourth vertexData.tangent.

                 if (((index + 1) % 4) !== 0) {

-                    data[dataIndex++] += value;

+                    tangents[dataIndex] = data[dataIndex] + value;

+                    dataIndex++;

                 }

             });

-            babylonMorphTarget.setTangents(data);

+            babylonMorphTarget.setTangents(tangents);

         });

         return Promise.all(promises).then(function () { });

     };

@@ -5090,48 +5176,36 @@ var GLTFLoader = /** @class */ (function () {
 
         });

         return bufferView._data;

     };

-    GLTFLoader.prototype._loadIndicesAccessorAsync = function (context, accessor) {

-        if (accessor.type !== "SCALAR" /* SCALAR */) {

-            throw new Error(context + "/type: Invalid value " + accessor.type);

-        }

-        if (accessor.componentType !== 5121 /* UNSIGNED_BYTE */ &&

-            accessor.componentType !== 5123 /* UNSIGNED_SHORT */ &&

-            accessor.componentType !== 5125 /* UNSIGNED_INT */) {

-            throw new Error(context + "/componentType: Invalid value " + accessor.componentType);

-        }

-        if (accessor._data) {

-            return accessor._data;

-        }

-        var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-        accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

-            return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, accessor.count);

-        });

-        return accessor._data;

-    };

-    GLTFLoader.prototype._loadFloatAccessorAsync = function (context, accessor) {

-        // TODO: support normalized and stride

+    GLTFLoader.prototype._loadAccessorAsync = function (context, accessor, constructor) {

         var _this = this;

-        if (accessor.componentType !== 5126 /* FLOAT */) {

-            throw new Error("Invalid component type " + accessor.componentType);

-        }

         if (accessor._data) {

             return accessor._data;

         }

         var numComponents = GLTFLoader._GetNumComponents(context, accessor.type);

+        var byteStride = numComponents * babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].GetTypeByteLength(accessor.componentType);

         var length = numComponents * accessor.count;

         if (accessor.bufferView == undefined) {

-            accessor._data = Promise.resolve(new Float32Array(length));

+            accessor._data = Promise.resolve(new constructor(length));

         }

         else {

-            var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

-                return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, length);

+            var bufferView_1 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView_1.index, bufferView_1).then(function (data) {

+                if (accessor.componentType === 5126 /* FLOAT */ && !accessor.normalized) {

+                    return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, length);

+                }

+                else {

+                    var typedArray_1 = new constructor(length);

+                    babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].ForEach(data, accessor.byteOffset || 0, bufferView_1.byteStride || byteStride, numComponents, accessor.componentType, typedArray_1.length, accessor.normalized || false, function (value, index) {

+                        typedArray_1[index] = value;

+                    });

+                    return typedArray_1;

+                }

             });

         }

         if (accessor.sparse) {

             var sparse_1 = accessor.sparse;

-            accessor._data = accessor._data.then(function (view) {

-                var data = view;

+            accessor._data = accessor._data.then(function (data) {

+                var typedArray = data;

                 var indicesBufferView = ArrayItem.Get(context + "/sparse/indices/bufferView", _this._gltf.bufferViews, sparse_1.indices.bufferView);

                 var valuesBufferView = ArrayItem.Get(context + "/sparse/values/bufferView", _this._gltf.bufferViews, sparse_1.values.bufferView);

                 return Promise.all([

@@ -5140,20 +5214,58 @@ var GLTFLoader = /** @class */ (function () {
 
                 ]).then(function (_a) {

                     var indicesData = _a[0], valuesData = _a[1];

                     var indices = GLTFLoader._GetTypedArray(context + "/sparse/indices", sparse_1.indices.componentType, indicesData, sparse_1.indices.byteOffset, sparse_1.count);

-                    var values = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, numComponents * sparse_1.count);

+                    var sparseLength = numComponents * sparse_1.count;

+                    var values;

+                    if (accessor.componentType === 5126 /* FLOAT */ && !accessor.normalized) {

+                        values = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, sparseLength);

+                    }

+                    else {

+                        var sparseData = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, sparseLength);

+                        values = new constructor(sparseLength);

+                        babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].ForEach(sparseData, 0, byteStride, numComponents, accessor.componentType, values.length, accessor.normalized || false, function (value, index) {

+                            values[index] = value;

+                        });

+                    }

                     var valuesIndex = 0;

                     for (var indicesIndex = 0; indicesIndex < indices.length; indicesIndex++) {

                         var dataIndex = indices[indicesIndex] * numComponents;

                         for (var componentIndex = 0; componentIndex < numComponents; componentIndex++) {

-                            data[dataIndex++] = values[valuesIndex++];

+                            typedArray[dataIndex++] = values[valuesIndex++];

                         }

                     }

-                    return data;

+                    return typedArray;

                 });

             });

         }

         return accessor._data;

     };

+    GLTFLoader.prototype._loadFloatAccessorAsync = function (context, accessor) {

+        return this._loadAccessorAsync(context, accessor, Float32Array);

+    };

+    GLTFLoader.prototype._loadIndicesAccessorAsync = function (context, accessor) {

+        if (accessor.type !== "SCALAR" /* SCALAR */) {

+            throw new Error(context + "/type: Invalid value " + accessor.type);

+        }

+        if (accessor.componentType !== 5121 /* UNSIGNED_BYTE */ &&

+            accessor.componentType !== 5123 /* UNSIGNED_SHORT */ &&

+            accessor.componentType !== 5125 /* UNSIGNED_INT */) {

+            throw new Error(context + "/componentType: Invalid value " + accessor.componentType);

+        }

+        if (accessor._data) {

+            return accessor._data;

+        }

+        if (accessor.sparse) {

+            var constructor = GLTFLoader._GetTypedArrayConstructor(context + "/componentType", accessor.componentType);

+            accessor._data = this._loadAccessorAsync(context, accessor, constructor);

+        }

+        else {

+            var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

+                return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, accessor.count);

+            });

+        }

+        return accessor._data;

+    };

     GLTFLoader.prototype._loadVertexBufferViewAsync = function (bufferView, kind) {

         var _this = this;

         if (bufferView._babylonBuffer) {

@@ -5182,10 +5294,10 @@ var GLTFLoader = /** @class */ (function () {
 
             });

         }

         else {

-            var bufferView_1 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-            accessor._babylonVertexBuffer = this._loadVertexBufferViewAsync(bufferView_1, kind).then(function (babylonBuffer) {

+            var bufferView_2 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._babylonVertexBuffer = this._loadVertexBufferViewAsync(bufferView_2, kind).then(function (babylonBuffer) {

                 var size = GLTFLoader._GetNumComponents(context, accessor.type);

-                return new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"](_this._babylonScene.getEngine(), babylonBuffer, kind, false, false, bufferView_1.byteStride, false, accessor.byteOffset, size, accessor.componentType, accessor.normalized, true);

+                return new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"](_this._babylonScene.getEngine(), babylonBuffer, kind, false, false, bufferView_2.byteStride, false, accessor.byteOffset, size, accessor.componentType, accessor.normalized, true);

             });

         }

         return accessor._babylonVertexBuffer;

@@ -5405,6 +5517,9 @@ var GLTFLoader = /** @class */ (function () {
 
             return extensionPromise;

         }

         this.logOpen("" + context);

+        if (textureInfo.texCoord >= 2) {

+            throw new Error(context + "/texCoord: Invalid value (" + textureInfo.texCoord + ")");

+        }

         var texture = ArrayItem.Get(context + "/index", this._gltf.textures, textureInfo.index);

         var promise = this._loadTextureAsync("/textures/" + textureInfo.index, texture, function (babylonTexture) {

             babylonTexture.coordinatesIndex = textureInfo.texCoord || 0;

@@ -5622,19 +5737,23 @@ var GLTFLoader = /** @class */ (function () {
 
             }

         }

     };

+    GLTFLoader._GetTypedArrayConstructor = function (context, componentType) {

+        switch (componentType) {

+            case 5120 /* BYTE */: return Int8Array;

+            case 5121 /* UNSIGNED_BYTE */: return Uint8Array;

+            case 5122 /* SHORT */: return Int16Array;

+            case 5123 /* UNSIGNED_SHORT */: return Uint16Array;

+            case 5125 /* UNSIGNED_INT */: return Uint32Array;

+            case 5126 /* FLOAT */: return Float32Array;

+            default: throw new Error(context + ": Invalid component type " + componentType);

+        }

+    };

     GLTFLoader._GetTypedArray = function (context, componentType, bufferView, byteOffset, length) {

         var buffer = bufferView.buffer;

         byteOffset = bufferView.byteOffset + (byteOffset || 0);

+        var constructor = GLTFLoader._GetTypedArrayConstructor(context + "/componentType", componentType);

         try {

-            switch (componentType) {

-                case 5120 /* BYTE */: return new Int8Array(buffer, byteOffset, length);

-                case 5121 /* UNSIGNED_BYTE */: return new Uint8Array(buffer, byteOffset, length);

-                case 5122 /* SHORT */: return new Int16Array(buffer, byteOffset, length);

-                case 5123 /* UNSIGNED_SHORT */: return new Uint16Array(buffer, byteOffset, length);

-                case 5125 /* UNSIGNED_INT */: return new Uint32Array(buffer, byteOffset, length);

-                case 5126 /* FLOAT */: return new Float32Array(buffer, byteOffset, length);

-                default: throw new Error("Invalid component type " + componentType);

-            }

+            return new constructor(buffer, byteOffset, length);

         }

         catch (e) {

             throw new Error(context + ": " + e);

@@ -5888,7 +6007,7 @@ _glTFFileLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFFileLoader"]._CreateGLTF2Loade
 
 /*!***************************!*\
 
   !*** ./glTF/2.0/index.ts ***!
 
   \***************************/
 
-/*! exports provided: ArrayItem, GLTFLoader, EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors */
 
+/*! exports provided: ArrayItem, GLTFLoader, EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors, ExtrasAsMetadata */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -5919,6 +6038,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MSFT_sRGBFactors", function() { return _Extensions__WEBPACK_IMPORTED_MODULE_1__["MSFT_sRGBFactors"]; });
 
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return _Extensions__WEBPACK_IMPORTED_MODULE_1__["ExtrasAsMetadata"]; });
 
+

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/loaders/babylon.glTFFileLoader.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 2
dist/preview release/loaders/babylon.glTFFileLoader.min.js


+ 26 - 1
dist/preview release/loaders/babylonjs.loaders.d.ts
Visa fil 

@@ -1415,8 +1415,9 @@ declare module BABYLON.GLTF2 {
 
          * @returns A promise that resolves with the loaded data when the load is complete

          */

         loadBufferViewAsync(context: string, bufferView: IBufferView): Promise<ArrayBufferView>;

-        private _loadIndicesAccessorAsync;

+        private _loadAccessorAsync;

         private _loadFloatAccessorAsync;

+        private _loadIndicesAccessorAsync;

         private _loadVertexBufferViewAsync;

         private _loadVertexAccessorAsync;

         private _loadMaterialMetallicRoughnessPropertiesAsync;

@@ -1491,6 +1492,7 @@ declare module BABYLON.GLTF2 {
 
         }, pointer: string): void;

         private static _GetTextureWrapMode;

         private static _GetTextureSamplingMode;

+        private static _GetTypedArrayConstructor;

         private static _GetTypedArray;

         private static _GetNumComponents;

         private static _ValidateUri;

@@ -1779,6 +1781,29 @@ declare module BABYLON.GLTF2.Loader.Extensions {
 
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;

     }

 }

+declare module BABYLON.GLTF2.Loader.Extensions {

+    /**

+     * Store glTF extras (if present) in BJS objects' metadata

+     */

+    export class ExtrasAsMetadata implements IGLTFLoaderExtension {

+        /** The name of this extension. */

+        readonly name: string;
 
+        /** Defines whether this extension is enabled. */

+        enabled: boolean;

+        private _loader;

+        private _assignExtras;

+        /** @hidden */

+        constructor(loader: GLTFLoader);

+        /** @hidden */

+        dispose(): void;

+        /** @hidden */

+        loadNodeAsync(context: string, node: INode, assign: (babylonTransformNode: TransformNode) => void): Nullable<Promise<TransformNode>>;

+        /** @hidden */

+        loadCameraAsync(context: string, camera: ICamera, assign: (babylonCamera: Camera) => void): Nullable<Promise<Camera>>;

+        /** @hidden */

+        createMaterial(context: string, material: IMaterial, babylonDrawMode: number): Nullable<Material>;

+    }

+}

 declare module BABYLON {

     /**

      * Class reading and parsing the MTL file bundled with the obj file.

+ 180 - 59
dist/preview release/loaders/babylonjs.loaders.js
Visa fil 

@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -4140,6 +4151,72 @@ _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].RegisterExtension(NAME, f
 
 
 /***/ }),
 
 
+/***/ "./glTF/2.0/Extensions/ExtrasAsMetadata.ts":
 
+/*!*************************************************!*\
 
+  !*** ./glTF/2.0/Extensions/ExtrasAsMetadata.ts ***!
 
+  \*************************************************/
 
+/*! exports provided: ExtrasAsMetadata */
 
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+
 
+"use strict";
 
+__webpack_require__.r(__webpack_exports__);
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return ExtrasAsMetadata; });
 
+/* harmony import */ var _glTFLoader__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../glTFLoader */ "./glTF/2.0/glTFLoader.ts");
 
+

+var NAME = "ExtrasAsMetadata";

+/**

+ * Store glTF extras (if present) in BJS objects' metadata

+ */

+var ExtrasAsMetadata = /** @class */ (function () {

+    /** @hidden */

+    function ExtrasAsMetadata(loader) {

+        /** The name of this extension. */

+        this.name = NAME;

+        /** Defines whether this extension is enabled. */

+        this.enabled = true;

+        this._loader = loader;

+    }

+    ExtrasAsMetadata.prototype._assignExtras = function (babylonObject, gltfProp) {

+        if (gltfProp.extras && Object.keys(gltfProp.extras).length > 0) {

+            var metadata = (babylonObject.metadata = babylonObject.metadata || {});

+            var gltf = (metadata.gltf = metadata.gltf || {});

+            gltf.extras = gltfProp.extras;

+        }

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.dispose = function () {

+        delete this._loader;

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.loadNodeAsync = function (context, node, assign) {

+        var _this = this;

+        return this._loader.loadNodeAsync(context, node, function (babylonTransformNode) {

+            _this._assignExtras(babylonTransformNode, node);

+            assign(babylonTransformNode);

+        });

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.loadCameraAsync = function (context, camera, assign) {

+        var _this = this;

+        return this._loader.loadCameraAsync(context, camera, function (babylonCamera) {

+            _this._assignExtras(babylonCamera, camera);

+            assign(babylonCamera);

+        });

+    };

+    /** @hidden */

+    ExtrasAsMetadata.prototype.createMaterial = function (context, material, babylonDrawMode) {

+        var babylonMaterial = this._loader.createMaterial(context, material, babylonDrawMode);

+        this._assignExtras(babylonMaterial, material);

+        return babylonMaterial;

+    };

+    return ExtrasAsMetadata;

+}());

+

+_glTFLoader__WEBPACK_IMPORTED_MODULE_0__["GLTFLoader"].RegisterExtension(NAME, function (loader) { return new ExtrasAsMetadata(loader); });

+
 
+
 
+/***/ }),
 
+
 
 /***/ "./glTF/2.0/Extensions/KHR_draco_mesh_compression.ts":
 
 /*!***********************************************************!*\
 
   !*** ./glTF/2.0/Extensions/KHR_draco_mesh_compression.ts ***!
 
@@ -5166,7 +5243,7 @@ _glTFLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFLoader"].RegisterExtension(NAME, f
 
 /*!**************************************!*\
 
   !*** ./glTF/2.0/Extensions/index.ts ***!
 
   \**************************************/
 
-/*! exports provided: EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors */
 
+/*! exports provided: EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors, ExtrasAsMetadata */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -5201,6 +5278,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony import */ var _MSFT_sRGBFactors__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./MSFT_sRGBFactors */ "./glTF/2.0/Extensions/MSFT_sRGBFactors.ts");
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MSFT_sRGBFactors", function() { return _MSFT_sRGBFactors__WEBPACK_IMPORTED_MODULE_9__["MSFT_sRGBFactors"]; });
 
 
+/* harmony import */ var _ExtrasAsMetadata__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./ExtrasAsMetadata */ "./glTF/2.0/Extensions/ExtrasAsMetadata.ts");
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return _ExtrasAsMetadata__WEBPACK_IMPORTED_MODULE_10__["ExtrasAsMetadata"]; });
 
+
 
+

 

 

 

@@ -5250,6 +5331,7 @@ __webpack_require__.r(__webpack_exports__);
 
 

 

 

+

 /**

  * Helper class for working with arrays when loading the glTF asset

  */

@@ -5953,10 +6035,10 @@ var GLTFLoader = /** @class */ (function () {
 
         else if (primitive.targets.length !== node._numMorphTargets) {

             throw new Error(context + ": Primitives do not have the same number of targets");

         }

-        babylonMesh.morphTargetManager = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTargetManager"]();

+        babylonMesh.morphTargetManager = new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTargetManager"](babylonMesh.getScene());

         for (var index = 0; index < primitive.targets.length; index++) {

             var weight = node.weights ? node.weights[index] : mesh.weights ? mesh.weights[index] : 0;

-            babylonMesh.morphTargetManager.addTarget(new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTarget"]("morphTarget" + index, weight));

+            babylonMesh.morphTargetManager.addTarget(new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["MorphTarget"]("morphTarget" + index, weight, babylonMesh.getScene()));

             // TODO: tell the target whether it has positions, normals, tangents

         }

     };

@@ -5989,28 +6071,32 @@ var GLTFLoader = /** @class */ (function () {
 
             }));

         };

         loadAttribute("POSITION", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].PositionKind, function (babylonVertexBuffer, data) {

+            var positions = new Float32Array(data.length);

             babylonVertexBuffer.forEach(data.length, function (value, index) {

-                data[index] += value;

+                positions[index] = data[index] + value;

             });

-            babylonMorphTarget.setPositions(data);

+            babylonMorphTarget.setPositions(positions);

         });

         loadAttribute("NORMAL", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].NormalKind, function (babylonVertexBuffer, data) {

-            babylonVertexBuffer.forEach(data.length, function (value, index) {

-                data[index] += value;

+            var normals = new Float32Array(data.length);

+            babylonVertexBuffer.forEach(normals.length, function (value, index) {

+                normals[index] = data[index] + value;

             });

-            babylonMorphTarget.setNormals(data);

+            babylonMorphTarget.setNormals(normals);

         });

         loadAttribute("TANGENT", babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].TangentKind, function (babylonVertexBuffer, data) {

+            var tangents = new Float32Array(data.length / 3 * 4);

             var dataIndex = 0;

             babylonVertexBuffer.forEach(data.length / 3 * 4, function (value, index) {

                 // Tangent data for morph targets is stored as xyz delta.

                 // The vertexData.tangent is stored as xyzw.

                 // So we need to skip every fourth vertexData.tangent.

                 if (((index + 1) % 4) !== 0) {

-                    data[dataIndex++] += value;

+                    tangents[dataIndex] = data[dataIndex] + value;

+                    dataIndex++;

                 }

             });

-            babylonMorphTarget.setTangents(data);

+            babylonMorphTarget.setTangents(tangents);

         });

         return Promise.all(promises).then(function () { });

     };

@@ -6432,48 +6518,36 @@ var GLTFLoader = /** @class */ (function () {
 
         });

         return bufferView._data;

     };

-    GLTFLoader.prototype._loadIndicesAccessorAsync = function (context, accessor) {

-        if (accessor.type !== "SCALAR" /* SCALAR */) {

-            throw new Error(context + "/type: Invalid value " + accessor.type);

-        }

-        if (accessor.componentType !== 5121 /* UNSIGNED_BYTE */ &&

-            accessor.componentType !== 5123 /* UNSIGNED_SHORT */ &&

-            accessor.componentType !== 5125 /* UNSIGNED_INT */) {

-            throw new Error(context + "/componentType: Invalid value " + accessor.componentType);

-        }

-        if (accessor._data) {

-            return accessor._data;

-        }

-        var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-        accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

-            return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, accessor.count);

-        });

-        return accessor._data;

-    };

-    GLTFLoader.prototype._loadFloatAccessorAsync = function (context, accessor) {

-        // TODO: support normalized and stride

+    GLTFLoader.prototype._loadAccessorAsync = function (context, accessor, constructor) {

         var _this = this;

-        if (accessor.componentType !== 5126 /* FLOAT */) {

-            throw new Error("Invalid component type " + accessor.componentType);

-        }

         if (accessor._data) {

             return accessor._data;

         }

         var numComponents = GLTFLoader._GetNumComponents(context, accessor.type);

+        var byteStride = numComponents * babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].GetTypeByteLength(accessor.componentType);

         var length = numComponents * accessor.count;

         if (accessor.bufferView == undefined) {

-            accessor._data = Promise.resolve(new Float32Array(length));

+            accessor._data = Promise.resolve(new constructor(length));

         }

         else {

-            var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

-                return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, length);

+            var bufferView_1 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView_1.index, bufferView_1).then(function (data) {

+                if (accessor.componentType === 5126 /* FLOAT */ && !accessor.normalized) {

+                    return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, length);

+                }

+                else {

+                    var typedArray_1 = new constructor(length);

+                    babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].ForEach(data, accessor.byteOffset || 0, bufferView_1.byteStride || byteStride, numComponents, accessor.componentType, typedArray_1.length, accessor.normalized || false, function (value, index) {

+                        typedArray_1[index] = value;

+                    });

+                    return typedArray_1;

+                }

             });

         }

         if (accessor.sparse) {

             var sparse_1 = accessor.sparse;

-            accessor._data = accessor._data.then(function (view) {

-                var data = view;

+            accessor._data = accessor._data.then(function (data) {

+                var typedArray = data;

                 var indicesBufferView = ArrayItem.Get(context + "/sparse/indices/bufferView", _this._gltf.bufferViews, sparse_1.indices.bufferView);

                 var valuesBufferView = ArrayItem.Get(context + "/sparse/values/bufferView", _this._gltf.bufferViews, sparse_1.values.bufferView);

                 return Promise.all([

@@ -6482,20 +6556,58 @@ var GLTFLoader = /** @class */ (function () {
 
                 ]).then(function (_a) {

                     var indicesData = _a[0], valuesData = _a[1];

                     var indices = GLTFLoader._GetTypedArray(context + "/sparse/indices", sparse_1.indices.componentType, indicesData, sparse_1.indices.byteOffset, sparse_1.count);

-                    var values = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, numComponents * sparse_1.count);

+                    var sparseLength = numComponents * sparse_1.count;

+                    var values;

+                    if (accessor.componentType === 5126 /* FLOAT */ && !accessor.normalized) {

+                        values = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, sparseLength);

+                    }

+                    else {

+                        var sparseData = GLTFLoader._GetTypedArray(context + "/sparse/values", accessor.componentType, valuesData, sparse_1.values.byteOffset, sparseLength);

+                        values = new constructor(sparseLength);

+                        babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"].ForEach(sparseData, 0, byteStride, numComponents, accessor.componentType, values.length, accessor.normalized || false, function (value, index) {

+                            values[index] = value;

+                        });

+                    }

                     var valuesIndex = 0;

                     for (var indicesIndex = 0; indicesIndex < indices.length; indicesIndex++) {

                         var dataIndex = indices[indicesIndex] * numComponents;

                         for (var componentIndex = 0; componentIndex < numComponents; componentIndex++) {

-                            data[dataIndex++] = values[valuesIndex++];

+                            typedArray[dataIndex++] = values[valuesIndex++];

                         }

                     }

-                    return data;

+                    return typedArray;

                 });

             });

         }

         return accessor._data;

     };

+    GLTFLoader.prototype._loadFloatAccessorAsync = function (context, accessor) {

+        return this._loadAccessorAsync(context, accessor, Float32Array);

+    };

+    GLTFLoader.prototype._loadIndicesAccessorAsync = function (context, accessor) {

+        if (accessor.type !== "SCALAR" /* SCALAR */) {

+            throw new Error(context + "/type: Invalid value " + accessor.type);

+        }

+        if (accessor.componentType !== 5121 /* UNSIGNED_BYTE */ &&

+            accessor.componentType !== 5123 /* UNSIGNED_SHORT */ &&

+            accessor.componentType !== 5125 /* UNSIGNED_INT */) {

+            throw new Error(context + "/componentType: Invalid value " + accessor.componentType);

+        }

+        if (accessor._data) {

+            return accessor._data;

+        }

+        if (accessor.sparse) {

+            var constructor = GLTFLoader._GetTypedArrayConstructor(context + "/componentType", accessor.componentType);

+            accessor._data = this._loadAccessorAsync(context, accessor, constructor);

+        }

+        else {

+            var bufferView = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._data = this.loadBufferViewAsync("/bufferViews/" + bufferView.index, bufferView).then(function (data) {

+                return GLTFLoader._GetTypedArray(context, accessor.componentType, data, accessor.byteOffset, accessor.count);

+            });

+        }

+        return accessor._data;

+    };

     GLTFLoader.prototype._loadVertexBufferViewAsync = function (bufferView, kind) {

         var _this = this;

         if (bufferView._babylonBuffer) {

@@ -6524,10 +6636,10 @@ var GLTFLoader = /** @class */ (function () {
 
             });

         }

         else {

-            var bufferView_1 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

-            accessor._babylonVertexBuffer = this._loadVertexBufferViewAsync(bufferView_1, kind).then(function (babylonBuffer) {

+            var bufferView_2 = ArrayItem.Get(context + "/bufferView", this._gltf.bufferViews, accessor.bufferView);

+            accessor._babylonVertexBuffer = this._loadVertexBufferViewAsync(bufferView_2, kind).then(function (babylonBuffer) {

                 var size = GLTFLoader._GetNumComponents(context, accessor.type);

-                return new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"](_this._babylonScene.getEngine(), babylonBuffer, kind, false, false, bufferView_1.byteStride, false, accessor.byteOffset, size, accessor.componentType, accessor.normalized, true);

+                return new babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__["VertexBuffer"](_this._babylonScene.getEngine(), babylonBuffer, kind, false, false, bufferView_2.byteStride, false, accessor.byteOffset, size, accessor.componentType, accessor.normalized, true);

             });

         }

         return accessor._babylonVertexBuffer;

@@ -6747,6 +6859,9 @@ var GLTFLoader = /** @class */ (function () {
 
             return extensionPromise;

         }

         this.logOpen("" + context);

+        if (textureInfo.texCoord >= 2) {

+            throw new Error(context + "/texCoord: Invalid value (" + textureInfo.texCoord + ")");

+        }

         var texture = ArrayItem.Get(context + "/index", this._gltf.textures, textureInfo.index);

         var promise = this._loadTextureAsync("/textures/" + textureInfo.index, texture, function (babylonTexture) {

             babylonTexture.coordinatesIndex = textureInfo.texCoord || 0;

@@ -6964,19 +7079,23 @@ var GLTFLoader = /** @class */ (function () {
 
             }

         }

     };

+    GLTFLoader._GetTypedArrayConstructor = function (context, componentType) {

+        switch (componentType) {

+            case 5120 /* BYTE */: return Int8Array;

+            case 5121 /* UNSIGNED_BYTE */: return Uint8Array;

+            case 5122 /* SHORT */: return Int16Array;

+            case 5123 /* UNSIGNED_SHORT */: return Uint16Array;

+            case 5125 /* UNSIGNED_INT */: return Uint32Array;

+            case 5126 /* FLOAT */: return Float32Array;

+            default: throw new Error(context + ": Invalid component type " + componentType);

+        }

+    };

     GLTFLoader._GetTypedArray = function (context, componentType, bufferView, byteOffset, length) {

         var buffer = bufferView.buffer;

         byteOffset = bufferView.byteOffset + (byteOffset || 0);

+        var constructor = GLTFLoader._GetTypedArrayConstructor(context + "/componentType", componentType);

         try {

-            switch (componentType) {

-                case 5120 /* BYTE */: return new Int8Array(buffer, byteOffset, length);

-                case 5121 /* UNSIGNED_BYTE */: return new Uint8Array(buffer, byteOffset, length);

-                case 5122 /* SHORT */: return new Int16Array(buffer, byteOffset, length);

-                case 5123 /* UNSIGNED_SHORT */: return new Uint16Array(buffer, byteOffset, length);

-                case 5125 /* UNSIGNED_INT */: return new Uint32Array(buffer, byteOffset, length);

-                case 5126 /* FLOAT */: return new Float32Array(buffer, byteOffset, length);

-                default: throw new Error("Invalid component type " + componentType);

-            }

+            return new constructor(buffer, byteOffset, length);

         }

         catch (e) {

             throw new Error(context + ": " + e);

@@ -7230,7 +7349,7 @@ _glTFFileLoader__WEBPACK_IMPORTED_MODULE_1__["GLTFFileLoader"]._CreateGLTF2Loade
 
 /*!***************************!*\
 
   !*** ./glTF/2.0/index.ts ***!
 
   \***************************/
 
-/*! exports provided: ArrayItem, GLTFLoader, EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors */
 
+/*! exports provided: ArrayItem, GLTFLoader, EXT_lights_image_based, KHR_draco_mesh_compression, KHR_lights, KHR_materials_pbrSpecularGlossiness, KHR_materials_unlit, KHR_texture_transform, MSFT_audio_emitter, MSFT_lod, MSFT_minecraftMesh, MSFT_sRGBFactors, ExtrasAsMetadata */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -7261,6 +7380,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MSFT_sRGBFactors", function() { return _Extensions__WEBPACK_IMPORTED_MODULE_1__["MSFT_sRGBFactors"]; });
 
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ExtrasAsMetadata", function() { return _Extensions__WEBPACK_IMPORTED_MODULE_1__["ExtrasAsMetadata"]; });
 
+

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/loaders/babylonjs.loaders.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 2
dist/preview release/loaders/babylonjs.loaders.min.js


+ 61 - 3
dist/preview release/loaders/babylonjs.loaders.module.d.ts
Visa fil 

@@ -1319,7 +1319,6 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoaderExtension" {
 
 }

 declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {

     import { Nullable } from "babylonjs/types";

-    import { IAnimatable } from "babylonjs/Misc/tools";

     import { Camera } from "babylonjs/Cameras/camera";

     import { AnimationGroup } from "babylonjs/Animations/animationGroup";

     import { Skeleton } from "babylonjs/Bones/skeleton";

@@ -1335,6 +1334,7 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
     import { IGLTF, INode, IScene, IMesh, ICamera, IAnimation, IAnimationChannel, IBufferView, IMaterial, ITextureInfo, IImage, IMeshPrimitive, IArrayItem as IArrItem } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";

     import { IGLTFLoaderExtension } from "babylonjs-loaders/glTF/2.0/glTFLoaderExtension";

     import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData } from "babylonjs-loaders/glTF/glTFFileLoader";

+    import { IAnimatable } from 'babylonjs/Animations/animatable.interface';

     /**

      * Helper class for working with arrays when loading the glTF asset

      */

@@ -1502,8 +1502,9 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
          * @returns A promise that resolves with the loaded data when the load is complete

          */

         loadBufferViewAsync(context: string, bufferView: IBufferView): Promise<ArrayBufferView>;

-        private _loadIndicesAccessorAsync;

+        private _loadAccessorAsync;

         private _loadFloatAccessorAsync;

+        private _loadIndicesAccessorAsync;

         private _loadVertexBufferViewAsync;

         private _loadVertexAccessorAsync;

         private _loadMaterialMetallicRoughnessPropertiesAsync;

@@ -1578,6 +1579,7 @@ declare module "babylonjs-loaders/glTF/2.0/glTFLoader" {
 
         }, pointer: string): void;

         private static _GetTextureWrapMode;

         private static _GetTextureSamplingMode;

+        private static _GetTypedArrayConstructor;

         private static _GetTypedArray;

         private static _GetNumComponents;

         private static _ValidateUri;

@@ -1922,6 +1924,36 @@ declare module "babylonjs-loaders/glTF/2.0/Extensions/MSFT_sRGBFactors" {
 
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;

     }

 }

+declare module "babylonjs-loaders/glTF/2.0/Extensions/ExtrasAsMetadata" {

+    import { Nullable } from "babylonjs/types";

+    import { TransformNode } from "babylonjs/Meshes/transformNode";

+    import { Camera } from "babylonjs/Cameras/camera";

+    import { INode, ICamera, IMaterial } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";

+    import { IGLTFLoaderExtension } from "babylonjs-loaders/glTF/2.0/glTFLoaderExtension";

+    import { GLTFLoader } from "babylonjs-loaders/glTF/2.0/glTFLoader";

+    import { Material } from "babylonjs/Materials/material";

+    /**

+     * Store glTF extras (if present) in BJS objects' metadata

+     */

+    export class ExtrasAsMetadata implements IGLTFLoaderExtension {

+        /** The name of this extension. */

+        readonly name: string;
 
+        /** Defines whether this extension is enabled. */

+        enabled: boolean;

+        private _loader;

+        private _assignExtras;

+        /** @hidden */

+        constructor(loader: GLTFLoader);

+        /** @hidden */

+        dispose(): void;

+        /** @hidden */

+        loadNodeAsync(context: string, node: INode, assign: (babylonTransformNode: TransformNode) => void): Nullable<Promise<TransformNode>>;

+        /** @hidden */

+        loadCameraAsync(context: string, camera: ICamera, assign: (babylonCamera: Camera) => void): Nullable<Promise<Camera>>;

+        /** @hidden */

+        createMaterial(context: string, material: IMaterial, babylonDrawMode: number): Nullable<Material>;

+    }

+}

 declare module "babylonjs-loaders/glTF/2.0/Extensions/index" {

     export * from "babylonjs-loaders/glTF/2.0/Extensions/EXT_lights_image_based";

     export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_draco_mesh_compression";

@@ -1933,6 +1965,7 @@ declare module "babylonjs-loaders/glTF/2.0/Extensions/index" {
 
     export * from "babylonjs-loaders/glTF/2.0/Extensions/MSFT_lod";

     export * from "babylonjs-loaders/glTF/2.0/Extensions/MSFT_minecraftMesh";

     export * from "babylonjs-loaders/glTF/2.0/Extensions/MSFT_sRGBFactors";

+    export * from "babylonjs-loaders/glTF/2.0/Extensions/ExtrasAsMetadata";

 }

 declare module "babylonjs-loaders/glTF/2.0/index" {

     export * from "babylonjs-loaders/glTF/2.0/glTFLoader";

@@ -3716,8 +3749,9 @@ declare module BABYLON.GLTF2 {
 
          * @returns A promise that resolves with the loaded data when the load is complete

          */

         loadBufferViewAsync(context: string, bufferView: IBufferView): Promise<ArrayBufferView>;

-        private _loadIndicesAccessorAsync;

+        private _loadAccessorAsync;

         private _loadFloatAccessorAsync;

+        private _loadIndicesAccessorAsync;

         private _loadVertexBufferViewAsync;

         private _loadVertexAccessorAsync;

         private _loadMaterialMetallicRoughnessPropertiesAsync;

@@ -3792,6 +3826,7 @@ declare module BABYLON.GLTF2 {
 
         }, pointer: string): void;

         private static _GetTextureWrapMode;

         private static _GetTextureSamplingMode;

+        private static _GetTypedArrayConstructor;

         private static _GetTypedArray;

         private static _GetNumComponents;

         private static _ValidateUri;

@@ -4080,6 +4115,29 @@ declare module BABYLON.GLTF2.Loader.Extensions {
 
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;

     }

 }

+declare module BABYLON.GLTF2.Loader.Extensions {

+    /**

+     * Store glTF extras (if present) in BJS objects' metadata

+     */

+    export class ExtrasAsMetadata implements IGLTFLoaderExtension {

+        /** The name of this extension. */

+        readonly name: string;
 
+        /** Defines whether this extension is enabled. */

+        enabled: boolean;

+        private _loader;

+        private _assignExtras;

+        /** @hidden */

+        constructor(loader: GLTFLoader);

+        /** @hidden */

+        dispose(): void;

+        /** @hidden */

+        loadNodeAsync(context: string, node: INode, assign: (babylonTransformNode: TransformNode) => void): Nullable<Promise<TransformNode>>;

+        /** @hidden */

+        loadCameraAsync(context: string, camera: ICamera, assign: (babylonCamera: Camera) => void): Nullable<Promise<Camera>>;

+        /** @hidden */

+        createMaterial(context: string, material: IMaterial, babylonDrawMode: number): Nullable<Material>;

+    }

+}

 declare module BABYLON {

     /**

      * Class reading and parsing the MTL file bundled with the obj file.

+ 3 - 3
dist/preview release/loaders/package.json
Visa fil 

@@ -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": "4.1.0-alpha.0",
 
+    "version": "4.1.0-alpha.13",
 
     "repository": {
 
         "type": "git",
 
         "url": "https://github.com/BabylonJS/Babylon.js.git"
 
@@ -28,8 +28,8 @@
 
     ],
 
     "license": "Apache-2.0",
 
     "dependencies": {
 
-        "babylonjs-gltf2interface": "4.1.0-alpha.0",
 
-        "babylonjs": "4.1.0-alpha.0"
 
+        "babylonjs-gltf2interface": "4.1.0-alpha.13",
 
+        "babylonjs": "4.1.0-alpha.13"
 
     },
 
     "engines": {
 
         "node": "*"

+ 21 - 10
dist/preview release/materialsLibrary/babylon.cellMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -355,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cellPixelShader", function() { return cellPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -388,7 +399,7 @@ var cellPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cellVertexShader", function() { return cellVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -422,7 +433,7 @@ var cellVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CellMaterial", function() { return CellMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _cell_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./cell.fragment */ "./cell/cell.fragment.ts");
 
 /* harmony import */ var _cell_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./cell.vertex */ "./cell/cell.vertex.ts");
 
@@ -762,14 +773,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.cellMaterial.js.map


+ 20 - 9
dist/preview release/materialsLibrary/babylon.customMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -358,7 +369,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ShaderSpecialParts", function() { return ShaderSpecialParts; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CustomMaterial", function() { return CustomMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__);
 
 

 

@@ -593,7 +604,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ShaderAlebdoParts", function() { return ShaderAlebdoParts; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PBRCustomMaterial", function() { return PBRCustomMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_1__);
 
 

 

@@ -830,14 +841,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.customMaterial.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.customMaterial.min.js


+ 21 - 10
dist/preview release/materialsLibrary/babylon.fireMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -355,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "firePixelShader", function() { return firePixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -382,7 +393,7 @@ var firePixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fireVertexShader", function() { return fireVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -413,7 +424,7 @@ var fireVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FireMaterial", function() { return FireMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _fire_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fire.fragment */ "./fire/fire.fragment.ts");
 
 /* harmony import */ var _fire_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fire.vertex */ "./fire/fire.vertex.ts");
 
@@ -793,14 +804,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.fireMaterial.js.map


+ 22 - 10
dist/preview release/materialsLibrary/babylon.furMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -355,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "furPixelShader", function() { return furPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -388,7 +399,7 @@ var furPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "furVertexShader", function() { return furVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -422,7 +433,7 @@ var furVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FurMaterial", function() { return FurMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _fur_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fur.fragment */ "./fur/fur.fragment.ts");
 
 /* harmony import */ var _fur_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fur.vertex */ "./fur/fur.vertex.ts");
 
@@ -442,6 +453,7 @@ __webpack_require__.r(__webpack_exports__);
 
 

 

 

+

 var FurMaterialDefines = /** @class */ (function (_super) {

     tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FurMaterialDefines, _super);

     function FurMaterialDefines() {

@@ -951,14 +963,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.furMaterial.js.map


+ 21 - 10
dist/preview release/materialsLibrary/babylon.gradientMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -355,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gradientPixelShader", function() { return gradientPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -388,7 +399,7 @@ var gradientPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gradientVertexShader", function() { return gradientVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -422,7 +433,7 @@ var gradientVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GradientMaterial", function() { return GradientMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _gradient_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./gradient.fragment */ "./gradient/gradient.fragment.ts");
 
 /* harmony import */ var _gradient_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./gradient.vertex */ "./gradient/gradient.vertex.ts");
 
@@ -731,14 +742,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.gradientMaterial.js.map


+ 22 - 10
dist/preview release/materialsLibrary/babylon.gridMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -355,7 +366,7 @@ module.exports = g;
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gridPixelShader", function() { return gridPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -379,7 +390,7 @@ var gridPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gridVertexShader", function() { return gridVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -404,7 +415,7 @@ var gridVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GridMaterial", function() { return GridMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _grid_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./grid.fragment */ "./grid/grid.fragment.ts");
 
 /* harmony import */ var _grid_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./grid.vertex */ "./grid/grid.vertex.ts");
 
@@ -419,6 +430,7 @@ __webpack_require__.r(__webpack_exports__);
 
 

 

 

+

 var GridMaterialDefines = /** @class */ (function (_super) {

     tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GridMaterialDefines, _super);

     function GridMaterialDefines() {

@@ -698,14 +710,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.gridMaterial.js.map


+ 21 - 10
dist/preview release/materialsLibrary/babylon.lavaMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -372,7 +383,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lavaPixelShader", function() { return lavaPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -405,7 +416,7 @@ var lavaPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lavaVertexShader", function() { return lavaVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -439,7 +450,7 @@ var lavaVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LavaMaterial", function() { return LavaMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _lava_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./lava.fragment */ "./lava/lava.fragment.ts");
 
 /* harmony import */ var _lava_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./lava.vertex */ "./lava/lava.vertex.ts");
 
@@ -850,14 +861,14 @@ if (typeof globalObject !== "undefined") {
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.lavaMaterial.js.map


+ 21 - 10
dist/preview release/materialsLibrary/babylon.mixMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -401,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mixPixelShader", function() { return mixPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -434,7 +445,7 @@ var mixPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mixVertexShader", function() { return mixVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -468,7 +479,7 @@ var mixVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MixMaterial", function() { return MixMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _mix_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./mix.fragment */ "./mix/mix.fragment.ts");
 
 /* harmony import */ var _mix_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./mix.vertex */ "./mix/mix.vertex.ts");
 
@@ -955,14 +966,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
dist/preview release/materialsLibrary/babylon.mixMaterial.js.map


+ 21 - 10
dist/preview release/materialsLibrary/babylon.normalMaterial.js
Visa fil 

@@ -7,7 +7,7 @@
 
 		exports["babylonjs-materials"] = factory(require("babylonjs"));
 
 	else
 
 		root["MATERIALS"] = factory(root["BABYLON"]);
 
-})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__) {
 
+})((typeof self !== "undefined" ? self : typeof global !== "undefined" ? global : this), function(__WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__) {
 
 return /******/ (function(modules) { // webpackBootstrap
 
 /******/ 	// The module cache
 
 /******/ 	var installedModules = {};
 
@@ -98,9 +98,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ "../../node_modules/tslib/tslib.es6.js":
 
 /*!***********************************************************!*\
 
-  !*** E:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
+  !*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
 
   \***********************************************************/
 
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
+/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
 
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 
 "use strict";
 
@@ -117,6 +117,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
 
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
 
@@ -169,8 +170,10 @@ function __rest(s, e) {
 
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

         t[p] = s[p];

     if (s != null && typeof Object.getOwnPropertySymbols === "function")

-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)

-            t[p[i]] = s[p[i]];

+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {

+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))

+                t[p[i]] = s[p[i]];

+        }

     return t;

 }

 

@@ -264,6 +267,14 @@ function __spread() {
 
     return ar;

 }

 

+function __spreadArrays() {

+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;

+    for (var r = Array(s), k = 0, i = 0; i < il; i++)

+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)

+            r[k] = a[j];

+    return r;

+};

+

 function __await(v) {

     return this instanceof __await ? (this.v = v, this) : new __await(v);

 }

@@ -401,7 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "normalPixelShader", function() { return normalPixelShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -434,7 +445,7 @@ var normalPixelShader = { name: name, shader: shader };
 
 "use strict";
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "normalVertexShader", function() { return normalVertexShader; });
 
-/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! babylonjs/Materials/effect */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Materials_effect__WEBPACK_IMPORTED_MODULE_0__);
 
 

 

@@ -468,7 +479,7 @@ var normalVertexShader = { name: name, shader: shader };
 
 __webpack_require__.r(__webpack_exports__);
 
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NormalMaterial", function() { return NormalMaterial; });
 
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
 
-/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Materials/effect");
 
+/* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! babylonjs/Misc/decorators */ "babylonjs/Misc/decorators");
 
 /* harmony import */ var babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__);
 
 /* harmony import */ var _normal_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./normal.fragment */ "./normal/normal.fragment.ts");
 
 /* harmony import */ var _normal_vertex__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./normal.vertex */ "./normal/normal.vertex.ts");
 
@@ -795,14 +806,14 @@ babylonjs_Misc_decorators__WEBPACK_IMPORTED_MODULE_1__["_TypeStore"].RegisteredT
 
 
 /***/ }),
 
 
-/***/ "babylonjs/Materials/effect":
 
+/***/ "babylonjs/Misc/decorators":
 
 /*!****************************************************************************************************!*\
 
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!
 
   \****************************************************************************************************/
 
 /*! no static exports found */
 
 /***/ (function(module, exports) {
 
 
-module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Materials_effect__;
 
+module.exports = __WEBPACK_EXTERNAL_MODULE_babylonjs_Misc_decorators__;
 
 
 /***/ })

+ 0 - 0
dist/preview release/materialsLibrary/babylon.normalMaterial.js.map
Visa fil


Vissa filer visades inte eftersom för många filer har ändrats