Переглянути джерело

Editor: Fixed helpers checkbox also hiding the grid.

Mr.doob 1 рік тому
батько
коміт
116382c177
1 змінених файлів з 8 додано та 8 видалено
  1. 8 8
      editor/js/Viewport.js

+ 8 - 8
editor/js/Viewport.js

@@ -37,12 +37,10 @@ function Viewport( editor ) {
 	const camera = editor.camera;
 	const camera = editor.camera;
 	const scene = editor.scene;
 	const scene = editor.scene;
 	const sceneHelpers = editor.sceneHelpers;
 	const sceneHelpers = editor.sceneHelpers;
-	let showSceneHelpers = true;
 
 
 	// helpers
 	// helpers
 
 
 	const grid = new THREE.Group();
 	const grid = new THREE.Group();
-	sceneHelpers.add( grid );
 
 
 	const grid1 = new THREE.GridHelper( 30, 30, 0x888888 );
 	const grid1 = new THREE.GridHelper( 30, 30, 0x888888 );
 	grid1.material.color.setHex( 0x888888 );
 	grid1.material.color.setHex( 0x888888 );
@@ -675,17 +673,18 @@ function Viewport( editor ) {
 
 
 	} );
 	} );
 
 
-	signals.showGridChanged.add( function ( showGrid ) {
+	signals.showGridChanged.add( function ( value ) {
+
+		grid.visible = value;
 
 
-		grid.visible = showGrid;
 		render();
 		render();
 
 
 	} );
 	} );
 
 
-	signals.showHelpersChanged.add( function ( showHelpers ) {
+	signals.showHelpersChanged.add( function ( value ) {
 
 
-		showSceneHelpers = showHelpers;
-		transformControls.enabled = showHelpers;
+		sceneHelpers.visible = value;
+		transformControls.enabled = value;
 
 
 		render();
 		render();
 
 
@@ -760,7 +759,8 @@ function Viewport( editor ) {
 		if ( camera === editor.viewportCamera ) {
 		if ( camera === editor.viewportCamera ) {
 
 
 			renderer.autoClear = false;
 			renderer.autoClear = false;
-			if ( showSceneHelpers === true ) renderer.render( sceneHelpers, camera );
+			if ( grid.visible === true ) renderer.render( grid, camera );
+			if ( sceneHelpers.visible === true ) renderer.render( sceneHelpers, camera );
 			if ( vr.currentSession === null ) viewHelper.render( renderer );
 			if ( vr.currentSession === null ) viewHelper.render( renderer );
 			renderer.autoClear = true;
 			renderer.autoClear = true;