Browse Source

Editor: Removed clearColor.

Mr.doob 12 years ago
parent
commit
da11d8ad99

+ 1 - 0
editor/css/dark.css

@@ -87,6 +87,7 @@ input.Number {
 	left: 0px;
 	right: 300px;
 	bottom: 32px;
+	background-color: #333333;
 }
 
 #menubar {

+ 1 - 0
editor/css/light.css

@@ -61,6 +61,7 @@ input.Number {
 	left: 0px;
 	right: 300px;
 	bottom: 32px;
+	background-color: #aaaaaa;
 }
 
 #menubar {

+ 0 - 1
editor/js/Editor.js

@@ -28,7 +28,6 @@ var Editor = function () {
 		helperRemoved: new SIGNALS.Signal(),
 
 		materialChanged: new SIGNALS.Signal(),
-		clearColorChanged: new SIGNALS.Signal(),
 		fogTypeChanged: new SIGNALS.Signal(),
 		fogColorChanged: new SIGNALS.Signal(),
 		fogParametersChanged: new SIGNALS.Signal(),

+ 1 - 1
editor/js/Sidebar.Geometry.js

@@ -45,7 +45,7 @@ Sidebar.Geometry = function ( editor ) {
 	var geometryTypeRow = new UI.Panel();
 	var geometryType = new UI.Text().setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' );
 
-	geometryTypeRow.add( new UI.Text( 'Class' ).setWidth( '90px' ) );
+	geometryTypeRow.add( new UI.Text( 'Type' ).setWidth( '90px' ) );
 	geometryTypeRow.add( geometryType );
 
 	container.add( geometryTypeRow );

+ 1 - 1
editor/js/Sidebar.Material.js

@@ -73,7 +73,7 @@ Sidebar.Material = function ( editor ) {
 
 	} ).setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).onChange( update );
 
-	materialClassRow.add( new UI.Text( 'Class' ).setWidth( '90px' ) );
+	materialClassRow.add( new UI.Text( 'Type' ).setWidth( '90px' ) );
 	materialClassRow.add( materialClass );
 
 	container.add( materialClassRow );

+ 16 - 75
editor/js/Sidebar.Renderer.js

