Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6793 from cocoscodeide/v3 

fixed mac relaunch
This commit is contained in:
James Chen 2014-05-17 22:54:02 +08:00
parent eb457a1c91 73d5f17c77
commit 30dd0460b3
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
View File

@ -76,6 +76,9 @@ std::string getCurAppPath(void)
if (args!=nullptr && [args count]>=2) { if (args!=nullptr && [args count]>=2) {
extern std::string g_resourcePath; extern std::string g_resourcePath;
g_resourcePath = [[args objectAtIndex:1]UTF8String]; g_resourcePath = [[args objectAtIndex:1]UTF8String];
if (g_resourcePath.at(0) != '/') {
g_resourcePath="";
}
} }
g_nsAppDelegate =self; g_nsAppDelegate =self;
AppDelegate app; AppDelegate app;
@ -125,7 +128,7 @@ void createSimulator(const char* viewName, float width, float height,bool isLand
{ {
float tmpvalue =width; float tmpvalue =width;
width = height; width = height;
height = width; height = tmpvalue;
} }
[g_nsAppDelegate createSimulator:[NSString stringWithUTF8String:viewName] viewWidth:width viewHeight:height factor:frameZoomFactor]; [g_nsAppDelegate createSimulator:[NSString stringWithUTF8String:viewName] viewWidth:width viewHeight:height factor:frameZoomFactor];

2
templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp
View File

@ -312,7 +312,7 @@ void createSimulator(const char* viewName, float width, float height, bool isLan
{ {
float tmpvalue =width; float tmpvalue =width;
width = height; width = height;
height = width; height = tmpvalue;
} }
g_eglView = GLView::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor); g_eglView = GLView::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor);

4
templates/lua-template-runtime/runtime/config.json
View File

@ -1,6 +1,6 @@
{ {
"version":"v3-lua-runtime-1.1", "version":"v3-lua-runtime-1.1.1",
"zip_file_size":"20844080", "zip_file_size":"20854899",
"repo_name":"cocos-runtime-bin", "repo_name":"cocos-runtime-bin",
"repo_parent":"https://github.com/chukong/" "repo_parent":"https://github.com/chukong/"
} }