remove unneeded codes

cocos/base/CCDirector.cpp

@@ -68,10 +68,6 @@ THE SOFTWARE.
 #include "base/CCScriptSupport.h"
 #endif
 
-#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
-#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.h"
-#endif
-
 /**
  Position of the FPS
  
@@ -118,7 +114,7 @@ Director::Director()
 {
 }
 
-bool Director::init(void)
+bool Director::init()
 {
  setDefaultValues();
 
@@ -161,13 +157,10 @@ bool Director::init(void)
  _renderer = new (std::nothrow) Renderer;
  RenderState::initialize();
 
-#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
- EngineDataManager::init();
-#endif
  return true;
 }
 
-Director::~Director(void)
+Director::~Director()
 {
  CCLOGINFO("deallocing Director: %p", this);
 
@@ -1128,10 +1121,7 @@ void Director::purgeDirector()
  _openGLView->end();
  _openGLView = nullptr;
  }
-
-#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
- EngineDataManager::destroy();
-#endif
+
  // delete Director
  release();
 }
@@ -1213,7 +1203,7 @@ void Director::pause()
  _oldAnimationInterval = _animationInterval;
 
  // when paused, don't consume CPU
- setAnimationInterval(1 / 4.0, SetIntervalReason::BY_DIRECTOR_PAUSE);
+ setAnimationInterval(1 / 4.0);
  _paused = true;
 }
 
@@ -1224,7 +1214,7 @@ void Director::resume()
  return;
  }
 
- setAnimationInterval(_oldAnimationInterval, SetIntervalReason::BY_ENGINE);
+ setAnimationInterval(_oldAnimationInterval);
 
  _paused = false;
  _deltaTime = 0;
@@ -1449,19 +1439,14 @@ void Director::setEventDispatcher(EventDispatcher* dispatcher)
 }
 
 void Director::startAnimation()
-{
- startAnimation(SetIntervalReason::BY_ENGINE);
-}
-
-void Director::startAnimation(SetIntervalReason reason)
 {
  _lastUpdate = std::chrono::steady_clock::now();
 
  _invalid = false;
 
  _cocos2d_thread_id = std::this_thread::get_id();
 
- Application::getInstance()->setAnimationInterval(_animationInterval, reason);
+ Application::getInstance()->setAnimationInterval(_animationInterval);
 
  // fix issue #3509, skip one fps to avoid incorrect time calculation.
  setNextDeltaTimeZero(true);
@@ -1501,17 +1486,12 @@ void Director::stopAnimation()
 }
 
 void Director::setAnimationInterval(float interval)
-{
- setAnimationInterval(interval, SetIntervalReason::BY_GAME);
-}
-
-void Director::setAnimationInterval(float interval, SetIntervalReason reason)
 {
  _animationInterval = interval;
  if (! _invalid)
  {
  stopAnimation();
- startAnimation(reason);
+ startAnimation();
  }
 }
 

cocos/base/CCDirector.h

@@ -585,10 +585,6 @@ class CC_DLL Director : public Ref
 
 protected:
  void reset();
-
-
- virtual void startAnimation(SetIntervalReason reason);
- virtual void setAnimationInterval(float interval, SetIntervalReason reason);
 
  void purgeDirector();
  bool _purgeDirectorInNextLoop = false; // this flag will be set to true in end()

cocos/base/ccTypes.h

@@ -634,15 +634,6 @@ class CC_DLL Acceleration
 extern const std::string CC_DLL STD_STRING_EMPTY;
 extern const ssize_t CC_DLL CC_INVALID_INDEX;
 
-enum class SetIntervalReason : char
-{
- BY_GAME = 0,
- BY_ENGINE,
- BY_SYSTEM,
- BY_SCENE_CHANGE,
- BY_DIRECTOR_PAUSE
-};
-
 NS_CC_END
 // end group
 /// @}

cocos/cocos2d.h

@@ -212,13 +212,6 @@ THE SOFTWARE.
 //Enhance modification end
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY)
- #include "platform/blackberry/CCApplication.h"
- #include "platform/blackberry/CCGLViewImpl.h"
- #include "platform/blackberry/CCGL.h"
- #include "platform/blackberry/CCStdC.h"
-#endif // CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY
-
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
  #include "platform/win32/CCApplication-win32.h"
  #include "platform/desktop/CCGLViewImpl-desktop.h"
@@ -240,20 +233,6 @@ THE SOFTWARE.
  #include "platform/linux/CCStdC-linux.h"
 #endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
-#include "platform/winrt/CCApplication.h"
-#include "platform/winrt/CCGLViewImpl-winrt.h"
-#include "platform/winrt/CCGL.h"
-#include "platform/winrt/CCStdC.h"
-#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WINRT
-
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_TIZEN)
-#include "platform/tizen/CCApplication-tizen.h"
-#include "platform/tizen/CCGLViewImpl-tizen.h"
-#include "platform/tizen/CCGL-tizen.h"
-#include "platform/tizen/CCStdC-tizen.h"
-#endif
-
 // script_support
 #include "base/CCScriptSupport.h"
 

cocos/platform/CCApplication.h

@@ -42,8 +42,6 @@ THE SOFTWARE.
 #include "platform/winrt/CCApplication.h"
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
 #include "platform/linux/CCApplication-linux.h"
-#elif CC_TARGET_PLATFORM == CC_PLATFORM_TIZEN
-#include "platform/tizen/CCApplication-tizen.h"
 #endif
 
 /// @endcond

cocos/platform/CCApplicationProtocol.h

@@ -100,7 +100,6 @@ class CC_DLL ApplicationProtocol
  * @lua NA
  */
  virtual void setAnimationInterval(float interval) = 0;
