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

issue #3498: commit jsruntime

This commit is contained in:
chuanweizhang2013 2014-02-11 11:26:47 +08:00
parent e9dd3d828a
commit c0d3ce2b75
3 changed files with 85 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
template/multi-platform-js-runtime/framework/Classes/Runtime.cpp
View File

@ -301,3 +301,42 @@ void StartRuntime()
#endif #endif
} }
// SimulatorConfig
SimulatorConfig *SimulatorConfig::s_sharedInstance = NULL;
SimulatorConfig *SimulatorConfig::getInstance(void)
{
if (!s_sharedInstance)
{
s_sharedInstance = new SimulatorConfig();
}
return s_sharedInstance;
}
SimulatorConfig::SimulatorConfig(void)
{
m_screenSizeArray.push_back(SimulatorScreenSize("iPhone 3Gs (480x320)", 480, 320));
m_screenSizeArray.push_back(SimulatorScreenSize("iPhone 4 (960x640)", 960, 640));
m_screenSizeArray.push_back(SimulatorScreenSize("iPhone 5 (1136x640)", 1136, 640));
m_screenSizeArray.push_back(SimulatorScreenSize("iPad (1024x768)", 1024, 768));
m_screenSizeArray.push_back(SimulatorScreenSize("iPad Retina (2048x1536)", 2048, 1536));
m_screenSizeArray.push_back(SimulatorScreenSize("Android (800x480)", 800, 480));
m_screenSizeArray.push_back(SimulatorScreenSize("Android (854x480)", 854, 480));
m_screenSizeArray.push_back(SimulatorScreenSize("Android (960x540)", 960, 540));
m_screenSizeArray.push_back(SimulatorScreenSize("Android (1024x600)", 1024, 600));
m_screenSizeArray.push_back(SimulatorScreenSize("Android (1280x720)", 1280, 720));
m_screenSizeArray.push_back(SimulatorScreenSize("Android (1280x800)", 1280, 800));
m_screenSizeArray.push_back(SimulatorScreenSize("Android (1920x1080)", 1920, 1080));
}
int SimulatorConfig::getScreenSizeCount(void)
{
return (int)m_screenSizeArray.size();
}
const SimulatorScreenSize SimulatorConfig::getScreenSize(int index)
{
return m_screenSizeArray.at(index);
}

33
template/multi-platform-js-runtime/framework/Classes/Runtime.h
View File

@ -25,10 +25,43 @@ THE SOFTWARE.
#ifndef _RUNTIME__H_ #ifndef _RUNTIME__H_
#define _RUNTIME__H_ #define _RUNTIME__H_
#include <string>
#include <vector>
using namespace std;
#define _MAX_PATH_ 512 #define _MAX_PATH_ 512
void StartRuntime(); void StartRuntime();
// SimulatorConfig
typedef struct _SimulatorScreenSize {
string title;
int width;
int height;
_SimulatorScreenSize(const string title_, int width_, int height_)
{
title = title_;
width = width_;
height = height_;
}
} SimulatorScreenSize;
typedef vector<SimulatorScreenSize> ScreenSizeArray;
class SimulatorConfig
{
public:
static SimulatorConfig *getInstance(void);
// predefined screen size
int getScreenSizeCount(void);
const SimulatorScreenSize getScreenSize(int index);
private:
SimulatorConfig(void);
static SimulatorConfig *s_sharedInstance;
ScreenSizeArray m_screenSizeArray;
};
#endif // _RUNTIME__H_ #endif // _RUNTIME__H_

53
template/multi-platform-js-runtime/framework/proj.win32/SimulatorWindow.cpp
View File

