Fixed bug with CCSpriteMultiTouch scale and rotate set to one finger

richardgroves · Jul 31, 2014 · e13980d · e13980d
1 parent 32697f7
commit e13980d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Extensions/CCSpriteMultiTouch/CCSpriteMultiTouch.m b/Extensions/CCSpriteMultiTouch/CCSpriteMultiTouch.m
@@ -30,6 +30,7 @@
 
 #define CCSpriteMultiTouchMaxTouches 3
 #define CCSpriteMultiTouchFuntionDisable 0
+#define CCSpriteMinTouchCountForScaleAndRotate 2
 
 //----------------------------------------------------------------------
 
@@ -145,11 +146,15 @@ - (void)touchMoved:(UITouch *)touch withEvent:(UIEvent *)event
     // check for dragging
     if (_touchCount == _touchCountForDrag) [self touchDrag];
 
-    // check for scaling
-    if (_touchCount == _touchCountForScale) [self touchScale];
+    if (_touchCount >= CCSpriteMinTouchCountForScaleAndRotate)
+    {
+        // check for scaling
+        if (_touchCount == _touchCountForScale) [self touchScale];
+
+        // check for rotation
+        if (_touchCount == _touchCountForRotate) [self touchRotate];
+    }
 
-    // check for rotation
-    if (_touchCount == _touchCountForRotate) [self touchRotate];
 }
 
 //----------------------------------------------------------------------

diff --git a/...eproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/Birkemose.xcuserdatad/UserInterfaceState.xcuserstate