Revision: 75453
http://sourceforge.net/p/brlcad/code/75453
Author: starseeker
Date: 2020-04-18 01:14:56 +0000 (Sat, 18 Apr 2020)
Log Message:
-----------
If the intent is for dm_light to mirror the overall state, we should be calling
dm_setLight always
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/include/dm.h
brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c
brlcad/branches/dm-fb-merge/src/libtclcad/tclcad_obj.c
Modified: brlcad/branches/dm-fb-merge/include/dm.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm.h 2020-04-17 23:10:16 UTC (rev
75452)
+++ brlcad/branches/dm-fb-merge/include/dm.h 2020-04-18 01:14:56 UTC (rev
75453)
@@ -245,8 +245,7 @@
DM_EXPORT extern struct bu_vls *dm_get_tkname(struct dm *dmp);
DM_EXPORT extern int dm_get_fontsize(struct dm *dmp);
DM_EXPORT extern void dm_set_fontsize(struct dm *dmp, int size);
-DM_EXPORT extern int dm_get_light_flag(struct dm *dmp);
-DM_EXPORT extern void dm_set_light_flag(struct dm *dmp, int size);
+DM_EXPORT extern int dm_get_light(struct dm *dmp);
DM_EXPORT extern int dm_set_light(struct dm *dmp, int light);
DM_EXPORT extern int dm_get_transparency(struct dm *dmp);
DM_EXPORT extern int dm_set_transparency(struct dm *dmp, int transparency);
Modified: brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c 2020-04-17 23:10:16 UTC
(rev 75452)
+++ brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c 2020-04-18 01:14:56 UTC
(rev 75453)
@@ -600,20 +600,6 @@
}
int
-dm_get_light_flag(struct dm *dmp)
-{
- if (UNLIKELY(!dmp)) return 0;
- return dmp->i->dm_light;
-}
-
-void
-dm_set_light_flag(struct dm *dmp, int val)
-{
- if (UNLIKELY(!dmp)) return;
- dmp->i->dm_light = val;
-}
-
-int
dm_close(struct dm *dmp)
{
if (UNLIKELY(!dmp)) return 0;
@@ -748,10 +734,22 @@
}
int
+dm_get_light(struct dm *dmp)
+{
+ if (UNLIKELY(!dmp)) return 0;
+ return dmp->i->dm_light;
+}
+
+int
dm_set_light(struct dm *dmp, int light)
{
if (UNLIKELY(!dmp)) return 0;
- return dmp->i->dm_setLight(dmp, light);
+ if (dmp->i->dm_setLight) {
+ return dmp->i->dm_setLight(dmp, light);
+ } else {
+ dmp->i->dm_light = light;
+ }
+ return dmp->i->dm_light;
}
int
Modified: brlcad/branches/dm-fb-merge/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libtclcad/tclcad_obj.c 2020-04-17
23:10:16 UTC (rev 75452)
+++ brlcad/branches/dm-fb-merge/src/libtclcad/tclcad_obj.c 2020-04-18
01:14:56 UTC (rev 75453)
@@ -7168,7 +7168,7 @@
/* get light flag */
if (argc == 2) {
- bu_vls_printf(gedp->ged_result_str, "%d",
dm_get_light_flag(gdvp->gdv_dmp));
+ bu_vls_printf(gedp->ged_result_str, "%d", dm_get_light(gdvp->gdv_dmp));
return GED_OK;
}
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
