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

Provide more useful for setFullscreen with width,height,refreshRate.

This commit is contained in:
halx99 2020-08-02 16:18:39 +08:00
parent 106d8e2ecf
commit dd226789b3
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -643,7 +643,13 @@ bool GLViewImpl::isFullscreen() const {
return (_monitor != nullptr);
}
void GLViewImpl::setFullscreen() {
void GLViewImpl::setFullscreen()
{
const GLFWvidmode* videoMode = glfwGetVideoMode(_monitor);
setFullscreen(videoMode->width, videoMode->height, videoMode->refreshRate);
}
void GLViewImpl::setFullscreen(int w, int h, int refreshRate) {
if (this->isFullscreen()) {
return;
}
@ -651,12 +657,16 @@ void GLViewImpl::setFullscreen() {
if (nullptr == _monitor) {
return;
}
const GLFWvidmode* videoMode = glfwGetVideoMode(_monitor);
this->setFullscreen(*videoMode, _monitor);
this->setFullscreen(_monitor, w, h, refreshRate);
}
void GLViewImpl::setFullscreen(int monitorIndex) {
// set fullscreen on specific monitor
void GLViewImpl::setFullscreen(int monitorIndex)
{
const GLFWvidmode* videoMode = glfwGetVideoMode(_monitor);
setFullscreen(monitorIndex, videoMode->width, videoMode->height, videoMode->refreshRate);
}
void GLViewImpl::setFullscreen(int monitorIndex, int w, int h, int refreshRate) {
int count = 0;
GLFWmonitor** monitors = glfwGetMonitors(&count);
if (monitorIndex < 0 || monitorIndex >= count) {
@ -666,13 +676,12 @@ void GLViewImpl::setFullscreen(int monitorIndex) {
if (nullptr == monitor) {
return;
}
const GLFWvidmode* videoMode = glfwGetVideoMode(monitor);
this->setFullscreen(*videoMode, monitor);
this->setFullscreen(monitor, w, h, refreshRate);
}
void GLViewImpl::setFullscreen(const GLFWvidmode &videoMode, GLFWmonitor *monitor) {
void GLViewImpl::setFullscreen(GLFWmonitor *monitor, int w, int h, int refreshRate) {
_monitor = monitor;
glfwSetWindowMonitor(_mainWindow, _monitor, 0, 0, videoMode.width, videoMode.height, videoMode.refreshRate);
glfwSetWindowMonitor(_mainWindow, _monitor, 0, 0, w, h, refreshRate);
updateWindowSize();
}

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

@ -82,9 +82,25 @@ public:
GLFWwindow* getWindow() const { return _mainWindow; }
bool isFullscreen() const;
/* Sets primary monitor full screen with w*h(refresh rate) */
void setFullscreen();
/* Sets primary monitor full screen with w*h(refresh rate) */
void setFullscreen(int w, int h, int refreshRate);
/* Sets monitor full screen with default w*h(refresh rate) */
void setFullscreen(int monitorIndex);
void setFullscreen(const GLFWvidmode &videoMode, GLFWmonitor *monitor);
/// <summary>
/// Sets monitor full screen with w*h(refresh rate)
/// </summary>
/// <param name="monitorIndex">the 0 based index of monitor</param>
/// <param name="w">the width of hardware resolution in full screen</param>
/// <param name="h">the height of hardware resolution in full screen</param>
/// <param name="refreshRate">the display refresh rate, usually 60</param>
void setFullscreen(int monitorIndex, int w, int h, int refreshRate);
/* for internal use */
void setFullscreen(GLFWmonitor *monitor, int w, int h, int refreshRate);
void setWindowed(int width, int height);
int getMonitorCount() const;