Przeglądaj źródła

Docs: Honor blendMode in animation pages. (#24614)

Michael Herzog 2 lat temu
rodzic
commit
52584f815d

+ 7 - 1
docs/api/en/animation/AnimationAction.html

@@ -27,7 +27,8 @@
 		<p>
 			[page:AnimationMixer mixer] - the `AnimationMixer` that is controlled by this action.<br />
 			[page:AnimationClip clip] - the `AnimationClip` that holds the animation data for this action.<br />
-			[page:Object3D localRoot] - the root object on which this action is performed.<br /><br />
+			[page:Object3D localRoot] - the root object on which this action is performed.<br />
+			[page:Number blendMode] - describes how the animation is blended/combined when two or more animations are simultaneously played.<br /><br />
 
 			Note: Instead of calling this constructor directly you should instantiate an AnimationAction with
 			[page:AnimationMixer.clipAction] since this method provides caching for better performance.
@@ -36,6 +37,11 @@
 
 		<h2>Properties</h2>
 
+		<h3>[property:Number blendMode]</h3>
+		<p>
+			Describes how the animation is blended/combined when two or more animations are simultaneously played. 
+			Valid values are *NormalAnimationBlendMode* (default) and *AdditiveAnimationBlendMode*.
+		</p>
 
 		<h3>[property:Boolean clampWhenFinished]</h3>
 		<p>

+ 9 - 3
docs/api/en/animation/AnimationClip.html

@@ -10,7 +10,7 @@
 		<h1>[name]</h1>
 
 		<p class="desc">
-			An AnimationClip is a reusable set of keyframe tracks which represent an animation.<br /><br />
+			An [name] is a reusable set of keyframe tracks which represent an animation.<br /><br />
 
 			For an overview of the different elements of the three.js animation system see the
 			"Animation System" article in the "Next Steps" section of the manual.
@@ -25,7 +25,9 @@
 			[page:String name] - a name for this clip.<br />
 			[page:Number duration] - the duration of this clip (in seconds). If a negative value is passed,
 			the duration will be calculated from the passed `tracks` array.<br />
-			[page:Array tracks] - an array of [page:KeyframeTrack KeyframeTracks].<br /><br />
+			[page:Array tracks] - an array of [page:KeyframeTrack KeyframeTracks].<br />
+			[page:Number blendMode] - describes how the animation is blended/combined when two or more animations are simultaneously played.<br /><br />
+
 
 			Note: Instead of instantiating an AnimationClip directly with the constructor, you can use one
 			of its static methods to create AnimationClips: from JSON ([page:.parse parse]), from morph
@@ -35,9 +37,13 @@
 			hold AnimationClips in its geometry's animations array.
 		</p>
 
-
 		<h2>Properties</h2>
 
+		<h3>[property:Number blendMode]</h3>
+		<p>
+			Describes how the animation is blended/combined when two or more animations are simultaneously played. 
+			Valid values are *NormalAnimationBlendMode* (default) and *AdditiveAnimationBlendMode*.
+		</p>
 
 		<h3>[property:Number duration]</h3>
 		<p>