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

Merge pull request #13234 from perminovVS/v3-dev-check-create-window 

glfwCreateWindow not guarantee create
This commit is contained in:
pandamicro 2015-09-20 23:22:47 +08:00
parent fa9afd6c2b 527e254617
commit 9246d50a7f
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cocos/platform/desktop/CCGLViewImpl-desktop.cpp
View File

@ -37,6 +37,7 @@ THE SOFTWARE.
#include "base/ccUtils.h" #include "base/ccUtils.h"
#include "base/ccUTF8.h" #include "base/ccUTF8.h"
#include "2d/CCCamera.h" #include "2d/CCCamera.h"
#include "deprecated/CCString.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -358,6 +359,19 @@ bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float fram
_mainWindow = glfwCreateWindow(needWidth, neeHeight, _viewName.c_str(), _monitor, nullptr); _mainWindow = glfwCreateWindow(needWidth, neeHeight, _viewName.c_str(), _monitor, nullptr);
if (_mainWindow == nullptr)
{
std::string message = "Can't create window";
if (!_glfwError.empty())
{
message.append("\nMore info: \n");
message.append(_glfwError);
}
MessageBox(message.c_str(), "Error launch application");
return false;
}
/* /*
* Note that the created window and context may differ from what you requested, * Note that the created window and context may differ from what you requested,
* as not all parameters and hints are * as not all parameters and hints are
@ -600,7 +614,8 @@ Rect GLViewImpl::getScissorRect() const
void GLViewImpl::onGLFWError(int errorID, const char* errorDesc) void GLViewImpl::onGLFWError(int errorID, const char* errorDesc)
{ {
CCLOGERROR("GLFWError #%d Happen, %s\n", errorID, errorDesc); _glfwError = StringUtils::format("GLFWError #%d Happen, %s", errorID, errorDesc);
CCLOGERROR(_glfwError.c_str());
} }
void GLViewImpl::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int modify) void GLViewImpl::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int modify)

2
cocos/platform/desktop/CCGLViewImpl-desktop.h
View File

@ -146,6 +146,8 @@ protected:
GLFWwindow* _mainWindow; GLFWwindow* _mainWindow;
GLFWmonitor* _monitor; GLFWmonitor* _monitor;
std::string _glfwError;
float _mouseX; float _mouseX;
float _mouseY; float _mouseY;