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

Updated ios project configuration.

This commit is contained in:
James Chen 2012-04-17 16:14:32 +08:00
parent 413bc3c343
commit 92e44f1c78
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cocos2dx/extensions/CCControlExtension/CCControlSlider.cpp
View File

@ -111,8 +111,8 @@ CCControlSlider* CCControlSlider::sliderWithSprites(CCSprite * backgroundSprite,
void CCControlSlider::setValue(float value)
{
//clamp between the two bounds
value=max(value, m_minimumValue);
value=min(value, m_maximumValue);
value=MAX(value, m_minimumValue);
value=MIN(value, m_maximumValue);
//if we're snapping
if (m_snappingInterval>=0)
@ -180,16 +180,16 @@ CCControlSlider* CCControlSlider::sliderWithSprites(CCSprite * backgroundSprite,
return true;
}
void CCControlSlider::ccTouchMoved(CCTouch *pTouch, CCEvent *pEvent)
{
void CCControlSlider::ccTouchMoved(CCTouch *pTouch, CCEvent *pEvent)
{
CCPoint location = getTouchLocationInControl(pTouch);
sliderMoved(location);
}
sliderMoved(location);
}
void CCControlSlider::ccTouchEnded(CCTouch *pTouch, CCEvent *pEvent)
{
void CCControlSlider::ccTouchEnded(CCTouch *pTouch, CCEvent *pEvent)
{
CCPoint location = getTouchLocationInControl(pTouch);
sliderEnded(CCPointZero);
sliderEnded(CCPointZero);
}
void CCControlSlider::sliderBegan(CCPoint location)

8
cocos2dx/extensions/CCControlExtension/CCControlUtils.cpp
View File

@ -135,11 +135,11 @@ CCRect CCControlUtils::CCRectUnion(const CCRect& src1, const CCRect& src2)
{
CCRect result;
float x1 = min(CCRect::CCRectGetMinX(src1), CCRect::CCRectGetMinX(src2));
float y1 = min(CCRect::CCRectGetMinY(src1), CCRect::CCRectGetMinY(src2));
float x1 = MIN(CCRect::CCRectGetMinX(src1), CCRect::CCRectGetMinX(src2));
float y1 = MIN(CCRect::CCRectGetMinY(src1), CCRect::CCRectGetMinY(src2));
float x2 = max(CCRect::CCRectGetMaxX(src1), CCRect::CCRectGetMaxX(src2));
float y2 = max(CCRect::CCRectGetMaxY(src1), CCRect::CCRectGetMaxY(src2));
float x2 = MAX(CCRect::CCRectGetMaxX(src1), CCRect::CCRectGetMaxX(src2));
float y2 = MAX(CCRect::CCRectGetMaxY(src1), CCRect::CCRectGetMaxY(src2));
result.origin=ccp(x1,x2);
result.size=CCSizeMake(x2-x1, y2-y1);

2
tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
b9cda1260ba870cf512eba65876376a4b0f6c7df
bcd7cf5cfb02c02d077222016fec6b77a05ad107

2
tests/tests/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp
View File

@ -23,7 +23,7 @@
*
*/
#include "ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h"
#include "CCControlButtonTest.h"
bool CCControlButtonTest_HelloVariableSize::init()
{