Reset branch to dev

editor/js/Editor.js

@@ -80,7 +80,6 @@ var Editor = function () {
 	this.loader = new Loader( this );
 
 	this.camera = this.DEFAULT_CAMERA.clone();
-	this.sceneCameras = [];
 
 	this.scene = new THREE.Scene();
 	this.scene.name = 'Scene';

editor/js/Sidebar.Object.js

@@ -8,8 +8,6 @@ Sidebar.Object = function ( editor ) {
 
 	var signals = editor.signals;
 
-	var sceneCameras = editor.sceneCameras;
-
 	var container = new UI.Panel();
 	container.setBorderTop( '0' );
 	container.setPaddingTop( '20px' );
@@ -314,41 +312,6 @@ Sidebar.Object = function ( editor ) {
 
 	container.add( objectUserDataRow );
 
-	// view from camera
-	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' ) );
-
-	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 );
-				return;
-
-			}
-
-			sceneCameras.push( object );
-			cameraViewCheckbox.setValue( true );
-
-		} else {
-
-			sceneCameras.splice( sceneCameras.indexOf( object ), 1 );
-			cameraViewCheckbox.setValue( false );
-
-		}
-
-		signals.sceneGraphChanged.dispatch();
-
-	} );
-	cameraViewRow.add( cameraViewCheckbox );
 
 	//
 
@@ -560,12 +523,12 @@ Sidebar.Object = function ( editor ) {
 			'intensity': objectIntensityRow,
 			'color': objectColorRow,
 			'groundColor': objectGroundColorRow,
-			'distance': objectDistanceRow,
-			'angle': objectAngleRow,
-			'penumbra': objectPenumbraRow,
-			'decay': objectDecayRow,
-			'castShadow': objectShadowRow,
-			'receiveShadow': objectReceiveShadow,
+			'distance' : objectDistanceRow,
+			'angle' : objectAngleRow,
+			'penumbra' : objectPenumbraRow,
+			'decay' : objectDecayRow,
+			'castShadow' : objectShadowRow,
+			'receiveShadow' : objectReceiveShadow,
 			'shadow': objectShadowRadius
 		};
 
@@ -726,17 +689,6 @@ Sidebar.Object = function ( editor ) {
 
 		}
 
-		if ( object.isCamera === true ) {
-
-			cameraViewRow.setDisplay( 'block' );
-			cameraViewCheckbox.setValue( sceneCameras.indexOf( object ) !== - 1 );
-
-		} else {
-
-			cameraViewRow.setDisplay( 'none' );
-
-		}
-
 		objectVisible.setValue( object.visible );
 		objectFrustumCulled.setValue( object.frustumCulled );
 		objectRenderOrder.setValue( object.renderOrder );

editor/js/Sidebar.Settings.Viewport.js

@@ -6,7 +6,6 @@ Sidebar.Settings.Viewport = function ( editor ) {
 
 	var signals = editor.signals;
 	var strings = editor.strings;
-	var config = editor.config;
 
 	var container = new UI.Div();
 	container.add( new UI.Break() );
@@ -14,34 +13,7 @@ Sidebar.Settings.Viewport = function ( editor ) {
 	container.add( new UI.Text( strings.getKey( 'sidebar/settings/viewport/grid' ) ).setWidth( '90px' ) );
 
 	var show = new UI.THREE.Boolean( true ).onChange( update );
-	container.add( show, new UI.Break() );
-
-	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( 'sceneCameraView' ) !== undefined ) {
-
-		sceneViewOptions.setValue( config.getKey( 'sceneCameraView' ) );
-
-	} else {
-
-		sceneViewOptions.setValue( 'left' );
-
-	}
-
-	sceneViewOptions.onChange( function () {
-
-		config.setKey( 'sceneCameraView', sceneViewOptions.getValue() );
-		signals.sceneGraphChanged.dispatch();
-
-	} );
-	container.add( sceneViewOptions );
+	container.add( show );
 
 	/*
 	var snapSize = new UI.Number( 25 ).setWidth( '40px' ).onChange( update );

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 () {} };

editor/js/Strings.js

@@ -97,7 +97,6 @@ var Strings = function ( config ) {
 			'sidebar/object/frustumcull': 'Frustum Cull',
 			'sidebar/object/renderorder': 'Render Order',
 			'sidebar/object/userdata': 'User data',
-			'sidebar/object/view': 'Show View',
 
 			'sidebar/geometry/type': 'Type',
 			'sidebar/geometry/new': 'New',
@@ -253,7 +252,6 @@ var Strings = function ( config ) {
 			'sidebar/settings/shortcuts/focus': 'Focus',
 
 			'sidebar/settings/viewport/grid': 'Grid',
-			'sidebar/settings/viewport/view': 'Cameras',
 
 			'sidebar/history/history': 'HISTORY',
 			'sidebar/history/persistent': 'persistent',

editor/js/Viewport.js

@@ -5,9 +5,6 @@
 var Viewport = function ( editor ) {
 
 	var signals = editor.signals;
-	var config = editor.config;
-
-	var sceneCameras = editor.sceneCameras;
 
 	var container = new UI.Panel();
 	container.setId( 'viewport' );
@@ -315,7 +312,6 @@ var Viewport = function ( editor ) {
 
 		renderer.autoClear = false;
 		renderer.autoUpdateScene = false;
-		renderer.setScissorTest( true );
 		renderer.setPixelRatio( window.devicePixelRatio );
 		renderer.setSize( container.dom.offsetWidth, container.dom.offsetHeight );
 
@@ -547,70 +543,17 @@ var Viewport = function ( editor ) {
 	requestAnimationFrame( animate );
 
 	//
-	var viewport = new THREE.Vector4();
 
 	function render() {
 
 		sceneHelpers.updateMatrixWorld();
 		scene.updateMatrixWorld();
 
-		var width = container.dom.offsetWidth;
-		var height = container.dom.offsetHeight;
-
-		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 );
-
-				}
-				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 );
-
-				}
-				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 );
-
-				}
-				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 );
-
-				}
-				break;
-			default:
-				console.error( "Unknown scene view type: " + config.getKey( "sceneCameraView" ) );
-				break;
-
-		}
-
-	}
-
-	function renderScene( cam, viewport, showHelpers ) {
-
-		renderer.setViewport( viewport );
-		renderer.setScissor( viewport );
-		renderer.render( scene, cam );
+		renderer.render( scene, camera );
 
-		if ( showHelpers === true && renderer instanceof THREE.RaytracingRenderer === false ) {
+		if ( renderer instanceof THREE.RaytracingRenderer === false ) {
 
-			renderer.render( sceneHelpers, cam );
+			renderer.render( sceneHelpers, camera );
 
 		}