Revision: 56543
http://sourceforge.net/p/brlcad/code/56543
Author: brlcad
Date: 2013-08-05 02:44:54 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
enable the large portions of dead code for the mortar_brick() and brick()
routines, just print a loud warning to say they're untested.
Modified Paths:
--------------
brlcad/trunk/src/proc-db/masonry.c
Modified: brlcad/trunk/src/proc-db/masonry.c
===================================================================
--- brlcad/trunk/src/proc-db/masonry.c 2013-08-05 02:22:34 UTC (rev 56542)
+++ brlcad/trunk/src/proc-db/masonry.c 2013-08-05 02:44:54 UTC (rev 56543)
@@ -795,8 +795,7 @@
/* put all the studding in a region */
snprintf(sol_name, 64, "r.%s.studs", obj_name);
- mk_lcomb(fd, sol_name, &wm_hd, 1,
- stud_properties[0], stud_properties[1], color, 0);
+ mk_lcomb(fd, sol_name, &wm_hd, 1, stud_properties[0], stud_properties[1],
color, 0);
}
@@ -843,22 +842,22 @@
}
snprintf(sol_name, 64, "r.%s.sr1", obj_name);
- mk_lcomb(fd, sol_name, &wm_hd, 1, (char *)NULL, (char *)NULL,
- color, 0);
+ mk_lcomb(fd, sol_name, &wm_hd, 1, (const char *)NULL, (const char *)NULL,
color, 0);
}
void
-mortar_brick(struct rt_wdb *UNUSED(fd))
+mortar_brick(struct rt_wdb *fd)
{
struct wmember wm_hd;
-#if 0
int horiz_bricks;
int vert_bricks;
double mortar_height;
double mortar_width;
point_t pts[8];
+ bu_log("WARNING: the mortar brick type option is untested\n");
+
horiz_bricks = (WALL_WIDTH-brick_depth) / (brick_width + min_mortar);
/* compute excess distance to be used in mortar */
@@ -892,11 +891,9 @@
*sol_name = 'r';
if (rand_brick_color)
- mk_lcomb(fd, sol_name, &wm_hd, 1, (char *)NULL, (char *)NULL,
- (char *)NULL, 0);
+ mk_lcomb(fd, sol_name, &wm_hd, 1, (const char *)NULL, (const char
*)NULL, (const unsigned char *)NULL, 0);
else
- mk_lcomb(fd, sol_name, &wm_hd, 1, (char *)NULL, (char *)NULL,
- brick_color, 0);
+ mk_lcomb(fd, sol_name, &wm_hd, 1, (const char *)NULL, (const char
*)NULL, brick_color, 0);
/* make prototype mortar upon which brick will sit */
@@ -915,8 +912,7 @@
(void)mk_addmember(sol_name, &wm_hd.l, NULL, WMOP_UNION);
*sol_name = 'r';
- mk_lcomb(fd, sol_name, &wm_hd, 1, (char *)NULL, (char *)NULL,
- mortar_color, 0);
+ mk_lcomb(fd, sol_name, &wm_hd, 1, (const char *)NULL, (const char *)NULL,
mortar_color, 0);
/* make the mortar that goes between
@@ -937,22 +933,14 @@
(void)mk_addmember(sol_name, &wm_hd.l, NULL, WMOP_UNION);
*sol_name = 'r';
- mk_lcomb(fd, sol_name, &wm_hd, 1, (char *)NULL, (char *)NULL,
- mortar_color, 0);
-#else
- BU_LIST_INIT(&wm_hd.l);
-
- bu_exit(0, "Not Yet Implemented\n");
-
-#endif
+ mk_lcomb(fd, sol_name, &wm_hd, 1, (const char *)NULL, (const char *)NULL,
mortar_color, 0);
}
void
-brick(struct rt_wdb *UNUSED(fd))
+brick(struct rt_wdb *fd)
{
struct wmember wm_hd;
-#if 0
int horiz_bricks;
int vert_bricks;
double mortar_height;
@@ -960,6 +948,8 @@
point_t pts[8];
char proto_brick[64];
+ bu_log("WARNING: the brick type option is untested\n");
+
if (!color)
color = brick_color;
@@ -988,14 +978,7 @@
(void)mk_addmember(proto_brick, &wm_hd.l, NULL, WMOP_UNION);
*proto_brick = 'r';
- mk_lcomb(fd, proto_brick, &wm_hd, 1, (char *)NULL, (char *)NULL,
- (char *)NULL, 0);
-#else
- BU_LIST_INIT(&wm_hd.l);
-
- bu_exit(0, "Not Yet Implemented\n");
-
-#endif
+ mk_lcomb(fd, proto_brick, &wm_hd, 1, (const char *)NULL, (const char
*)NULL, (const unsigned char *)NULL, 0);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
