Changeset 72997

Timestamp:

Jul 19, 2018, 7:18:06 AM (6 years ago)

Author:

hcho

Message:

nviz: offscreen rendering for Windows (Fix #2114)

Location:

grass/trunk

Files:

• include/nviz.h (modified) (1 diff)
• lib/nviz/render.c (modified) (4 diffs)

grass/trunk/include/nviz.h

@@ -135 +135 @@
     HDC displayId;              /* display context */
     HGLRC contextId;            /* rendering context */
-    HBITMAP bitmapId;
 #endif
     int width, height;

grass/trunk/lib/nviz/render.c

@@ -51 +51 @@
     rwin->displayId = NULL;
     rwin->contextId = NULL;
-    rwin->bitmapId = NULL;
 #endif
 
@@ -78 +77 @@
     wglDeleteContext(rwin->contextId);
     DeleteDC(rwin->displayId);
-    DeleteObject(rwin->bitmapId);
 #endif
 
@@ -148 +146 @@
     aglCreatePBuffer(width, height, GL_TEXTURE_2D, GL_RGBA, 0, &(rwin->windowId));
 #elif defined(OPENGL_WINDOWS)
+    WNDCLASS wc = {0};
+    HWND hWnd;
     PIXELFORMATDESCRIPTOR pfd = {
         sizeof(PIXELFORMATDESCRIPTOR),  //  size of this pfd 
         1,                      /* version number           */
         PFD_DRAW_TO_WINDOW |    /* support window           */
-            PFD_SUPPORT_OPENGL |        /* support OpenGL           */
-            PFD_DOUBLEBUFFER,   /* double buffered          */
+        PFD_SUPPORT_OPENGL |    /* support OpenGL           */
+        PFD_DOUBLEBUFFER,       /* double buffered          */
         PFD_TYPE_RGBA,          /* RGBA type                */
         24,                     /* 24-bit color depth       */
@@ -170 +170 @@
     int iPixelFormat;
 
-    rwin->displayId = CreateCompatibleDC(NULL);
+    wc.lpfnWndProc = DefWindowProc;
+    wc.lpszClassName = "nviz";
+
+    if (!RegisterClass(&wc)) {
+        G_warning(_("Unable to register window class"));
+        return -1;
+    }
+
+    hWnd = CreateWindow(wc.lpszClassName, wc.lpszClassName, WS_POPUP,
+            CW_USEDEFAULT, CW_USEDEFAULT, width, height,
+            NULL, NULL, wc.hInstance, NULL);
+
+    if (!hWnd) {
+        G_warning(_("Unable to create window"));
+        return -1;
+    }
+
+    rwin->displayId = GetDC(hWnd);
     iPixelFormat = ChoosePixelFormat(rwin->displayId, &pfd);
     SetPixelFormat(rwin->displayId, iPixelFormat, &pfd);
-    rwin->bitmapId = CreateCompatibleBitmap(rwin->displayId, width, height);
-    SelectObject(rwin->displayId, rwin->bitmapId);
     rwin->contextId = wglCreateContext(rwin->displayId);
-    /* TODO */
 #endif