Merge pull request #778 from minggo/gles20

implement ActionsProgressTest and run ok on win32

cocos2dx/include/CCProgressTimer.h

@@ -119,6 +119,8 @@ protected:
 
 	bool				m_bReverseDirection;
 
+private:
+	CCProgressTimer();
 };
 
 }

cocos2dx/include/cocos2d.h

@@ -86,6 +86,7 @@ THE SOFTWARE.
 #include "CCTouchDispatcher.h"
 #include "CCDrawingPrimitives.h"
 #include "CCScheduler.h"
+#include "CCProgressTimer.h"
 
 // havn't implement on wophone
 #if (CC_TARGET_PLATFORM != CC_PLATFORM_WOPHONE)

cocos2dx/misc_nodes/CCProgressTimer.cpp

@@ -44,6 +44,18 @@ NS_CC_BEGIN
 //  kProgressTextureCoords holds points {0,1} {0,0} {1,0} {1,1} we can represent it as bits
 const char kCCProgressTextureCoords = 0x4b;
 
+
+CCProgressTimer::CCProgressTimer()
+:m_eType(kCCProgressTimerTypeRadial)
+,m_fPercentage(0.0f)
+,m_pSprite(NULL)
+,m_nVertexDataCount(0)
+,m_pVertexData(NULL)
+,m_tMidpoint(0,0)
+,m_tBarChangeRate(0,0)
+,m_bReverseDirection(false)
+{}
+
 CCProgressTimer* CCProgressTimer::progressWithSprite(CCSprite* sp)
 {
 	CCProgressTimer *pProgressTimer = new CCProgressTimer();

tests/test.win32/test.win32.vcproj

@@ -851,6 +851,18 @@
 					Name="NodeTest"
 					>
 				</Filter>
+				<Filter
+					Name="ActionsProgressTest"
+					>
+					<File
+						RelativePath="..\tests\ActionsProgressTest\ActionsProgressTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\ActionsProgressTest\ActionsProgressTest.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 	</Files>

tests/tests/ActionsProgressTest/ActionsProgressTest.cpp

@@ -0,0 +1,475 @@
+#include "ActionsProgressTest.h"
+#include "../testResource.h"
+
+static int sceneIdx = -1; 
+
+#define MAX_LAYER	7
+
+CCLayer* nextAction();
+CCLayer* backAction();
+CCLayer* restartAction();
+
+CCLayer* createLayer(int nIndex)
+{
+	switch(nIndex)
+	{
+		case 0: return new SpriteProgressToRadial();
+		case 1: return new SpriteProgressToHorizontal();
+		case 2: return new SpriteProgressToVertical();
+		case 3: return new SpriteProgressToRadialMidpointChanged();
+		case 4: return new SpriteProgressBarVarious();
+		case 5: return new SpriteProgressBarTintAndFade();
+		case 6: return new SpriteProgressWithSpriteFrame();
+	}
+
+	return NULL;
+}
+
+CCLayer* nextAction()
+{
+	sceneIdx++;
+	sceneIdx = sceneIdx % MAX_LAYER;
+
+	CCLayer* pLayer = createLayer(sceneIdx);
+	pLayer->autorelease();
+
+	return pLayer;
+}
+
+CCLayer* backAction()
+{
+	sceneIdx--;
+	int total = MAX_LAYER;
+	if( sceneIdx < 0 )
+		sceneIdx += total;	
+	
+	CCLayer* pLayer = createLayer(sceneIdx);
+	pLayer->autorelease();
+
+	return pLayer;
+}
+
+CCLayer* restartAction()
+{
+	CCLayer* pLayer = createLayer(sceneIdx);
+	pLayer->autorelease();
+
+	return pLayer;
+} 
+
+
+void ProgressActionsTestScene::runThisTest()
+{
+    addChild(nextAction());
+    CCDirector::sharedDirector()->replaceScene(this);
+}
+
+
+//------------------------------------------------------------------
+//
+// SpriteDemo
+//
+//------------------------------------------------------------------
+SpriteDemo::SpriteDemo(void)
+{
+}
+
+SpriteDemo::~SpriteDemo(void)
+{
+}
+
+std::string SpriteDemo::title()
+{
+	return "ActionsProgressTest";
+}
+
+std::string SpriteDemo::subtitle()
+{
+	return "";
+}
+
+void SpriteDemo::onEnter()
+{
+	CCLayer::onEnter();
+
+    CCSize s = CCDirector::sharedDirector()->getWinSize();
+
+	CCLabelTTF* label = CCLabelTTF::labelWithString(title().c_str(), "Arial", 18);
+	addChild(label, 1);
+	label->setPosition( CCPointMake(s.width/2, s.height-50) );
+
+	std::string strSubtitle = subtitle();
+	if( ! strSubtitle.empty() ) 
+	{
+		CCLabelTTF* l = CCLabelTTF::labelWithString(strSubtitle.c_str(), "Thonburi", 22);
+		addChild(l, 1);
+		l->setPosition( CCPointMake(s.width/2, s.height-80) );
+	}	
+
+	CCMenuItemImage *item1 = CCMenuItemImage::itemWithNormalImage(s_pPathB1, s_pPathB2, this, menu_selector(SpriteDemo::backCallback) );
+	CCMenuItemImage *item2 = CCMenuItemImage::itemWithNormalImage(s_pPathR1, s_pPathR2, this, menu_selector(SpriteDemo::restartCallback) );
+	CCMenuItemImage *item3 = CCMenuItemImage::itemWithNormalImage(s_pPathF1, s_pPathF2, this, menu_selector(SpriteDemo::nextCallback) );
+
+	CCMenu *menu = CCMenu::menuWithItems(item1, item2, item3, NULL);
+	menu->setPosition( CCPointZero );
+	item1->setPosition( CCPointMake( s.width/2 - 100,30) );
+	item2->setPosition( CCPointMake( s.width/2, 30) );
+	item3->setPosition( CCPointMake( s.width/2 + 100,30) );	
+	addChild(menu, 1);	
+
+	CCLayerColor *background = CCLayerColor::layerWithColor(ccc4(255,0,0,255));
+	addChild(background, -10);
+}
+
+void SpriteDemo::restartCallback(CCObject* pSender)
+{
+	CCScene* s = new ProgressActionsTestScene();
+	s->addChild(restartAction()); 
+
+	CCDirector::sharedDirector()->replaceScene(s);
+    s->release();
+}
+
+void SpriteDemo::nextCallback(CCObject* pSender)
+{
+	CCScene* s = new ProgressActionsTestScene();
+	s->addChild( nextAction() );
+	CCDirector::sharedDirector()->replaceScene(s);
+    s->release();
+}
+
+void SpriteDemo::backCallback(CCObject* pSender)
+{
+	CCScene* s = new ProgressActionsTestScene();
+	s->addChild( backAction() );
+	CCDirector::sharedDirector()->replaceScene(s);
+    s->release();
+} 
+
+//------------------------------------------------------------------
+//
+// SpriteProgressToRadial
+//
+//------------------------------------------------------------------
+void SpriteProgressToRadial::onEnter()
+{
+	SpriteDemo::onEnter();
+	
+	CCSize s = CCDirector::sharedDirector()->getWinSize();
+
+	CCProgressTo *to1 = CCProgressTo::actionWithDuration(2, 100);
+	CCProgressTo *to2 = CCProgressTo::actionWithDuration(2, 100);
+
+	CCProgressTimer *left = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister1));
+	left->setType( kCCProgressTimerTypeRadial );
+	addChild(left);
+	left->setPosition(CCPointMake(100, s.height/2));
+	left->runAction( CCRepeatForever::actionWithAction(to1));
+	
+	CCProgressTimer *right = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathBlock));
+	right->setType(kCCProgressTimerTypeRadial);
+	// Makes the ridial CCW
+	right->setReverseProgress(true);
+	addChild(right);
+	right->setPosition(CCPointMake(s.width-100, s.height/2));
+	right->runAction( CCRepeatForever::actionWithAction(to2));
+}
+
+std::string SpriteProgressToRadial::subtitle()
+{
+	return "ProgressTo Radial";
+}
+
+//------------------------------------------------------------------
+//
+// SpriteProgressToHorizontal
+//
+//------------------------------------------------------------------
+
+void SpriteProgressToHorizontal::onEnter()
+{
+	SpriteDemo::onEnter();
+	
+	CCSize s = CCDirector::sharedDirector()->getWinSize();
+	
+	CCProgressTo *to1 = CCProgressTo::actionWithDuration(2, 100);
+	CCProgressTo *to2 = CCProgressTo::actionWithDuration(2, 100);
+	
+	CCProgressTimer *left = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister1));
+	left->setType(kCCProgressTimerTypeBar);
+	//	Setup for a bar starting from the left since the midpoint is 0 for the x
+	left->setMidpoint(ccp(0,0));
+	//	Setup for a horizontal bar since the bar change rate is 0 for y meaning no vertical change
+	left->setBarChangeRate(ccp(1, 0));
+	addChild(left);
+	left->setPosition(CCPointMake(100, s.height/2));
+	left->runAction( CCRepeatForever::actionWithAction(to1));
+	
+    CCProgressTimer *right = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister2));
+	right->setType(kCCProgressTimerTypeBar);
+	//	Setup for a bar starting from the left since the midpoint is 1 for the x
+	right->setMidpoint(ccp(1, 0));
+	//	Setup for a horizontal bar since the bar change rate is 0 for y meaning no vertical change
+	right->setBarChangeRate(ccp(1, 0));
+	addChild(right);
+	right->setPosition(CCPointMake(s.width-100, s.height/2));
+	right->runAction( CCRepeatForever::actionWithAction(to2));
+}
+
+std::string SpriteProgressToHorizontal::subtitle()
+{
+	return "ProgressTo Horizontal";
+}
+
+//------------------------------------------------------------------
+//
+// SpriteProgressToVertical
+//
+//------------------------------------------------------------------
+void SpriteProgressToVertical::onEnter()
+{
+	SpriteDemo::onEnter();
+	
+	CCSize s = CCDirector::sharedDirector()->getWinSize();
+	
+	CCProgressTo *to1 = CCProgressTo::actionWithDuration(2, 100);
+	CCProgressTo *to2 = CCProgressTo::actionWithDuration(2, 100);
+	
+	CCProgressTimer *left = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister1));
+	left->setType(kCCProgressTimerTypeBar);
+
+	//	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	left->setMidpoint(ccp(0,0));
+	//	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	left->setBarChangeRate(ccp(0, 1));
+	addChild(left);
+	left->setPosition(CCPointMake(100, s.height/2));
+	left->runAction( CCRepeatForever::actionWithAction(to1));
+	
+	CCProgressTimer *right = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister2));
+	right->setType(kCCProgressTimerTypeBar);
+	//	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	right->setMidpoint(ccp(0, 1));
+	//	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	right->setBarChangeRate(ccp(0, 1));
+	addChild(right);
+	right->setPosition(CCPointMake(s.width-100, s.height/2));
+	right->runAction( CCRepeatForever::actionWithAction(to2));
+}
+
+std::string SpriteProgressToVertical::subtitle()
+{
+	return "ProgressTo Vertical";
+}
+
+//------------------------------------------------------------------
+//
+// SpriteProgressToRadialMidpointChanged
+//
+//------------------------------------------------------------------
+void SpriteProgressToRadialMidpointChanged::onEnter()
+{
+	SpriteDemo::onEnter();
+
+	CCSize s = CCDirector::sharedDirector()->getWinSize();
+
+	CCProgressTo *action = CCProgressTo::actionWithDuration(2, 100);
+
+	/**
+   *  Our image on the left should be a radial progress indicator, clockwise
+   */
+	CCProgressTimer *left = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathBlock));
+	left->setType(kCCProgressTimerTypeRadial);
+	addChild(left);
+	left->setMidpoint(ccp(0.25f, 0.75f));
+	left->setPosition(ccp(100, s.height/2));
+	left->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)action->copy()->autorelease()));
+
+    /**
+   *  Our image on the left should be a radial progress indicator, counter clockwise
+   */
+	CCProgressTimer *right = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathBlock));
+	right->setType(kCCProgressTimerTypeRadial);
+	right->setMidpoint(ccp(0.75f, 0.25f));
+
+	/**
+   *  Note the reverse property (default=NO) is only added to the right image. That's how
+   *  we get a counter clockwise progress.
+   */
+	addChild(right);
+	right->setPosition(ccp(s.width-100, s.height/2));
+	right->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)action->copy()->autorelease()));
+}
+
+std::string SpriteProgressToRadialMidpointChanged::subtitle()
+{
+	return "Radial w/ Different Midpoints";
+}
+
+//------------------------------------------------------------------
+//
+// SpriteProgressBarVarious
+//
+//------------------------------------------------------------------
+void SpriteProgressBarVarious::onEnter()
+{
+	SpriteDemo::onEnter();
+
+	CCSize s = CCDirector::sharedDirector()->getWinSize();
+
+	CCProgressTo *to = CCProgressTo::actionWithDuration(2, 100);
+
+	CCProgressTimer *left = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister1));
+	left->setType(kCCProgressTimerTypeBar);
+
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	left->setMidpoint(ccp(0.5f, 0.5f));
+	//	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	left->setBarChangeRate(ccp(1, 0));
+	addChild(left);
+	left->setPosition(ccp(100, s.height/2));
+	left->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+
+	CCProgressTimer *middle = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister2));
+	middle->setType(kCCProgressTimerTypeBar);
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	middle->setMidpoint(ccp(0.5f, 0.5f));
+	//	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	middle->setBarChangeRate(ccp(1,1));
+	addChild(middle);
+	middle->setPosition(ccp(s.width/2, s.height/2));
+	middle->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+
+	CCProgressTimer *right = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister2));
+	right->setType(kCCProgressTimerTypeBar);
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	right->setMidpoint(ccp(0.5f, 0.5f));
+    //	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	right->setBarChangeRate(ccp(0, 1));
+	addChild(right);
+	right->setPosition(ccp(s.width-100, s.height/2));
+	right->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+}
+
+std::string SpriteProgressBarVarious::subtitle()
+{
+	return "ProgressTo Bar Mid";
+}
+
+//------------------------------------------------------------------
+//
+// SpriteProgressBarTintAndFade
+//
+//------------------------------------------------------------------
+void SpriteProgressBarTintAndFade::onEnter()
+{
+	SpriteDemo::onEnter();
+
+	CCSize s = CCDirector::sharedDirector()->getWinSize();
+
+	CCProgressTo *to = CCProgressTo::actionWithDuration(6, 100);
+	CCAction *tint = CCSequence::actions(CCTintTo::actionWithDuration(1, 255, 0, 0),
+		                                 CCTintTo::actionWithDuration(1, 0, 255, 0),
+		                                 CCTintTo::actionWithDuration(1, 0, 0, 255),
+		                                 NULL);
+	CCAction *fade = CCSequence::actions(CCFadeTo::actionWithDuration(1.0f, 0),
+		                                 CCFadeTo::actionWithDuration(1.0f, 255),
+		                                 NULL);
+
+	CCProgressTimer *left = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister1));
+	left->setType(kCCProgressTimerTypeBar);
+
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	left->setMidpoint(ccp(0.5f, 0.5f));
+    //	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	left->setBarChangeRate(ccp(1, 0));
+	addChild(left);
+	left->setPosition(ccp(100, s.height/2));
+	left->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+	left->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)tint->copy()->autorelease()));
+
+	left->addChild(CCLabelTTF::labelWithString("Tint", "Marker Felt", 20.0f));
+
+	CCProgressTimer *middle = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister2));
+	middle->setType(kCCProgressTimerTypeBar);
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	middle->setMidpoint(ccp(0.5f, 0.5f));
+    //	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	middle->setBarChangeRate(ccp(1, 1));
+	addChild(middle);
+	middle->setPosition(ccp(s.width/2, s.height/2));
+	middle->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+	middle->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)fade->copy()->autorelease()));
+
+	middle->addChild(CCLabelTTF::labelWithString("Fade", "Marker Felt", 20.0f));
+
+	CCProgressTimer *right = CCProgressTimer::progressWithSprite(CCSprite::spriteWithFile(s_pPathSister2));
+	right->setType(kCCProgressTimerTypeBar);
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	right->setMidpoint(ccp(0.5f, 0.5f));
+    //	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	right->setBarChangeRate(ccp(0, 1));
+	addChild(right);
+	right->setPosition(ccp(s.width-100, s.height/2));
+	right->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+	right->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)tint->copy()->autorelease()));
+	right->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)fade->copy()->autorelease()));
+
+	right->addChild(CCLabelTTF::labelWithString("Tint and Fade", "Marker Felt", 20.0f));
+}
+
+std::string SpriteProgressBarTintAndFade::subtitle()
+{
+	return "ProgressTo Bar Mid";
+}
+
+//------------------------------------------------------------------
+//
+// SpriteProgressWithSpriteFrame
+//
+//------------------------------------------------------------------
+void SpriteProgressWithSpriteFrame::onEnter()
+{
+	SpriteDemo::onEnter();
+
+	CCSize s = CCDirector::sharedDirector()->getWinSize();
+
+	CCProgressTo *to = CCProgressTo::actionWithDuration(6, 100);
+
+	CCSpriteFrameCache::sharedSpriteFrameCache()->addSpriteFramesWithFile("zwoptex/grossini.plist");
+
+	CCProgressTimer *left = CCProgressTimer::progressWithSprite(CCSprite::spriteWithSpriteFrameName("grossini_dance_01.png"));
+	left->setType(kCCProgressTimerTypeBar);
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	left->setMidpoint(ccp(0.5f, 0.5f));
+    //	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	left->setBarChangeRate(ccp(1, 0));
+	addChild(left);
+	left->setPosition(ccp(100, s.height/2));
+	left->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+
+	CCProgressTimer *middle = CCProgressTimer::progressWithSprite(CCSprite::spriteWithSpriteFrameName("grossini_dance_02.png"));
+	middle->setType(kCCProgressTimerTypeBar);
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	middle->setMidpoint(ccp(0.5f, 0.5f));
+    //	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	middle->setBarChangeRate(ccp(1, 1));
+	addChild(middle);
+	middle->setPosition(ccp(s.width/2, s.height/2));
+	middle->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+
+	CCProgressTimer *right = CCProgressTimer::progressWithSprite(CCSprite::spriteWithSpriteFrameName("grossini_dance_03.png"));
+	right->setType(kCCProgressTimerTypeRadial);
+    //	Setup for a bar starting from the bottom since the midpoint is 0 for the y
+	right->setMidpoint(ccp(0.5f, 0.5f));
+    //	Setup for a vertical bar since the bar change rate is 0 for x meaning no horizontal change
+	right->setBarChangeRate(ccp(0, 1));
+	addChild(right);
+	right->setPosition(ccp(s.width-100, s.height/2));
+	right->runAction(CCRepeatForever::actionWithAction((CCActionInterval *)to->copy()->autorelease()));
+}
+
+std::string SpriteProgressWithSpriteFrame::subtitle()
+{
+	return "Progress With Sprite Frame";
+}

