|
@@ -24,7 +24,8 @@ var materialClasses = {
|
|
'RawShaderMaterial': THREE.RawShaderMaterial,
|
|
'RawShaderMaterial': THREE.RawShaderMaterial,
|
|
'ShaderMaterial': THREE.ShaderMaterial,
|
|
'ShaderMaterial': THREE.ShaderMaterial,
|
|
'ShadowMaterial': THREE.ShadowMaterial,
|
|
'ShadowMaterial': THREE.ShadowMaterial,
|
|
- 'SpriteMaterial': THREE.SpriteMaterial
|
|
|
|
|
|
+ 'SpriteMaterial': THREE.SpriteMaterial,
|
|
|
|
+ 'PointsMaterial': THREE.PointsMaterial
|
|
};
|
|
};
|
|
|
|
|
|
function SidebarMaterial( editor ) {
|
|
function SidebarMaterial( editor ) {
|
|
@@ -75,7 +76,8 @@ function SidebarMaterial( editor ) {
|
|
'RawShaderMaterial': 'RawShaderMaterial',
|
|
'RawShaderMaterial': 'RawShaderMaterial',
|
|
'ShaderMaterial': 'ShaderMaterial',
|
|
'ShaderMaterial': 'ShaderMaterial',
|
|
'ShadowMaterial': 'ShadowMaterial',
|
|
'ShadowMaterial': 'ShadowMaterial',
|
|
- 'SpriteMaterial': 'SpriteMaterial'
|
|
|
|
|
|
+ 'SpriteMaterial': 'SpriteMaterial',
|
|
|
|
+ 'PointsMaterial': 'PointsMaterial'
|
|
|
|
|
|
} ).setWidth( '150px' ).setFontSize( '12px' ).onChange( update );
|
|
} ).setWidth( '150px' ).setFontSize( '12px' ).onChange( update );
|
|
|
|
|
|
@@ -501,6 +503,26 @@ function SidebarMaterial( editor ) {
|
|
|
|
|
|
container.add( materialSideRow );
|
|
container.add( materialSideRow );
|
|
|
|
|
|
|
|
+ // size
|
|
|
|
+
|
|
|
|
+ var materialSizeRow = new UIRow();
|
|
|
|
+ var materialSize = new UINumber( 1 ).setWidth( '60px' ).setRange( 0, Infinity ).onChange( update );
|
|
|
|
+
|
|
|
|
+ materialSizeRow.add( new UIText( strings.getKey( 'sidebar/material/size' ) ).setWidth( '90px' ) );
|
|
|
|
+ materialSizeRow.add( materialSize );
|
|
|
|
+
|
|
|
|
+ container.add( materialSizeRow );
|
|
|
|
+
|
|
|
|
+ // sizeAttenuation
|
|
|
|
+
|
|
|
|
+ var materialSizeAttenuationRow = new UIRow();
|
|
|
|
+ var materialSizeAttenuation = new UICheckbox( true ).onChange( update );
|
|
|
|
+
|
|
|
|
+ materialSizeAttenuationRow.add( new UIText( strings.getKey( 'sidebar/material/sizeAttenuation' ) ).setWidth( '90px' ) );
|
|
|
|
+ materialSizeAttenuationRow.add( materialSizeAttenuation );
|
|
|
|
+
|
|
|
|
+ container.add( materialSizeAttenuationRow );
|
|
|
|
+
|
|
// shading
|
|
// shading
|
|
|
|
|
|
var materialShadingRow = new UIRow();
|
|
var materialShadingRow = new UIRow();
|
|
@@ -1120,6 +1142,28 @@ function SidebarMaterial( editor ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ( material.size !== undefined ) {
|
|
|
|
+
|
|
|
|
+ var size = materialSize.getValue();
|
|
|
|
+ if ( material.size !== size ) {
|
|
|
|
+
|
|
|
|
+ editor.execute( new SetMaterialValueCommand( editor, currentObject, 'size', size, currentMaterialSlot ) );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if ( material.sizeAttenuation !== undefined ) {
|
|
|
|
+
|
|
|
|
+ var sizeAttenuation = materialSizeAttenuation.getValue();
|
|
|
|
+ if ( material.sizeAttenuation !== sizeAttenuation ) {
|
|
|
|
+
|
|
|
|
+ editor.execute( new SetMaterialValueCommand( editor, currentObject, 'sizeAttenuation', sizeAttenuation, currentMaterialSlot ) );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
if ( material.flatShading !== undefined ) {
|
|
if ( material.flatShading !== undefined ) {
|
|
|
|
|
|
var flatShading = materialShading.getValue();
|
|
var flatShading = materialShading.getValue();
|
|
@@ -1248,6 +1292,8 @@ function SidebarMaterial( editor ) {
|
|
'emissiveMap': materialEmissiveMapRow,
|
|
'emissiveMap': materialEmissiveMapRow,
|
|
'gradientMap': materialGradientMapRow,
|
|
'gradientMap': materialGradientMapRow,
|
|
'side': materialSideRow,
|
|
'side': materialSideRow,
|
|
|
|
+ 'size': materialSize,
|
|
|
|
+ 'sizeAttenuation': materialSizeAttenuation,
|
|
'flatShading': materialShadingRow,
|
|
'flatShading': materialShadingRow,
|
|
'blending': materialBlendingRow,
|
|
'blending': materialBlendingRow,
|
|
'opacity': materialOpacityRow,
|
|
'opacity': materialOpacityRow,
|
|
@@ -1602,6 +1648,18 @@ function SidebarMaterial( editor ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ( material.size !== undefined ) {
|
|
|
|
+
|
|
|
|
+ materialSize.setValue( material.size );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if ( material.sizeAttenuation !== undefined ) {
|
|
|
|
+
|
|
|
|
+ materialSizeAttenuation.setValue( material.sizeAttenuation );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
if ( material.flatShading !== undefined ) {
|
|
if ( material.flatShading !== undefined ) {
|
|
|
|
|
|
materialShading.setValue( material.flatShading );
|
|
materialShading.setValue( material.flatShading );
|