Merge pull request #1130 from andykorth/PositioningTest1114

slembcke · slembcke · commit 78142a3c231c · 2014-12-22T13:18:40.000-06:00
Fix moving cards with normalized positions and worldspace coords
diff --git a/cocos2d-ui-tests/tests/PositioningTest.m b/cocos2d-ui-tests/tests/PositioningTest.m
@@ -40,6 +40,8 @@ - (void)touchBegan:(CCTouch *)touch withEvent:(CCTouchEvent *)event
 - (void)touchMoved:(CCTouch *)touch withEvent:(CCTouchEvent *)event
 {
     CGPoint pos = [self.parent convertToNodeSpace:touch.locationInWorld];
+    // If we want to position them relative to the window, we can't use normalized positions.
+    self.positionType = CCPositionTypePoints;
     self.position = pos;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ - (void)touchBegan:(CCTouch )touch withEvent:(CCTouchEvent )event`
`40`	`40`	`- (void)touchMoved:(CCTouch )touch withEvent:(CCTouchEvent )event`
`41`	`41`	`{`
`42`	`42`	`CGPoint pos = [self.parent convertToNodeSpace:touch.locationInWorld];`
	`43`	`+ // If we want to position them relative to the window, we can't use normalized positions.`
	`44`	`+ self.positionType = CCPositionTypePoints;`
`43`	`45`	`self.position = pos;`
`44`	`46`	`}`
`45`	`47`