tests/tests/ActionsProgressTest/ActionsProgressTest.h

@@ -1,5 +1,5 @@
-#ifndef _PROGRESS_ACTIONS_TEST_H_
-#define _PROGRESS_ACTIONS_TEST_H_
+#ifndef _ACTIONS__PROGRESS_TEST_H_
+#define _ACTIONS_PROGRESS_TEST_H_
 
 #include "../testBasic.h"
 
@@ -39,6 +39,34 @@ public:
 	virtual std::string subtitle();
 };
 
+class SpriteProgressToRadialMidpointChanged : public SpriteDemo
+{
+public:
+	virtual void onEnter();
+	virtual std::string subtitle();
+};
+
+class SpriteProgressBarVarious : public SpriteDemo
+{
+public:
+	virtual void onEnter();
+	virtual std::string subtitle();
+};
+
+class SpriteProgressBarTintAndFade : public SpriteDemo
+{
+public:
+	virtual void onEnter();
+	virtual std::string subtitle();
+};
+
+class SpriteProgressWithSpriteFrame : public SpriteDemo
+{
+public:
+	virtual void onEnter();
+	virtual std::string subtitle();
+};
+
 class ProgressActionsTestScene : public TestScene
 {
 public:

tests/tests/ProgressActionsTest/ProgressActionsTest.cpp

@@ -1,239 +0,0 @@
-#include "ProgressActionsTest.h"
-#include "../testResource.h"
-
-static int sceneIdx = -1; 
-
-#define MAX_LAYER	3
-
-CCLayer* nextAction();
-CCLayer* backAction();
-CCLayer* restartAction();
-
-CCLayer* createLayer(int nIndex)
-{
-	switch(nIndex)
-	{
-		case 0: return new SpriteProgressToRadial();
-		case 1: return new SpriteProgressToHorizontal();
-		case 2: return new SpriteProgressToVertical();
-	}
-
-	return NULL;
-}
-
-CCLayer* nextAction()
-{
-	sceneIdx++;
-	sceneIdx = sceneIdx % MAX_LAYER;
-
-	CCLayer* pLayer = createLayer(sceneIdx);
-	pLayer->autorelease();
-
-	return pLayer;
-}
-
-CCLayer* backAction()
-{
-	sceneIdx--;
-	int total = MAX_LAYER;
-	if( sceneIdx < 0 )
-		sceneIdx += total;	
-	
-	CCLayer* pLayer = createLayer(sceneIdx);
-	pLayer->autorelease();
-
-	return pLayer;
-}
-
-CCLayer* restartAction()
-{
-	CCLayer* pLayer = createLayer(sceneIdx);
-	pLayer->autorelease();
-
-	return pLayer;
-} 
-
-
-void ProgressActionsTestScene::runThisTest()
-{
-    addChild(nextAction());
-    CCDirector::sharedDirector()->replaceScene(this);
-}
-
-
-//------------------------------------------------------------------
-//
-// SpriteDemo
-//
-//------------------------------------------------------------------
-SpriteDemo::SpriteDemo(void)
-{
-}
-
-SpriteDemo::~SpriteDemo(void)
-{
-}
-
-std::string SpriteDemo::title()
-{
-	return "ProgressActionsTest";
-}
-
-std::string SpriteDemo::subtitle()
-{
-	return "";
-}
-
-void SpriteDemo::onEnter()
-{
-	CCLayer::onEnter();
-
-    CCSize s = CCDirector::sharedDirector()->getWinSize();
-
-	CCLabelTTF* label = CCLabelTTF::labelWithString(title().c_str(), "Arial", 18);
-	addChild(label, 1);
-	label->setPosition( CCPointMake(s.width/2, s.height-50) );
-
-	std::string strSubtitle = subtitle();
-	if( ! strSubtitle.empty() ) 
-	{
-		CCLabelTTF* l = CCLabelTTF::labelWithString(strSubtitle.c_str(), "Thonburi", 22);
-		addChild(l, 1);
-		l->setPosition( CCPointMake(s.width/2, s.height-80) );
-	}	
-
-	CCMenuItemImage *item1 = CCMenuItemImage::itemWithNormalImage(s_pPathB1, s_pPathB2, this, menu_selector(SpriteDemo::backCallback) );
-	CCMenuItemImage *item2 = CCMenuItemImage::itemWithNormalImage(s_pPathR1, s_pPathR2, this, menu_selector(SpriteDemo::restartCallback) );
-	CCMenuItemImage *item3 = CCMenuItemImage::itemWithNormalImage(s_pPathF1, s_pPathF2, this, menu_selector(SpriteDemo::nextCallback) );
-
-	CCMenu *menu = CCMenu::menuWithItems(item1, item2, item3, NULL);
-
-	menu->setPosition( CCPointZero );
-	item1->setPosition( CCPointMake( s.width/2 - 100,30) );
-	item2->setPosition( CCPointMake( s.width/2, 30) );
-	item3->setPosition( CCPointMake( s.width/2 + 100,30) );
-	
-	addChild(menu, 1);	
-}
-
-void SpriteDemo::restartCallback(CCObject* pSender)
-{
-	CCScene* s = new ProgressActionsTestScene();
-	s->addChild(restartAction()); 
-
-	CCDirector::sharedDirector()->replaceScene(s);
-    s->release();
-}
-
-void SpriteDemo::nextCallback(CCObject* pSender)
-{
-	CCScene* s = new ProgressActionsTestScene();
-	s->addChild( nextAction() );
-	CCDirector::sharedDirector()->replaceScene(s);
-    s->release();
-}
-
-void SpriteDemo::backCallback(CCObject* pSender)
-{
-	CCScene* s = new ProgressActionsTestScene();
-	s->addChild( backAction() );
-	CCDirector::sharedDirector()->replaceScene(s);
-    s->release();
-} 
-
-//------------------------------------------------------------------
-//
-// SpriteProgressToRadial
-//
-//------------------------------------------------------------------
-void SpriteProgressToRadial::onEnter()
-{
-	SpriteDemo::onEnter();
-	
-	CCSize s = CCDirector::sharedDirector()->getWinSize();
-
-	CCProgressTo *to1 = CCProgressTo::actionWithDuration(2, 100);
-	CCProgressTo *to2 = CCProgressTo::actionWithDuration(2, 100);
-
-	CCProgressTimer *left = CCProgressTimer::progressWithFile(s_pPathSister1);
-	left->setType( kCCProgressTimerTypeRadialCW );
-	addChild(left);
-	left->setPosition(CCPointMake(100, s.height/2));
-	left->runAction( CCRepeatForever::actionWithAction(to1));
-	
-	CCProgressTimer *right = CCProgressTimer::progressWithFile(s_pPathBlock);
-	right->setType( kCCProgressTimerTypeRadialCCW );
-	addChild(right);
-	right->setPosition(CCPointMake(s.width-100, s.height/2));
-	right->runAction( CCRepeatForever::actionWithAction(to2));
-}
-
-std::string SpriteProgressToRadial::subtitle()
-{
-	return "ProgressTo Radial";
-}
-
-//------------------------------------------------------------------
-//
-// SpriteProgressToHorizontal
-//
-//------------------------------------------------------------------
-
-void SpriteProgressToHorizontal::onEnter()
-{
-	SpriteDemo::onEnter();
-	
-	CCSize s = CCDirector::sharedDirector()->getWinSize();
-	
-	CCProgressTo *to1 = CCProgressTo::actionWithDuration(2, 100);
-	CCProgressTo *to2 = CCProgressTo::actionWithDuration(2, 100);
-	
-	CCProgressTimer *left = CCProgressTimer::progressWithFile(s_pPathSister1);
-	left->setType( kCCProgressTimerTypeHorizontalBarLR );
-	addChild(left);
-	left->setPosition(CCPointMake(100, s.height/2));
-	left->runAction( CCRepeatForever::actionWithAction(to1));
-	
-	CCProgressTimer *right = CCProgressTimer::progressWithFile(s_pPathSister2);
-	right->setType( kCCProgressTimerTypeHorizontalBarRL );
-	addChild(right);
-	right->setPosition(CCPointMake(s.width-100, s.height/2));
-	right->runAction( CCRepeatForever::actionWithAction(to2));
-}
-
-std::string SpriteProgressToHorizontal::subtitle()
-{
-	return "ProgressTo Horizontal";
-}
-
-//------------------------------------------------------------------
-//
-// SpriteProgressToVertical
-//
-//------------------------------------------------------------------
-void SpriteProgressToVertical::onEnter()
-{
-	SpriteDemo::onEnter();
-	
-	CCSize s = CCDirector::sharedDirector()->getWinSize();
-	
-	CCProgressTo *to1 = CCProgressTo::actionWithDuration(2, 100);
-	CCProgressTo *to2 = CCProgressTo::actionWithDuration(2, 100);
-	
-	CCProgressTimer *left = CCProgressTimer::progressWithFile(s_pPathSister1);
-	left->setType( kCCProgressTimerTypeVerticalBarBT );
-	addChild(left);
-	left->setPosition(CCPointMake(100, s.height/2));
-	left->runAction( CCRepeatForever::actionWithAction(to1));
-	
-	CCProgressTimer *right = CCProgressTimer::progressWithFile(s_pPathSister2);
-	right->setType( kCCProgressTimerTypeVerticalBarTB );
-	addChild(right);
-	right->setPosition(CCPointMake(s.width-100, s.height/2));
-	right->runAction( CCRepeatForever::actionWithAction(to2));
-}
-
-std::string SpriteProgressToVertical::subtitle()
-{
-	return "ProgressTo Vertical";
-}

tests/tests/RenderTextureTest/RenderTextureTest.cpp

@@ -213,7 +213,7 @@ void RenderTextureTest::ccTouchesEnded(CCSet* touches, CCEvent* event)
 		if(!touch)
 			break;
 
-		CCPoint location = touch->locationInView(touch->view());
+		CCPoint location = touch->locationInView();
 
 		location = CCDirector::sharedDirector()->convertToGL(location);
 

tests/tests/controller.cpp

@@ -18,8 +18,8 @@ static TestScene* CreateTestScene(int nIdx)
         pScene = new ActionsTestScene(); break;
     case TEST_TRANSITIONS:
         pScene = new TransitionsTestScene(); break;
-//TODO:     case TEST_PROGRESS_ACTIONS:
-//         pScene = new ProgressActionsTestScene(); break;
+     case TEST_PROGRESS_ACTIONS:
+         pScene = new ProgressActionsTestScene(); break;
     case TEST_EFFECTS:
         pScene = new EffectTestScene(); break;
     case TEST_CLICK_AND_MOVE:

tests/tests/tests.h

@@ -3,7 +3,7 @@
 
 #include "ActionsTest/ActionsTest.h"
 #include "TransitionsTest/TransitionsTest.h"
-#include "ProgressActionsTest/ProgressActionsTest.h"
+#include "ActionsProgressTest/ActionsProgressTest.h"
 #include "EffectsTest/EffectsTest.h"
 #include "ClickAndMoveTest/ClickAndMoveTest.h"
 #include "RotateWorldTest/RotateWorldTest.h"
@@ -109,7 +109,7 @@ enum
 const std::string g_aTestNames[TESTS_COUNT] = {
     "ActionsTest",
     "TransitionsTest",
-    "ProgressActionsTest",
+    "ActionsProgressTest",
     "EffectsTest",
     "ClickAndMoveTest",
     "RotateWorldTest",