瀏覽代碼

Merge pull request #13943 from etr2460/patch-1

Add uuid field to AnimationClip.toJSON
Mr.doob 7 年之前
父節點
當前提交
bbfbe98cb7
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 2 1
      src/animation/AnimationClip.js
  2. 5 1
      src/loaders/ObjectLoader.js

+ 2 - 1
src/animation/AnimationClip.js

@@ -59,7 +59,8 @@ Object.assign( AnimationClip, {
 
 			'name': clip.name,
 			'duration': clip.duration,
-			'tracks': tracks
+			'tracks': tracks,
+			'uuid': clip.uuid
 
 		};
 

+ 5 - 1
src/loaders/ObjectLoader.js

@@ -458,7 +458,11 @@ Object.assign( ObjectLoader.prototype, {
 
 		for ( var i = 0; i < json.length; i ++ ) {
 
-			var clip = AnimationClip.parse( json[ i ] );
+			var data = json[ i ];
+
+			var clip = AnimationClip.parse( data );
+
+			if ( data.uuid !== undefined ) clip.uuid = data.uuid;
 
 			animations.push( clip );