AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-29 11:11:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/PixarAnimationStudios/OpenSubdiv

Browse Source
This commit is contained in:
Takahito Tejima 2013-02-05 18:06:35 -08:00
commit 31a5c04bf8
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
examples/glViewer/viewer.cpp
View File

@ -70,6 +70,7 @@
#if defined(GLFW_VERSION_3)
#include <GL/glfw3.h>
GLFWwindow* g_window=0;
GLFWmonitor* g_primary=0;
#else
#include <GL/glfw.h>
#endif
@ -1767,15 +1768,29 @@ int main(int argc, char ** argv)
#endif
#if GLFW_VERSION_MAJOR>=3
if (fullscreen) {
GLFWvidmode vidmode = glfwGetVideoMode( glfwGetPrimaryMonitor() );
g_width = vidmode.width;
g_height = vidmode.height;
}
if (fullscreen) {
g_primary = glfwGetPrimaryMonitor();
// apparently glfwGetPrimaryMonitor fails under linux : if no primary,
// settle for the first one in the list
if (not g_primary) {
int count=0;
GLFWmonitor ** monitors = glfwGetMonitors(&count);
if (count)
g_primary = monitors[0];
}
if (g_primary) {
GLFWvidmode vidmode = glfwGetVideoMode(g_primary);
g_width = vidmode.width;
g_height = vidmode.height;
}
}
if (not (g_window=glfwCreateWindow(g_width, g_height, windowTitle,
fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL))) {
fullscreen and g_primary ? g_primary : NULL, NULL))) {
printf("Failed to open window.\n");
glfwTerminate();
return 1;

25
examples/ptexViewer/viewer.cpp
View File

@ -70,6 +70,7 @@
#if defined(GLFW_VERSION_3)
#include <GL/glfw3.h>
GLFWwindow* g_window=0;
GLFWmonitor* g_primary=0;
#else
#include <GL/glfw.h>
#endif
@ -1736,8 +1737,30 @@ int main(int argc, char ** argv) {
#endif
#if GLFW_VERSION_MAJOR>=3
if (fullscreen) {
g_primary = glfwGetPrimaryMonitor();
// apparently glfwGetPrimaryMonitor fails under linux : if no primary,
// settle for the first one in the list
if (not g_primary) {
int count=0;
GLFWmonitor ** monitors = glfwGetMonitors(&count);
if (count)
g_primary = monitors[0];
}
if (g_primary) {
GLFWvidmode vidmode = glfwGetVideoMode(g_primary);
g_width = vidmode.width;
g_height = vidmode.height;
}
}
if (not (g_window=glfwCreateWindow(g_width, g_height, windowTitle,
fullscreen ? glfwGetPrimaryMonitor() : NULL, NULL))) {
fullscreen and g_primary ? g_primary : NULL, NULL))) {
printf("Failed to open window.\n");
glfwTerminate();
return 1;