소스 검색

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

Guide 6 년 전
부모
커밋
39727690a5
4개의 변경된 파일164637개의 추가작업 그리고 164617개의 파일을 삭제
  1. 6 6
      Playground/indexWebGPU.html
  2. 164629 164610
      Playground/js/babylonWebGpu.max.js
  3. 1 0
      Playground/js/babylonWebGpu.max.js.map
  4. 1 1
      Playground/js/indexWebGPU.js

+ 6 - 6
Playground/indexWebGPU.html

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Babylon.js Playground</title>
+    <title>Babylon.js Playground WEBGPU</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">
@@ -32,7 +32,7 @@
     <script src="https://preview.babylonjs.com/shaderc/shaderc.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/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>
@@ -122,7 +122,7 @@
                 </div>
             </div>
 
-            <!-- <div class="button uncheck" id="debugButton1600">Inspector</div> -->
+            <div class="button uncheck" id="debugButton1600">Inspector</div>
             <div class="button" id="metadataButton1600">Metadata</div>
         </div>
 
@@ -203,7 +203,7 @@
                     <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="debugButton1475">Inspector</div>
                     <div class="option" id="metadataButton1475">Metadata</div>
                     <div class="option subSelect">
                         <span id="currentVersion1475">Vers. : Latest</span>
@@ -287,7 +287,7 @@
                     <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="debugButton1030">Inspector</div>
                     <div class="option" id="metadataButton1030">Metadata</div>
                     <div class="option subSelect">
                         <span id="currentVersion1030">Vers. : Latest</span>
@@ -362,7 +362,7 @@
                     <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="debugButton750">Inspector</div>
                     <div class="option" id="metadataButton750">Metadata</div>
                     <div class="option subSelect">
                         <span id="currentVersion750">Vers. : Latest</span>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 164629 - 164610
Playground/js/babylonWebGpu.max.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
Playground/js/babylonWebGpu.max.js.map


+ 1 - 1
Playground/js/indexWebGPU.js

@@ -1223,7 +1223,7 @@ function showError(errorMessage, errorEvent) {
         // Format
         setToMultipleID("minimapToggle", "click", toggleMinimap);
         // Debug
-        // setToMultipleID("debugButton", "click", toggleDebug);
+        setToMultipleID("debugButton", "click", toggleDebug);
         // Metadata
         setToMultipleID("metadataButton", "click", toggleMetadata);