mirror of https://github.com/axmolengine/axmol.git
android & ios screen size change support
This commit is contained in:
parent
4952df576b
commit
969b464b9b
|
@ -128,4 +128,8 @@ Application::Platform Application::getTargetPlatform()
|
||||||
return Platform::OS_ANDROID;
|
return Platform::OS_ANDROID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Application::applicationScreenSizeChanged(int newWidth, int newHeight) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -50,6 +50,13 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual Platform getTargetPlatform();
|
virtual Platform getTargetPlatform();
|
||||||
|
|
||||||
|
/**
|
||||||
|
@brief This function will be called when the application screen size is changed.
|
||||||
|
@param new width
|
||||||
|
@param new height
|
||||||
|
*/
|
||||||
|
virtual void applicationScreenSizeChanged(int newWidth, int newHeight);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static Application * sm_pSharedApplication;
|
static Application * sm_pSharedApplication;
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include <android/configuration.h>
|
#include <android/configuration.h>
|
||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
#include <chrono>
|
||||||
|
|
||||||
#include "CCDirector.h"
|
#include "CCDirector.h"
|
||||||
#include "CCApplication.h"
|
#include "CCApplication.h"
|
||||||
|
@ -69,6 +70,9 @@ struct engine {
|
||||||
struct saved_state state;
|
struct saved_state state;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static bool isContentRectChanged = false;
|
||||||
|
static std::chrono::steady_clock::time_point timeRectChanged;
|
||||||
|
|
||||||
static struct engine engine;
|
static struct engine engine;
|
||||||
|
|
||||||
static char* editboxText = NULL;
|
static char* editboxText = NULL;
|
||||||
|
@ -556,6 +560,11 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void onContentRectChanged(ANativeActivity* activity, const ARect* rect) {
|
||||||
|
timeRectChanged = std::chrono::steady_clock::now();
|
||||||
|
isContentRectChanged = true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the main entry point of a native application that is using
|
* This is the main entry point of a native application that is using
|
||||||
* android_native_app_glue. It runs in its own thread, with its own
|
* android_native_app_glue. It runs in its own thread, with its own
|
||||||
|
@ -584,6 +593,9 @@ void android_main(struct android_app* state) {
|
||||||
engine.state = *(struct saved_state*)state->savedState;
|
engine.state = *(struct saved_state*)state->savedState;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Screen size change support
|
||||||
|
state->activity->callbacks->onContentRectChanged = onContentRectChanged;
|
||||||
|
|
||||||
// loop waiting for stuff to do.
|
// loop waiting for stuff to do.
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
|
@ -671,5 +683,20 @@ void android_main(struct android_app* state) {
|
||||||
} else {
|
} else {
|
||||||
LOG_RENDER_DEBUG("android_main : !engine.animating");
|
LOG_RENDER_DEBUG("android_main : !engine.animating");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if screen size changed
|
||||||
|
if (isContentRectChanged) {
|
||||||
|
std::chrono::duration<int, std::milli> duration(
|
||||||
|
std::chrono::duration_cast<std::chrono::duration<int, std::milli>>(std::chrono::steady_clock::now() - timeRectChanged));
|
||||||
|
|
||||||
|
// Wait about 30 ms to get new width and height. Without waiting we can get old values sometime
|
||||||
|
if (duration.count() > 30) {
|
||||||
|
isContentRectChanged = false;
|
||||||
|
|
||||||
|
int32_t newWidth = ANativeWindow_getWidth(engine.app->window);
|
||||||
|
int32_t newHeight = ANativeWindow_getHeight(engine.app->window);
|
||||||
|
cocos2d::Application::getInstance()->applicationScreenSizeChanged(newWidth, newHeight);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,6 +76,13 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual Platform getTargetPlatform();
|
virtual Platform getTargetPlatform();
|
||||||
|
|
||||||
|
/**
|
||||||
|
@brief This function will be called when the application screen size is changed.
|
||||||
|
@param new width
|
||||||
|
@param new height
|
||||||
|
*/
|
||||||
|
virtual void applicationScreenSizeChanged(int newWidth, int newHeight);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static Application * sm_pSharedApplication;
|
static Application * sm_pSharedApplication;
|
||||||
};
|
};
|
||||||
|
|
|
@ -146,4 +146,8 @@ Application::Platform Application::getTargetPlatform()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Application::applicationScreenSizeChanged(int newWidth, int newHeight) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#import "RootViewController.h"
|
#import "RootViewController.h"
|
||||||
|
#import "cocos2d.h"
|
||||||
|
#import "EAGLView.h"
|
||||||
|
|
||||||
@implementation RootViewController
|
@implementation RootViewController
|
||||||
|
|
||||||
|
@ -43,6 +44,14 @@
|
||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
|
||||||
|
[super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
|
||||||
|
|
||||||
|
CGSize s = CGSizeMake([[CCEAGLView sharedEGLView] getWidth], [[CCEAGLView sharedEGLView] getHeight]);
|
||||||
|
|
||||||
|
cocos2d::Application::getInstance()->applicationScreenSizeChanged((int) s.width, (int) s.height);
|
||||||
|
}
|
||||||
|
|
||||||
//fix not hide status on ios7
|
//fix not hide status on ios7
|
||||||
- (BOOL)prefersStatusBarHidden
|
- (BOOL)prefersStatusBarHidden
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
#import "RootViewController.h"
|
#import "RootViewController.h"
|
||||||
|
#import "cocos2d.h"
|
||||||
|
#import "EAGLView.h"
|
||||||
|
|
||||||
@implementation RootViewController
|
@implementation RootViewController
|
||||||
|
|
||||||
|
@ -44,6 +44,14 @@
|
||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
|
||||||
|
[super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
|
||||||
|
|
||||||
|
CGSize s = CGSizeMake([[CCEAGLView sharedEGLView] getWidth], [[CCEAGLView sharedEGLView] getHeight]);
|
||||||
|
|
||||||
|
cocos2d::Application::getInstance()->applicationScreenSizeChanged((int) s.width, (int) s.height);
|
||||||
|
}
|
||||||
|
|
||||||
//fix not hide status on ios7
|
//fix not hide status on ios7
|
||||||
- (BOOL)prefersStatusBarHidden
|
- (BOOL)prefersStatusBarHidden
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,7 +24,8 @@
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#import "RootViewController.h"
|
#import "RootViewController.h"
|
||||||
|
#import "cocos2d.h"
|
||||||
|
#import "EAGLView.h"
|
||||||
|
|
||||||
@implementation RootViewController
|
@implementation RootViewController
|
||||||
|
|
||||||
|
@ -68,6 +69,14 @@
|
||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
|
||||||
|
[super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
|
||||||
|
|
||||||
|
CGSize s = CGSizeMake([[CCEAGLView sharedEGLView] getWidth], [[CCEAGLView sharedEGLView] getHeight]);
|
||||||
|
|
||||||
|
cocos2d::Application::getInstance()->applicationScreenSizeChanged((int) s.width, (int) s.height);
|
||||||
|
}
|
||||||
|
|
||||||
//fix not hide status on ios7
|
//fix not hide status on ios7
|
||||||
- (BOOL)prefersStatusBarHidden
|
- (BOOL)prefersStatusBarHidden
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue