Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migrate convertXXXX to Vector2

This commit is contained in:
Huabing.Xu 2014-04-15 14:29:12 +08:00
parent 4df714b9d8
commit 633173005b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cocos/2d/CCNode.cpp
View File

@ -1517,15 +1517,15 @@ Vector2 Node::convertToWorldSpace(const Vector2& nodePoint) const
} }
Point Node::convertToNodeSpaceAR(const Point& worldPoint) const Vector2 Node::convertToNodeSpaceAR(const Vector2& worldPoint) const
{ {
Point nodePoint = convertToNodeSpace(worldPoint); Vector2 nodePoint = convertToNodeSpace(worldPoint);
return nodePoint - _anchorPointInPoints; return nodePoint - _anchorPointInPoints;
} }
Point Node::convertToWorldSpaceAR(const Point& nodePoint) const Vector2 Node::convertToWorldSpaceAR(const Vector2& nodePoint) const
{ {
Point pt = nodePoint + _anchorPointInPoints; Vector2 pt = nodePoint + _anchorPointInPoints;
return convertToWorldSpace(pt); return convertToWorldSpace(pt);
} }
@ -1536,12 +1536,13 @@ Point Node::convertToWindowSpace(const Point& nodePoint) const
} }
// convenience methods which take a Touch instead of Point // convenience methods which take a Touch instead of Point
Point Node::convertTouchToNodeSpace(Touch *touch) const Vector2 Node::convertTouchToNodeSpace(Touch *touch) const
{ {
Point point = touch->getLocation(); Point point = touch->getLocation();
return this->convertToNodeSpace(point); return this->convertToNodeSpace(point);
} }
Point Node::convertTouchToNodeSpaceAR(Touch *touch) const
Vector2 Node::convertTouchToNodeSpaceAR(Touch *touch) const
{ {
Point point = touch->getLocation(); Point point = touch->getLocation();
return this->convertToNodeSpaceAR(point); return this->convertToNodeSpaceAR(point);

8
cocos/2d/CCNode.h
View File

@ -1253,23 +1253,23 @@ public:
* Converts a Point to node (local) space coordinates. The result is in Points. * Converts a Point to node (local) space coordinates. The result is in Points.
* treating the returned/received node point as anchor relative. * treating the returned/received node point as anchor relative.
*/ */
Point convertToNodeSpaceAR(const Point& worldPoint) const; Vector2 convertToNodeSpaceAR(const Vector2& worldPoint) const;
/** /**
* Converts a local Point to world space coordinates.The result is in Points. * Converts a local Point to world space coordinates.The result is in Points.
* treating the returned/received node point as anchor relative. * treating the returned/received node point as anchor relative.
*/ */
Point convertToWorldSpaceAR(const Point& nodePoint) const; Vector2 convertToWorldSpaceAR(const Vector2& nodePoint) const;
/** /**
* convenience methods which take a Touch instead of Point * convenience methods which take a Touch instead of Point
*/ */
Point convertTouchToNodeSpace(Touch * touch) const; Vector2 convertTouchToNodeSpace(Touch * touch) const;
/** /**
* converts a Touch (world coordinates) into a local coordinate. This method is AR (Anchor Relative). * converts a Touch (world coordinates) into a local coordinate. This method is AR (Anchor Relative).
*/ */
Point convertTouchToNodeSpaceAR(Touch * touch) const; Vector2 convertTouchToNodeSpaceAR(Touch * touch) const;
/** /**
* Sets an additional transform matrix to the node. * Sets an additional transform matrix to the node.