Skip to content

Uses better configuration for huawei optimization #17838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 19, 2017
Merged

Uses better configuration for huawei optimization #17838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66d34ed
Uses better configuration for huawei optimization
May 19, 2017
dc31066
Updates jar file and uncomment fps controlling code
May 19, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified cocos/platform/android/java/libs/EngineDataManager.jar
View file
Open in desktop
Binary file not shown.
68 changes: 34 additions & 34 deletions cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ bool _isFpsChanged = false;
float _oldRealFps = 60.0f;

uint32_t _lowFpsCheckMode = 0; // 0: Continuous mode, 1: Average mode
float _lowRealFpsThreshold = 0.25f; // Unit: percentage (0 ~ 1)
float _lowRealFpsThreshold = 0.5f; // Unit: percentage (0 ~ 1)
std::chrono::steady_clock::time_point _lastTimeNotifyLevelByLowFps; // Only used in continuous mode
float _notifyLevelByLowFpsThreshold = 0.2f; // Unit: seconds, only used in continuous mode
float _notifyLevelByLowFpsThreshold = 0.5f; // Unit: seconds, only used in continuous mode
uint32_t _continuousLowRealFpsCount = 0; // Only used in continuous mode
uint32_t _continuousLowRealFpsThreshold = 1; // Only used in continuous mode
uint32_t _calculateAvgFpsCount = 0; // Only used in average mode
Expand Down Expand Up @@ -1223,38 +1223,38 @@ void EngineDataManager::nativeOnChangeLowFpsConfig(JNIEnv* env, jobject thiz, ji

void EngineDataManager::nativeOnChangeExpectedFps(JNIEnv* env, jobject thiz, jint fps)
{
// if (!_isSupported)
// return;

// if (fps < -1 || fps > 60)
// {
// LOGE("Setting fps (%d) isn't supported!", fps);
// return;
// }

// auto director = cocos2d::Director::getInstance();
// float defaultAnimationInterval = director->getAnimationInterval();

// int defaultFps = static_cast<int>(std::ceil(1.0f/defaultAnimationInterval));

// if (fps > defaultFps)
// {
// LOGD("nativeOnChangeExpectedFps, fps (%d) is greater than default fps (%d), reset it to default!", fps, defaultFps);
// fps = -1;
// }

// LOGD("nativeOnChangeExpectedFps, set fps: %d, default fps: %d", fps, defaultFps);

// if (fps > 0)
// {
// setAnimationIntervalBySystem(1.0f/fps);
// LOGD("nativeOnChangeExpectedFps, fps (%d) was set successfuly!", fps);
// }
// else if (fps == -1) // -1 means to reset to default FPS
// {
// setAnimationIntervalBySystem(-1.0f);
// LOGD("nativeOnChangeExpectedFps, fps (%d) was reset successfuly!", defaultFps);
// }
if (!_isSupported)
return;

if (fps < -1 || fps > 60)
{
LOGE("Setting fps (%d) isn't supported!", fps);
return;
}

auto director = cocos2d::Director::getInstance();
float defaultAnimationInterval = director->getAnimationInterval();

int defaultFps = static_cast<int>(std::ceil(1.0f/defaultAnimationInterval));

if (fps > defaultFps)
{
LOGD("nativeOnChangeExpectedFps, fps (%d) is greater than default fps (%d), reset it to default!", fps, defaultFps);
fps = -1;
}

LOGD("nativeOnChangeExpectedFps, set fps: %d, default fps: %d", fps, defaultFps);

if (fps > 0)
{
setAnimationIntervalBySystem(1.0f/fps);
LOGD("nativeOnChangeExpectedFps, fps (%d) was set successfuly!", fps);
}
else if (fps == -1) // -1 means to reset to default FPS
{
setAnimationIntervalBySystem(-1.0f);
LOGD("nativeOnChangeExpectedFps, fps (%d) was reset successfuly!", defaultFps);
}
}

void EngineDataManager::nativeOnChangeSpecialEffectLevel(JNIEnv* env, jobject thiz, jint level)
Expand Down