Просмотр исходного кода

Editor: Renamed ModelViewer to Room.

Mr.doob 1 год назад
Родитель
Сommit
a6bbc0e4e2
3 измененных файлов с 7 добавлено и 6 удалено
  1. 4 3
      editor/js/Editor.js
  2. 2 2
      editor/js/Sidebar.Scene.js
  3. 1 1
      editor/js/Viewport.js

+ 4 - 3
editor/js/Editor.js

@@ -654,7 +654,8 @@ Editor.prototype = {
 
 		this.setScene( await loader.parseAsync( json.scene ) );
 
-		if ( json.environment === 'ModelViewer' ) {
+		if ( json.environment === 'Room' ||
+			 json.environment === 'ModelViewer' /* DEPRECATED */ ) {
 
 			this.signals.sceneEnvironmentChanged.dispatch( json.environment );
 			this.signals.refreshSidebarEnvironment.dispatch();
@@ -682,13 +683,13 @@ Editor.prototype = {
 
 		}
 
-		// honor modelviewer environment
+		// honor neutral environment
 
 		let environment = null;
 
 		if ( this.scene.environment !== null && this.scene.environment.isRenderTargetTexture === true ) {
 
-			environment = 'ModelViewer';
+			environment = 'Room';
 
 		}
 

+ 2 - 2
editor/js/Sidebar.Scene.js

@@ -233,7 +233,7 @@ function SidebarScene( editor ) {
 		'None': '',
 		'Background': 'Background',
 		'Equirectangular': 'Equirect',
-		'ModelViewer': 'ModelViewer'
+		'Room': 'Room'
 
 	} ).setWidth( '150px' );
 	environmentType.setValue( 'None' );
@@ -435,7 +435,7 @@ function SidebarScene( editor ) {
 
 			} else if ( scene.environment.isRenderTargetTexture === true ) {
 
-				environmentType.setValue( 'ModelViewer' );
+				environmentType.setValue( 'Room' );
 
 			}
 

+ 1 - 1
editor/js/Viewport.js

@@ -582,7 +582,7 @@ function Viewport( editor ) {
 
 				break;
 
-			case 'ModelViewer':
+			case 'Room':
 
 				scene.environment = pmremGenerator.fromScene( new RoomEnvironment(), 0.04 ).texture;
 

粤ICP备19079148号