Selaa lähdekoodia

Remove ability to move camera selection menu

Temdog007 6 vuotta sitten
vanhempi
commit
c03c2d3a10

+ 1 - 19
editor/css/dark.css

@@ -239,31 +239,13 @@ select {
 		width: 100%;
 		width: 100%;
 	}
 	}
 
 
-	#cameraSelect[layout='topLeft']{
-		margin-top: 32px;
-		left: 0;
-		top : 0;
-	}
-
-	#cameraSelect[layout='topRight']{
+	#cameraSelect{
 		margin-top: 32px;
 		margin-top: 32px;
 		margin-right: 300px;
 		margin-right: 300px;
 		right: 0;
 		right: 0;
 		top : 0;
 		top : 0;
 	}
 	}
 
 
-	#cameraSelect[layout='bottomLeft']{
-		bottom: 0;
-		left: 0;
-		padding-bottom: 60px;
-	}
-
-	#cameraSelect[layout='bottomRight']{ 
-		bottom: 0;
-		right: 0;
-		margin-right: 300px;
-	}
-
 .Outliner {
 .Outliner {
 	color: #888;
 	color: #888;
 	background: #222;
 	background: #222;

+ 1 - 19
editor/css/light.css

@@ -232,31 +232,13 @@ select {
 		width: 100%;
 		width: 100%;
 	}
 	}
 
 
-	#cameraSelect[layout='topLeft']{
-		margin-top: 32px;
-		left: 0;
-		top : 0;
-	}
-
-	#cameraSelect[layout='topRight']{
+	#cameraSelect{
 		margin-top: 32px;
 		margin-top: 32px;
 		margin-right: 300px;
 		margin-right: 300px;
 		right: 0;
 		right: 0;
 		top : 0;
 		top : 0;
 	}
 	}
 
 
-	#cameraSelect[layout='bottomLeft']{
-		bottom: 0;
-		left: 0;
-		padding-bottom: 60px;
-	}
-
-	#cameraSelect[layout='bottomRight']{ 
-		bottom: 0;
-		right: 0;
-		margin-right: 300px;
-	}
-
 
 
 .Outliner {
 .Outliner {
 	color: #444;
 	color: #444;

+ 1 - 1
editor/js/Config.js

@@ -21,7 +21,7 @@ var Config = function () {
 		'project/renderer/gammaOutput': false,
 		'project/renderer/gammaOutput': false,
 		'project/renderer/shadows': true,
 		'project/renderer/shadows': true,
 		'project/renderer/showHelpers': true,
 		'project/renderer/showHelpers': true,
-		'project/renderer/sceneCameras': 'topLeft',
+		'project/renderer/sceneCameras': 'topRight',
 		'project/renderer/showSceneCameras': true,
 		'project/renderer/showSceneCameras': true,
 
 
 		'project/vr': false,
 		'project/vr': false,

+ 0 - 28
editor/js/Sidebar.Settings.js

@@ -74,34 +74,6 @@ Sidebar.Settings = function ( editor ) {
 
 
 	container.add( themeRow );
 	container.add( themeRow );
 
 
-	// scene camera position
-
-	var sceneCameraRow = new UI.Row();
-	container.add( sceneCameraRow );
-
-	var sceneCameraSelection = new UI.Select().setWidth( '150px' );
-	sceneCameraSelection.setOptions( {
-		topLeft: 'Top Left',
-		bottomLeft: 'Bottom Left',
-		topRight: 'Top Right',
-		bottomRight: 'Bottom Right'
-	} );
-
-	if ( config.getKey( 'project/renderer/sceneCameras' ) !== undefined ) {
-
-		sceneCameraSelection.setValue( config.getKey( 'project/renderer/sceneCameras' ) );
-
-	}
-
-	sceneCameraSelection.onChange( function () {
-
-		config.setKey( 'project/renderer/sceneCameras', this.getValue() );
-		signals.sceneCamerasChanged.dispatch();
-
-	} );
-
-	sceneCameraRow.add( new UI.Text( strings.getKey( 'sidebar/settings/sceneCameras' ) ).setWidth( '90px' ), sceneCameraSelection );
-
 	// scene camera visible
 	// scene camera visible
 
 
 	var sceneShowCameraRow = new UI.Row();
 	var sceneShowCameraRow = new UI.Row();

+ 2 - 3
editor/js/Strings.js

@@ -244,9 +244,8 @@ var Strings = function ( config ) {
 			'sidebar/settings/theme': 'Theme',
 			'sidebar/settings/theme': 'Theme',
 			'sidebar/settings/theme/light': 'light',
 			'sidebar/settings/theme/light': 'light',
 			'sidebar/settings/theme/dark': 'dark',
 			'sidebar/settings/theme/dark': 'dark',
-			'sidebar/settings/sceneCameras': 'Camera Select Menu',
-			'sidebar/settings/showSceneCameras': 'Show Camera Select Menu',
-			'sidebar/settings/showHelpers': 'Show Heleprs',
+			'sidebar/settings/showSceneCameras': 'Cameras',
+			'sidebar/settings/showHelpers': 'Helpers',
 
 
 			'sidebar/settings/shortcuts/translate': 'Translate',
 			'sidebar/settings/shortcuts/translate': 'Translate',
 			'sidebar/settings/shortcuts/rotate': 'Rotate',
 			'sidebar/settings/shortcuts/rotate': 'Rotate',

+ 0 - 1
editor/js/Viewport.js

@@ -176,7 +176,6 @@ var Viewport = function ( editor ) {
 
 
 	signals.sceneCamerasChanged.add( function () {
 	signals.sceneCamerasChanged.add( function () {
 
 
-		sceneCameraDisplay.dom.setAttribute( 'layout', config.getKey( 'project/renderer/sceneCameras' ) || 'topLeft' );
 		sceneCameraDisplay.setDisplay( config.getKey( 'project/renderer/showSceneCameras' ) === true && Object.keys( cameras ).length > 0 ? 'block' : 'none' );
 		sceneCameraDisplay.setDisplay( config.getKey( 'project/renderer/showSceneCameras' ) === true && Object.keys( cameras ).length > 0 ? 'block' : 'none' );
 
 
 	} );
 	} );