CCEffectUtils - Better error handling when finding node to node transforms

Thayer J Andrews · Thayer J Andrews · commit 6993e06c4719 · 2014-09-26T15:11:33.000-07:00
If there is no common ancestor indicate as much and return early with the identity transform
as the result.
diff --git a/cocos2d/CCEffectUtils.m b/cocos2d/CCEffectUtils.m
@@ -48,6 +48,10 @@ GLKMatrix4 CCEffectUtilsTransformFromNodeToNode(CCNode *first, CCNode *second, B
     {
         *isPossible = (commonAncestor != nil);
     }
+    if (commonAncestor == nil)
+    {
+        return GLKMatrix4Identity;
+    }
 
     // Compute the transform from this node to the common ancestor
     CGAffineTransform t1 = [first nodeToParentTransform];

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ GLKMatrix4 CCEffectUtilsTransformFromNodeToNode(CCNode first, CCNode second, B`
`48`	`48`	`{`
`49`	`49`	`*isPossible = (commonAncestor != nil);`
`50`	`50`	`}`
	`51`	`+ if (commonAncestor == nil)`
	`52`	`+ {`
	`53`	`+ return GLKMatrix4Identity;`
	`54`	`+ }`
`51`	`55`
`52`	`56`	`// Compute the transform from this node to the common ancestor`
`53`	`57`	`CGAffineTransform t1 = [first nodeToParentTransform];`