Revision: 76582
http://sourceforge.net/p/brlcad/code/76582
Author: starseeker
Date: 2020-07-29 19:47:21 +0000 (Wed, 29 Jul 2020)
Log Message:
-----------
more struct shifting
Modified Paths:
--------------
brlcad/branches/bioh/include/tclcad.h
brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
brlcad/branches/bioh/src/libtclcad/view/autoview.c
brlcad/branches/bioh/src/libtclcad/view/draw.c
brlcad/branches/bioh/src/libtclcad/view/faceplate.c
Modified: brlcad/branches/bioh/include/tclcad.h
===================================================================
--- brlcad/branches/bioh/include/tclcad.h 2020-07-29 19:38:10 UTC (rev
76581)
+++ brlcad/branches/bioh/include/tclcad.h 2020-07-29 19:47:21 UTC (rev
76582)
@@ -136,6 +136,7 @@
struct bu_vls gdv_edit_motion_delta_callback;
struct bu_vls gdv_callback;
struct fbserv_obj gdv_fbs;
+ struct ged_obj *gdv_gop;
};
struct ged_dm_view {
@@ -142,7 +143,6 @@
struct bu_list l;
struct bview *gdv_view;
struct dm *gdv_dmp;
- struct ged_obj *gdv_gop;
void *gdv_data;
};
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-07-29 19:38:10 UTC
(rev 76581)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-07-29 19:47:21 UTC
(rev 76582)
@@ -4558,7 +4558,6 @@
}
- new_gdvp->gdv_gop = current_top->to_gop;
bu_vls_init(&new_gdvp->gdv_view->gv_name);
struct tclcad_view_data *tvd;
@@ -4565,6 +4564,7 @@
BU_GET(tvd, struct tclcad_view_data);
bu_vls_init(&tvd->gdv_edit_motion_delta_callback);
bu_vls_init(&tvd->gdv_callback);
+ tvd->gdv_gop = current_top->to_gop;
new_gdvp->gdv_data = (void *)tvd;
bu_vls_printf(&new_gdvp->gdv_view->gv_name, "%s", argv[name_index]);
Modified: brlcad/branches/bioh/src/libtclcad/view/autoview.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/autoview.c 2020-07-29 19:38:10 UTC
(rev 76581)
+++ brlcad/branches/bioh/src/libtclcad/view/autoview.c 2020-07-29 19:47:21 UTC
(rev 76582)
@@ -39,18 +39,18 @@
int ret;
const char *av[3];
- gdvp->gdv_gop->go_gedp->ged_gvp = gdvp->gdv_view;
+ struct tclcad_view_data *tvd = (struct tclcad_view_data *)gdvp->gdv_data;
+ tvd->gdv_gop->go_gedp->ged_gvp = gdvp->gdv_view;
av[0] = "autoview";
av[1] = scale;
av[2] = NULL;
if (scale)
- ret = ged_autoview(gdvp->gdv_gop->go_gedp, 2, (const char **)av);
+ ret = ged_autoview(tvd->gdv_gop->go_gedp, 2, (const char **)av);
else
- ret = ged_autoview(gdvp->gdv_gop->go_gedp, 1, (const char **)av);
+ ret = ged_autoview(tvd->gdv_gop->go_gedp, 1, (const char **)av);
if (ret == GED_OK) {
- struct tclcad_view_data *tvd = (struct tclcad_view_data
*)gdvp->gdv_data;
if (0 < bu_vls_strlen(&tvd->gdv_callback)) {
Tcl_Eval(current_top->to_interp, bu_vls_addr(&tvd->gdv_callback));
}
Modified: brlcad/branches/bioh/src/libtclcad/view/draw.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/draw.c 2020-07-29 19:38:10 UTC
(rev 76581)
+++ brlcad/branches/bioh/src/libtclcad/view/draw.c 2020-07-29 19:47:21 UTC
(rev 76582)
@@ -70,7 +70,8 @@
static void
go_draw_solid(struct ged_dm_view *gdvp, struct solid *sp)
{
- struct ged_obj *gop = gdvp->gdv_gop;
+ struct tclcad_view_data *tvd = (struct tclcad_view_data *)gdvp->gdv_data;
+ struct ged_obj *gop = tvd->gdv_gop;
struct dm *dmp = gdvp->gdv_dmp;
struct bu_hash_entry *entry;
struct path_edit_params *params = NULL;
@@ -121,7 +122,8 @@
struct solid *sp;
int line_style = -1;
struct dm *dmp = gdvp->gdv_dmp;
- struct bu_list *hdlp = gdvp->gdv_gop->go_gedp->ged_gdp->gd_headDisplay;
+ struct tclcad_view_data *tvd = (struct tclcad_view_data *)gdvp->gdv_data;
+ struct bu_list *hdlp = tvd->gdv_gop->go_gedp->ged_gdp->gd_headDisplay;
if (dm_get_transparency(dmp)) {
/* First, draw opaque stuff */
Modified: brlcad/branches/bioh/src/libtclcad/view/faceplate.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/faceplate.c 2020-07-29 19:38:10 UTC
(rev 76581)
+++ brlcad/branches/bioh/src/libtclcad/view/faceplate.c 2020-07-29 19:47:21 UTC
(rev 76582)
@@ -319,8 +319,10 @@
dm_draw_adc(gdvp->gdv_dmp, &(gdvp->gdv_view->gv_adc),
gdvp->gdv_view->gv_view2model, gdvp->gdv_view->gv_model2view);
/* Draw grid */
- if (gdvp->gdv_view->gv_grid.draw)
- dm_draw_grid(gdvp->gdv_dmp, &gdvp->gdv_view->gv_grid,
gdvp->gdv_view->gv_scale, gdvp->gdv_view->gv_model2view,
gdvp->gdv_gop->go_gedp->ged_wdbp->dbip->dbi_base2local);
+ if (gdvp->gdv_view->gv_grid.draw) {
+ struct tclcad_view_data *tvd = (struct tclcad_view_data
*)gdvp->gdv_data;
+ dm_draw_grid(gdvp->gdv_dmp, &gdvp->gdv_view->gv_grid,
gdvp->gdv_view->gv_scale, gdvp->gdv_view->gv_model2view,
tvd->gdv_gop->go_gedp->ged_wdbp->dbip->dbi_base2local);
+ }
/* Draw rect */
if (gdvp->gdv_view->gv_rect.draw && gdvp->gdv_view->gv_rect.line_width)
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
