Browse Source

Update code style

Temdog007 6 years ago
parent
commit
5ab4aa1c53
4 changed files with 86 additions and 68 deletions
  1. 29 24
      editor/js/Sidebar.Object.js
  2. 22 20
      editor/js/Sidebar.Settings.Viewport.js
  3. 1 1
      editor/js/Storage.js
  4. 34 23
      editor/js/Viewport.js

+ 29 - 24
editor/js/Sidebar.Object.js

@@ -318,32 +318,36 @@ Sidebar.Object = function ( editor ) {
 	var cameraViewRow = new UI.Row().setDisplay( editor.selected !== null && editor.selected.isCamera ? 'block' : 'none' );
 	container.add( cameraViewRow );
 
-	cameraViewRow.add( new UI.Text(strings.getKey( 'sidebar/object/view' )).setWidth('90px'));
+	cameraViewRow.add( new UI.Text( strings.getKey( 'sidebar/object/view' ) ).setWidth( '90px' ) );
+
+	var cameraViewCheckbox = new UI.Checkbox( false ).onChange( update ).onClick( function () {
 
-	var cameraViewCheckbox = new UI.Checkbox(false).onChange(update).onClick(function() {
 		var object = editor.selected;
-		if(object.isCamera !== true) return;
-
-		if(sceneCameras.indexOf(object) === -1)
-		{
-			if(sceneCameras.length === 4)
-			{
-				alert("Only 4 scene cameras can be shown at once.");
-				cameraViewCheckbox.setValue(false);
+		if ( object.isCamera !== true ) return;
+
+		if ( sceneCameras.indexOf( object ) === - 1 ) {
+
+			if ( sceneCameras.length === 4 ) {
+
+				alert( "Only 4 scene cameras can be shown at once." );
+				cameraViewCheckbox.setValue( false );
 				return;
+
 			}
 
-			sceneCameras.push(object);
-			cameraViewCheckbox.setValue(true);
-		}
-		else
-		{
-			sceneCameras.splice(sceneCameras.indexOf(object), 1);
-			cameraViewCheckbox.setValue(false);
+			sceneCameras.push( object );
+			cameraViewCheckbox.setValue( true );
+
+		} else {
+
+			sceneCameras.splice( sceneCameras.indexOf( object ), 1 );
+			cameraViewCheckbox.setValue( false );
+
 		}
 
 		signals.sceneGraphChanged.dispatch();
-	});
+
+	} );
 	cameraViewRow.add( cameraViewCheckbox );
 
 	//
@@ -722,14 +726,15 @@ Sidebar.Object = function ( editor ) {
 
 		}
 
-		if(object.isCamera === true) {
+		if ( object.isCamera === true ) {
 
-			cameraViewRow.setDisplay('block');
-			cameraViewCheckbox.setValue(sceneCameras.indexOf(object) !== -1)
+			cameraViewRow.setDisplay( 'block' );
+			cameraViewCheckbox.setValue( sceneCameras.indexOf( object ) !== - 1 );
+
+		} else {
+
+			cameraViewRow.setDisplay( 'none' );
 
-		}
-		else {
-			cameraViewRow.setDisplay('none');
 		}
 
 		objectVisible.setValue( object.visible );

+ 22 - 20
editor/js/Sidebar.Settings.Viewport.js

@@ -18,28 +18,30 @@ Sidebar.Settings.Viewport = function ( editor ) {
 
 	container.add( new UI.Text( strings.getKey( 'sidebar/settings/viewport/view' ) ).setWidth( '90px' ) );
 
-	var sceneViewOptions = new UI.Select().setOptions({
-		left : 'left',
-		right : 'right',
-		top : 'top',
-		bottom : 'bottom'
-	});
-
-	if(config.getKey('sceneView') !== undefined)
-	{
-		sceneViewOptions.setValue(config.getKey('sceneView'));
-	}
-	else
-	{
-		sceneViewOptions.setValue('left');
+	var sceneViewOptions = new UI.Select().setOptions( {
+		left: 'left',
+		right: 'right',
+		top: 'top',
+		bottom: 'bottom'
+	} );
+
+	if ( config.getKey( 'sceneCameraView' ) !== undefined ) {
+
+		sceneViewOptions.setValue( config.getKey( 'sceneCameraView' ) );
+
+	} else {
+
+		sceneViewOptions.setValue( 'left' );
+
 	}
-	
-	sceneViewOptions.onChange(function()
-	{
-		config.setKey('sceneView', sceneViewOptions.getValue());
+
+	sceneViewOptions.onChange( function () {
+
+		config.setKey( 'sceneCameraView', sceneViewOptions.getValue() );
 		signals.sceneGraphChanged.dispatch();
-	});
-	container.add(sceneViewOptions);
+
+	} );
+	container.add( sceneViewOptions );
 
 	/*
 	var snapSize = new UI.Number( 25 ).setWidth( '40px' ).onChange( update );

+ 1 - 1
editor/js/Storage.js

@@ -6,7 +6,7 @@ var Storage = function () {
 
 	var indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
 
-	if ( indexedDB === undefined  ) {
+	if ( indexedDB === undefined ) {
 
 		console.warn( 'Storage: IndexedDB not available.' );
 		return { init: function () {}, get: function () {}, set: function () {}, clear: function () {} };

+ 34 - 23
editor/js/Viewport.js

@@ -315,7 +315,7 @@ var Viewport = function ( editor ) {
 
 		renderer.autoClear = false;
 		renderer.autoUpdateScene = false;
-		renderer.setScissorTest(true);
+		renderer.setScissorTest( true );
 		renderer.setPixelRatio( window.devicePixelRatio );
 		renderer.setSize( container.dom.offsetWidth, container.dom.offsetHeight );
 
@@ -556,46 +556,56 @@ var Viewport = function ( editor ) {
 
 		var width = container.dom.offsetWidth;
 		var height = container.dom.offsetHeight;
-		
-		viewport.set(0, 0, width, height);
-		renderScene(camera, viewport, true);
 
-		switch(config.getKey('sceneView'))
-		{
+		viewport.set( 0, 0, width, height );
+		renderScene( camera, viewport, true );
+
+		switch ( config.getKey( 'sceneCameraView' ) ) {
+
 			case 'left':
-				for(var i = 0; i < sceneCameras.length; ++i) {
-					viewport.set(0, height * 0.25 * i, width * 0.25, height * 0.25);
-					renderScene(sceneCameras[i], viewport);
+				for ( var i = 0; i < sceneCameras.length; ++ i ) {
+
+					viewport.set( 0, height * 0.25 * i, width * 0.25, height * 0.25 );
+					renderScene( sceneCameras[ i ], viewport );
+
 				}
 				break;
 			case 'right':
-				for(var i = 0; i < sceneCameras.length; ++i) {
-					viewport.set(width * 0.75, height * 0.25 * i, width * 0.25, height * 0.25);
-					renderScene(sceneCameras[i], viewport);
+				for ( var i = 0; i < sceneCameras.length; ++ i ) {
+
+					viewport.set( width * 0.75, height * 0.25 * i, width * 0.25, height * 0.25 );
+					renderScene( sceneCameras[ i ], viewport );
+
 				}
 				break;
 			case 'bottom':
-				for(var i = 0; i < sceneCameras.length; ++i) {
-					viewport.set(width * 0.25 * i, 0, width * 0.25, height * 0.25);
-					renderScene(sceneCameras[i], viewport);
+				for ( var i = 0; i < sceneCameras.length; ++ i ) {
+
+					viewport.set( width * 0.25 * i, 0, width * 0.25, height * 0.25 );
+					renderScene( sceneCameras[ i ], viewport );
+
 				}
 				break;
 			case 'top':
-				for(var i = 0; i < sceneCameras.length; ++i) {
-					viewport.set(width * 0.25 * i, height * 0.75, width * 0.25, height * 0.25);
-					renderScene(sceneCameras[i], viewport);
+				for ( var i = 0; i < sceneCameras.length; ++ i ) {
+
+					viewport.set( width * 0.25 * i, height * 0.75, width * 0.25, height * 0.25 );
+					renderScene( sceneCameras[ i ], viewport );
+
 				}
 				break;
 			default:
-				console.error("Unknown scene view type: " + config.getKey("sceneView"));
+				console.error( "Unknown scene view type: " + config.getKey( "sceneCameraView" ) );
 				break;
+
 		}
+
 	}
 
-	function renderScene(cam, viewport, showHelpers)
-	{
-		renderer.setViewport(viewport);
-		renderer.setScissor(viewport);
+	function renderScene( cam, viewport, showHelpers ) {
+
+		renderer.setViewport( viewport );
+		renderer.setScissor( viewport );
 		renderer.render( scene, cam );
 
 		if ( showHelpers === true && renderer instanceof THREE.RaytracingRenderer === false ) {
@@ -603,6 +613,7 @@ var Viewport = function ( editor ) {
 			renderer.render( sceneHelpers, cam );
 
 		}
+
 	}
 
 	return container;