issue #304 Remove codes for controlling frame rate.

cocos2dx/include/CCDirector.h

@@ -470,16 +470,7 @@ protected:
 	void showFPS(void) {}
 #endif // CC_DIRECTOR_FAST_FPS
 
-	/** calculates delta time since last time it was called */
-	void calculateDeltaTime();
-
-protected:
-	// compute frame rate
-    void computeFrameRate(void);
-	// compute delta time between computing frame rate
-	void calculateFramerateDeltaTime(void);
-
-protected:
+/** calculates delta time since last time it was called */	void calculateDeltaTime();protected:
 	/* The CCXEGLView, where everything is rendered */
     CC_GLVIEW	*m_pobOpenGLView;
 
@@ -493,7 +484,6 @@ protected:
 	int  m_nFrames;
 	ccTime m_fAccumDt;
 	ccTime m_fFrameRate;
-	ccTime m_fExpectedFrameRate;
 #if	CC_DIRECTOR_FAST_FPS
 	CCLabelTTF *m_pFPSLabel;
 #endif
@@ -520,11 +510,6 @@ protected:
 	/* delta time since last tick to main loop */
 	ccTime m_fDeltaTime;
 
-	/* last time the director compute frame rate */
-	struct cc_timeval *m_pLastComputeFrameRate;
-	/* delta time since last computing frame rate */
-	ccTime m_fComputeFrameRateDeltaTime;
-
 	/* whether or not the next delta time will be zero */
 	bool m_bNextDeltaTimeZero;
 	

cocos2dx/platform/CCDirector_mobile.cpp

@@ -102,9 +102,6 @@ bool CCDirector::init(void)
 	m_bDisplayFPS = false;
 	m_nFrames = 0;
 	m_pszFPS = new char[10];
-	m_fExpectedFrameRate = (ccTime)(1 / m_dAnimationInterval);
-	m_fComputeFrameRateDeltaTime = 0;
-	m_pLastComputeFrameRate = new struct cc_timeval();
 	m_pLastUpdate = new struct cc_timeval();
 
 	// paused ?
@@ -148,9 +145,6 @@ CCDirector::~CCDirector(void)
 	// delete m_pLastUpdate
 	CCX_SAFE_DELETE(m_pLastUpdate);
 
-	// delete last compute time
-	CCX_SAFE_DELETE(m_pLastComputeFrameRate);
-
     CCKeypadDispatcher::purgeSharedDispatcher();
 
 	// delete fps string
@@ -678,61 +672,22 @@ void CCDirector::mainLoop(void)
 // updates the FPS every frame
 void CCDirector::showFPS(void)
 {
-	sprintf(m_pszFPS, "%.1f", m_fFrameRate);
-	m_pFPSLabel->setString(m_pszFPS);
-
-    m_pFPSLabel->draw();
-}
-#endif // CC_DIRECTOR_FAST_FPS
-
-void CCDirector::calculateFramerateDeltaTime(void)
-{
-	struct cc_timeval now;
-
-	if (CCTime::gettimeofdayCocos2d(&now, NULL) != 0)
-	{
-		CCLOG("error in gettimeofday");
-		m_fComputeFrameRateDeltaTime = 0;
-		return;
-	}
-
-	m_fComputeFrameRateDeltaTime = (now.tv_sec - m_pLastComputeFrameRate->tv_sec) + (now.tv_usec - m_pLastComputeFrameRate->tv_usec) / 1000000.0f;
-	m_fComputeFrameRateDeltaTime = MAX(0, m_fComputeFrameRateDeltaTime);
-
-	*m_pLastComputeFrameRate = now;
-}
-
-void CCDirector::computeFrameRate()
-{
-	static bool bInvoked = true;
-
-	// compute delta time
-	calculateFramerateDeltaTime();
-
-	// only add frames if the director really draw the scene
-	if (bInvoked)
-	{
-		m_nFrames++;
-	}
-
-	m_fAccumDt += m_fComputeFrameRateDeltaTime;
+	m_nFrames++;
+	m_fAccumDt += m_fDeltaTime;
 
 	if (m_fAccumDt > CC_DIRECTOR_FPS_INTERVAL)
 	{
 		m_fFrameRate = m_nFrames / m_fAccumDt;
+		m_nFrames = 0;
+		m_fAccumDt = 0;
 
-		if (m_fFrameRate > m_fExpectedFrameRate)
-		{
-			bInvoked = false;
-		}
-		else
-		{
-			m_nFrames = 0;
-			m_fAccumDt = 0;
-			bInvoked = true;
-		}
+		sprintf(m_pszFPS, "%.1f", m_fFrameRate);
+		m_pFPSLabel->setString(m_pszFPS);
 	}
+
+    m_pFPSLabel->draw();
 }