@ -27,6 +27,7 @@ THE SOFTWARE.
#include "cocos2d.h" #include "cocos2d.h"
#include "glfw3native.h" #include "glfw3native.h"
#include "resource.h" #include "resource.h"
#include "Runtime.h"
#include <string> #include <string>
#include <vector> #include <vector>
@ -40,47 +41,17 @@ 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);
typedef struct _SimulatorScreenSize {
string title;
int width;
int height;
_SimulatorScreenSize(const string title_, int width_, int height_)
{
title = title_;
width = width_;
height = height_;
}
} SimulatorScreenSize;
typedef vector<SimulatorScreenSize> ScreenSizeArray;
ScreenSizeArray _screenSizeArray;
void initScreenSize()
{
_screenSizeArray.push_back(SimulatorScreenSize("iPhone 3Gs (480x320)", 480, 320));
_screenSizeArray.push_back(SimulatorScreenSize("iPhone 4 (960x640)", 960, 640));
_screenSizeArray.push_back(SimulatorScreenSize("iPhone 5 (1136x640)", 1136, 640));
_screenSizeArray.push_back(SimulatorScreenSize("iPad (1024x768)", 1024, 768));
_screenSizeArray.push_back(SimulatorScreenSize("iPad Retina (2048x1536)", 2048, 1536));
_screenSizeArray.push_back(SimulatorScreenSize("Android (800x480)", 800, 480));
_screenSizeArray.push_back(SimulatorScreenSize("Android (854x480)", 854, 480));
_screenSizeArray.push_back(SimulatorScreenSize("Android (960x540)", 960, 540));
_screenSizeArray.push_back(SimulatorScreenSize("Android (1024x600)", 1024, 600));
_screenSizeArray.push_back(SimulatorScreenSize("Android (1280x720)", 1280, 720));
_screenSizeArray.push_back(SimulatorScreenSize("Android (1280x800)", 1280, 800));
_screenSizeArray.push_back(SimulatorScreenSize("Android (1920x1080)", 1920, 1080));
}
void createViewMenu() void createViewMenu()
{ {
HMENU menu = GetMenu(glfwGetWin32Window(g_eglView->getWindow())); HMENU menu = GetMenu(glfwGetWin32Window(g_eglView->getWindow()));
HMENU viewMenu = GetSubMenu(menu, 1); HMENU viewMenu = GetSubMenu(menu, 1);
for (int i = _screenSizeArray.size() - 1; i >= 0; --i) for (int i = SimulatorConfig::getInstance()->getScreenSizeCount() - 1; i >= 0; --i)
{ {
SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(i);
wstring menuName; wstring menuName;
menuName.assign(_screenSizeArray[i].title.begin(), _screenSizeArray[i].title.end()); menuName.assign(size.title.begin(), size.title.end());
MENUITEMINFO item; MENUITEMINFO item;
ZeroMemory(&item, sizeof(item)); ZeroMemory(&item, sizeof(item));
@ -120,11 +91,13 @@ void updateMenu()
height = w; height = w;
} }
int count = (int)_screenSizeArray.size(); int count = SimulatorConfig::getInstance()->getScreenSizeCount();
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
{ {
bool bSel = false; bool bSel = false;
if (_screenSizeArray[i].width == width && _screenSizeArray[i].height == height)
SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(i);
if (size.width == width && size.height == height)
{ {
bSel = true; bSel = true;
} }
@ -163,10 +136,11 @@ void onViewChangeOrientation(int viewMenuID)
void onViewChangeFrameSize(int viewMenuID) void onViewChangeFrameSize(int viewMenuID)
{ {
int index = viewMenuID - ID_VIEW_SIZE; int index = viewMenuID - ID_VIEW_SIZE;
if (index >= 0 && index < _screenSizeArray.size()) if (index >= 0 && index < SimulatorConfig::getInstance()->getScreenSizeCount())
{ {
g_screenSize.width = _screenSizeArray[index].width; SimulatorScreenSize size = SimulatorConfig::getInstance()->getScreenSize(index);
g_screenSize.height = _screenSizeArray[index].height; g_screenSize.width = size.width;
g_screenSize.height = size.height;
updateView(); updateView();
} }
} }
@ -201,7 +175,7 @@ LRESULT CALLBACK SNewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar
onHelpAbout(); onHelpAbout();
default: default:
if (wmId >= ID_VIEW_SIZE && wmId <= ID_VIEW_SIZE + _screenSizeArray.size() - 1) if (wmId >= ID_VIEW_SIZE && wmId <= ID_VIEW_SIZE + SimulatorConfig::getInstance()->getScreenSizeCount() - 1)
{ {
onViewChangeFrameSize(wmId); onViewChangeFrameSize(wmId);
break; break;
@ -252,7 +226,6 @@ void createSimulator(const char* viewName, float width, float height, float fram
g_landscape = true; g_landscape = true;
} }
initScreenSize();
HWND hWnd=glfwGetWin32Window(g_eglView->getWindow()); HWND hWnd=glfwGetWin32Window(g_eglView->getWindow());
HMENU hMenu = LoadMenu(GetModuleHandle(NULL), MAKEINTRESOURCE(IDR_MENU_COCOS)); HMENU hMenu = LoadMenu(GetModuleHandle(NULL), MAKEINTRESOURCE(IDR_MENU_COCOS));
SetMenu(hWnd, hMenu); SetMenu(hWnd, hMenu);