Merge pull request #498 from minggo/iss703

fixed #703: refactor Accelerometer

cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp

@@ -148,11 +148,11 @@ void CCLayer::setIsAccelerometerEnabled(bool enabled)
         {
             if (enabled)
             {
-                CCAccelerometer::sharedAccelerometer()->addDelegate(this);
+                CCAccelerometer::sharedAccelerometer()->setDelegate(this);
             }
             else
             {
-                CCAccelerometer::sharedAccelerometer()->removeDelegate(this);
+                CCAccelerometer::sharedAccelerometer()->setDelegate(NULL);
             }
         }
     }
@@ -200,7 +200,7 @@ void CCLayer::onEnter()
     // add this layer to concern the Accelerometer Sensor
     if (m_bIsAccelerometerEnabled)
     {
-        CCAccelerometer::sharedAccelerometer()->addDelegate(this);
+        CCAccelerometer::sharedAccelerometer()->setDelegate(this);
     }
 
     // add this layer to concern the kaypad msg
@@ -220,7 +220,7 @@ void CCLayer::onExit()
     // remove this layer from the delegates who concern Accelerometer Sensor
     if (m_bIsAccelerometerEnabled)
     {
-        CCAccelerometer::sharedAccelerometer()->removeDelegate(this);
+        CCAccelerometer::sharedAccelerometer()->setDelegate(NULL);
     }
 
     // remove this layer from the delegates who concern the kaypad msg
@@ -236,7 +236,7 @@ void CCLayer::onEnterTransitionDidFinish()
 {
     if (m_bIsAccelerometerEnabled)
     {
-        CCAccelerometer::sharedAccelerometer()->addDelegate(this);
+        CCAccelerometer::sharedAccelerometer()->setDelegate(this);
     }
     
     CCNode::onEnterTransitionDidFinish();

cocos2dx/platform/android/CCAccelerometer_android.cpp

@@ -54,15 +54,18 @@ namespace cocos2d
     	return m_spCCAccelerometer;
     }
 
-    void CCAccelerometer::removeDelegate(CCAccelerometerDelegate* pDelegate) 
+    void CCAccelerometer::setDelegate(CCAccelerometerDelegate* pDelegate) 
+	{
+		m_pAccelDelegate = pDelegate;
+
+		if (pDelegate)
+		{		
+			enableAccelerometerJNI();
+		}
+		else
 		{
 			disableAccelerometerJNI();
 		}
-
-    void CCAccelerometer::addDelegate(CCAccelerometerDelegate* pDelegate) 
-	{
-		m_pAccelDelegate = pDelegate;
-		enableAccelerometerJNI();
     }
 
     void CCAccelerometer::update(float x, float y, float z, long sensorTimeStamp) 

cocos2dx/platform/android/CCAccelerometer_android.h

@@ -38,8 +38,7 @@ public:
 
     static CCAccelerometer* sharedAccelerometer();
 
-    void removeDelegate(CCAccelerometerDelegate* pDelegate);
+    void setDelegate(CCAccelerometerDelegate* pDelegate);
-    void addDelegate(CCAccelerometerDelegate* pDelegate);
     void update(float x, float y, float z, long sensorTimeStamp);
 
 private:

cocos2dx/platform/ios/AccelerometerDelegateWrapper.h

@@ -38,6 +38,5 @@
 + (id) sharedAccelerometerDispather;
 - (id) init;
 - (void) addDelegate: (cocos2d::CCAccelerometerDelegate *) delegate;
-- (void) removeDelegate: (cocos2d::CCAccelerometerDelegate *) delegate;
 
 @end

cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm

@@ -56,14 +56,16 @@ static AccelerometerDispatcher* s_pAccelerometerDispatcher;
 
 - (void) addDelegate: (cocos2d::CCAccelerometerDelegate *) delegate
 {
-    [[UIAccelerometer sharedAccelerometer] setDelegate:self];
     delegate_ = delegate;
-}
     
-- (void) removeDelegate: (cocos2d::CCAccelerometerDelegate *) delegate
+    if (delegate_)
+    {
+        [[UIAccelerometer sharedAccelerometer] setDelegate:self];
+    }
+    else 
     {
         [[UIAccelerometer sharedAccelerometer] setDelegate:nil];
-    delegate_ = 0;
+    }
 }
 
 - (void)accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration

