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

Merge pull request #8827 from cocoscodeide/v3 

don't show runtime on top by default
This commit is contained in:
minggo 2014-10-18 15:12:17 +08:00
parent bca15538e3 f2647e56e4
commit 8318b16922
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/lua-template-runtime/cocos-project-template.json
View File

@ -81,6 +81,13 @@
"*.dll" "*.dll"
] ]
}, },
{
"from": "external/sqlite3/libraries/win32",
"to": "runtime/win32",
"include": [
"*.dll"
]
},
{ {
"from": "external/tiff/prebuilt/win32", "from": "external/tiff/prebuilt/win32",
"to": "runtime/win32", "to": "runtime/win32",

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

@ -37,7 +37,7 @@ using namespace cocos2d;
WNDPROC g_oldProc=NULL; WNDPROC g_oldProc=NULL;
bool g_landscape=false; bool g_landscape=false;
bool g_windTop = true; bool g_windTop = false;
CCSize g_screenSize; CCSize g_screenSize;
GLView* g_eglView=NULL; GLView* g_eglView=NULL;
INT_PTR CALLBACK AboutDialogCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AboutDialogCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
@ -339,7 +339,7 @@ void createSimulator(const char* viewName, float width, float height, bool isLan
width = height; width = height;
height = tmpvalue; height = tmpvalue;
} }
g_windTop = true; g_windTop = ConfigParser::getInstance()->isWindowTop();
g_eglView = GLViewImpl::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor); g_eglView = GLViewImpl::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor);
auto director = Director::getInstance(); auto director = Director::getInstance();

2
templates/lua-template-runtime/src/main.lua
View File

@ -34,8 +34,6 @@ local function main()
--set FPS. the default value is 1.0/60 if you don't call this --set FPS. the default value is 1.0/60 if you don't call this
director:setAnimationInterval(1.0 / 60) director:setAnimationInterval(1.0 / 60)
cc.FileUtils:getInstance():addSearchPath("src")
cc.FileUtils:getInstance():addSearchPath("res")
cc.Director:getInstance():getOpenGLView():setDesignResolutionSize(480, 320, 0) cc.Director:getInstance():getOpenGLView():setDesignResolutionSize(480, 320, 0)
--create scene --create scene