소스 검색

Addressing PR feedback from https://github.com/mrdoob/three.js/pull/18822#discussion_r403237819

- Removed default value from AnimationClip function signature
- Replaced let and const with var
Christine Morten 5 년 전
부모
커밋
0bb86f2c29
4개의 변경된 파일27개의 추가작업 그리고 28개의 파일을 삭제
  1. 0 1
      examples/webgl_animation_skinning_additive_blending.html
  2. 2 2
      src/animation/AnimationClip.js
  3. 16 16
      src/animation/AnimationUtils.js
  4. 9 9
      src/math/Quaternion.js

+ 0 - 1
examples/webgl_animation_skinning_additive_blending.html

@@ -127,7 +127,6 @@
 							// Make the clip additive and remove the reference frame
 
 							THREE.AnimationUtils.makeClipAdditive( clip );
-							console.log( clip );
 
 							if ( clip.name.endsWith( '_pose' ) ) {
 

+ 2 - 2
src/animation/AnimationClip.js

@@ -17,12 +17,12 @@ import { NormalAnimationBlendMode } from '../constants.js';
  * @author David Sarno / http://lighthaus.us/
  */
 
-function AnimationClip( name, duration, tracks, blendMode = NormalAnimationBlendMode ) {
+function AnimationClip( name, duration, tracks, blendMode ) {
 
 	this.name = name;
 	this.tracks = tracks;
 	this.duration = ( duration !== undefined ) ? duration : - 1;
-	this.blendMode = blendMode;
+	this.blendMode = blendMode || NormalAnimationBlendMode;
 
 	this.uuid = MathUtils.generateUUID();
 

+ 16 - 16
src/animation/AnimationUtils.js

@@ -244,22 +244,22 @@ var AnimationUtils = {
 
 		}
 
-		const numTracks = targetClip.tracks.length;
+		var numTracks = targetClip.tracks.length;
 
 		fps = fps > 0 ? fps : 30;
-		const referenceTime = referenceFrame / fps;
+		var referenceTime = referenceFrame / fps;
 
 		// Make each track's values relative to the values at the reference frame
-		for ( let i = 0; i < numTracks; ++ i ) {
+		for ( var i = 0; i < numTracks; ++ i ) {
 
-			const referenceTrack = referenceClip.tracks[ i ];
-			const referenceTrackType = referenceTrack.ValueTypeName;
+			var referenceTrack = referenceClip.tracks[ i ];
+			var referenceTrackType = referenceTrack.ValueTypeName;
 
 			// Skip this track if it's non-numeric
 			if ( referenceTrackType === 'bool' || referenceTrackType === 'string' ) continue;
 
 			// Find the track in the target clip whose name and type matches the reference track
-			const targetTrack = targetClip.tracks.find( track => {
+			var targetTrack = targetClip.tracks.find( track => {
 
 				return track.name === referenceTrack.name
 				&& track.ValueTypeName === referenceTrackType;
@@ -268,9 +268,9 @@ var AnimationUtils = {
 
 			if ( targetTrack === undefined ) continue;
 
-			const valueSize = referenceTrack.getValueSize();
-			const lastIndex = referenceTrack.times.length - 1;
-			let referenceValue;
+			var valueSize = referenceTrack.getValueSize();
+			var lastIndex = referenceTrack.times.length - 1;
+			var referenceValue;
 
 			// Find the value to subtract out of the track
 			if ( referenceTime <= referenceTrack.times[ 0 ] ) {
@@ -281,13 +281,13 @@ var AnimationUtils = {
 			} else if ( referenceTime >= referenceTrack.times[ lastIndex ] ) {
 
 				// Reference frame is after the last keyframe, so just use the last keyframe
-				const startIndex = lastIndex * valueSize;
+				var startIndex = lastIndex * valueSize;
 				referenceValue = AnimationUtils.arraySlice( referenceTrack.values, startIndex );
 
 			} else {
 
 				// Interpolate to the reference value
-				const interpolant = referenceTrack.createInterpolant();
+				var interpolant = referenceTrack.createInterpolant();
 				interpolant.evaluate( referenceTime );
 				referenceValue = interpolant.resultBuffer;
 
@@ -296,7 +296,7 @@ var AnimationUtils = {
 			// Conjugate the quaternion
 			if ( referenceTrackType === 'quaternion' ) {
 
-				const referenceQuat = new Quaternion(
+				var referenceQuat = new Quaternion(
 					referenceValue[ 0 ],
 					referenceValue[ 1 ],
 					referenceValue[ 2 ],
@@ -308,10 +308,10 @@ var AnimationUtils = {
 
 			// Subtract the reference value from all of the track values
 
-			const numTimes = targetTrack.times.length;
-			for ( let j = 0; j < numTimes; ++ j ) {
+			var numTimes = targetTrack.times.length;
+			for ( var j = 0; j < numTimes; ++ j ) {
 
-				const valueStart = j * valueSize;
+				var valueStart = j * valueSize;
 
 				if ( referenceTrackType === 'quaternion' ) {
 
@@ -328,7 +328,7 @@ var AnimationUtils = {
 				} else {
 
 					// Subtract each value for all other numeric track types
-					for ( let k = 0; k < valueSize; ++ k ) {
+					for ( var k = 0; k < valueSize; ++ k ) {
 
 						targetTrack.values[ valueStart + k ] -= referenceValue[ k ];
 

+ 9 - 9
src/math/Quaternion.js

@@ -88,15 +88,15 @@ Object.assign( Quaternion, {
 
 	multiplyQuaternionsFlat: function ( dst, dstOffset, src0, srcOffset0, src1, srcOffset1 ) {
 
-		const x0 = src0[ srcOffset0 ];
-		const y0 = src0[ srcOffset0 + 1 ];
-		const z0 = src0[ srcOffset0 + 2 ];
-		const w0 = src0[ srcOffset0 + 3 ];
-
-		const x1 = src1[ srcOffset1 ];
-		const y1 = src1[ srcOffset1 + 1 ];
-		const z1 = src1[ srcOffset1 + 2 ];
-		const w1 = src1[ srcOffset1 + 3 ];
+		var x0 = src0[ srcOffset0 ];
+		var y0 = src0[ srcOffset0 + 1 ];
+		var z0 = src0[ srcOffset0 + 2 ];
+		var w0 = src0[ srcOffset0 + 3 ];
+
+		var x1 = src1[ srcOffset1 ];
+		var y1 = src1[ srcOffset1 + 1 ];
+		var z1 = src1[ srcOffset1 + 2 ];
+		var w1 = src1[ srcOffset1 + 3 ];
 
 		dst[ dstOffset ] = x0 * w1 + w0 * x1 + y0 * z1 - z0 * y1;
 		dst[ dstOffset + 1 ] = y0 * w1 + w0 * y1 + z0 * x1 - x0 * z1;