|
@@ -2,7 +2,57 @@
|
|
* @author mrdoob / http://mrdoob.com/
|
|
* @author mrdoob / http://mrdoob.com/
|
|
*/
|
|
*/
|
|
|
|
|
|
-Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
+import {
|
|
|
|
+ BasicDepthPacking,
|
|
|
|
+ LineBasicMaterial,
|
|
|
|
+ LineDashedMaterial,
|
|
|
|
+ Math as _Math,
|
|
|
|
+ MeshBasicMaterial,
|
|
|
|
+ MeshDepthMaterial,
|
|
|
|
+ MeshNormalMaterial,
|
|
|
|
+ MeshLambertMaterial,
|
|
|
|
+ MeshToonMaterial,
|
|
|
|
+ MeshPhongMaterial,
|
|
|
|
+ MeshMatcapMaterial,
|
|
|
|
+ ShaderMaterial,
|
|
|
|
+ RawShaderMaterial,
|
|
|
|
+ SpriteMaterial,
|
|
|
|
+ MeshPhysicalMaterial,
|
|
|
|
+ ShadowMaterial,
|
|
|
|
+ MeshStandardMaterial,
|
|
|
|
+ RGBADepthPacking,
|
|
|
|
+ SphericalReflectionMapping,
|
|
|
|
+ sRGBEncoding
|
|
|
|
+} from '../../build/three.module.js';
|
|
|
|
+
|
|
|
|
+import { UIPanel, UIRow, UIInput, UIButton, UIColor, UICheckbox, UISelect, UIText, UINumber } from './libs/ui.js';
|
|
|
|
+import { UITexture } from './libs/ui.three.js';
|
|
|
|
+
|
|
|
|
+import { SetMaterialCommand } from './commands/SetMaterialCommand.js';
|
|
|
|
+import { SetMaterialColorCommand } from './commands/SetMaterialColorCommand.js';
|
|
|
|
+import { SetMaterialMapCommand } from './commands/SetMaterialMapCommand.js';
|
|
|
|
+import { SetMaterialValueCommand } from './commands/SetMaterialValueCommand.js';
|
|
|
|
+import { SetMaterialVectorCommand } from './commands/SetMaterialVectorCommand.js';
|
|
|
|
+
|
|
|
|
+var materialClasses = {
|
|
|
|
+ 'LineBasicMaterial': LineBasicMaterial,
|
|
|
|
+ 'LineDashedMaterial': LineDashedMaterial,
|
|
|
|
+ 'MeshBasicMaterial': MeshBasicMaterial,
|
|
|
|
+ 'MeshDepthMaterial': MeshDepthMaterial,
|
|
|
|
+ 'MeshNormalMaterial': MeshNormalMaterial,
|
|
|
|
+ 'MeshLambertMaterial': MeshLambertMaterial,
|
|
|
|
+ 'MeshMatcapMaterial': MeshMatcapMaterial,
|
|
|
|
+ 'MeshPhongMaterial': MeshPhongMaterial,
|
|
|
|
+ 'MeshToonMaterial': MeshToonMaterial,
|
|
|
|
+ 'MeshStandardMaterial': MeshStandardMaterial,
|
|
|
|
+ 'MeshPhysicalMaterial': MeshPhysicalMaterial,
|
|
|
|
+ 'RawShaderMaterial': RawShaderMaterial,
|
|
|
|
+ 'ShaderMaterial': ShaderMaterial,
|
|
|
|
+ 'ShadowMaterial': ShadowMaterial,
|
|
|
|
+ 'SpriteMaterial': SpriteMaterial
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+var SidebarMaterial = function ( editor ) {
|
|
|
|
|
|
var strings = editor.strings;
|
|
var strings = editor.strings;
|
|
|
|
|
|
@@ -12,18 +62,18 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
var currentMaterialSlot = 0;
|
|
var currentMaterialSlot = 0;
|
|
|
|
|
|
- var container = new UI.Panel();
|
|
|
|
|
|
+ var container = new UIPanel();
|
|
container.setBorderTop( '0' );
|
|
container.setBorderTop( '0' );
|
|
container.setDisplay( 'none' );
|
|
container.setDisplay( 'none' );
|
|
container.setPaddingTop( '20px' );
|
|
container.setPaddingTop( '20px' );
|
|
|
|
|
|
// Current material slot
|
|
// Current material slot
|
|
|
|
|
|
- var materialSlotRow = new UI.Row();
|
|
|
|
|
|
+ var materialSlotRow = new UIRow();
|
|
|
|
|
|
- materialSlotRow.add( new UI.Text( 'Slot' ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialSlotRow.add( new UIText( 'Slot' ).setWidth( '90px' ) );
|
|
|
|
|
|
- var materialSlotSelect = new UI.Select().setWidth( '170px' ).setFontSize( '12px' ).onChange( update );
|
|
|
|
|
|
+ var materialSlotSelect = new UISelect().setWidth( '170px' ).setFontSize( '12px' ).onChange( update );
|
|
materialSlotSelect.setOptions( { 0: '' } ).setValue( 0 );
|
|
materialSlotSelect.setOptions( { 0: '' } ).setValue( 0 );
|
|
materialSlotRow.add( materialSlotSelect );
|
|
materialSlotRow.add( materialSlotSelect );
|
|
|
|
|
|
@@ -31,8 +81,8 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// type
|
|
// type
|
|
|
|
|
|
- var materialClassRow = new UI.Row();
|
|
|
|
- var materialClass = new UI.Select().setOptions( {
|
|
|
|
|
|
+ var materialClassRow = new UIRow();
|
|
|
|
+ var materialClass = new UISelect().setOptions( {
|
|
|
|
|
|
'LineBasicMaterial': 'LineBasicMaterial',
|
|
'LineBasicMaterial': 'LineBasicMaterial',
|
|
'LineDashedMaterial': 'LineDashedMaterial',
|
|
'LineDashedMaterial': 'LineDashedMaterial',
|
|
@@ -52,23 +102,23 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
} ).setWidth( '150px' ).setFontSize( '12px' ).onChange( update );
|
|
} ).setWidth( '150px' ).setFontSize( '12px' ).onChange( update );
|
|
|
|
|
|
- materialClassRow.add( new UI.Text( strings.getKey( 'sidebar/material/type' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialClassRow.add( new UIText( strings.getKey( 'sidebar/material/type' ) ).setWidth( '90px' ) );
|
|
materialClassRow.add( materialClass );
|
|
materialClassRow.add( materialClass );
|
|
|
|
|
|
container.add( materialClassRow );
|
|
container.add( materialClassRow );
|
|
|
|
|
|
// uuid
|
|
// uuid
|
|
|
|
|
|
- var materialUUIDRow = new UI.Row();
|
|
|
|
- var materialUUID = new UI.Input().setWidth( '102px' ).setFontSize( '12px' ).setDisabled( true );
|
|
|
|
- var materialUUIDRenew = new UI.Button( strings.getKey( 'sidebar/material/new' ) ).setMarginLeft( '7px' ).onClick( function () {
|
|
|
|
|
|
+ var materialUUIDRow = new UIRow();
|
|
|
|
+ var materialUUID = new UIInput().setWidth( '102px' ).setFontSize( '12px' ).setDisabled( true );
|
|
|
|
+ var materialUUIDRenew = new UIButton( strings.getKey( 'sidebar/material/new' ) ).setMarginLeft( '7px' ).onClick( function () {
|
|
|
|
|
|
- materialUUID.setValue( THREE.Math.generateUUID() );
|
|
|
|
|
|
+ materialUUID.setValue( _Math.generateUUID() );
|
|
update();
|
|
update();
|
|
|
|
|
|
} );
|
|
} );
|
|
|
|
|
|
- materialUUIDRow.add( new UI.Text( strings.getKey( 'sidebar/material/uuid' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialUUIDRow.add( new UIText( strings.getKey( 'sidebar/material/uuid' ) ).setWidth( '90px' ) );
|
|
materialUUIDRow.add( materialUUID );
|
|
materialUUIDRow.add( materialUUID );
|
|
materialUUIDRow.add( materialUUIDRenew );
|
|
materialUUIDRow.add( materialUUIDRenew );
|
|
|
|
|
|
@@ -76,24 +126,24 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// name
|
|
// name
|
|
|
|
|
|
- var materialNameRow = new UI.Row();
|
|
|
|
- var materialName = new UI.Input().setWidth( '150px' ).setFontSize( '12px' ).onChange( function () {
|
|
|
|
|
|
+ var materialNameRow = new UIRow();
|
|
|
|
+ var materialName = new UIInput().setWidth( '150px' ).setFontSize( '12px' ).onChange( function () {
|
|
|
|
|
|
editor.execute( new SetMaterialValueCommand( editor, editor.selected, 'name', materialName.getValue(), currentMaterialSlot ) );
|
|
editor.execute( new SetMaterialValueCommand( editor, editor.selected, 'name', materialName.getValue(), currentMaterialSlot ) );
|
|
|
|
|
|
} );
|
|
} );
|
|
|
|
|
|
- materialNameRow.add( new UI.Text( strings.getKey( 'sidebar/material/name' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialNameRow.add( new UIText( strings.getKey( 'sidebar/material/name' ) ).setWidth( '90px' ) );
|
|
materialNameRow.add( materialName );
|
|
materialNameRow.add( materialName );
|
|
|
|
|
|
container.add( materialNameRow );
|
|
container.add( materialNameRow );
|
|
|
|
|
|
// program
|
|
// program
|
|
|
|
|
|
- var materialProgramRow = new UI.Row();
|
|
|
|
- materialProgramRow.add( new UI.Text( strings.getKey( 'sidebar/material/program' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ var materialProgramRow = new UIRow();
|
|
|
|
+ materialProgramRow.add( new UIText( strings.getKey( 'sidebar/material/program' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
- var materialProgramInfo = new UI.Button( strings.getKey( 'sidebar/material/info' ) );
|
|
|
|
|
|
+ var materialProgramInfo = new UIButton( strings.getKey( 'sidebar/material/info' ) );
|
|
materialProgramInfo.setMarginLeft( '4px' );
|
|
materialProgramInfo.setMarginLeft( '4px' );
|
|
materialProgramInfo.onClick( function () {
|
|
materialProgramInfo.onClick( function () {
|
|
|
|
|
|
@@ -102,7 +152,7 @@ Sidebar.Material = function ( editor ) {
|
|
} );
|
|
} );
|
|
materialProgramRow.add( materialProgramInfo );
|
|
materialProgramRow.add( materialProgramInfo );
|
|
|
|
|
|
- var materialProgramVertex = new UI.Button( strings.getKey( 'sidebar/material/vertex' ) );
|
|
|
|
|
|
+ var materialProgramVertex = new UIButton( strings.getKey( 'sidebar/material/vertex' ) );
|
|
materialProgramVertex.setMarginLeft( '4px' );
|
|
materialProgramVertex.setMarginLeft( '4px' );
|
|
materialProgramVertex.onClick( function () {
|
|
materialProgramVertex.onClick( function () {
|
|
|
|
|
|
@@ -111,7 +161,7 @@ Sidebar.Material = function ( editor ) {
|
|
} );
|
|
} );
|
|
materialProgramRow.add( materialProgramVertex );
|
|
materialProgramRow.add( materialProgramVertex );
|
|
|
|
|
|
- var materialProgramFragment = new UI.Button( strings.getKey( 'sidebar/material/fragment' ) );
|
|
|
|
|
|
+ var materialProgramFragment = new UIButton( strings.getKey( 'sidebar/material/fragment' ) );
|
|
materialProgramFragment.setMarginLeft( '4px' );
|
|
materialProgramFragment.setMarginLeft( '4px' );
|
|
materialProgramFragment.onClick( function () {
|
|
materialProgramFragment.onClick( function () {
|
|
|
|
|
|
@@ -124,30 +174,30 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// color
|
|
// color
|
|
|
|
|
|
- var materialColorRow = new UI.Row();
|
|
|
|
- var materialColor = new UI.Color().onChange( update );
|
|
|
|
|
|
+ var materialColorRow = new UIRow();
|
|
|
|
+ var materialColor = new UIColor().onChange( update );
|
|
|
|
|
|
- materialColorRow.add( new UI.Text( strings.getKey( 'sidebar/material/color' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialColorRow.add( new UIText( strings.getKey( 'sidebar/material/color' ) ).setWidth( '90px' ) );
|
|
materialColorRow.add( materialColor );
|
|
materialColorRow.add( materialColor );
|
|
|
|
|
|
container.add( materialColorRow );
|
|
container.add( materialColorRow );
|
|
|
|
|
|
// roughness
|
|
// roughness
|
|
|
|
|
|
- var materialRoughnessRow = new UI.Row();
|
|
|
|
- var materialRoughness = new UI.Number( 0.5 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
+ var materialRoughnessRow = new UIRow();
|
|
|
|
+ var materialRoughness = new UINumber( 0.5 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
- materialRoughnessRow.add( new UI.Text( strings.getKey( 'sidebar/material/roughness' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialRoughnessRow.add( new UIText( strings.getKey( 'sidebar/material/roughness' ) ).setWidth( '90px' ) );
|
|
materialRoughnessRow.add( materialRoughness );
|
|
materialRoughnessRow.add( materialRoughness );
|
|
|
|
|
|
container.add( materialRoughnessRow );
|
|
container.add( materialRoughnessRow );
|
|
|
|
|
|
// metalness
|
|
// metalness
|
|
|
|
|
|
- var materialMetalnessRow = new UI.Row();
|
|
|
|
- var materialMetalness = new UI.Number( 0.5 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
+ var materialMetalnessRow = new UIRow();
|
|
|
|
+ var materialMetalness = new UINumber( 0.5 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
- materialMetalnessRow.add( new UI.Text( strings.getKey( 'sidebar/material/metalness' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialMetalnessRow.add( new UIText( strings.getKey( 'sidebar/material/metalness' ) ).setWidth( '90px' ) );
|
|
materialMetalnessRow.add( materialMetalness );
|
|
materialMetalnessRow.add( materialMetalness );
|
|
|
|
|
|
container.add( materialMetalnessRow );
|
|
container.add( materialMetalnessRow );
|
|
@@ -155,11 +205,11 @@ Sidebar.Material = function ( editor ) {
|
|
/*
|
|
/*
|
|
// sheen
|
|
// sheen
|
|
|
|
|
|
- var materialSheenRow = new UI.Row();
|
|
|
|
- var materialSheenEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialSheen = new UI.Color().setHexValue( 0x000000 ).onChange( update );
|
|
|
|
|
|
+ var materialSheenRow = new UIRow();
|
|
|
|
+ var materialSheenEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialSheen = new UIColor().setHexValue( 0x000000 ).onChange( update );
|
|
|
|
|
|
- materialSheenRow.add( new UI.Text( strings.getKey( 'sidebar/material/sheen' ) ).setWidth( '90px' ) )
|
|
|
|
|
|
+ materialSheenRow.add( new UIText( strings.getKey( 'sidebar/material/sheen' ) ).setWidth( '90px' ) )
|
|
materialSheenRow.add( materialSheenEnabled );
|
|
materialSheenRow.add( materialSheenEnabled );
|
|
materialSheenRow.add( materialSheen );
|
|
materialSheenRow.add( materialSheen );
|
|
|
|
|
|
@@ -168,58 +218,58 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// emissive
|
|
// emissive
|
|
|
|
|
|
- var materialEmissiveRow = new UI.Row();
|
|
|
|
- var materialEmissive = new UI.Color().setHexValue( 0x000000 ).onChange( update );
|
|
|
|
|
|
+ var materialEmissiveRow = new UIRow();
|
|
|
|
+ var materialEmissive = new UIColor().setHexValue( 0x000000 ).onChange( update );
|
|
|
|
|
|
- materialEmissiveRow.add( new UI.Text( strings.getKey( 'sidebar/material/emissive' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialEmissiveRow.add( new UIText( strings.getKey( 'sidebar/material/emissive' ) ).setWidth( '90px' ) );
|
|
materialEmissiveRow.add( materialEmissive );
|
|
materialEmissiveRow.add( materialEmissive );
|
|
|
|
|
|
container.add( materialEmissiveRow );
|
|
container.add( materialEmissiveRow );
|
|
|
|
|
|
// specular
|
|
// specular
|
|
|
|
|
|
- var materialSpecularRow = new UI.Row();
|
|
|
|
- var materialSpecular = new UI.Color().setHexValue( 0x111111 ).onChange( update );
|
|
|
|
|
|
+ var materialSpecularRow = new UIRow();
|
|
|
|
+ var materialSpecular = new UIColor().setHexValue( 0x111111 ).onChange( update );
|
|
|
|
|
|
- materialSpecularRow.add( new UI.Text( strings.getKey( 'sidebar/material/specular' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialSpecularRow.add( new UIText( strings.getKey( 'sidebar/material/specular' ) ).setWidth( '90px' ) );
|
|
materialSpecularRow.add( materialSpecular );
|
|
materialSpecularRow.add( materialSpecular );
|
|
|
|
|
|
container.add( materialSpecularRow );
|
|
container.add( materialSpecularRow );
|
|
|
|
|
|
// shininess
|
|
// shininess
|
|
|
|
|
|
- var materialShininessRow = new UI.Row();
|
|
|
|
- var materialShininess = new UI.Number( 30 ).onChange( update );
|
|
|
|
|
|
+ var materialShininessRow = new UIRow();
|
|
|
|
+ var materialShininess = new UINumber( 30 ).onChange( update );
|
|
|
|
|
|
- materialShininessRow.add( new UI.Text( strings.getKey( 'sidebar/material/shininess' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialShininessRow.add( new UIText( strings.getKey( 'sidebar/material/shininess' ) ).setWidth( '90px' ) );
|
|
materialShininessRow.add( materialShininess );
|
|
materialShininessRow.add( materialShininess );
|
|
|
|
|
|
container.add( materialShininessRow );
|
|
container.add( materialShininessRow );
|
|
|
|
|
|
// clearcoat
|
|
// clearcoat
|
|
|
|
|
|
- var materialClearcoatRow = new UI.Row();
|
|
|
|
- var materialClearcoat = new UI.Number( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
+ var materialClearcoatRow = new UIRow();
|
|
|
|
+ var materialClearcoat = new UINumber( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
- materialClearcoatRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoat' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialClearcoatRow.add( new UIText( strings.getKey( 'sidebar/material/clearcoat' ) ).setWidth( '90px' ) );
|
|
materialClearcoatRow.add( materialClearcoat );
|
|
materialClearcoatRow.add( materialClearcoat );
|
|
|
|
|
|
container.add( materialClearcoatRow );
|
|
container.add( materialClearcoatRow );
|
|
|
|
|
|
// clearcoatRoughness
|
|
// clearcoatRoughness
|
|
|
|
|
|
- var materialClearcoatRoughnessRow = new UI.Row();
|
|
|
|
- var materialClearcoatRoughness = new UI.Number( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
+ var materialClearcoatRoughnessRow = new UIRow();
|
|
|
|
+ var materialClearcoatRoughness = new UINumber( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
- materialClearcoatRoughnessRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoatroughness' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialClearcoatRoughnessRow.add( new UIText( strings.getKey( 'sidebar/material/clearcoatroughness' ) ).setWidth( '90px' ) );
|
|
materialClearcoatRoughnessRow.add( materialClearcoatRoughness );
|
|
materialClearcoatRoughnessRow.add( materialClearcoatRoughness );
|
|
|
|
|
|
container.add( materialClearcoatRoughnessRow );
|
|
container.add( materialClearcoatRoughnessRow );
|
|
|
|
|
|
// vertex colors
|
|
// vertex colors
|
|
|
|
|
|
- var materialVertexColorsRow = new UI.Row();
|
|
|
|
- var materialVertexColors = new UI.Select().setOptions( {
|
|
|
|
|
|
+ var materialVertexColorsRow = new UIRow();
|
|
|
|
+ var materialVertexColors = new UISelect().setOptions( {
|
|
|
|
|
|
0: strings.getKey( 'sidebar/material/vertexcolors/no' ),
|
|
0: strings.getKey( 'sidebar/material/vertexcolors/no' ),
|
|
1: strings.getKey( 'sidebar/material/vertexcolors/face' ),
|
|
1: strings.getKey( 'sidebar/material/vertexcolors/face' ),
|
|
@@ -227,42 +277,42 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
} ).onChange( update );
|
|
} ).onChange( update );
|
|
|
|
|
|
- materialVertexColorsRow.add( new UI.Text( strings.getKey( 'sidebar/material/vertexcolors' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialVertexColorsRow.add( new UIText( strings.getKey( 'sidebar/material/vertexcolors' ) ).setWidth( '90px' ) );
|
|
materialVertexColorsRow.add( materialVertexColors );
|
|
materialVertexColorsRow.add( materialVertexColors );
|
|
|
|
|
|
container.add( materialVertexColorsRow );
|
|
container.add( materialVertexColorsRow );
|
|
|
|
|
|
// depth packing
|
|
// depth packing
|
|
|
|
|
|
- var materialDepthPackingRow = new UI.Row();
|
|
|
|
- var materialDepthPacking = new UI.Select().setOptions( {
|
|
|
|
- [ THREE.BasicDepthPacking ]: 'BasicDepthPacking',
|
|
|
|
- [ THREE.RGBADepthPacking ]: 'RGBADepthPacking'
|
|
|
|
|
|
+ var materialDepthPackingRow = new UIRow();
|
|
|
|
+ var materialDepthPacking = new UISelect().setOptions( {
|
|
|
|
+ [ BasicDepthPacking ]: 'BasicDepthPacking',
|
|
|
|
+ [ RGBADepthPacking ]: 'RGBADepthPacking'
|
|
} );
|
|
} );
|
|
materialDepthPacking.onChange( update );
|
|
materialDepthPacking.onChange( update );
|
|
|
|
|
|
- materialDepthPackingRow.add( new UI.Text( strings.getKey( 'sidebar/material/depthPacking' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialDepthPackingRow.add( new UIText( strings.getKey( 'sidebar/material/depthPacking' ) ).setWidth( '90px' ) );
|
|
materialDepthPackingRow.add( materialDepthPacking );
|
|
materialDepthPackingRow.add( materialDepthPacking );
|
|
|
|
|
|
container.add( materialDepthPackingRow );
|
|
container.add( materialDepthPackingRow );
|
|
|
|
|
|
// skinning
|
|
// skinning
|
|
|
|
|
|
- var materialSkinningRow = new UI.Row();
|
|
|
|
- var materialSkinning = new UI.Checkbox( false ).onChange( update );
|
|
|
|
|
|
+ var materialSkinningRow = new UIRow();
|
|
|
|
+ var materialSkinning = new UICheckbox( false ).onChange( update );
|
|
|
|
|
|
- materialSkinningRow.add( new UI.Text( strings.getKey( 'sidebar/material/skinning' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialSkinningRow.add( new UIText( strings.getKey( 'sidebar/material/skinning' ) ).setWidth( '90px' ) );
|
|
materialSkinningRow.add( materialSkinning );
|
|
materialSkinningRow.add( materialSkinning );
|
|
|
|
|
|
container.add( materialSkinningRow );
|
|
container.add( materialSkinningRow );
|
|
|
|
|
|
// map
|
|
// map
|
|
|
|
|
|
- var materialMapRow = new UI.Row();
|
|
|
|
- var materialMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialMap = new UI.Texture().onChange( updateMaterial );
|
|
|
|
|
|
+ var materialMapRow = new UIRow();
|
|
|
|
+ var materialMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialMap = new UITexture().onChange( updateMaterial );
|
|
|
|
|
|
- materialMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/map' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialMapRow.add( new UIText( strings.getKey( 'sidebar/material/map' ) ).setWidth( '90px' ) );
|
|
materialMapRow.add( materialMapEnabled );
|
|
materialMapRow.add( materialMapEnabled );
|
|
materialMapRow.add( materialMap );
|
|
materialMapRow.add( materialMap );
|
|
|
|
|
|
@@ -270,11 +320,11 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// matcap map
|
|
// matcap map
|
|
|
|
|
|
- var materialMatcapMapRow = new UI.Row();
|
|
|
|
- var materialMatcapMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialMatcapMap = new UI.Texture().onChange( update );
|
|
|
|
|
|
+ var materialMatcapMapRow = new UIRow();
|
|
|
|
+ var materialMatcapMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialMatcapMap = new UITexture().onChange( update );
|
|
|
|
|
|
- materialMatcapMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/matcap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialMatcapMapRow.add( new UIText( strings.getKey( 'sidebar/material/matcap' ) ).setWidth( '90px' ) );
|
|
materialMatcapMapRow.add( materialMatcapMapEnabled );
|
|
materialMatcapMapRow.add( materialMatcapMapEnabled );
|
|
materialMatcapMapRow.add( materialMatcapMap );
|
|
materialMatcapMapRow.add( materialMatcapMap );
|
|
|
|
|
|
@@ -282,11 +332,11 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// alpha map
|
|
// alpha map
|
|
|
|
|
|
- var materialAlphaMapRow = new UI.Row();
|
|
|
|
- var materialAlphaMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialAlphaMap = new UI.Texture().onChange( update );
|
|
|
|
|
|
+ var materialAlphaMapRow = new UIRow();
|
|
|
|
+ var materialAlphaMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialAlphaMap = new UITexture().onChange( update );
|
|
|
|
|
|
- materialAlphaMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/alphamap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialAlphaMapRow.add( new UIText( strings.getKey( 'sidebar/material/alphamap' ) ).setWidth( '90px' ) );
|
|
materialAlphaMapRow.add( materialAlphaMapEnabled );
|
|
materialAlphaMapRow.add( materialAlphaMapEnabled );
|
|
materialAlphaMapRow.add( materialAlphaMap );
|
|
materialAlphaMapRow.add( materialAlphaMap );
|
|
|
|
|
|
@@ -294,12 +344,12 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// bump map
|
|
// bump map
|
|
|
|
|
|
- var materialBumpMapRow = new UI.Row();
|
|
|
|
- var materialBumpMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialBumpMap = new UI.Texture().onChange( update );
|
|
|
|
- var materialBumpScale = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
+ var materialBumpMapRow = new UIRow();
|
|
|
|
+ var materialBumpMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialBumpMap = new UITexture().onChange( update );
|
|
|
|
+ var materialBumpScale = new UINumber( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
- materialBumpMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/bumpmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialBumpMapRow.add( new UIText( strings.getKey( 'sidebar/material/bumpmap' ) ).setWidth( '90px' ) );
|
|
materialBumpMapRow.add( materialBumpMapEnabled );
|
|
materialBumpMapRow.add( materialBumpMapEnabled );
|
|
materialBumpMapRow.add( materialBumpMap );
|
|
materialBumpMapRow.add( materialBumpMap );
|
|
materialBumpMapRow.add( materialBumpScale );
|
|
materialBumpMapRow.add( materialBumpScale );
|
|
@@ -308,13 +358,13 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// normal map
|
|
// normal map
|
|
|
|
|
|
- var materialNormalMapRow = new UI.Row();
|
|
|
|
- var materialNormalMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialNormalMap = new UI.Texture().onChange( update );
|
|
|
|
- var materialNormalScaleX = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
- var materialNormalScaleY = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
+ var materialNormalMapRow = new UIRow();
|
|
|
|
+ var materialNormalMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialNormalMap = new UITexture().onChange( update );
|
|
|
|
+ var materialNormalScaleX = new UINumber( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
+ var materialNormalScaleY = new UINumber( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
- materialNormalMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/normalmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialNormalMapRow.add( new UIText( strings.getKey( 'sidebar/material/normalmap' ) ).setWidth( '90px' ) );
|
|
materialNormalMapRow.add( materialNormalMapEnabled );
|
|
materialNormalMapRow.add( materialNormalMapEnabled );
|
|
materialNormalMapRow.add( materialNormalMap );
|
|
materialNormalMapRow.add( materialNormalMap );
|
|
materialNormalMapRow.add( materialNormalScaleX );
|
|
materialNormalMapRow.add( materialNormalScaleX );
|
|
@@ -324,13 +374,13 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// clearcoat normal map
|
|
// clearcoat normal map
|
|
|
|
|
|
- var materialClearcoatNormalMapRow = new UI.Row();
|
|
|
|
- var materialClearcoatNormalMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialClearcoatNormalMap = new UI.Texture().onChange( update );
|
|
|
|
- var materialClearcoatNormalScaleX = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
- var materialClearcoatNormalScaleY = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
+ var materialClearcoatNormalMapRow = new UIRow();
|
|
|
|
+ var materialClearcoatNormalMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialClearcoatNormalMap = new UITexture().onChange( update );
|
|
|
|
+ var materialClearcoatNormalScaleX = new UINumber( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
+ var materialClearcoatNormalScaleY = new UINumber( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
- materialClearcoatNormalMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoatnormalmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialClearcoatNormalMapRow.add( new UIText( strings.getKey( 'sidebar/material/clearcoatnormalmap' ) ).setWidth( '90px' ) );
|
|
materialClearcoatNormalMapRow.add( materialClearcoatNormalMapEnabled );
|
|
materialClearcoatNormalMapRow.add( materialClearcoatNormalMapEnabled );
|
|
materialClearcoatNormalMapRow.add( materialClearcoatNormalMap );
|
|
materialClearcoatNormalMapRow.add( materialClearcoatNormalMap );
|
|
materialClearcoatNormalMapRow.add( materialClearcoatNormalScaleX );
|
|
materialClearcoatNormalMapRow.add( materialClearcoatNormalScaleX );
|
|
@@ -340,12 +390,12 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// displacement map
|
|
// displacement map
|
|
|
|
|
|
- var materialDisplacementMapRow = new UI.Row();
|
|
|
|
- var materialDisplacementMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialDisplacementMap = new UI.Texture().onChange( update );
|
|
|
|
- var materialDisplacementScale = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
+ var materialDisplacementMapRow = new UIRow();
|
|
|
|
+ var materialDisplacementMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialDisplacementMap = new UITexture().onChange( update );
|
|
|
|
+ var materialDisplacementScale = new UINumber( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
- materialDisplacementMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/displacemap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialDisplacementMapRow.add( new UIText( strings.getKey( 'sidebar/material/displacemap' ) ).setWidth( '90px' ) );
|
|
materialDisplacementMapRow.add( materialDisplacementMapEnabled );
|
|
materialDisplacementMapRow.add( materialDisplacementMapEnabled );
|
|
materialDisplacementMapRow.add( materialDisplacementMap );
|
|
materialDisplacementMapRow.add( materialDisplacementMap );
|
|
materialDisplacementMapRow.add( materialDisplacementScale );
|
|
materialDisplacementMapRow.add( materialDisplacementScale );
|
|
@@ -354,11 +404,11 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// roughness map
|
|
// roughness map
|
|
|
|
|
|
- var materialRoughnessMapRow = new UI.Row();
|
|
|
|
- var materialRoughnessMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialRoughnessMap = new UI.Texture().onChange( update );
|
|
|
|
|
|
+ var materialRoughnessMapRow = new UIRow();
|
|
|
|
+ var materialRoughnessMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialRoughnessMap = new UITexture().onChange( update );
|
|
|
|
|
|
- materialRoughnessMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/roughmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialRoughnessMapRow.add( new UIText( strings.getKey( 'sidebar/material/roughmap' ) ).setWidth( '90px' ) );
|
|
materialRoughnessMapRow.add( materialRoughnessMapEnabled );
|
|
materialRoughnessMapRow.add( materialRoughnessMapEnabled );
|
|
materialRoughnessMapRow.add( materialRoughnessMap );
|
|
materialRoughnessMapRow.add( materialRoughnessMap );
|
|
|
|
|
|
@@ -366,11 +416,11 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// metalness map
|
|
// metalness map
|
|
|
|
|
|
- var materialMetalnessMapRow = new UI.Row();
|
|
|
|
- var materialMetalnessMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialMetalnessMap = new UI.Texture().onChange( update );
|
|
|
|
|
|
+ var materialMetalnessMapRow = new UIRow();
|
|
|
|
+ var materialMetalnessMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialMetalnessMap = new UITexture().onChange( update );
|
|
|
|
|
|
- materialMetalnessMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/metalmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialMetalnessMapRow.add( new UIText( strings.getKey( 'sidebar/material/metalmap' ) ).setWidth( '90px' ) );
|
|
materialMetalnessMapRow.add( materialMetalnessMapEnabled );
|
|
materialMetalnessMapRow.add( materialMetalnessMapEnabled );
|
|
materialMetalnessMapRow.add( materialMetalnessMap );
|
|
materialMetalnessMapRow.add( materialMetalnessMap );
|
|
|
|
|
|
@@ -378,11 +428,11 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// specular map
|
|
// specular map
|
|
|
|
|
|
- var materialSpecularMapRow = new UI.Row();
|
|
|
|
- var materialSpecularMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialSpecularMap = new UI.Texture().onChange( update );
|
|
|
|
|
|
+ var materialSpecularMapRow = new UIRow();
|
|
|
|
+ var materialSpecularMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialSpecularMap = new UITexture().onChange( update );
|
|
|
|
|
|
- materialSpecularMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/specularmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialSpecularMapRow.add( new UIText( strings.getKey( 'sidebar/material/specularmap' ) ).setWidth( '90px' ) );
|
|
materialSpecularMapRow.add( materialSpecularMapEnabled );
|
|
materialSpecularMapRow.add( materialSpecularMapEnabled );
|
|
materialSpecularMapRow.add( materialSpecularMap );
|
|
materialSpecularMapRow.add( materialSpecularMap );
|
|
|
|
|
|
@@ -390,12 +440,12 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// env map
|
|
// env map
|
|
|
|
|
|
- var materialEnvMapRow = new UI.Row();
|
|
|
|
- var materialEnvMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialEnvMap = new UI.Texture( THREE.SphericalReflectionMapping ).onChange( updateMaterial );
|
|
|
|
- var materialReflectivity = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
+ var materialEnvMapRow = new UIRow();
|
|
|
|
+ var materialEnvMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialEnvMap = new UITexture( SphericalReflectionMapping ).onChange( updateMaterial );
|
|
|
|
+ var materialReflectivity = new UINumber( 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
- materialEnvMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/envmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialEnvMapRow.add( new UIText( strings.getKey( 'sidebar/material/envmap' ) ).setWidth( '90px' ) );
|
|
materialEnvMapRow.add( materialEnvMapEnabled );
|
|
materialEnvMapRow.add( materialEnvMapEnabled );
|
|
materialEnvMapRow.add( materialEnvMap );
|
|
materialEnvMapRow.add( materialEnvMap );
|
|
materialEnvMapRow.add( materialReflectivity );
|
|
materialEnvMapRow.add( materialReflectivity );
|
|
@@ -404,11 +454,11 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// light map
|
|
// light map
|
|
|
|
|
|
- var materialLightMapRow = new UI.Row();
|
|
|
|
- var materialLightMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialLightMap = new UI.Texture().onChange( update );
|
|
|
|
|
|
+ var materialLightMapRow = new UIRow();
|
|
|
|
+ var materialLightMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialLightMap = new UITexture().onChange( update );
|
|
|
|
|
|
- materialLightMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/lightmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialLightMapRow.add( new UIText( strings.getKey( 'sidebar/material/lightmap' ) ).setWidth( '90px' ) );
|
|
materialLightMapRow.add( materialLightMapEnabled );
|
|
materialLightMapRow.add( materialLightMapEnabled );
|
|
materialLightMapRow.add( materialLightMap );
|
|
materialLightMapRow.add( materialLightMap );
|
|
|
|
|
|
@@ -416,12 +466,12 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// ambient occlusion map
|
|
// ambient occlusion map
|
|
|
|
|
|
- var materialAOMapRow = new UI.Row();
|
|
|
|
- var materialAOMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialAOMap = new UI.Texture().onChange( update );
|
|
|
|
- var materialAOScale = new UI.Number( 1 ).setRange( 0, 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
+ var materialAOMapRow = new UIRow();
|
|
|
|
+ var materialAOMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialAOMap = new UITexture().onChange( update );
|
|
|
|
+ var materialAOScale = new UINumber( 1 ).setRange( 0, 1 ).setWidth( '30px' ).onChange( update );
|
|
|
|
|
|
- materialAOMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/aomap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialAOMapRow.add( new UIText( strings.getKey( 'sidebar/material/aomap' ) ).setWidth( '90px' ) );
|
|
materialAOMapRow.add( materialAOMapEnabled );
|
|
materialAOMapRow.add( materialAOMapEnabled );
|
|
materialAOMapRow.add( materialAOMap );
|
|
materialAOMapRow.add( materialAOMap );
|
|
materialAOMapRow.add( materialAOScale );
|
|
materialAOMapRow.add( materialAOScale );
|
|
@@ -430,11 +480,11 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// emissive map
|
|
// emissive map
|
|
|
|
|
|
- var materialEmissiveMapRow = new UI.Row();
|
|
|
|
- var materialEmissiveMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialEmissiveMap = new UI.Texture().onChange( updateMaterial );
|
|
|
|
|
|
+ var materialEmissiveMapRow = new UIRow();
|
|
|
|
+ var materialEmissiveMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialEmissiveMap = new UITexture().onChange( updateMaterial );
|
|
|
|
|
|
- materialEmissiveMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/emissivemap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialEmissiveMapRow.add( new UIText( strings.getKey( 'sidebar/material/emissivemap' ) ).setWidth( '90px' ) );
|
|
materialEmissiveMapRow.add( materialEmissiveMapEnabled );
|
|
materialEmissiveMapRow.add( materialEmissiveMapEnabled );
|
|
materialEmissiveMapRow.add( materialEmissiveMap );
|
|
materialEmissiveMapRow.add( materialEmissiveMap );
|
|
|
|
|
|
@@ -442,11 +492,11 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// gradient map
|
|
// gradient map
|
|
|
|
|
|
- var materialGradientMapRow = new UI.Row();
|
|
|
|
- var materialGradientMapEnabled = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialGradientMap = new UI.Texture().onChange( update );
|
|
|
|
|
|
+ var materialGradientMapRow = new UIRow();
|
|
|
|
+ var materialGradientMapEnabled = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialGradientMap = new UITexture().onChange( update );
|
|
|
|
|
|
- materialGradientMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/gradientmap' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialGradientMapRow.add( new UIText( strings.getKey( 'sidebar/material/gradientmap' ) ).setWidth( '90px' ) );
|
|
materialGradientMapRow.add( materialGradientMapEnabled );
|
|
materialGradientMapRow.add( materialGradientMapEnabled );
|
|
materialGradientMapRow.add( materialGradientMap );
|
|
materialGradientMapRow.add( materialGradientMap );
|
|
|
|
|
|
@@ -454,8 +504,8 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
// side
|
|
// side
|
|
|
|
|
|
- var materialSideRow = new UI.Row();
|
|
|
|
- var materialSide = new UI.Select().setOptions( {
|
|
|
|
|
|
+ var materialSideRow = new UIRow();
|
|
|
|
+ var materialSide = new UISelect().setOptions( {
|
|
|
|
|
|
0: strings.getKey( 'sidebar/material/side/front' ),
|
|
0: strings.getKey( 'sidebar/material/side/front' ),
|
|
1: strings.getKey( 'sidebar/material/side/back' ),
|
|
1: strings.getKey( 'sidebar/material/side/back' ),
|
|
@@ -463,25 +513,25 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
} ).setWidth( '150px' ).setFontSize( '12px' ).onChange( update );
|
|
} ).setWidth( '150px' ).setFontSize( '12px' ).onChange( update );
|
|
|
|
|
|
- materialSideRow.add( new UI.Text( strings.getKey( 'sidebar/material/side' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialSideRow.add( new UIText( strings.getKey( 'sidebar/material/side' ) ).setWidth( '90px' ) );
|
|
materialSideRow.add( materialSide );
|
|
materialSideRow.add( materialSide );
|
|
|
|
|
|
container.add( materialSideRow );
|
|
container.add( materialSideRow );
|
|
|
|
|
|
// shading
|
|
// shading
|
|
|
|
|
|
- var materialShadingRow = new UI.Row();
|
|
|
|
- var materialShading = new UI.Checkbox( false ).setLeft( '100px' ).onChange( update );
|
|
|
|
|
|
+ var materialShadingRow = new UIRow();
|
|
|
|
+ var materialShading = new UICheckbox( false ).setLeft( '100px' ).onChange( update );
|
|
|
|
|
|
- materialShadingRow.add( new UI.Text( strings.getKey( 'sidebar/material/flatshaded' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialShadingRow.add( new UIText( strings.getKey( 'sidebar/material/flatshaded' ) ).setWidth( '90px' ) );
|
|
materialShadingRow.add( materialShading );
|
|
materialShadingRow.add( materialShading );
|
|
|
|
|
|
container.add( materialShadingRow );
|
|
container.add( materialShadingRow );
|
|
|
|
|
|
// blending
|
|
// blending
|
|
|
|
|
|
- var materialBlendingRow = new UI.Row();
|
|
|
|
- var materialBlending = new UI.Select().setOptions( {
|
|
|
|
|
|
+ var materialBlendingRow = new UIRow();
|
|
|
|
+ var materialBlending = new UISelect().setOptions( {
|
|
|
|
|
|
0: strings.getKey( 'sidebar/material/blending/no' ),
|
|
0: strings.getKey( 'sidebar/material/blending/no' ),
|
|
1: strings.getKey( 'sidebar/material/blending/normal' ),
|
|
1: strings.getKey( 'sidebar/material/blending/normal' ),
|
|
@@ -492,48 +542,48 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
} ).setWidth( '150px' ).setFontSize( '12px' ).onChange( update );
|
|
} ).setWidth( '150px' ).setFontSize( '12px' ).onChange( update );
|
|
|
|
|
|
- materialBlendingRow.add( new UI.Text( strings.getKey( 'sidebar/material/blending' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialBlendingRow.add( new UIText( strings.getKey( 'sidebar/material/blending' ) ).setWidth( '90px' ) );
|
|
materialBlendingRow.add( materialBlending );
|
|
materialBlendingRow.add( materialBlending );
|
|
|
|
|
|
container.add( materialBlendingRow );
|
|
container.add( materialBlendingRow );
|
|
|
|
|
|
// opacity
|
|
// opacity
|
|
|
|
|
|
- var materialOpacityRow = new UI.Row();
|
|
|
|
- var materialOpacity = new UI.Number( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
+ var materialOpacityRow = new UIRow();
|
|
|
|
+ var materialOpacity = new UINumber( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
- materialOpacityRow.add( new UI.Text( strings.getKey( 'sidebar/material/opacity' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialOpacityRow.add( new UIText( strings.getKey( 'sidebar/material/opacity' ) ).setWidth( '90px' ) );
|
|
materialOpacityRow.add( materialOpacity );
|
|
materialOpacityRow.add( materialOpacity );
|
|
|
|
|
|
container.add( materialOpacityRow );
|
|
container.add( materialOpacityRow );
|
|
|
|
|
|
// transparent
|
|
// transparent
|
|
|
|
|
|
- var materialTransparentRow = new UI.Row();
|
|
|
|
- var materialTransparent = new UI.Checkbox().setLeft( '100px' ).onChange( update );
|
|
|
|
|
|
+ var materialTransparentRow = new UIRow();
|
|
|
|
+ var materialTransparent = new UICheckbox().setLeft( '100px' ).onChange( update );
|
|
|
|
|
|
- materialTransparentRow.add( new UI.Text( strings.getKey( 'sidebar/material/transparent' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialTransparentRow.add( new UIText( strings.getKey( 'sidebar/material/transparent' ) ).setWidth( '90px' ) );
|
|
materialTransparentRow.add( materialTransparent );
|
|
materialTransparentRow.add( materialTransparent );
|
|
|
|
|
|
container.add( materialTransparentRow );
|
|
container.add( materialTransparentRow );
|
|
|
|
|
|
// alpha test
|
|
// alpha test
|
|
|
|
|
|
- var materialAlphaTestRow = new UI.Row();
|
|
|
|
- var materialAlphaTest = new UI.Number().setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
+ var materialAlphaTestRow = new UIRow();
|
|
|
|
+ var materialAlphaTest = new UINumber().setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
|
|
|
|
|
|
- materialAlphaTestRow.add( new UI.Text( strings.getKey( 'sidebar/material/alphatest' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialAlphaTestRow.add( new UIText( strings.getKey( 'sidebar/material/alphatest' ) ).setWidth( '90px' ) );
|
|
materialAlphaTestRow.add( materialAlphaTest );
|
|
materialAlphaTestRow.add( materialAlphaTest );
|
|
|
|
|
|
container.add( materialAlphaTestRow );
|
|
container.add( materialAlphaTestRow );
|
|
|
|
|
|
// wireframe
|
|
// wireframe
|
|
|
|
|
|
- var materialWireframeRow = new UI.Row();
|
|
|
|
- var materialWireframe = new UI.Checkbox( false ).onChange( update );
|
|
|
|
- var materialWireframeLinewidth = new UI.Number( 1 ).setWidth( '60px' ).setRange( 0, 100 ).onChange( update );
|
|
|
|
|
|
+ var materialWireframeRow = new UIRow();
|
|
|
|
+ var materialWireframe = new UICheckbox( false ).onChange( update );
|
|
|
|
+ var materialWireframeLinewidth = new UINumber( 1 ).setWidth( '60px' ).setRange( 0, 100 ).onChange( update );
|
|
|
|
|
|
- materialWireframeRow.add( new UI.Text( strings.getKey( 'sidebar/material/wireframe' ) ).setWidth( '90px' ) );
|
|
|
|
|
|
+ materialWireframeRow.add( new UIText( strings.getKey( 'sidebar/material/wireframe' ) ).setWidth( '90px' ) );
|
|
materialWireframeRow.add( materialWireframe );
|
|
materialWireframeRow.add( materialWireframe );
|
|
materialWireframeRow.add( materialWireframeLinewidth );
|
|
materialWireframeRow.add( materialWireframeLinewidth );
|
|
|
|
|
|
@@ -572,7 +622,7 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
if ( material.type !== materialClass.getValue() ) {
|
|
if ( material.type !== materialClass.getValue() ) {
|
|
|
|
|
|
- material = new THREE[ materialClass.getValue() ]();
|
|
|
|
|
|
+ material = new materialClasses[ materialClass.getValue() ]();
|
|
|
|
|
|
if ( material.type == "RawShaderMaterial" ) {
|
|
if ( material.type == "RawShaderMaterial" ) {
|
|
|
|
|
|
@@ -612,7 +662,7 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
var sheenEnabled = materialSheenEnabled.getValue() === true;
|
|
var sheenEnabled = materialSheenEnabled.getValue() === true;
|
|
|
|
|
|
- var sheen = sheenEnabled ? new THREE.Color(materialSheen.getHexValue()) : null;
|
|
|
|
|
|
+ var sheen = sheenEnabled ? new Color(materialSheen.getHexValue()) : null;
|
|
|
|
|
|
editor.execute( new SetMaterialValueCommand( editor, currentObject, 'sheen', sheen, currentMaterialSlot ) );
|
|
editor.execute( new SetMaterialValueCommand( editor, currentObject, 'sheen', sheen, currentMaterialSlot ) );
|
|
|
|
|
|
@@ -1118,9 +1168,9 @@ Sidebar.Material = function ( editor ) {
|
|
|
|
|
|
if ( texture !== null ) {
|
|
if ( texture !== null ) {
|
|
|
|
|
|
- if ( texture.encoding !== THREE.sRGBEncoding ) {
|
|
|
|
|
|
+ if ( texture.encoding !== sRGBEncoding ) {
|
|
|
|
|
|
- texture.encoding = THREE.sRGBEncoding;
|
|
|
|
|
|
+ texture.encoding = sRGBEncoding;
|
|
var object = currentObject;
|
|
var object = currentObject;
|
|
if ( object !== null ) {
|
|
if ( object !== null ) {
|
|
|
|
|
|
@@ -1617,3 +1667,5 @@ Sidebar.Material = function ( editor ) {
|
|
return container;
|
|
return container;
|
|
|
|
|
|
};
|
|
};
|
|
|
|
+
|
|
|
|
+export { SidebarMaterial };
|