瀏覽代碼

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

Popov72 5 年之前
父節點
當前提交
2ab1140b54
共有 100 個文件被更改,包括 24 次插入7 次删除
  1. 15 1
      .vscode/launch.json
  2. 2 1
      Playground/debug.html
  3. 2 1
      Playground/frame.html
  4. 2 1
      Playground/full.html
  5. 1 1
      Playground/index.html
  6. 1 1
      Playground/indexStable.html
  7. 1 1
      Playground/indexWebGPU.html
  8. 二進制
      Playground/textures/360photo.jpg
  9. 二進制
      Playground/textures/BJS-logo_v3.png
  10. 二進制
      Playground/textures/DemageFont.png
  11. 二進制
      Playground/textures/Dot.png
  12. 二進制
      Playground/textures/Fire_SpriteSheet1_8x8.png
  13. 二進制
      Playground/textures/Fire_SpriteSheet2_8x8.png
  14. 二進制
      Playground/textures/Fire_SpriteSheet3_8x8.png
  15. 二進制
      Playground/textures/Fire_SpriteSheet_8x8.png
  16. 二進制
      Playground/textures/FlameBlastSpriteSheet.png
  17. 二進制
      Playground/textures/Flare2.png
  18. 二進制
      Playground/textures/FlashParticle.png
  19. 二進制
      Playground/textures/GatonaParkWalkway1_Panorama_4Kx2K.jpg
  20. 二進制
      Playground/textures/Logo.png
  21. 二進制
      Playground/textures/ParallaxDiffuse.png
  22. 二進制
      Playground/textures/ParallaxNormal.png
  23. 二進制
      Playground/textures/Rain.png
  24. 二進制
      Playground/textures/Smoke_SpriteSheet_8x8.png
  25. 二進制
      Playground/textures/Space/space_back.jpg
  26. 二進制
      Playground/textures/Space/space_down.jpg
  27. 二進制
      Playground/textures/Space/space_front.jpg
  28. 二進制
      Playground/textures/Space/space_left.jpg
  29. 二進制
      Playground/textures/Space/space_right.jpg
  30. 二進制
      Playground/textures/Space/space_up.jpg
  31. 二進制
      Playground/textures/Spark.png
  32. 二進制
      Playground/textures/SunDiffuse.png
  33. 二進制
      Playground/textures/TropicalSunnyDay_nx.jpg
  34. 二進制
      Playground/textures/TropicalSunnyDay_ny.jpg
  35. 二進制
      Playground/textures/TropicalSunnyDay_nz.jpg
  36. 二進制
      Playground/textures/TropicalSunnyDay_px.jpg
  37. 二進制
      Playground/textures/TropicalSunnyDay_py.jpg
  38. 二進制
      Playground/textures/TropicalSunnyDay_pz.jpg
  39. 二進制
      Playground/textures/WhiteTransarentRamp.png
  40. 二進制
      Playground/textures/albedo.png
  41. 二進制
      Playground/textures/amiga.jpg
  42. 二進制
      Playground/textures/bloc.jpg
  43. 二進制
      Playground/textures/candleopacity.png
  44. 二進制
      Playground/textures/checkerBJS.png
  45. 二進制
      Playground/textures/co.png
  46. 二進制
      Playground/textures/colorGrade-highContrast.png
  47. 二進制
      Playground/textures/colorGrade-inverted.png
  48. 二進制
      Playground/textures/colorGrade-posterize.png
  49. 二進制
      Playground/textures/colorGrade.png
  50. 二進制
      Playground/textures/crate.png
  51. 二進制
      Playground/textures/cubemapDebug/_nx.jpg
  52. 二進制
      Playground/textures/cubemapDebug/_ny.jpg
  53. 二進制
      Playground/textures/cubemapDebug/_nz.jpg
  54. 二進制
      Playground/textures/cubemapDebug/_px.jpg
  55. 二進制
      Playground/textures/cubemapDebug/_py.jpg
  56. 二進制
      Playground/textures/cubemapDebug/_pz.jpg
  57. 二進制
      Playground/textures/customProceduralTextures/land/textures/dirt.jpg
  58. 二進制
      Playground/textures/customProceduralTextures/land/textures/grass.png
  59. 二進制
      Playground/textures/detailmap.png
  60. 二進制
      Playground/textures/distortion.png
  61. 二進制
      Playground/textures/down.png
  62. 二進制
      Playground/textures/earth.jpg
  63. 二進制
      Playground/textures/earthnormal.jpg
  64. 二進制
      Playground/textures/equirectangular.jpg
  65. 二進制
      Playground/textures/fan.png
  66. 二進制
      Playground/textures/fire.jpg
  67. 二進制
      Playground/textures/fire.png
  68. 二進制
      Playground/textures/fire/diffuse.png
  69. 二進制
      Playground/textures/fire/distortion.png
  70. 二進制
      Playground/textures/fire/opacity.png
  71. 二進制
      Playground/textures/flare.png
  72. 二進制
      Playground/textures/flare3.png
  73. 二進制
      Playground/textures/floor.png
  74. 二進制
      Playground/textures/floor_bump.PNG
  75. 二進制
      Playground/textures/fur.jpg
  76. 二進制
      Playground/textures/grass.jpg
  77. 二進制
      Playground/textures/grass.png
  78. 二進制
      Playground/textures/grassn.png
  79. 二進制
      Playground/textures/ground.jpg
  80. 二進制
      Playground/textures/gui/backgroundImage-vertical.png
  81. 二進制
      Playground/textures/gui/backgroundImage.png
  82. 二進制
      Playground/textures/gui/thumb.png
  83. 二進制
      Playground/textures/gui/valueImage-vertical.png
  84. 二進制
      Playground/textures/gui/valueImage.png
  85. 二進制
      Playground/textures/heightMap.png
  86. 二進制
      Playground/textures/heightMapTriPlanar.png
  87. 二進制
      Playground/textures/hollow.png
  88. 二進制
      Playground/textures/icons/Back.png
  89. 二進制
      Playground/textures/icons/Crop.png
  90. 二進制
      Playground/textures/icons/Delete.png
  91. 二進制
      Playground/textures/icons/Dot.png
  92. 二進制
      Playground/textures/icons/Download.png
  93. 二進制
      Playground/textures/icons/Edit.png
  94. 二進制
      Playground/textures/icons/GearIcon.png
  95. 二進制
      Playground/textures/icons/Open.png
  96. 二進制
      Playground/textures/icons/Pause.png
  97. 二進制
      Playground/textures/icons/Play.png
  98. 二進制
      Playground/textures/icons/Redo.png
  99. 二進制
      Playground/textures/icons/Refresh.png
  100. 0 0
      Playground/textures/icons/Save.png

