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

CCGLView: Remove frameZoomFactor param from createWithFullScreen overload.

This commit is contained in:
Nick Barrios 2014-04-04 06:26:00 -04:00
parent 58224d9b23
commit eae1ccb279
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/platform/desktop/CCGLView.cpp
View File

@ -317,10 +317,10 @@ GLView* GLView::createWithFullScreen(const std::string& viewName)
return nullptr;
}
GLView* GLView::createWithFullScreen(const std::string& viewName, Size size, float frameZoomFactor)
GLView* GLView::createWithFullScreen(const std::string& viewName, Size size)
{
auto ret = new GLView();
if(ret && ret->initWithFullScreen(viewName, size, frameZoomFactor)) {
if(ret && ret->initWithFullScreen(viewName, size)) {
ret->autorelease();
return ret;
}
@ -386,7 +386,7 @@ bool GLView::initWithFullScreen(const std::string& viewName)
return initWithRect(viewName, Rect(0, 0, videoMode->width, videoMode->height), 1.0f);
}
bool GLView::initWithFullScreen(const std::string &viewName, cocos2d::Size size, float frameZoomFactor)
bool GLView::initWithFullScreen(const std::string &viewName, cocos2d::Size size)
{
_primaryMonitor = glfwGetPrimaryMonitor();
if (nullptr == _primaryMonitor)

4
cocos/2d/platform/desktop/CCGLView.h
View File

@ -39,7 +39,7 @@ public:
static GLView* create(const std::string& viewName);
static GLView* createWithRect(const std::string& viewName, Rect size, float frameZoomFactor = 1.0f);
static GLView* createWithFullScreen(const std::string& viewName);
static GLView* createWithFullScreen(const std::string& viewName, Size size, float frameZoomFactor = 1.0f);
static GLView* createWithFullScreen(const std::string& viewName, Size size);
/*
*frameZoomFactor for frame. This method is for debugging big resolution (e.g.new ipad) app on desktop.
@ -83,7 +83,7 @@ protected:
bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor);
bool initWithFullScreen(const std::string& viewName);
bool initWithFullScreen(const std::string& viewName, Size rect, float frameZoomFactor);
bool initWithFullScreen(const std::string& viewName, Size rect);
bool initGlew();