浏览代码

Editor: Removed VR code from App.js (#27772)

mrdoob 1 年之前
父节点
当前提交
a19b944786
共有 6 个文件被更改,包括 0 次插入28 次删除
  1. 0 2
      editor/index.html
  2. 0 1
      editor/js/Editor.js
  3. 0 14
      editor/js/Sidebar.Project.js
  4. 0 3
      editor/js/Strings.js
  5. 0 7
      editor/js/libs/app.js
  6. 0 1
      editor/sw.js

+ 0 - 2
editor/index.html

@@ -70,7 +70,6 @@
 			import { Sidebar } from './js/Sidebar.js';
 			import { Menubar } from './js/Menubar.js';
 			import { Resizer } from './js/Resizer.js';
-			import { VRButton } from 'three/addons/webxr/VRButton.js';
 
 			window.URL = window.URL || window.webkitURL;
 			window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder;
@@ -87,7 +86,6 @@
 
 			window.editor = editor; // Expose editor to Console
 			window.THREE = THREE; // Expose THREE to APP Scripts and Console
-			window.VRButton = VRButton; // Expose VRButton to APP Scripts
 
 			const viewport = new Viewport( editor );
 			document.body.appendChild( viewport.dom );

+ 0 - 1
editor/js/Editor.js

@@ -710,7 +710,6 @@ Editor.prototype = {
 			project: {
 				shadows: this.config.getKey( 'project/renderer/shadows' ),
 				shadowType: this.config.getKey( 'project/renderer/shadowType' ),
-				vr: this.config.getKey( 'project/vr' ),
 				toneMapping: this.config.getKey( 'project/renderer/toneMapping' ),
 				toneMappingExposure: this.config.getKey( 'project/renderer/toneMappingExposure' )
 			},

+ 0 - 14
editor/js/Sidebar.Project.js

@@ -45,20 +45,6 @@ function SidebarProject( editor ) {
 
 	settings.add( editableRow );
 
-	// WebVR
-
-	const vrRow = new UIRow();
-	const vr = new UICheckbox( config.getKey( 'project/vr' ) ).setLeft( '100px' ).onChange( function () {
-
-		config.setKey( 'project/vr', this.getValue() );
-
-	} );
-
-	vrRow.add( new UIText( strings.getKey( 'sidebar/project/vr' ) ).setWidth( '90px' ) );
-	vrRow.add( vr );
-
-	settings.add( vrRow );
-
 	//
 
 	/* container.add( new SidebarProjectMaterials( editor ) ); */

+ 0 - 3
editor/js/Strings.js

@@ -313,7 +313,6 @@ function Strings( config ) {
 			'sidebar/project': 'Project',
 			'sidebar/project/title': 'Title',
 			'sidebar/project/editable': 'Editable',
-			'sidebar/project/vr': 'VR',
 			'sidebar/project/renderer': 'Renderer',
 			'sidebar/project/antialias': 'Antialias',
 			'sidebar/project/shadows': 'Shadows',
@@ -662,7 +661,6 @@ function Strings( config ) {
 			'sidebar/project': 'Projet',
 			'sidebar/project/title': 'Titre',
 			'sidebar/project/editable': 'Modifiable',
-			'sidebar/project/vr': 'VR',
 			'sidebar/project/renderer': 'Rendus',
 			'sidebar/project/antialias': 'Anticrénelage',
 			'sidebar/project/shadows': 'Ombres',
@@ -1011,7 +1009,6 @@ function Strings( config ) {
 			'sidebar/project': '项目',
 			'sidebar/project/title': '标题',
 			'sidebar/project/editable': '编辑性',
-			'sidebar/project/vr': '虚拟现实',
 			'sidebar/project/renderer': '渲染器',
 			'sidebar/project/antialias': '抗锯齿',
 			'sidebar/project/shadows': '阴影',

+ 0 - 7
editor/js/libs/app.js

@@ -8,8 +8,6 @@ var APP = {
 		var loader = new THREE.ObjectLoader();
 		var camera, scene;
 
-		var vrButton = VRButton.createButton( renderer ); // eslint-disable-line no-undef
-
 		var events = {};
 
 		var dom = document.createElement( 'div' );
@@ -24,7 +22,6 @@ var APP = {
 
 			var project = json.project;
 
-			if ( project.vr !== undefined ) renderer.xr.enabled = project.vr;
 			if ( project.shadows !== undefined ) renderer.shadowMap.enabled = project.shadows;
 			if ( project.shadowType !== undefined ) renderer.shadowMap.type = project.shadowType;
 			if ( project.toneMapping !== undefined ) renderer.toneMapping = project.toneMapping;
@@ -169,8 +166,6 @@ var APP = {
 
 		this.play = function () {
 
-			if ( renderer.xr.enabled ) dom.append( vrButton );
-
 			startTime = prevTime = performance.now();
 
 			document.addEventListener( 'keydown', onKeyDown );
@@ -187,8 +182,6 @@ var APP = {
 
 		this.stop = function () {
 
-			if ( renderer.xr.enabled ) vrButton.remove();
-
 			document.removeEventListener( 'keydown', onKeyDown );
 			document.removeEventListener( 'keyup', onKeyUp );
 			document.removeEventListener( 'pointerdown', onPointerDown );

+ 0 - 1
editor/sw.js

@@ -77,7 +77,6 @@ const assets = [
 
 	'../examples/jsm/utils/BufferGeometryUtils.js',
 
-	'../examples/jsm/webxr/VRButton.js',
 	'../examples/jsm/webxr/XRControllerModelFactory.js',
 
 	'./images/rotate.svg',