Revision: 75448
http://sourceforge.net/p/brlcad/code/75448
Author: starseeker
Date: 2020-04-17 21:18:05 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
Relocate the type aware functions to the beginning of dm-generic.c
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c
Modified: brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c 2020-04-17 21:14:38 UTC
(rev 75447)
+++ brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c 2020-04-17 21:18:05 UTC
(rev 75448)
@@ -187,6 +187,84 @@
}
}
+struct bu_vls *
+dm_list_types(const char separator)
+{
+ struct bu_vls *list;
+ char sep = ' ';
+ if (separator) sep = separator;
+ BU_GET(list, struct bu_vls);
+ bu_vls_init(list);
+
+ bu_vls_trunc(list, 0);
+
+#ifdef DM_OSGL
+ if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "osgl");
+#endif /* DM_OSGL*/
+
+#ifdef DM_WGL
+ if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "wgl");
+#endif /* DM_WGL */
+
+#ifdef DM_OGL
+ if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "ogl");
+#endif /* DM_OGL */
+
+#ifdef DM_QT
+ if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "Qt");
+#endif /* DM_QT */
+
+#ifdef DM_X
+ if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "X");
+#endif /* DM_X */
+
+#ifdef DM_X
+ if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "tk");
+#endif /* DM_X */
+
+ if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "txt");
+ bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "plot");
+ bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "ps");
+ bu_vls_printf(list, "%c", sep);
+ bu_vls_printf(list, "null");
+ return list;
+}
+
+void
+dm_fogHint(struct dm *dmp, int fastfog)
+{
+ if (UNLIKELY(!dmp)) {
+ bu_log("WARNING: NULL display (fastfog => %d)\n", fastfog);
+ return;
+ }
+
+ switch (dmp->i->dm_type) {
+#ifdef DM_OGL
+# if defined(HAVE_TK)
+ case DM_TYPE_OGL:
+ ogl_fogHint(dmp, fastfog);
+ return;
+# endif
+#endif
+#ifdef DM_WGL
+ case DM_TYPE_WGL:
+ wgl_fogHint(dmp, fastfog);
+ return;
+#endif
+ default:
+ return;
+ }
+}
+
int
dm_write_image(struct bu_vls *msgs, FILE *fp, struct dm *dmp)
{
@@ -251,32 +329,7 @@
return (0.5 - f * 0.5) * dmp->i->dm_height;
}
-void
-dm_fogHint(struct dm *dmp, int fastfog)
-{
- if (UNLIKELY(!dmp)) {
- bu_log("WARNING: NULL display (fastfog => %d)\n", fastfog);
- return;
- }
- switch (dmp->i->dm_type) {
-#ifdef DM_OGL
-# if defined(HAVE_TK)
- case DM_TYPE_OGL:
- ogl_fogHint(dmp, fastfog);
- return;
-# endif
-#endif
-#ifdef DM_WGL
- case DM_TYPE_WGL:
- wgl_fogHint(dmp, fastfog);
- return;
-#endif
- default:
- return;
- }
-}
-
struct dm *
dm_get()
{
@@ -983,58 +1036,7 @@
return ndrawn;
}
-struct bu_vls *
-dm_list_types(const char separator)
-{
- struct bu_vls *list;
- char sep = ' ';
- if (separator) sep = separator;
- BU_GET(list, struct bu_vls);
- bu_vls_init(list);
- bu_vls_trunc(list, 0);
-
-#ifdef DM_OSGL
- if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "osgl");
-#endif /* DM_OSGL*/
-
-#ifdef DM_WGL
- if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "wgl");
-#endif /* DM_WGL */
-
-#ifdef DM_OGL
- if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "ogl");
-#endif /* DM_OGL */
-
-#ifdef DM_QT
- if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "Qt");
-#endif /* DM_QT */
-
-#ifdef DM_X
- if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "X");
-#endif /* DM_X */
-
-#ifdef DM_X
- if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "tk");
-#endif /* DM_X */
-
- if (strlen(bu_vls_addr(list)) > 0) bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "txt");
- bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "plot");
- bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "ps");
- bu_vls_printf(list, "%c", sep);
- bu_vls_printf(list, "null");
- return list;
-}
-
/*
* Local Variables:
* mode: C
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