- virtual void setAnimationInterval(float interval, SetIntervalReason reason) = 0;
 
  /** Subclass override the function to set OpenGL context attribution instead of use default value.
  * And now can only set six attributions:redBits,greenBits,blueBits,alphaBits,depthBits,stencilBits.

cocos/platform/CCPlatformDefine.h

@@ -38,12 +38,8 @@ THE SOFTWARE.
 #include "platform/android/CCPlatformDefine-android.h"
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
 #include "platform/win32/CCPlatformDefine-win32.h"
-#elif CC_TARGET_PLATFORM == CC_PLATFORM_WINRT
-#include "platform/winrt/CCPlatformDefine-winrt.h"
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
 #include "platform/linux/CCPlatformDefine-linux.h"
-#elif CC_TARGET_PLATFORM == CC_PLATFORM_TIZEN
-#include "platform/tizen/CCPlatformDefine-tizen.h"
 #endif
 
 /// @endcond

cocos/platform/CCStdC.h

@@ -41,8 +41,6 @@ THE SOFTWARE.
 #include "platform/winrt/CCStdC.h"
 #elif CC_TARGET_PLATFORM == CC_PLATFORM_LINUX
 #include "platform/linux/CCStdC-linux.h"
-#elif CC_TARGET_PLATFORM == CC_PLATFORM_TIZEN
-#include "platform/tizen/CCStdC-tizen.h"
 #endif
 
 #endif /* __PLATFORM_CCSTDC_H__*/

cocos/platform/android/Android.mk

@@ -18,7 +18,6 @@ jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp \
 jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp \
 jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp \
 jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp \
-jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.cpp \
 jni/JniHelper.cpp \
 jni/TouchesJni.cpp
 

cocos/platform/android/CCApplication-android.cpp

@@ -27,7 +27,6 @@ THE SOFTWARE.
 #include "platform/CCPlatformConfig.h"
 #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
 
-#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.h"
 #include "platform/android/jni/JniHelper.h"
 #include "platform/CCApplication.h"
 #include "base/CCDirector.h"
@@ -79,12 +78,7 @@ int Application::run()
 
 void Application::setAnimationInterval(float interval)
 {
- setAnimationInterval(interval, SetIntervalReason::BY_ENGINE);
-}
-
-void Application::setAnimationInterval(float interval, SetIntervalReason reason)
-{
- EngineDataManager::setAnimationInterval(interval, reason);
+ JniHelper::callStaticVoidMethod("org/cocos2dx/lib/Cocos2dxRenderer", "setAnimationInterval", interval);
 }
 
 //////////////////////////////////////////////////////////////////////////

cocos/platform/android/CCApplication-android.h

@@ -53,7 +53,6 @@ class CC_DLL Application : public ApplicationProtocol
  @param interval The time, expressed in seconds, between current frame and next.
  */
  virtual void setAnimationInterval(float interval) override;
- virtual void setAnimationInterval(float interval, SetIntervalReason reason) override;
 
  /**
  @brief Run the message loop.

cocos/platform/android/CCFileUtils-android.cpp

@@ -31,7 +31,6 @@ THE SOFTWARE.
 #include "platform/CCCommon.h"
 #include "platform/android/jni/JniHelper.h"
 #include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h"
-#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.h"
 #include "android/asset_manager.h"
 #include "android/asset_manager_jni.h"
 #include "base/ZipUtils.h"
@@ -347,8 +346,6 @@ std::vector<std::string> FileUtilsAndroid::listFiles(const std::string& dirPath)
 
 FileUtils::Status FileUtilsAndroid::getContents(const std::string& filename, ResizableBuffer* buffer) const
 {
- EngineDataManager::onBeforeReadFile();
-
  static const std::string apkprefix("assets/");
  if (filename.empty())
  return FileUtils::Status::NotExists;

cocos/platform/android/CMakeLists.txt

@@ -14,7 +14,6 @@ set(${target_name}_src
  jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp
  jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
  jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp
- jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.cpp
 )
 
 add_library(${target_name} STATIC

cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java

@@ -166,8 +166,6 @@ protected void onCreate(final Bundle savedInstanceState) {
 
  // Audio configuration
  this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
-
- Cocos2dxEngineDataManager.init(this, mGLSurfaceView);
  }
 
  //native method,call GLViewImpl::getGLContextAttrs() to get the OpenGL ES context attributions
@@ -190,8 +188,6 @@ protected void onResume() {
  Cocos2dxAudioFocusManager.registerAudioFocusListener(this);
  this.hideVirtualButton();
  resumeIfHasFocus();
-
- Cocos2dxEngineDataManager.resume();
  }
 
  @Override
@@ -224,16 +220,13 @@ protected void onPause() {
  Cocos2dxAudioFocusManager.unregisterAudioFocusListener(this);
  Cocos2dxHelper.onPause();
  mGLSurfaceView.onPause();
- Cocos2dxEngineDataManager.pause();
  }
 
  @Override
  protected void onDestroy() {
  if(gainAudioFocus)
  Cocos2dxAudioFocusManager.unregisterAudioFocusListener(this);
  super.onDestroy();
-
- Cocos2dxEngineDataManager.destroy();
  }
 
  @Override