Skip to content

Commit 1c03bd6

Browse files
takahiroxmrdoob
takahirox
authored and
mrdoob
committed
Let THREE.PropertyBinding follow code style (mrdoob#9084)
* Let THREE.PropertyBinding.parseTrackName() follow code style * Let CleanupPropertyBinding follow code style more
1 parent 52913d2 commit 1c03bd6

File tree

1 file changed

+35
-29
lines changed

1 file changed

+35
-29
lines changed

‎src/animation/PropertyBinding.js

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ THREE.PropertyBinding.prototype = {
7676

7777
}
7878

79-
if( objectName ) {
79+
if ( objectName ) {
8080

8181
var objectIndex = parsedPath.objectIndex;
8282

@@ -85,14 +85,14 @@ THREE.PropertyBinding.prototype = {
8585

8686
case 'materials':
8787

88-
if( ! targetObject.material ) {
88+
if ( ! targetObject.material ) {
8989

9090
console.error( ' can not bind to material as node does not have a material', this );
9191
return;
9292

9393
}
9494

95-
if( ! targetObject.material.materials ) {
95+
if ( ! targetObject.material.materials ) {
9696

9797
console.error( ' can not bind to material.materials as node.material does not have a materials array', this );
9898
return;
@@ -105,7 +105,7 @@ THREE.PropertyBinding.prototype = {
105105

106106
case 'bones':
107107

108-
if( ! targetObject.skeleton ) {
108+
if ( ! targetObject.skeleton ) {
109109

110110
console.error( ' can not bind to bones as node does not have a skeleton', this );
111111
return;
@@ -120,7 +120,7 @@ THREE.PropertyBinding.prototype = {
120120
// support resolving morphTarget names into indices.
121121
for ( var i = 0; i < targetObject.length; i ++ ) {
122122

123-
if ( targetObject[i].name === objectIndex ) {
123+
if ( targetObject[ i ].name === objectIndex ) {
124124

125125
objectIndex = i;
126126
break;
@@ -147,7 +147,7 @@ THREE.PropertyBinding.prototype = {
147147

148148
if ( objectIndex !== undefined ) {
149149

150-
if( targetObject[ objectIndex ] === undefined ) {
150+
if ( targetObject[ objectIndex ] === undefined ) {
151151

152152
console.error( " trying to bind to objectIndex of objectName, but is undefined:", this, targetObject );
153153
return;
@@ -214,7 +214,7 @@ THREE.PropertyBinding.prototype = {
214214

215215
for ( var i = 0; i < this.node.geometry.morphTargets.length; i ++ ) {
216216

217-
if ( targetObject.geometry.morphTargets[i].name === propertyIndex ) {
217+
if ( targetObject.geometry.morphTargets[ i ].name === propertyIndex ) {
218218

219219
propertyIndex = i;
220220
break;
@@ -544,27 +544,33 @@ THREE.PropertyBinding.parseTrackName = function( trackName ) {
544544
// created and tested via https://regex101.com/#javascript
545545

546546
var re = /^(([\w]+\/)*)([\w-\d]+)?(\.([\w]+)(\[([\w\d\[\]\_.:\- ]+)\])?)?(\.([\w.]+)(\[([\w\d\[\]\_. ]+)\])?)$/;
547-
var matches = re.exec(trackName);
547+
var matches = re.exec( trackName );
548+
549+
if ( ! matches ) {
548550

549-
if( ! matches ) {
550551
throw new Error( "cannot parse trackName at all: " + trackName );
552+
551553
}
552554

553-
if (matches.index === re.lastIndex) {
554-
re.lastIndex++;
555-
}
555+
if ( matches.index === re.lastIndex ) {
556+
557+
re.lastIndex++;
558+
559+
}
556560

557561
var results = {
558-
// directoryName: matches[1], // (tschw) currently unused
559-
nodeName: matches[3], // allowed to be null, specified root node.
560-
objectName: matches[5],
561-
objectIndex: matches[7],
562-
propertyName: matches[9],
563-
propertyIndex: matches[11] // allowed to be null, specifies that the whole property is set.
562+
// directoryName: matches[ 1 ], // (tschw) currently unused
563+
nodeName: matches[ 3 ], // allowed to be null, specified root node.
564+
objectName: matches[ 5 ],
565+
objectIndex: matches[ 7 ],
566+
propertyName: matches[ 9 ],
567+
propertyIndex: matches[ 11 ] // allowed to be null, specifies that the whole property is set.
564568
};
565569

566-
if( results.propertyName === null || results.propertyName.length === 0 ) {
570+
if ( results.propertyName === null || results.propertyName.length === 0 ) {
571+
567572
throw new Error( "can not parse propertyName from trackName: " + trackName );
573+
568574
}
569575

570576
return results;
@@ -573,22 +579,22 @@ THREE.PropertyBinding.parseTrackName = function( trackName ) {
573579

574580
THREE.PropertyBinding.findNode = function( root, nodeName ) {
575581

576-
if( ! nodeName || nodeName === "" || nodeName === "root" || nodeName === "." || nodeName === -1 || nodeName === root.name || nodeName === root.uuid ) {
582+
if ( ! nodeName || nodeName === "" || nodeName === "root" || nodeName === "." || nodeName === -1 || nodeName === root.name || nodeName === root.uuid ) {
577583

578584
return root;
579585

580586
}
581587

582588
// search into skeleton bones.
583-
if( root.skeleton ) {
589+
if ( root.skeleton ) {
584590

585591
var searchSkeleton = function( skeleton ) {
586592

587593
for( var i = 0; i < skeleton.bones.length; i ++ ) {
588594

589-
var bone = skeleton.bones[i];
595+
var bone = skeleton.bones[ i ];
590596

591-
if( bone.name === nodeName ) {
597+
if ( bone.name === nodeName ) {
592598

593599
return bone;
594600

@@ -601,31 +607,31 @@ THREE.PropertyBinding.findNode = function( root, nodeName ) {
601607

602608
var bone = searchSkeleton( root.skeleton );
603609

604-
if( bone ) {
610+
if ( bone ) {
605611

606612
return bone;
607613

608614
}
609615
}
610616

611617
// search into node subtree.
612-
if( root.children ) {
618+
if ( root.children ) {
613619

614620
var searchNodeSubtree = function( children ) {
615621

616622
for( var i = 0; i < children.length; i ++ ) {
617623

618-
var childNode = children[i];
624+
var childNode = children[ i ];
619625

620-
if( childNode.name === nodeName || childNode.uuid === nodeName ) {
626+
if ( childNode.name === nodeName || childNode.uuid === nodeName ) {
621627

622628
return childNode;
623629

624630
}
625631

626632
var result = searchNodeSubtree( childNode.children );
627633

628-
if( result ) return result;
634+
if ( result ) return result;
629635

630636
}
631637

@@ -635,7 +641,7 @@ THREE.PropertyBinding.findNode = function( root, nodeName ) {
635641

636642
var subTreeNode = searchNodeSubtree( root.children );
637643

638-
if( subTreeNode ) {
644+
if ( subTreeNode ) {
639645

640646
return subTreeNode;
641647

0 commit comments

Comments
 (0)