cocos2dx/platform/ios/CCAccelerometer_ios.h

@@ -37,8 +37,7 @@ public:
 
     static CCAccelerometer* sharedAccelerometer();
 
-    void removeDelegate(CCAccelerometerDelegate* pDelegate);
+    void setDelegate(CCAccelerometerDelegate* pDelegate);
-    void addDelegate(CCAccelerometerDelegate* pDelegate);
     
 private:
     static CCAccelerometer* m_spUIAccelerometer;

cocos2dx/platform/ios/CCAccelerometer_ios.mm

@@ -46,12 +46,7 @@ namespace cocos2d {
         return m_spUIAccelerometer;
     }
     
-    void CCAccelerometer::removeDelegate(CCAccelerometerDelegate* pDelegate)
+    void CCAccelerometer::setDelegate(CCAccelerometerDelegate* pDelegate)
-    {
-        [[AccelerometerDispatcher sharedAccelerometerDispather] removeDelegate:pDelegate];
-    }
-    
-    void CCAccelerometer::addDelegate(CCAccelerometerDelegate* pDelegate)
     {
         [[AccelerometerDispatcher sharedAccelerometerDispather] addDelegate:pDelegate];
     }

cocos2dx/platform/win32/CCAccelerometer_win32.h

@@ -34,9 +34,7 @@ public:
     ~CCAccelerometer();
 
     static CCAccelerometer* sharedAccelerometer() { return NULL; }
-
+    void setDelegate(CCAccelerometerDelegate* pDelegate) {CC_UNUSED_PARAM(pDelegate);}
-    void removeDelegate(CCAccelerometerDelegate* pDelegate) {CC_UNUSED_PARAM(pDelegate);}
-    void addDelegate(CCAccelerometerDelegate* pDelegate) {CC_UNUSED_PARAM(pDelegate);}
 };
 
 }//namespace   cocos2d 

cocos2dx/platform/wophone/CCAccelerometer_wophone.cpp

@@ -61,20 +61,12 @@ CCAccelerometer* CCAccelerometer::sharedAccelerometer()
     return &s_Accelerometer;
 }
 
-void CCAccelerometer::removeDelegate(CCAccelerometerDelegate* pDelegate)
+void CCAccelerometer::setDelegate(CCAccelerometerDelegate* pDelegate)
-{
-	m_pDelegate = NULL;
-	if (m_pSensor)
-	{
-		m_pSensor->Release();
-		m_pSensor = NULL;
-	}	
-}
-
-void CCAccelerometer::addDelegate(CCAccelerometerDelegate* pDelegate)
 {
 	m_pDelegate = pDelegate;
 
+	if (m_pDelegate)
+	{
 		do 
 		{
 			if (m_pSensor)
@@ -99,7 +91,15 @@ void CCAccelerometer::addDelegate(CCAccelerometerDelegate* pDelegate)
 				CCLOG("cocos2d: The Accelerometer Sensor Open failed");
 			}
 		} while (0);
-	
+	}
+	else
+	{
+		if (m_pSensor)
+		{
+			m_pSensor->Release();
+			m_pSensor = NULL;
+		}
+	}
 }
 
 void CCAccelerometer::didAccelerate(CCAcceleration* pAccelerationValue)

cocos2dx/platform/wophone/CCAccelerometer_wophone.h

@@ -51,12 +51,7 @@ public:
     /**
     @brief add delegate to concern accelerometer sensor
     */
-    void addDelegate(CCAccelerometerDelegate* pDelegate);
+    void setDelegate(CCAccelerometerDelegate* pDelegate);
-
-    /**
-    @brief remove the delegate from the delegates who concern Accelerometer Sensor
-    */
-    void removeDelegate(CCAccelerometerDelegate* pDelegate);
 
     /**
     @brief call delegates' didAccelerate function