首页 发现 帮助
登录
javascript
/
three.js
镜像自地址 https://github.com/tazdij/three.js.git
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

Examples: Fix `monaco-editor` (#28201)

sunag 1 年之前
父节点
50d4f74070
当前提交
c5c42fb7d0
共有 5 个文件被更改，包括 7 次插入 和 10 次删除
合并视图 显示文件统计
  1. 2 0
      examples/jsm/nodes/materials/NodeMaterial.js
  2. 2 7
      examples/webgpu_tsl_editor.html
  3. 1 1
      examples/webgpu_tsl_transpiler.html
  4. 1 1
      playground/elements/CodeEditorElement.js
  5. 1 1
      playground/index.html

+ 2 - 0
examples/jsm/nodes/materials/NodeMaterial.js
查看文件 

@@ -146,6 +146,8 @@ class NodeMaterial extends ShaderMaterial {
 
 
 
 	setupClipping( builder ) {
 
 	setupClipping( builder ) {
 
 
 
+		if ( builder.clippingContext === null ) return null;
 
+
 
 		const { globalClippingCount, localClippingCount } = builder.clippingContext;
 
 		const { globalClippingCount, localClippingCount } = builder.clippingContext;
 
 
 
 		let result = null;
 
 		let result = null;

+ 2 - 7
examples/webgpu_tsl_editor.html
查看文件 

@@ -59,7 +59,6 @@
 
 			import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
 
 			import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
 
 			import WGSLNodeBuilder from 'three/addons/renderers/webgpu/nodes/WGSLNodeBuilder.js';
 
 			import WGSLNodeBuilder from 'three/addons/renderers/webgpu/nodes/WGSLNodeBuilder.js';
 
 			import GLSLNodeBuilder from 'three/addons/renderers/webgl/nodes/GLSLNodeBuilder.js';
 
 			import GLSLNodeBuilder from 'three/addons/renderers/webgl/nodes/GLSLNodeBuilder.js';
 
-			import GLSL1NodeBuilder from 'three/addons/renderers/webgl-legacy/nodes/GLSL1NodeBuilder.js';
 
 
 
 			import { GUI } from 'three/addons/libs/lil-gui.module.min.js';
 
 			import { GUI } from 'three/addons/libs/lil-gui.module.min.js';
 
 
 
@@ -109,7 +108,7 @@
 
 
 
 				// editor
 
 				// editor
 
 
 
-				window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs' } } );
 
+				window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.48.0/min/vs' } } );
 
 
 
 				require( [ 'vs/editor/editor.main' ], () => {
 
 				require( [ 'vs/editor/editor.main' ], () => {
 
 
 
@@ -196,10 +195,6 @@ output = vec4( finalColor, opacity );
 
 
 
 								NodeBuilder = GLSLNodeBuilder;
 
 								NodeBuilder = GLSLNodeBuilder;
 
 
 
-							} else {
 
-
 
-								NodeBuilder = GLSL1NodeBuilder;
 
-
 
 							}
 
 							}
 
 
 
 							nodeBuilder = new NodeBuilder( mesh, renderer );
 
 							nodeBuilder = new NodeBuilder( mesh, renderer );
 
@@ -238,7 +233,7 @@ output = vec4( finalColor, opacity );
 
 
 
 					const gui = new GUI();
 
 					const gui = new GUI();
 
 
 
-					gui.add( options, 'output', [ 'WGSL', 'GLSL ES 3.0', 'GLSL' ] ).onChange( build );
 
+					gui.add( options, 'output', [ 'WGSL', 'GLSL ES 3.0' ] ).onChange( build );
 
 					gui.add( options, 'shader', [ 'vertex', 'fragment' ] ).onChange( showCode );
 
 					gui.add( options, 'shader', [ 'vertex', 'fragment' ] ).onChange( showCode );
 
 
 
 					gui.add( options, 'outputColorSpace', [ THREE.LinearSRGBColorSpace, THREE.SRGBColorSpace ] ).onChange( ( value ) => {
 
 					gui.add( options, 'outputColorSpace', [ THREE.LinearSRGBColorSpace, THREE.SRGBColorSpace ] ).onChange( ( value ) => {

+ 1 - 1
examples/webgpu_tsl_transpiler.html
查看文件 

@@ -50,7 +50,7 @@
 
 
 
 				// editor
 
 				// editor
 
 
 
-				window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs' } } );
 
+				window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.48.0/min/vs' } } );
 
 
 
 				require( [ 'vs/editor/editor.main' ], () => {
 
 				require( [ 'vs/editor/editor.main' ], () => {

+ 1 - 1
playground/elements/CodeEditorElement.js
查看文件 

@@ -22,7 +22,7 @@ export class CodeEditorElement extends Element {
 
 
 
 		this.editor = null; // async
 
 		this.editor = null; // async
 
 
 
-		window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs' } } );
 
+		window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.48.0/min/vs' } } );
 
 
 
 		require( [ 'vs/editor/editor.main' ], () => {
 
 		require( [ 'vs/editor/editor.main' ], () => {

+ 1 - 1
playground/index.html
查看文件 

@@ -92,7 +92,7 @@
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
 
 
-		<script src="https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs/loader.min.js"></script>
 
+		<script src="https://cdn.jsdelivr.net/npm/monaco-editor@0.48.0/min/vs/loader.min.js"></script>
 
 
 
 		<script type="importmap">
 
 		<script type="importmap">
 
 			{
 
 			{