Revision: 75508
http://sourceforge.net/p/brlcad/code/75508
Author: starseeker
Date: 2020-04-21 20:54:39 +0000 (Tue, 21 Apr 2020)
Log Message:
-----------
There was a bit of backend specific code for the dm layer using the IF_
conditionals instead. Start stubbing in the callback.
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h
brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-21 20:20:59 UTC
(rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-21 20:54:39 UTC
(rev 75508)
@@ -2076,6 +2076,7 @@
null_drawPoints3D,
X_drawVList,
X_drawVList,
+ NULL,
X_draw,
X_setFGColor,
X_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-21 20:20:59 UTC
(rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-21 20:54:39 UTC
(rev 75508)
@@ -1891,7 +1891,34 @@
return BRLCAD_OK;
}
+int
+ogl_draw_data_axes(struct dm *dmp,
+ fastf_t UNUSED(sf),
+ struct bview_data_axes_state *bndasp)
+{
+ int npoints = bndasp->num_points * 6;
+ if (npoints < 1)
+ return 0;
+ /* set color */
+ dm_set_fg(dmp, bndasp->color[0], bndasp->color[1], bndasp->color[2], 1,
1.0);
+
+ if (bndasp->draw > 1) {
+ if (dmp->i->dm_light)
+ glDisable(GL_LIGHTING);
+
+ glPointSize(bndasp->size);
+ dm_draw_points_3d(dmp, bndasp->num_points, bndasp->points);
+ glPointSize(1);
+
+ if (dmp->i->dm_light)
+ glEnable(GL_LIGHTING);
+
+ }
+
+ return 0;
+}
+
HIDDEN int
ogl_draw(struct dm *dmp, struct bn_vlist *(*callback_function)(void *), void
**data)
{
@@ -2938,6 +2965,7 @@
ogl_drawPoints3D,
ogl_drawVList,
ogl_drawVListHiddenLine,
+ ogl_draw_data_axes,
ogl_draw,
ogl_setFGColor,
ogl_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h 2020-04-21
20:20:59 UTC (rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h 2020-04-21
20:54:39 UTC (rev 75508)
@@ -74,6 +74,7 @@
int (*dm_drawPoints3D)(struct dm *dmp, int npoints, point_t *points);
int (*dm_drawVList)(struct dm *dmp, struct bn_vlist *vp);
int (*dm_drawVListHiddenLine)(struct dm *dmp, register struct bn_vlist
*vp);
+ int (*dm_draw_data_axes)(struct dm *dmp, fastf_t sf, struct
bview_data_axes_state *bndasp);
int (*dm_draw)(struct dm *dmp, struct bn_vlist *(*callback_function)(void
*), void **data); /**< @brief formerly dmr_object */
int (*dm_setFGColor)(struct dm *dmp, unsigned char r, unsigned char g,
unsigned char b, int strict, fastf_t transparency);
int (*dm_setBGColor)(struct dm *, unsigned char, unsigned char, unsigned
char);
Modified: brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-21
20:20:59 UTC (rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-21
20:54:39 UTC (rev 75508)
@@ -320,6 +320,7 @@
null_drawPoints3D,
null_drawVList,
null_drawVListHiddenLine,
+ NULL,
null_draw,
null_setFGColor,
null_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-21
20:20:59 UTC (rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-21
20:54:39 UTC (rev 75508)
@@ -2566,6 +2566,7 @@
osgl_drawPoints3D,
osgl_drawVList,
osgl_drawVListHiddenLine,
+ NULL,
osgl_draw,
osgl_setFGColor,
osgl_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-21
20:20:59 UTC (rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-21
20:54:39 UTC (rev 75508)
@@ -682,6 +682,7 @@
null_drawPoints3D,
plot_drawVList,
plot_drawVList,
+ NULL,
plot_draw,
plot_setFGColor,
plot_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-21
20:20:59 UTC (rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-21
20:54:39 UTC (rev 75508)
@@ -751,6 +751,7 @@
null_drawPoints3D,
ps_drawVList,
ps_drawVList,
+ NULL,
ps_draw,
ps_setFGColor,
ps_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-21 20:20:59 UTC
(rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-21 20:54:39 UTC
(rev 75508)
@@ -1330,6 +1330,7 @@
null_drawPoints3D,
qt_drawVList,
qt_drawVList,
+ NULL,
qt_draw,
qt_setFGColor,
qt_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-21 20:20:59 UTC
(rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-21 20:54:39 UTC
(rev 75508)
@@ -1128,6 +1128,7 @@
null_drawPoints3D,
tk_drawVList,
tk_drawVList,
+ NULL,
tk_draw,
tk_setFGColor,
tk_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-21 20:20:59 UTC
(rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-21 20:54:39 UTC
(rev 75508)
@@ -367,6 +367,7 @@
txt_drawPoints3D,
txt_drawVList,
txt_drawVListHiddenLine,
+ NULL,
txt_draw,
txt_setFGColor,
txt_setBGColor,
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-21 20:20:59 UTC
(rev 75507)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-21 20:54:39 UTC
(rev 75508)
@@ -2507,6 +2507,7 @@
wgl_drawPoints3D,
wgl_drawVList,
wgl_drawVListHiddenLine,
+ NULL,
wgl_draw,
wgl_setFGColor,
wgl_setBGColor,
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
