|
@@ -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;
|
|
|
|
|
|
}
|