提交 8d3e2e2d 编写于 作者: M Mr.doob

Editor: Handle UUIDs.

上级 7932fb51
......@@ -19,6 +19,9 @@ Menubar.Add = function ( signals ) {
options.setDisplay( 'none' );
container.add( options );
var meshCount = 0;
var lightCount = 0;
// add plane
var option = new UI.Panel();
......@@ -34,7 +37,7 @@ Menubar.Add = function ( signals ) {
var geometry = new THREE.PlaneGeometry( width, height, widthSegments, heightSegments );
var mesh = new THREE.Mesh( geometry, createDummyMaterial( geometry ) );
mesh.name = 'Plane ' + mesh.id;
mesh.name = 'Plane ' + ( ++ meshCount );
mesh.rotation.x = - Math.PI/2;
......@@ -60,7 +63,7 @@ Menubar.Add = function ( signals ) {
var geometry = new THREE.CubeGeometry( width, height, depth, widthSegments, heightSegments, depthSegments );
var mesh = new THREE.Mesh( geometry, createDummyMaterial( geometry ) );
mesh.name = 'Cube ' + mesh.id;
mesh.name = 'Cube ' + ( ++ meshCount );
signals.objectAdded.dispatch( mesh );
......@@ -84,7 +87,7 @@ Menubar.Add = function ( signals ) {
var geometry = new THREE.CylinderGeometry( radiusTop, radiusBottom, height, radiusSegments, heightSegments, openEnded );
var mesh = new THREE.Mesh( geometry, createDummyMaterial( geometry ) );
mesh.name = 'Cylinder ' + mesh.id;
mesh.name = 'Cylinder ' + ( ++ meshCount );
signals.objectAdded.dispatch( mesh );
......@@ -104,7 +107,7 @@ Menubar.Add = function ( signals ) {
var geometry = new THREE.SphereGeometry( radius, widthSegments, heightSegments );
var mesh = new THREE.Mesh( geometry, createDummyMaterial( geometry ) );
mesh.name = 'Sphere ' + mesh.id;
mesh.name = 'Sphere ' + ( ++ meshCount );
signals.objectAdded.dispatch( mesh );
......@@ -123,7 +126,7 @@ Menubar.Add = function ( signals ) {
var geometry = new THREE.IcosahedronGeometry ( radius, detail );
var mesh = new THREE.Mesh( geometry, createDummyMaterial( geometry ) );
mesh.name = 'Icosahedron ' + mesh.id;
mesh.name = 'Icosahedron ' + ( ++ meshCount );
signals.objectAdded.dispatch( mesh );
......@@ -145,7 +148,7 @@ Menubar.Add = function ( signals ) {
var geometry = new THREE.TorusGeometry( radius, tube, radialSegments, tubularSegments, arc );
var mesh = new THREE.Mesh( geometry, createDummyMaterial( geometry ) );
mesh.name = 'Torus ' + mesh.id;
mesh.name = 'Torus ' + ( ++ meshCount );
signals.objectAdded.dispatch( mesh );
......@@ -169,7 +172,7 @@ Menubar.Add = function ( signals ) {
var geometry = new THREE.TorusKnotGeometry( radius, tube, radialSegments, tubularSegments, p, q, heightScale );
var mesh = new THREE.Mesh( geometry, createDummyMaterial( geometry ) );
mesh.name = 'TorusKnot ' + mesh.id;
mesh.name = 'TorusKnot ' + ( ++ meshCount );
signals.objectAdded.dispatch( mesh );
......@@ -192,7 +195,7 @@ Menubar.Add = function ( signals ) {
var distance = 0;
var light = new THREE.PointLight( color, intensity, distance );
light.name = 'PointLight ' + light.id;
light.name = 'PointLight ' + ( ++ lightCount );
signals.objectAdded.dispatch( light );
......@@ -213,8 +216,8 @@ Menubar.Add = function ( signals ) {
var exponent = 10;
var light = new THREE.SpotLight( color, intensity, distance, angle, exponent );
light.name = 'SpotLight ' + light.id;
light.target.name = 'SpotLight ' + light.id + ' Target';
light.name = 'SpotLight ' + ( ++ lightCount );
light.target.name = 'SpotLight ' + ( lightCount ) + ' Target';
light.position.set( 0, 1, 0 ).multiplyScalar( 200 );
......@@ -234,8 +237,8 @@ Menubar.Add = function ( signals ) {
var intensity = 1;
var light = new THREE.DirectionalLight( color, intensity );
light.name = 'DirectionalLight ' + light.id;
light.target.name = 'DirectionalLight ' + light.id + ' Target';
light.name = 'DirectionalLight ' + ( ++ lightCount );
light.target.name = 'DirectionalLight ' + ( lightCount ) + ' Target';
light.position.set( 1, 1, 1 ).multiplyScalar( 200 );
......@@ -256,7 +259,7 @@ Menubar.Add = function ( signals ) {
var intensity = 1;
var light = new THREE.HemisphereLight( skyColor, groundColor, intensity );
light.name = 'HemisphereLight ' + light.id;
light.name = 'HemisphereLight ' + ( ++ lightCount );
light.position.set( 1, 1, 1 ).multiplyScalar( 200 );
......@@ -275,7 +278,7 @@ Menubar.Add = function ( signals ) {
var color = 0x222222;
var light = new THREE.AmbientLight( color );
light.name = 'AmbientLight ' + light.id;
light.name = 'AmbientLight ' + ( ++ lightCount );
signals.objectAdded.dispatch( light );
......
......@@ -9,15 +9,15 @@ Sidebar.Object3D = function ( signals ) {
container.add( objectType );
container.add( new UI.Break(), new UI.Break() );
// parent
// id
var objectParentRow = new UI.Panel();
var objectParent = new UI.Select().setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).onChange( update );
var objectIdRow = new UI.Panel();
var objectId = new UI.Input().setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).setDisabled( true );
objectParentRow.add( new UI.Text( 'Parent' ).setWidth( '90px' ).setColor( '#666' ) );
objectParentRow.add( objectParent );
objectIdRow.add( new UI.Text( 'Id' ).setWidth( '90px' ).setColor( '#666' ) );
objectIdRow.add( objectId );
container.add( objectParentRow );
container.add( objectIdRow );
// name
......@@ -29,6 +29,16 @@ Sidebar.Object3D = function ( signals ) {
container.add( objectNameRow );
// parent
var objectParentRow = new UI.Panel();
var objectParent = new UI.Select().setWidth( '150px' ).setColor( '#444' ).setFontSize( '12px' ).onChange( update );
objectParentRow.add( new UI.Text( 'Parent' ).setWidth( '90px' ).setColor( '#666' ) );
objectParentRow.add( objectParent );
container.add( objectParentRow );
// position
var objectPositionRow = new UI.Panel();
......@@ -455,6 +465,7 @@ Sidebar.Object3D = function ( signals ) {
updateUI();
} );
signals.objectChanged.add( function ( object ) {
if ( selected === object ) updateUI();
......@@ -469,14 +480,15 @@ Sidebar.Object3D = function ( signals ) {
objectType.setValue( getObjectInstanceName( object ) );
objectId.setValue( object.id );
objectName.setValue( object.name );
if ( object.parent !== undefined ) {
objectParent.setValue( object.parent.id );
}
objectName.setValue( object.name );
objectPositionX.setValue( object.position.x );
objectPositionY.setValue( object.position.y );
objectPositionZ.setValue( object.position.z );
......
......@@ -22,6 +22,14 @@ UI.Element.prototype = {
},
setDisabled: function ( value ) {
this.dom.disabled = value;
return this;
},
setTextContent: function ( value ) {
this.dom.textContent = value;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册