Revision: 75415
http://sourceforge.net/p/brlcad/code/75415
Author: starseeker
Date: 2020-04-15 20:45:38 +0000 (Wed, 15 Apr 2020)
Log Message:
-----------
Remove some code for inactive DMs
Modified Paths:
--------------
brlcad/trunk/src/libdm/CMakeLists.txt
brlcad/trunk/src/libdm/dm-generic.c
brlcad/trunk/src/libdm/dm_util.c
brlcad/trunk/src/libdm/dm_xvars.h
brlcad/trunk/src/libdm/query.c
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/mged/dozoom.c
Modified: brlcad/trunk/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/CMakeLists.txt 2020-04-15 20:31:27 UTC (rev
75414)
+++ brlcad/trunk/src/libdm/CMakeLists.txt 2020-04-15 20:45:38 UTC (rev
75415)
@@ -88,7 +88,6 @@
${dmw32_srcs}
${dmogl_srcs}
${dmosg_srcs}
- ${dmrtgl_srcs}
${dmtk_srcs}
${dmqt_srcs}
adc.c
Modified: brlcad/trunk/src/libdm/dm-generic.c
===================================================================
--- brlcad/trunk/src/libdm/dm-generic.c 2020-04-15 20:31:27 UTC (rev 75414)
+++ brlcad/trunk/src/libdm/dm-generic.c 2020-04-15 20:45:38 UTC (rev 75415)
@@ -68,12 +68,6 @@
extern int osgl_share_dlist(struct dm *dmp1, struct dm *dmp2);
#endif /* DM_OSGL*/
-#ifdef DM_RTGL
-extern struct dm *rtgl_open(void *interp, int argc, const char **argv);
-extern void rtgl_fogHint(struct dm *dmp, int fastfog);
-extern int rtgl_share_dlist(struct dm *dmp1, struct dm *dmp2);
-#endif /* DM_RTGL */
-
#ifdef DM_WGL
extern struct dm *wgl_open(void *interp, int argc, const char **argv);
extern void wgl_fogHint(struct dm *dmp, int fastfog);
@@ -137,10 +131,6 @@
case DM_TYPE_OSGL:
return osgl_open(interp, argc, argv);
#endif
-#ifdef DM_RTGL
- case DM_TYPE_RTGL:
- return rtgl_open(interp, argc, argv);
-#endif
#ifdef DM_WGL
case DM_TYPE_WGL:
return wgl_open(interp, argc, argv);
@@ -190,10 +180,6 @@
return ogl_share_dlist(dmp1, dmp2);
# endif
#endif
-#ifdef DM_RTGL
- case DM_TYPE_RTGL:
- return rtgl_share_dlist(dmp1, dmp2);
-#endif
#ifdef DM_WGL
case DM_TYPE_WGL:
return wgl_share_dlist(dmp1, dmp2);
@@ -302,11 +288,6 @@
return;
# endif
#endif
-#ifdef DM_RTGL
- case DM_TYPE_RTGL:
- rtgl_fogHint(dmp, fastfog);
- return;
-#endif
#ifdef DM_WGL
case DM_TYPE_WGL:
wgl_fogHint(dmp, fastfog);
Modified: brlcad/trunk/src/libdm/dm_util.c
===================================================================
--- brlcad/trunk/src/libdm/dm_util.c 2020-04-15 20:31:27 UTC (rev 75414)
+++ brlcad/trunk/src/libdm/dm_util.c 2020-04-15 20:45:38 UTC (rev 75415)
@@ -31,7 +31,7 @@
# include <GL/gl.h>
# endif
-#if defined(DM_OGL) || defined(DM_WGL) || defined(DM_RTGL)
+#if defined(DM_OGL) || defined(DM_WGL)
int
drawLine3D(struct dm *dmp, point_t pt1, point_t pt2, const char *log_bu, float
*wireColor)
{
Modified: brlcad/trunk/src/libdm/dm_xvars.h
===================================================================
--- brlcad/trunk/src/libdm/dm_xvars.h 2020-04-15 20:31:27 UTC (rev 75414)
+++ brlcad/trunk/src/libdm/dm_xvars.h 2020-04-15 20:45:38 UTC (rev 75415)
@@ -70,7 +70,7 @@
HFONT fontstruct;
HDC hdc; /* device context of device that OpenGL calls are to be
drawn on */
#endif
-#if defined(DM_X) || defined (DM_OGL) || defined (DM_RTGL)
+#if defined(DM_X) || defined (DM_OGL)
XVisualInfo *vip;
XFontStruct *fontstruct;
#endif
Modified: brlcad/trunk/src/libdm/query.c
===================================================================
--- brlcad/trunk/src/libdm/query.c 2020-04-15 20:31:27 UTC (rev 75414)
+++ brlcad/trunk/src/libdm/query.c 2020-04-15 20:45:38 UTC (rev 75415)
@@ -36,7 +36,7 @@
int
-#if !defined(DM_WGL) && !defined(DM_RTGL) && !defined(DM_OGL) && !defined(DM_X)
+#if !defined(DM_WGL) && !defined(DM_OGL) && !defined(DM_X)
dm_validXType(const char *UNUSED(dpy_string), const char *name)
#else
dm_validXType(const char *dpy_string, const char *name)
@@ -50,24 +50,6 @@
return 0;
#endif /* DM_WGL */
}
-
- if (BU_STR_EQUAL(name, "rtgl")) {
-#ifdef DM_RTGL
- Display *dpy;
- int return_val;
- if ((dpy = XOpenDisplay(dpy_string)) != NULL) {
- if (XQueryExtension(dpy, "GLX", &return_val, &return_val,
&return_val)) {
- XCloseDisplay(dpy);
- return 1;
- }
- XCloseDisplay(dpy);
- }
-#else
- bu_log("Specified display type [%s] is not available in this
compilation.", name);
-#endif /* DM_RTGL */
- return 0;
- }
-
if (BU_STR_EQUAL(name, "ogl")) {
#ifdef DM_OGL
Display *dpy;
@@ -115,7 +97,7 @@
*/
char *
-#if !defined(DM_WGL) && !defined(DM_RTGL) && !defined(DM_OGL) &&
!defined(DM_OSGL) && !defined(DM_X)
+#if !defined(DM_WGL) && !defined(DM_OGL) && !defined(DM_OSGL) && !defined(DM_X)
dm_bestXType(const char *UNUSED(dpy_string))
#else
dm_bestXType(const char *dpy_string)
@@ -167,25 +149,6 @@
return "tk";
#endif
-#ifdef DM_RTGL
- {
- if (dpy_string) {
- Display *dpy;
- int return_val;
-
- if ((dpy = XOpenDisplay(dpy_string)) != NULL) {
- if (XQueryExtension(dpy, "GLX", &return_val, &return_val,
&return_val)) {
- XCloseDisplay(dpy);
- return "rtgl";
- }
- XCloseDisplay(dpy);
- }
- } else {
- return "rtgl";
- }
- }
-#endif
-
return "nu";
}
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2020-04-15 20:31:27 UTC (rev 75414)
+++ brlcad/trunk/src/mged/attach.c 2020-04-15 20:45:38 UTC (rev 75415)
@@ -54,9 +54,7 @@
IS_DM_TYPE_WGL(_type) || \
IS_DM_TYPE_OGL(_type) || \
IS_DM_TYPE_OSG(_type) || \
- IS_DM_TYPE_RTGL(_type) || \
IS_DM_TYPE_GLX(_type) || \
- IS_DM_TYPE_PEX(_type) || \
IS_DM_TYPE_TK(_type) || \
IS_DM_TYPE_X(_type) || \
IS_DM_TYPE_TXT(_type) || \
@@ -94,18 +92,10 @@
extern int Osg_dm_init();
#endif /* DM_OSG */
-#ifdef DM_RTGL
-extern int Rtgl_dm_init();
-#endif /* DM_RTGL */
-
#ifdef DM_GLX
extern int Glx_dm_init();
#endif /* DM_GLX */
-#ifdef DM_PEX
-extern int Pex_dm_init();
-#endif /* DM_PEX */
-
#ifdef DM_QT
extern int Qt_dm_init();
#endif /* DM_QT */
@@ -229,12 +219,6 @@
{ DM_TYPE_OSGL, "osgl", osgl_doevent },
# endif
#endif /* DM_OSGL */
-#ifdef DM_RTGL
- { DM_TYPE_RTGL, "rtgl", ogl_doevent },
-#endif /* DM_RTGL */
-#ifdef DM_PEX
- { DM_TYPE_PEX, "pex", NULL},
-#endif /* DM_PEX */
#ifdef DM_QT
{ DM_TYPE_QT, "qt", x_doevent },
#endif /* DM_QT */
@@ -465,10 +449,6 @@
Tcl_AppendResult(interpreter, "osgl ", (char *)NULL);
i++;
#endif /* DM_OSGL*/
-#ifdef DM_RTGL
- Tcl_AppendResult(interpreter, "rtgl ", (char *)NULL);
- i++;
-#endif /* DM_RTGL */
#ifdef DM_GLX
Tcl_AppendResult(interpreter, "glx", (char *)NULL);
i++;
@@ -822,11 +802,6 @@
Tcl_AppendResult(interpreter, "osgl", (char *)NULL);
}
#endif /* DM_OSGL*/
-#ifdef DM_RTGL
- if (BU_STR_EQUAL(argv[argc-1], "rtgl")) {
- Tcl_AppendResult(interpreter, "rtgl", (char *)NULL);
- }
-#endif /* DM_RTGL */
#ifdef DM_GLX
if (BU_STR_EQUAL(argv[argc-1], "glx")) {
Tcl_AppendResult(interpreter, "glx", (char *)NULL);
Modified: brlcad/trunk/src/mged/dozoom.c
===================================================================
--- brlcad/trunk/src/mged/dozoom.c 2020-04-15 20:31:27 UTC (rev 75414)
+++ brlcad/trunk/src/mged/dozoom.c 2020-04-15 20:45:38 UTC (rev 75415)
@@ -27,10 +27,6 @@
#include "vmath.h"
#include "bn.h"
-#ifdef DM_RTGL
-# include "dm-rtgl.h"
-#endif
-
#include "./mged.h"
#include "./sedit.h"
#include "./mged_dm.h"
@@ -149,22 +145,6 @@
dm_loadmatrix(DMP, mat, which_eye);
-#ifdef DM_RTGL
- /* dm rtgl has its own way of drawing */
- if (IS_DM_TYPE_RTGL(dm_get_type(DMP))) {
-
- /* dm-rtgl needs database info for ray tracing */
- RTGL_GEDP = GEDP;
-
- /* will ray trace visible objects and draw the intersection points */
- dm_draw_vlist(DMP, (struct bn_vlist *)NULL);
- /* force update if needed */
- dirty = RTGL_DIRTY;
-
- return;
- }
-#endif
-
if (dm_get_transparency(DMP)) {
/* First, draw opaque stuff */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