+#endif // CC_DIRECTOR_FAST_FPS
 
 
 void CCDirector::showProfilers()
@@ -957,23 +912,17 @@ void CCDisplayLinkDirector::startAnimation(void)
 	}
 
 	m_bInvalid = false;
+	m_pobOpenGLView->setAnimationInterval(m_dAnimationInterval);
 }
 
 void CCDisplayLinkDirector::mainLoop(void)
 {
  	if (! m_bInvalid)
  	{
-		// compute frame rate
-		computeFrameRate();
-
-		// control frame rate
-		if (m_fFrameRate <= m_fExpectedFrameRate)
-		{
- 			drawScene();
+ 		drawScene();
 	 
- 			// release the objects
- 			NSPoolManager::getInstance()->pop();
-		}		
+ 		// release the objects
+ 		NSPoolManager::getInstance()->pop();		
  	}
 }
 
@@ -985,7 +934,6 @@ void CCDisplayLinkDirector::stopAnimation(void)
 void CCDisplayLinkDirector::setAnimationInterval(double dValue)
 {
 	m_dAnimationInterval = dValue;
-	m_fExpectedFrameRate = (ccTime)(1 / m_dAnimationInterval);
 	if (! m_bInvalid)
 	{
 		stopAnimation();

cocos2dx/platform/android/CCXEGLView_android.h

@@ -49,6 +49,7 @@ public:
     void    swapBuffers();
     bool    canSetContentScaleFactor();
     void    setContentScaleFactor(float contentScaleFactor); 
+	void    setAnimationInterval(double interval) {};
     
 private:
 	int m_nWidth;

cocos2dx/platform/iphone/CCDirectorCaller.h

@@ -28,6 +28,7 @@
 }
 -(void) startMainLoop;
 -(void) doCaller: (id) sender;
+-(void) setAnimationInterval:(double)interval;
 +(id) sharedDirectorCaller;
 +(void) destroy;
 @end

cocos2dx/platform/iphone/CCDirectorCaller.mm

@@ -64,6 +64,11 @@ static id s_sharedDirectorCaller;
 	[displayLink setFrameInterval: 1];
 	[displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
 }
+
+-(void) setAnimationInterval:(double)interval
+{
+        [displayLink setFrameInterval: interval];
+}
 					  
 -(void) doCaller: (id) sender
 {

cocos2dx/platform/iphone/CCXEGLView_iphone.h

@@ -44,6 +44,7 @@ public:
     bool    isOpenGLReady();
     bool    canSetContentScaleFactor();
     void    setContentScaleFactor(float contentScaleFactor);
+	void    setAnimationInterval(double interval);
     
     // keep compatible
     void    release();

cocos2dx/platform/iphone/CCXEGLView_iphone.mm

@@ -60,6 +60,11 @@ bool CCXEGLView::isOpenGLReady()
     {
         [[EAGLView sharedEGLView] setContentScaleFactor:contentScaleFactor];
     }
+    
+    void CCXEGLView::setAnimationInterval(double interval)
+    {
+        [CCDirectorCaller setAnimationInterval: interval]
+    }
 
 void CCXEGLView::release()
 {

cocos2dx/platform/mac/CCDirector_mac.mm

@@ -100,9 +100,6 @@ bool CCDirector::init(void)
 	m_bDisplayFPS = false;
 	m_nFrames = 0;
 	m_pszFPS = new char[10];
-	m_fExpectedFrameRate = (ccTime)(1 / m_dAnimationInterval);
-	m_fComputeFrameRateDeltaTime = 0;
-	m_pLastComputeFrameRate = new struct cc_timeval();
 	m_pLastUpdate = new struct cc_timeval();
 
 	// paused ?
@@ -655,62 +652,22 @@ void CCDirector::mainLoop(void)
 // updates the FPS every frame
 void CCDirector::showFPS(void)
 {
-	sprintf(m_pszFPS, "%.1f", m_fFrameRate);
-	m_pFPSLabel->setString(m_pszFPS);
-
-    m_pFPSLabel->draw();
-}
-#endif // CC_DIRECTOR_FAST_FPS
-
-void CCDirector::calculateFramerateDeltaTime(void)
-{
-	struct cc_timeval now;
-
-	if (CCTime::gettimeofdayCocos2d(&now, NULL) != 0)
-	{
-		CCLOG("error in gettimeofday");
-		m_fComputeFrameRateDeltaTime = 0;
-		return;
-	}
-
-	m_fComputeFrameRateDeltaTime = (now.tv_sec - m_pLastComputeFrameRate->tv_sec) + (now.tv_usec - m_pLastComputeFrameRate->tv_usec) / 1000000.0f;
-	m_fComputeFrameRateDeltaTime = MAX(0, m_fComputeFrameRateDeltaTime);
-
-	*m_pLastComputeFrameRate = now;
-}
-
-void CCDirector::computeFrameRate()
-{
-	static bool bInvoked = true;
-
-	// compute delta time
-	calculateFramerateDeltaTime();
-
-	// only add frames if the director really draw the scene
-	if (bInvoked)
-	{
-		m_nFrames++;
-	}
-
-	m_fAccumDt += m_fComputeFrameRateDeltaTime;
+	m_nFrames++;
+	m_fAccumDt += m_fDeltaTime;
 
 	if (m_fAccumDt > CC_DIRECTOR_FPS_INTERVAL)
 	{
 		m_fFrameRate = m_nFrames / m_fAccumDt;
+		m_nFrames = 0;
+		m_fAccumDt = 0;
 
-		if (m_fFrameRate > m_fExpectedFrameRate)
-		{
-			bInvoked = false;
-		}
-		else
-		{
-			m_nFrames = 0;
-			m_fAccumDt = 0;
-			bInvoked = true;
-		}
+		sprintf(m_pszFPS, "%.1f", m_fFrameRate);
+		m_pFPSLabel->setString(m_pszFPS);
 	}
-}
 
+    m_pFPSLabel->draw();
+}
+#endif // CC_DIRECTOR_FAST_FPS
 
 void CCDirector::showProfilers()
 {
@@ -938,17 +895,10 @@ void CCDisplayLinkDirector::mainLoop(void)
 {
  	if (! m_bInvalid)
  	{
-		// compute frame rate
-		computeFrameRate();
-
-		// control frame rate
-		if (m_fFrameRate <= m_fExpectedFrameRate)
-		{
- 			drawScene();
+ 		drawScene();
 	 
- 			// release the objects
- 			NSPoolManager::getInstance()->pop();
-		}		
+ 		// release the objects
+ 		NSPoolManager::getInstance()->pop();		
  	}
 }
 

cocos2dx/platform/uphone/CCXEGLView_uphone.h

@@ -57,6 +57,7 @@ public:
     void    swapBuffers();
 	bool    canSetContentScaleFactor();
 	void    setContentScaleFactor(float contentScaleFactor);
+	void    setAnimationInterval(double interval) {};
 
 protected:
     Boolean OnPenDown(EventType* pEvent, Int32 nIndex);

cocos2dx/platform/win32/CCXEGLView_win32.h

@@ -52,6 +52,7 @@ public:
     void    swapBuffers();
     bool    canSetContentScaleFactor();
     void    setContentScaleFactor(float contentScaleFactor);
+	void    setAnimationInterval(double interval) {};
 
 	virtual bool Create(LPCTSTR pTitle, int w, int h);
 	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);