revert the modification of CCNode_mobile.cpp and CCSprite.cpp

Author: minggo

cocos2dx/platform/CCNode_mobile.cpp

@@ -458,10 +458,7 @@ CCRect CCNode::boundingBox()
 CCRect CCNode::boundingBoxInPixels()
 {
 	CCRect rect = CCRectMake(0, 0, m_tContentSizeInPixels.width, m_tContentSizeInPixels.height);
-	rect = CCRectApplyAffineTransform(rect, nodeToParentTransform());
-    rect.origin.x *= CC_CONTENT_SCALE_FACTOR();
-    rect.origin.y *= CC_CONTENT_SCALE_FACTOR();
-    return rect;
+	return CCRectApplyAffineTransform(rect, nodeToParentTransform());
 }
 
 

cocos2dx/sprite_nodes/CCSprite.cpp

@@ -428,14 +428,14 @@ void CCSprite::updateTextureCoords(CCRect rect)
 	if (m_bRectRotated)
 	{
 #if CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL
-		left	= (2*rect.origin.x+1)/(2*atlasWidth);
-		right	= left+(rect.size.height*2-2)/(2*atlasWidth);
-		top		= (2*rect.origin.y+1)/(2*atlasHeight);
+		left	= (2*rect.origin.x+1)/(2*atlasWidth);
+		right	= left+(rect.size.height*2-2)/(2*atlasWidth);
+		top		= (2*rect.origin.y+1)/(2*atlasHeight);
 		bottom	= top+(rect.size.width*2-2)/(2*atlasHeight);
 #else
-		left	= rect.origin.x/atlasWidth;
-		right	= left+(rect.size.height/atlasWidth);
-		top		= rect.origin.y/atlasHeight;
+		left	= rect.origin.x/atlasWidth;
+		right	= left+(rect.size.height/atlasWidth);
+		top		= rect.origin.y/atlasHeight;
 		bottom	= top+(rect.size.width/atlasHeight);
 #endif // CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL
 
@@ -449,46 +449,46 @@ void CCSprite::updateTextureCoords(CCRect rect)
 			CC_SWAP(left, right, float);
 		}
 
-		m_sQuad.bl.texCoords.u = left;
-		m_sQuad.bl.texCoords.v = top;
-		m_sQuad.br.texCoords.u = left;
-		m_sQuad.br.texCoords.v = bottom;
-		m_sQuad.tl.texCoords.u = right;
-		m_sQuad.tl.texCoords.v = top;
-		m_sQuad.tr.texCoords.u = right;
+		m_sQuad.bl.texCoords.u = left;
+		m_sQuad.bl.texCoords.v = top;
+		m_sQuad.br.texCoords.u = left;
+		m_sQuad.br.texCoords.v = bottom;
+		m_sQuad.tl.texCoords.u = right;
+		m_sQuad.tl.texCoords.v = top;
+		m_sQuad.tr.texCoords.u = right;
 		m_sQuad.tr.texCoords.v = bottom;
 	}
 	else
 	{
-#if CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL
-		left	= (2*rect.origin.x+1)/(2*atlasWidth);
-		right	= left + (rect.size.width*2-2)/(2*atlasWidth);
-		top		= (2*rect.origin.y+1)/(2*atlasHeight);
-		bottom	= top + (rect.size.height*2-2)/(2*atlasHeight);
-#else
-		left	= rect.origin.x/atlasWidth;
-		right	= left + rect.size.width/atlasWidth;
-		top		= rect.origin.y/atlasHeight;
-		bottom	= top + rect.size.height/atlasHeight;
-#endif // ! CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL
-
-		if(m_bFlipX)
-		{
-			CC_SWAP(left,right,float);
-		}
-
-		if(m_bFlipY)
-		{
-			CC_SWAP(top,bottom,float);
-		}
-
-		m_sQuad.bl.texCoords.u = left;
-		m_sQuad.bl.texCoords.v = bottom;
-		m_sQuad.br.texCoords.u = right;
-		m_sQuad.br.texCoords.v = bottom;
-		m_sQuad.tl.texCoords.u = left;
-		m_sQuad.tl.texCoords.v = top;
-		m_sQuad.tr.texCoords.u = right;
+#if CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL
+		left	= (2*rect.origin.x+1)/(2*atlasWidth);
+		right	= left + (rect.size.width*2-2)/(2*atlasWidth);
+		top		= (2*rect.origin.y+1)/(2*atlasHeight);
+		bottom	= top + (rect.size.height*2-2)/(2*atlasHeight);
+#else
+		left	= rect.origin.x/atlasWidth;
+		right	= left + rect.size.width/atlasWidth;
+		top		= rect.origin.y/atlasHeight;
+		bottom	= top + rect.size.height/atlasHeight;
+#endif // ! CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL
+
+		if(m_bFlipX)
+		{
+			CC_SWAP(left,right,float);
+		}
+
+		if(m_bFlipY)
+		{
+			CC_SWAP(top,bottom,float);
+		}
+
+		m_sQuad.bl.texCoords.u = left;
+		m_sQuad.bl.texCoords.v = bottom;
+		m_sQuad.br.texCoords.u = right;
+		m_sQuad.br.texCoords.v = bottom;
+		m_sQuad.tl.texCoords.u = left;
+		m_sQuad.tl.texCoords.v = top;
+		m_sQuad.tr.texCoords.u = right;
 		m_sQuad.tr.texCoords.v = top;
 	}
 }
@@ -543,10 +543,10 @@ void CCSprite::updateTransform(void)
 			// If any of the parents are not visible, then don't draw this node
 			if (! tv.visible)
 			{
-				m_sQuad.br.vertices = m_sQuad.tl.vertices = m_sQuad.tr.vertices = m_sQuad.bl.vertices = vertex3(0,0,0);
-				m_pobTextureAtlas->updateQuad(&m_sQuad, m_uAtlasIndex);
-				m_bDirty = m_bRecursiveDirty = false;
-
+				m_sQuad.br.vertices = m_sQuad.tl.vertices = m_sQuad.tr.vertices = m_sQuad.bl.vertices = vertex3(0,0,0);
+				m_pobTextureAtlas->updateQuad(&m_sQuad, m_uAtlasIndex);
+				m_bDirty = m_bRecursiveDirty = false;
+
 				return;
 			}
 
@@ -675,7 +675,7 @@ void CCSprite::draw(void)
 	}
 
 #if CC_SPRITE_DEBUG_DRAW
-	CCSize s = m_tContentSizeInPixels;
+	CCSize s = m_tContentSize;
 	CCPoint vertices[4]={
 		ccp(0,0),ccp(s.width,0),
 		ccp(s.width,s.height),ccp(0,s.height),