提交 2db8a4a9 编写于 作者: T Temdog007

Fixed coding style

上级 d1f553f3
...@@ -240,8 +240,10 @@ Editor.prototype = { ...@@ -240,8 +240,10 @@ Editor.prototype = {
}, },
addAnimation: function(result) { addAnimation: function ( result ) {
this.animations[result.scene.uuid] = result.animations;
this.animations[ result.scene.uuid ] = result.animations;
}, },
// //
......
...@@ -34,7 +34,7 @@ var Loader = function ( editor ) { ...@@ -34,7 +34,7 @@ var Loader = function ( editor ) {
for ( var i = 0; i < files.length; i ++ ) { for ( var i = 0; i < files.length; i ++ ) {
scope.loadFile( files[ i ], manager ) ; scope.loadFile( files[ i ], manager );
} }
...@@ -150,7 +150,7 @@ var Loader = function ( editor ) { ...@@ -150,7 +150,7 @@ var Loader = function ( editor ) {
stream.offset = 0; stream.offset = 0;
var loader = new THREE.CTMLoader(); var loader = new THREE.CTMLoader();
loader.createModel( new CTM.File( stream ), function( geometry ) { loader.createModel( new CTM.File( stream ), function ( geometry ) {
geometry.sourceType = "ctm"; geometry.sourceType = "ctm";
geometry.sourceFile = file.name; geometry.sourceFile = file.name;
...@@ -216,7 +216,7 @@ var Loader = function ( editor ) { ...@@ -216,7 +216,7 @@ var Loader = function ( editor ) {
loader.parse( contents, '', function ( result ) { loader.parse( contents, '', function ( result ) {
result.scene.name = filename; result.scene.name = filename;
editor.addAnimation(result); editor.addAnimation( result );
editor.execute( new AddObjectCommand( result.scene ) ); editor.execute( new AddObjectCommand( result.scene ) );
} ); } );
...@@ -247,7 +247,7 @@ var Loader = function ( editor ) { ...@@ -247,7 +247,7 @@ var Loader = function ( editor ) {
loader.parse( contents, '', function ( result ) { loader.parse( contents, '', function ( result ) {
result.scene.name = filename; result.scene.name = filename;
editor.addAnimation(result); editor.addAnimation( result );
editor.execute( new AddObjectCommand( result.scene ) ); editor.execute( new AddObjectCommand( result.scene ) );
} ); } );
...@@ -452,7 +452,7 @@ var Loader = function ( editor ) { ...@@ -452,7 +452,7 @@ var Loader = function ( editor ) {
var group = new THREE.Group(); var group = new THREE.Group();
group.scale.multiplyScalar( 0.1 ); group.scale.multiplyScalar( 0.1 );
group.scale.y *= -1; group.scale.y *= - 1;
for ( var i = 0; i < paths.length; i ++ ) { for ( var i = 0; i < paths.length; i ++ ) {
...@@ -680,7 +680,7 @@ var Loader = function ( editor ) { ...@@ -680,7 +680,7 @@ var Loader = function ( editor ) {
var loader = new THREE.GLTFLoader(); var loader = new THREE.GLTFLoader();
loader.parse( file.asArrayBuffer(), '', function ( result ) { loader.parse( file.asArrayBuffer(), '', function ( result ) {
editor.addAnimation(result); editor.addAnimation( result );
editor.execute( new AddObjectCommand( result.scene ) ); editor.execute( new AddObjectCommand( result.scene ) );
} ); } );
...@@ -692,7 +692,7 @@ var Loader = function ( editor ) { ...@@ -692,7 +692,7 @@ var Loader = function ( editor ) {
var loader = new THREE.GLTFLoader( manager ); var loader = new THREE.GLTFLoader( manager );
loader.parse( file.asText(), '', function ( result ) { loader.parse( file.asText(), '', function ( result ) {
editor.addAnimation(result); editor.addAnimation( result );
editor.execute( new AddObjectCommand( result.scene ) ); editor.execute( new AddObjectCommand( result.scene ) );
} ); } );
......
...@@ -9,61 +9,71 @@ Sidebar.Animation = function ( editor ) { ...@@ -9,61 +9,71 @@ Sidebar.Animation = function ( editor ) {
var renderer = null; var renderer = null;
signals.rendererChanged.add( function ( newRenderer ) { signals.rendererChanged.add( function ( newRenderer ) {
renderer = newRenderer; renderer = newRenderer;
});
signals.objectSelected.add(function(object) } );
{
signals.objectSelected.add( function ( object ) {
var uuid = object !== null ? object.uuid : ''; var uuid = object !== null ? object.uuid : '';
var animations = editor.animations[uuid]; var animations = editor.animations[ uuid ];
if(animations !== undefined) if ( animations !== undefined ) {
{
container.setDisplay(''); container.setDisplay( '' );
mixer = new THREE.AnimationMixer(object); mixer = new THREE.AnimationMixer( object );
var options = {}; var options = {};
for(var animation of animations) for ( var animation of animations ) {
{
options[animation.name] = animation.name; options[ animation.name ] = animation.name;
var action = mixer.clipAction( animation );
actions[ animation.name ] = action;
var action = mixer.clipAction(animation);
actions[animation.name] = action;
} }
animationsSelect.setOptions(options); animationsSelect.setOptions( options );
}
else } else {
{
container.setDisplay('none'); container.setDisplay( 'none' );
} }
});
} );
var mixer, currentAnimation, actions = {}; var mixer, currentAnimation, actions = {};
var clock = new THREE.Clock(); var clock = new THREE.Clock();
function updateAnimation() function updateAnimation() {
{
if(mixer !== undefined && renderer !== null) if ( mixer !== undefined && renderer !== null ) {
{
var dt = clock.getDelta(); var dt = clock.getDelta();
mixer.update(dt); mixer.update( dt );
if(currentAnimation !== undefined && currentAnimation.isRunning()) if ( currentAnimation !== undefined && currentAnimation.isRunning() ) {
{
requestAnimationFrame(updateAnimation); requestAnimationFrame( updateAnimation );
renderer.render(editor.scene, editor.camera); renderer.render( editor.scene, editor.camera );
}
else } else {
{
currentAnimation = undefined; currentAnimation = undefined;
} }
} }
} }
function stopAnimations() function stopAnimations() {
{
if(mixer !== undefined) if ( mixer !== undefined ) {
{
mixer.stopAllAction(); mixer.stopAllAction();
} }
} }
var container = new UI.Panel(); var container = new UI.Panel();
...@@ -71,21 +81,23 @@ Sidebar.Animation = function ( editor ) { ...@@ -71,21 +81,23 @@ Sidebar.Animation = function ( editor ) {
container.add( new UI.Text( 'Animation' ).setTextTransform( 'uppercase' ) ); container.add( new UI.Text( 'Animation' ).setTextTransform( 'uppercase' ) );
var div = new UI.Div().setMarginLeft('90px'); var div = new UI.Div().setMarginLeft( '90px' );
container.add(div); container.add( div );
div.add( new UI.Button( "Stop" ).setFontSize( '12px' ).onClick( stopAnimations ), new UI.Break() );
div.add(new UI.Button("Stop").setFontSize('12px').onClick(stopAnimations), new UI.Break()); var animationsSelect = new UI.Select().setFontSize( '12px' ).setMarginTop( '10px' ).onChange( function () {
currentAnimation = actions[ animationsSelect.getValue() ];
if ( currentAnimation !== undefined ) {
var animationsSelect = new UI.Select().setFontSize('12px').setMarginTop('10px').onChange(function()
{
currentAnimation = actions[animationsSelect.getValue()];
if(currentAnimation !== undefined)
{
stopAnimations(); stopAnimations();
currentAnimation.play(); currentAnimation.play();
updateAnimation(); updateAnimation();
} }
});
} );
div.add( animationsSelect ); div.add( animationsSelect );
return container; return container;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册