+ 15 - 1
.vscode/launch.json

@@ -45,7 +45,21 @@
             "name": "Launch sandbox (Chrome)",
             "type": "chrome",
             "request": "launch",
-            "url": "http://localhost:1338/sandbox/index-local.html",
+            "url": "http://localhost:1338/sandbox/public/index-local.html",
+            "webRoot": "${workspaceRoot}/",
+            "sourceMaps": true,
+            "preLaunchTask": "run",
+            "userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
+            "runtimeArgs": [
+                "--enable-unsafe-es3-apis"
+            ]
+        },
+        {
+            "name": "Launch sandbox (Edge)",
+            "type": "edge",
+            "version": "dev",
+            "request": "launch",
+            "url": "http://localhost:1338/sandbox/public/index-local.html",
             "webRoot": "${workspaceRoot}/",
             "sourceMaps": true,
             "preLaunchTask": "run",

+ 2 - 1
Playground/debug.html

@@ -57,7 +57,6 @@
         <script src="https://preview.babylonjs.com/libktx.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>
         <!-- Babylon.js -->
         <script src="https://preview.babylonjs.com/materialsLibrary/babylon.fireMaterial.min.js"></script>
@@ -100,6 +99,8 @@
 
         <script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.js"></script>
 
+        <script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
+
         <!-- Extensions -->
         <script
             src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"

+ 2 - 1
Playground/frame.html

@@ -28,7 +28,6 @@
         <script src="https://preview.babylonjs.com/earcut.min.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>
         <!-- Babylon.js -->
         <script src="https://preview.babylonjs.com/materialsLibrary/babylon.fireMaterial.min.js"></script>
@@ -71,6 +70,8 @@
 
         <script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>
 
+        <script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
+
         <!-- Extensions -->
         <script
             src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"

+ 2 - 1
Playground/full.html

@@ -18,7 +18,6 @@
         <script src="https://preview.babylonjs.com/libktx.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">
@@ -26,6 +25,8 @@
         <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/inspector/babylon.inspector.bundle.js"></script>
+
         <!-- Extensions -->
         <script
             src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"

+ 1 - 1
Playground/index.html

@@ -407,7 +407,6 @@
         <!-- 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/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">
@@ -415,6 +414,7 @@
         <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>
+        <script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
 
          <!-- Dependencies -->
          <script src="https://preview.babylonjs.com/ammo.js"></script>

+ 1 - 1
Playground/indexStable.html

@@ -387,12 +387,12 @@
         <!-- Babylon.js -->
         <script src="https://cdn.babylonjs.com/babylon.js"></script>
         <script src="https://cdn.babylonjs.com/gui/babylon.gui.min.js"></script>
-        <script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
         <script src="https://cdn.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
         <script src="https://cdn.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>
         <script src="https://cdn.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
         <script src="https://cdn.babylonjs.com/loaders/babylonjs.loaders.js"></script>
         <script src="https://cdn.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>
+        <script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
 
         <!-- Monaco -->
         <script src="/node_modules/monaco-editor/dev/vs/loader.js"></script>

+ 1 - 1
Playground/indexWebGPU.html

@@ -33,13 +33,13 @@
         <script src="https://preview.babylonjs.com/glslang/glslang.js"></script>
         <script src="/js/babylonWebGpu.max.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.min.js"></script>
         <script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>
+        <script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
 
         <!-- Monaco -->
         <script src="/node_modules/monaco-editor/min/vs/loader.js"></script>

二進制
Playground/textures/360photo.jpg


二進制
Playground/textures/BJS-logo_v3.png


二進制
Playground/textures/DemageFont.png


二進制
Playground/textures/Dot.png


二進制
Playground/textures/Fire_SpriteSheet1_8x8.png


二進制
Playground/textures/Fire_SpriteSheet2_8x8.png


二進制
Playground/textures/Fire_SpriteSheet3_8x8.png


二進制
Playground/textures/Fire_SpriteSheet_8x8.png


二進制
Playground/textures/FlameBlastSpriteSheet.png


二進制
Playground/textures/Flare2.png


二進制
Playground/textures/FlashParticle.png


二進制
Playground/textures/GatonaParkWalkway1_Panorama_4Kx2K.jpg


二進制
Playground/textures/Logo.png


二進制
Playground/textures/ParallaxDiffuse.png


二進制
Playground/textures/ParallaxNormal.png


二進制
Playground/textures/Rain.png


二進制
Playground/textures/Smoke_SpriteSheet_8x8.png


二進制
Playground/textures/Space/space_back.jpg


二進制
Playground/textures/Space/space_down.jpg


二進制
Playground/textures/Space/space_front.jpg


二進制
Playground/textures/Space/space_left.jpg


二進制
Playground/textures/Space/space_right.jpg


二進制
Playground/textures/Space/space_up.jpg


二進制
Playground/textures/Spark.png


二進制
Playground/textures/SunDiffuse.png


二進制
Playground/textures/TropicalSunnyDay_nx.jpg


二進制
Playground/textures/TropicalSunnyDay_ny.jpg


二進制
Playground/textures/TropicalSunnyDay_nz.jpg


二進制
Playground/textures/TropicalSunnyDay_px.jpg


二進制
Playground/textures/TropicalSunnyDay_py.jpg


二進制
Playground/textures/TropicalSunnyDay_pz.jpg


二進制
Playground/textures/WhiteTransarentRamp.png


二進制
Playground/textures/albedo.png


二進制
Playground/textures/amiga.jpg


二進制
Playground/textures/bloc.jpg


二進制
Playground/textures/candleopacity.png


二進制
Playground/textures/checkerBJS.png


二進制
Playground/textures/co.png


二進制
Playground/textures/colorGrade-highContrast.png


二進制
Playground/textures/colorGrade-inverted.png


二進制
Playground/textures/colorGrade-posterize.png


二進制
Playground/textures/colorGrade.png


二進制
Playground/textures/crate.png


二進制
Playground/textures/cubemapDebug/_nx.jpg


二進制
Playground/textures/cubemapDebug/_ny.jpg


二進制
Playground/textures/cubemapDebug/_nz.jpg


二進制
Playground/textures/cubemapDebug/_px.jpg


二進制
Playground/textures/cubemapDebug/_py.jpg


二進制
Playground/textures/cubemapDebug/_pz.jpg


二進制
Playground/textures/customProceduralTextures/land/textures/dirt.jpg


二進制
Playground/textures/customProceduralTextures/land/textures/grass.png


二進制
Playground/textures/detailmap.png


二進制
Playground/textures/distortion.png


二進制
Playground/textures/down.png


二進制
Playground/textures/earth.jpg


二進制
Playground/textures/earthnormal.jpg


二進制
Playground/textures/equirectangular.jpg


二進制
Playground/textures/fan.png


二進制
Playground/textures/fire.jpg


二進制
Playground/textures/fire.png


二進制
Playground/textures/fire/diffuse.png


二進制
Playground/textures/fire/distortion.png


二進制
Playground/textures/fire/opacity.png


二進制
Playground/textures/flare.png


二進制
Playground/textures/flare3.png


二進制
Playground/textures/floor.png


二進制
Playground/textures/floor_bump.PNG


二進制
Playground/textures/fur.jpg


二進制
Playground/textures/grass.jpg


二進制
Playground/textures/grass.png


二進制
Playground/textures/grassn.png


二進制
Playground/textures/ground.jpg


二進制
Playground/textures/gui/backgroundImage-vertical.png


二進制
Playground/textures/gui/backgroundImage.png


二進制
Playground/textures/gui/thumb.png


二進制
Playground/textures/gui/valueImage-vertical.png


二進制
Playground/textures/gui/valueImage.png


二進制
Playground/textures/heightMap.png


二進制
Playground/textures/heightMapTriPlanar.png


二進制
Playground/textures/hollow.png


二進制
Playground/textures/icons/Back.png


二進制
Playground/textures/icons/Crop.png


二進制
Playground/textures/icons/Delete.png


二進制
Playground/textures/icons/Dot.png


二進制
Playground/textures/icons/Download.png


二進制
Playground/textures/icons/Edit.png


二進制
Playground/textures/icons/GearIcon.png


二進制
Playground/textures/icons/Open.png


二進制
Playground/textures/icons/Pause.png


二進制
Playground/textures/icons/Play.png


二進制
Playground/textures/icons/Redo.png


二進制
Playground/textures/icons/Refresh.png


+ 0 - 0
Playground/textures/icons/Save.png


Some files were not shown because too many files changed in this diff