Revision: 46545
http://brlcad.svn.sourceforge.net/brlcad/?rev=46545&view=rev
Author: bob1961
Date: 2011-09-01 21:00:04 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Moved and renamed a few mode related macros that are used only by libtclcad
from ged.h to tclcad.h.
Modified Paths:
--------------
brlcad/trunk/include/ged.h
brlcad/trunk/include/tclcad.h
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/include/ged.h
===================================================================
--- brlcad/trunk/include/ged.h 2011-09-01 20:42:33 UTC (rev 46544)
+++ brlcad/trunk/include/ged.h 2011-09-01 21:00:04 UTC (rev 46545)
@@ -85,28 +85,6 @@
#define GED_FUNC_PTR_NULL ((ged_func_ptr)0)
#define GED_REFRESH_CALLBACK_PTR_NULL ((ged_refresh_callback_ptr)0)
-#define GED_IDLE_MODE 0
-#define GED_ROTATE_MODE 1
-#define GED_TRANSLATE_MODE 2
-#define GED_SCALE_MODE 3
-#define GED_CONSTRAINED_ROTATE_MODE 4
-#define GED_CONSTRAINED_TRANSLATE_MODE 5
-#define GED_OROTATE_MODE 6
-#define GED_OSCALE_MODE 7
-#define GED_OTRANSLATE_MODE 8
-#define GED_MOVE_ARB_EDGE_MODE 9
-#define GED_MOVE_ARB_FACE_MODE 10
-#define GED_ROTATE_ARB_FACE_MODE 11
-#define GED_PROTATE_MODE 12
-#define GED_PSCALE_MODE 13
-#define GED_PTRANSLATE_MODE 14
-#define GED_RECTANGLE_MODE 15
-
-#define GED_OBJ_FB_MODE_OFF 0
-#define GED_OBJ_FB_MODE_UNDERLAY 1
-#define GED_OBJ_FB_MODE_INTERLAY 2
-#define GED_OBJ_FB_MODE_OVERLAY 3
-
/**
* S E M A P H O R E S
*
Modified: brlcad/trunk/include/tclcad.h
===================================================================
--- brlcad/trunk/include/tclcad.h 2011-09-01 20:42:33 UTC (rev 46544)
+++ brlcad/trunk/include/tclcad.h 2011-09-01 21:00:04 UTC (rev 46545)
@@ -52,7 +52,28 @@
# endif
#endif
+#define TCLCAD_IDLE_MODE 0
+#define TCLCAD_ROTATE_MODE 1
+#define TCLCAD_TRANSLATE_MODE 2
+#define TCLCAD_SCALE_MODE 3
+#define TCLCAD_CONSTRAINED_ROTATE_MODE 4
+#define TCLCAD_CONSTRAINED_TRANSLATE_MODE 5
+#define TCLCAD_OROTATE_MODE 6
+#define TCLCAD_OSCALE_MODE 7
+#define TCLCAD_OTRANSLATE_MODE 8
+#define TCLCAD_MOVE_ARB_EDGE_MODE 9
+#define TCLCAD_MOVE_ARB_FACE_MODE 10
+#define TCLCAD_ROTATE_ARB_FACE_MODE 11
+#define TCLCAD_PROTATE_MODE 12
+#define TCLCAD_PSCALE_MODE 13
+#define TCLCAD_PTRANSLATE_MODE 14
+#define TCLCAD_RECTANGLE_MODE 15
+#define TCLCAD_OBJ_FB_MODE_OFF 0
+#define TCLCAD_OBJ_FB_MODE_UNDERLAY 1
+#define TCLCAD_OBJ_FB_MODE_INTERLAY 2
+#define TCLCAD_OBJ_FB_MODE_OVERLAY 3
+
struct tclcad_obj {
struct bu_list l;
struct ged_obj *to_gop;
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2011-09-01 20:42:33 UTC (rev
46544)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2011-09-01 21:00:04 UTC (rev
46545)
@@ -1983,7 +1983,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_CONSTRAINED_ROTATE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_CONSTRAINED_ROTATE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_constrain_rot %V %s
%%x %%y}; break",
@@ -2048,7 +2048,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_CONSTRAINED_TRANSLATE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_CONSTRAINED_TRANSLATE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_constrain_trans %V %s
%%x %%y}; break",
@@ -4159,8 +4159,8 @@
bu_vls_free(&bindings);
if (gdvp->gdv_view->gv_grid.ggs_snap &&
- (gdvp->gdv_view->gv_mode == GED_TRANSLATE_MODE ||
- gdvp->gdv_view->gv_mode == GED_CONSTRAINED_TRANSLATE_MODE)) {
+ (gdvp->gdv_view->gv_mode == TCLCAD_TRANSLATE_MODE ||
+ gdvp->gdv_view->gv_mode == TCLCAD_CONSTRAINED_TRANSLATE_MODE)) {
char *av[3];
gedp->ged_gvp = gdvp->gdv_view;
@@ -4176,7 +4176,7 @@
to_refresh_view(gdvp);
}
- gdvp->gdv_view->gv_mode = GED_IDLE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_IDLE_MODE;
return GED_OK;
}
@@ -5959,7 +5959,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_MOVE_ARB_EDGE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_MOVE_ARB_EDGE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_move_arb_edge %V %s
%s %%x %%y}",
@@ -6018,7 +6018,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_MOVE_ARB_FACE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_MOVE_ARB_FACE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_move_arb_face %V %s
%s %%x %%y}",
@@ -6210,7 +6210,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_OROTATE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_OROTATE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_orotate %V %s %%x
%%y}",
@@ -6268,7 +6268,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_OSCALE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_OSCALE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_oscale %V %s %%x
%%y}",
@@ -6326,7 +6326,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_OTRANSLATE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_OTRANSLATE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_otranslate %V %s %%x
%%y}",
@@ -6666,7 +6666,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = gdvp->gdv_dmp->dm_height - y;
- gdvp->gdv_view->gv_mode = GED_RECTANGLE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_RECTANGLE_MODE;
ac = 4;
av[0] = "rect";
@@ -6827,7 +6827,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_ROTATE_ARB_FACE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_ROTATE_ARB_FACE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_rotate_arb_face %V %s
%s %s %%x %%y}",
@@ -6887,7 +6887,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_ROTATE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_ROTATE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_rot %V %%x %%y}",
@@ -7051,7 +7051,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_PROTATE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_PROTATE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_protate %V %s %s %%x
%%y}",
@@ -7110,7 +7110,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_PSCALE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_PSCALE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_pscale %V %s %s %%x
%%y}",
@@ -7169,7 +7169,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_PTRANSLATE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_PTRANSLATE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_ptranslate %V %s %s
%%x %%y}",
@@ -7228,7 +7228,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_SCALE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_SCALE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_scale %V %%x %%y}",
@@ -7457,8 +7457,8 @@
if (mode < 0)
mode = 0;
- else if (GED_OBJ_FB_MODE_OVERLAY < mode)
- mode = GED_OBJ_FB_MODE_OVERLAY;
+ else if (TCLCAD_OBJ_FB_MODE_OVERLAY < mode)
+ mode = TCLCAD_OBJ_FB_MODE_OVERLAY;
gdvp->gdv_fbs.fbs_mode = mode;
to_refresh_view(gdvp);
@@ -7563,7 +7563,7 @@
gdvp->gdv_view->gv_prevMouseX = x;
gdvp->gdv_view->gv_prevMouseY = y;
- gdvp->gdv_view->gv_mode = GED_TRANSLATE_MODE;
+ gdvp->gdv_view->gv_mode = TCLCAD_TRANSLATE_MODE;
bu_vls_init(&bindings);
bu_vls_printf(&bindings, "bind %V <Motion> {%V mouse_trans %V %%x %%y}",
@@ -9165,7 +9165,7 @@
int restore_zbuffer = 0;
/* Turn off the zbuffer if the framebuffer is active AND the zbuffer is
on. */
- if (gdvp->gdv_fbs.fbs_mode != GED_OBJ_FB_MODE_OFF &&
+ if (gdvp->gdv_fbs.fbs_mode != TCLCAD_OBJ_FB_MODE_OFF &&
gdvp->gdv_dmp->dm_zbuffer) {
DM_SET_ZBUFFER(gdvp->gdv_dmp, 0);
restore_zbuffer = 1;
@@ -9184,7 +9184,7 @@
void
go_refresh_draw(struct ged_obj *gop, struct ged_dm_view *gdvp)
{
- if (gdvp->gdv_fbs.fbs_mode == GED_OBJ_FB_MODE_OVERLAY) {
+ if (gdvp->gdv_fbs.fbs_mode == TCLCAD_OBJ_FB_MODE_OVERLAY) {
if (gdvp->gdv_view->gv_rect.grs_draw) {
go_draw(gdvp);
@@ -9201,7 +9201,7 @@
gdvp->gdv_dmp->dm_width, gdvp->gdv_dmp->dm_height);
return;
- } else if (gdvp->gdv_fbs.fbs_mode == GED_OBJ_FB_MODE_INTERLAY) {
+ } else if (gdvp->gdv_fbs.fbs_mode == TCLCAD_OBJ_FB_MODE_INTERLAY) {
go_draw(gdvp);
if (gdvp->gdv_view->gv_rect.grs_draw) {
@@ -9213,7 +9213,7 @@
fb_refresh(gdvp->gdv_fbs.fbs_fbp, 0, 0,
gdvp->gdv_dmp->dm_width, gdvp->gdv_dmp->dm_height);
} else {
- if (gdvp->gdv_fbs.fbs_mode == GED_OBJ_FB_MODE_UNDERLAY) {
+ if (gdvp->gdv_fbs.fbs_mode == TCLCAD_OBJ_FB_MODE_UNDERLAY) {
if (gdvp->gdv_view->gv_rect.grs_draw) {
fb_refresh(gdvp->gdv_fbs.fbs_fbp,
gdvp->gdv_view->gv_rect.grs_pos[X],
gdvp->gdv_view->gv_rect.grs_pos[Y],
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
