|
@@ -5,22 +5,24 @@ Sidebar.Animation = function ( editor ) {
|
|
|
var options = {};
|
|
|
var possibleAnimations = {};
|
|
|
|
|
|
- var container = new UI.Panel();
|
|
|
+ var container = new UI.CollapsiblePanel();
|
|
|
container.setDisplay( 'none' );
|
|
|
|
|
|
- container.add( new UI.Text( 'Animation' ) );
|
|
|
- container.add( new UI.Break(), new UI.Break() );
|
|
|
+ container.addStatic( new UI.Text( 'ANIMATION' ) );
|
|
|
+ container.add( new UI.Break() );
|
|
|
|
|
|
var AnimationsRow = new UI.Panel();
|
|
|
var Animations = new UI.Select().setOptions( options ).setWidth( '130px' ).setColor( '#444' ).setFontSize( '12px' );
|
|
|
AnimationsRow.add( new UI.Text( 'animations' ).setWidth( '90px' ) );
|
|
|
AnimationsRow.add( Animations );
|
|
|
+
|
|
|
container.add( AnimationsRow );
|
|
|
container.add( new UI.Break() );
|
|
|
|
|
|
var PlayRow = new UI.Panel();
|
|
|
- var playButton = new UI.Button().setLabel("Play").onClick(play);
|
|
|
+ var playButton = new UI.Button().setLabel( 'Play' ).onClick( play );
|
|
|
PlayRow.add( playButton );
|
|
|
+
|
|
|
container.add( PlayRow );
|
|
|
container.add( new UI.Break() );
|
|
|
|
|
@@ -46,28 +48,30 @@ Sidebar.Animation = function ( editor ) {
|
|
|
|
|
|
signals.objectAdded.add( function ( object ) {
|
|
|
|
|
|
- if ( object instanceof THREE.Mesh ) {
|
|
|
+ if ( object instanceof THREE.SkinnedMesh ) {
|
|
|
+
|
|
|
+ var geometry = object.geometry;
|
|
|
+ var material = object.material;
|
|
|
|
|
|
- if ( object.geometry && object.geometry.animation ) {
|
|
|
+ material.skinning = true;
|
|
|
|
|
|
- var name = object.geometry.animation.name;
|
|
|
- options[name] = name
|
|
|
+ var name = geometry.animation.name;
|
|
|
|
|
|
- Animations.setOptions( options );
|
|
|
+ options[ name ] = name
|
|
|
|
|
|
- THREE.AnimationHandler.add( object.geometry.animation );
|
|
|
+ Animations.setOptions( options );
|
|
|
|
|
|
- var animation = new THREE.Animation( object, name, THREE.AnimationHandler.CATMULLROM );
|
|
|
+ THREE.AnimationHandler.add( geometry.animation );
|
|
|
|
|
|
- if ( possibleAnimations[ name ] ){
|
|
|
+ var animation = new THREE.Animation( object, name );
|
|
|
|
|
|
- possibleAnimations[ name ].push( animation );
|
|
|
+ if ( possibleAnimations[ name ] ){
|
|
|
|
|
|
- } else {
|
|
|
+ possibleAnimations[ name ].push( animation );
|
|
|
|
|
|
- possibleAnimations[ name ] = [ animation ];
|
|
|
+ } else {
|
|
|
|
|
|
- }
|
|
|
+ possibleAnimations[ name ] = [ animation ];
|
|
|
|
|
|
}
|
|
|
|