@@ -2,7 +2,7 @@ Sidebar.Renderer = function ( editor ) {
 
 	var signals = editor.signals;
 
-	var rendererClasses = {
+	var rendererTypes = {
 
 		'WebGLRenderer': THREE.WebGLRenderer,
 		'WebGLRenderer3': THREE.WebGLRenderer3,
@@ -21,7 +21,7 @@ Sidebar.Renderer = function ( editor ) {
 
 	var options = {};
 
-	for ( var key in rendererClasses ) {
+	for ( var key in rendererTypes ) {
 
 		if ( key.indexOf( 'WebGL' ) >= 0 && System.support.webgl === false ) continue;
 
@@ -29,107 +29,48 @@ Sidebar.Renderer = function ( editor ) {
 
 	}
 
-	var rendererClassRow = new UI.Panel();
-	var rendererClass = new UI.Select().setOptions( options ).setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).onChange( updateRenderer );
+	var rendererTypeRow = new UI.Panel();
+	var rendererType = new UI.Select().setOptions( options ).setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).onChange( updateRenderer );
 
-	rendererClassRow.add( new UI.Text( 'Class' ).setWidth( '90px' ) );
-	rendererClassRow.add( rendererClass );
+	rendererTypeRow.add( new UI.Text( 'Type' ).setWidth( '90px' ) );
+	rendererTypeRow.add( rendererType );
 
-	container.add( rendererClassRow );
+	container.add( rendererTypeRow );
 
 	// Quick hack to expose a user control to switch themes - for easy review purposes only
 
-	var themeLink = document.getElementById('theme');
+	var themeLink = document.getElementById( 'theme' );
 	var themeRow = new UI.Panel();
 	var originalColor;
 
-	var themeClass = new UI.Select().setOptions( ['Light', 'Dark', 'Dark+'] ).setWidth( '150px ').setColor( '#444' ).setFontSize( '12px ').onChange( function () {
+	var theme = new UI.Select().setOptions( [ 'Light', 'Dark' ] ).setWidth( '150px ').setColor( '#444' ).setFontSize( '12px ');
+	theme.onChange( function () {
 
-		var colorVal = clearColor.getValue();
 		switch ( this.value ) {
 
-			case '1':
-				themeLink.href = 'css/dark.css';
+			case '0': themeLink.href = 'css/light.css'; break;
+			case '1': themeLink.href = 'css/dark.css'; break;
 
-				if ( originalColor && originalColor != colorVal ) {
-
-					clearColor.setValue( originalColor );
-
-				}
-
-				break;
-
-			case '2':
-				themeLink.href =  'css/dark.css'
-
-				if ( colorVal != '#333333' ) {
-
-					originalColor = colorVal;
-					clearColor.setValue( '#333333' );
-
-				}
-
-				break;
-
-			default:
-				themeLink.href = 'css/light.css';
-
-				if ( originalColor && originalColor != colorVal ) {
-
-					clearColor.setValue( originalColor );
-
-				}
-
-				break;
 		}
 
-		updateClearColor();
-
-	});
+	} );
 
 	themeRow.add( new UI.Text('Theme').setWidth('90px') );
-	themeRow.add( themeClass );
+	themeRow.add( theme );
 
 	container.add( themeRow );
 
-	// clear color
-
-	var clearColorRow = new UI.Panel();
-	var clearColor = new UI.Color().setValue( '#aaaaaa' ).onChange( updateClearColor );
-
-	clearColorRow.add( new UI.Text( 'Clear color' ).setWidth( '90px' ) );
-	clearColorRow.add( clearColor );
-
-	container.add( clearColorRow );
-
 	//
 
 	function updateRenderer() {
 
-		var renderer = new rendererClasses[ rendererClass.getValue() ]( {
-			antialias: true,
-			alpha: false,
-			clearColor: clearColor.getHexValue(),
-			clearAlpha: 1
+		var renderer = new rendererTypes[ rendererType.getValue() ]( {
+			antialias: true
 		} );
 		signals.rendererChanged.dispatch( renderer );
 
 	}
 
-	function updateClearColor() {
-
-		signals.clearColorChanged.dispatch( clearColor.getHexValue() );
-
-	}
-
-	// events
-
-	signals.clearColorChanged.add( function ( color ) {
-
-		clearColor.setHexValue( color );
-
-	} );
-
 	return container;
 
 }

+ 1 - 14
editor/js/Viewport.js

@@ -4,7 +4,6 @@ var Viewport = function ( editor ) {
 
 	var container = new UI.Panel();
 	container.setPosition( 'absolute' );
-	container.setBackgroundColor( '#aaa' );
 
 	var info = new UI.Text();
 	info.setPosition( 'absolute' );
@@ -18,7 +17,6 @@ var Viewport = function ( editor ) {
 	var scene = editor.scene;
 	var sceneHelpers = editor.sceneHelpers;
 
-	var clearColor = 0xAAAAAA;
 	var objects = [];
 
 	// helpers
@@ -196,7 +194,6 @@ var Viewport = function ( editor ) {
 		container.dom.removeChild( renderer.domElement );
 
 		renderer = object;
-		renderer.setClearColor( clearColor );
 		renderer.autoClear = false;
 		renderer.autoUpdateScene = false;
 		renderer.setSize( container.dom.offsetWidth, container.dom.offsetHeight );
@@ -322,15 +319,6 @@ var Viewport = function ( editor ) {
 
 	} );
 
-	signals.clearColorChanged.add( function ( color ) {
-
-		renderer.setClearColor( color );
-		render();
-
-		clearColor = color;
-
-	} );
-
 	signals.fogTypeChanged.add( function ( fogType ) {
 
 		if ( fogType !== oldFogType ) {
@@ -417,7 +405,7 @@ var Viewport = function ( editor ) {
 
 	if ( System.support.webgl === true ) {
 
-		renderer = new THREE.WebGLRenderer( { antialias: true, alpha: false } );
+		renderer = new THREE.WebGLRenderer( { antialias: true } );
 
 	} else {
 
@@ -425,7 +413,6 @@ var Viewport = function ( editor ) {
 
 	}
 
-	renderer.setClearColor( clearColor );
 	renderer.autoClear = false;
 	renderer.autoUpdateScene = false;
 	container.dom.appendChild( renderer.domElement );