Changeset 32043

Timestamp:

Jul 8, 2008, 2:32:12 AM (16 years ago)

Author:

martinl

Message:

nvizlib: conditional references to x11 and aqua added (TODO: wgl)

Location:

grass/trunk

Files:

• include/nviz.h (modified) (3 diffs)
• lib/nviz/render.c (modified) (8 diffs)

grass/trunk/include/nviz.h

@@ -1 +1 @@
 #ifndef GRASS_NVIZ_H
 #define GRASS_NVIZ_H
-
-#include <grass/gsurf.h>
-#include <grass/gstypes.h>
 
 /*** Windows headers ***/
@@ -34 +31 @@
 #  error Unsupported platform, or confused platform defines...
 #endif
+
+#include <grass/gsurf.h>
+#include <grass/gstypes.h>
 
 #define MAP_OBJ_UNDEFINED 0
@@ -110 +110 @@
 
 struct render_window {
+#if defined(OPENGL_X11)
     Display *displayId;   /* display connection */
     GLXContext contextId; /* GLX rendering context */
+    GLXPixmap windowId;
     Pixmap pixmap;
-    GLXPixmap windowId;
+#elif defined(OPENGL_AQUA)
+    AGLPixelFmtID displayId;
+    AGLContext contextId;
+    AGLPixmap windowId;
+    GWorldPtr pixmap;
+#elif defined(OPENGL_WGL)
+    /* TODO */
+#endif
 };
 

grass/trunk/lib/nviz/render.c

@@ -10 +10 @@
   for details.
 
-  Based on visualization/nviz/src/togl.c etc.
+  Based on visualization/nviz/src/togl.c
 
   \author Updated/modified by Martin Landa <landa.martin gmail.com> (Google SoC 2008)
@@ -58 +58 @@
 void Nviz_destroy_render_window(struct render_window *rwin)
 {
+#if defined(OPENGL_X11)
     glXDestroyContext(rwin->displayId, rwin->contextId);
+    glXDestroyGLXPixmap(rwin->displayId, rwin->windowId); 
     XFreePixmap(rwin->displayId, rwin->pixmap);
+#elif defined(OPENGL_AQUA)
+    aglDestroyContext(rwin->contextId);
+    aglDestroyAGLPixmap(rwin->windowId); 
+    /* TODO FreePixMap */
+#elif defined(OPENGL_WGL)
+    /* TODO: wglDeleteContext( HRC hrc ) */
+#endif
 
     G_free ((void *) rwin);
@@ -79 +88 @@
                               int width, int height)
 {
+#if defined(OPENGL_X11)
     XVisualInfo  *v;
+#elif defined(OPENGL_AQUA)
+    AGLPixelFmtID v;
+#elif defined(OPENGL_WGL)
+    int v;
+#endif
 
     int attributeList[] = { GLX_RGBA, GLX_RED_SIZE, 1,
@@ -86 +101 @@
 
     /* get the default display connection */
+#if defined(OPENGL_X11)
     rwin->displayId = XOpenDisplay((char *) display);
+#elif defined(OPENGL_AQUA)
+    /* TODO */
+#elif defined(OPENGL_WGL)
+    /* TODO */
+#endif
+
     if (!rwin->displayId) {
-        G_fatal_error (_("Bad X server connection"));
+        G_fatal_error (_("Bad server connection"));
     }
 
     /* get visual info and set up pixmap buffer */
+#if defined(OPENGL_X11)
     v = glXChooseVisual(rwin->displayId,
                         DefaultScreen(rwin->displayId),
@@ -97 +120 @@
 
     rwin->contextId = glXCreateContext(rwin->displayId,
-                                      v, NULL, GL_FALSE);
+                                       v, NULL, GL_FALSE);
+#elif defined(OPENGL_AQUA)
+    /* TODO */
+    rwin->displayId = aglChoosePixelFmt(GDHandle *dev, int ndev, attributeList);
+    
+    rwin->contextId = aglCreateContext(rwin->display, NULL); 
+#elif defined(OPENGL_WGL)
+    /* TODO int ChoosePixelFormat( HDC hdc, PIXELFORMATDESCRIPTOR *pfd ) */
+#endif
+
     if (!rwin->contextId) {
-        G_fatal_error (_("Unable to create GLX rendering context"));
+        G_fatal_error (_("Unable to create rendering context"));
     }
 
+
+#if defined(OPENGL_X11)
     /* create win pixmap to render to (same depth as RootWindow) */
     rwin->pixmap = XCreatePixmap(rwin->displayId,
@@ -112 +146 @@
     rwin->windowId = glXCreateGLXPixmap(rwin->displayId,
                                         v, rwin->pixmap);
+#elif defined(OPENGL_AQUA)
+    /* create win pixmap to render to (same depth as RootWindow) */
+    rwin->pixmap = NULL; /* TODO */
+    /* create an off-screen AGL rendering area */
+    rwin->windowId = aglCreateAGLPixmap(rwin->displayId,
+                                        rwin->pixmap); 
+#elif defined(OPENGL_WGL)
+    /* TODO */
+#endif
 
     if (v) {
@@ -133 +176 @@
         return 0;
 
+#if defined(OPENGL_X11)
     if (rwin->contextId == glXGetCurrentContext())
         return 1;
@@ -138 +182 @@
     glXMakeCurrent(rwin->displayId, rwin->windowId,
                    rwin->contextId);
+#elif defined(OPENGL_AQUA)
+    if (rwin->contextId == aglGetCurrentContext())
+        return 1;
 
-    /* TODO: AQUA */
+    aglMakeCurrent(rwin->windowId, rwin->contextId);
+#elif defined(OPENGL_WGL)
+    /* TODO wglMakeCurrent( HDC hdc, HGLRC hrc ) */
+#endif
 
     return 1;