Revision: 41086
http://brlcad.svn.sourceforge.net/brlcad/?rev=41086&view=rev
Author: brlcad
Date: 2010-10-19 05:18:13 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
remove gratuitous blank lineage and move rgb decl to top of scope for Windows
portability
Modified Paths:
--------------
brlcad/trunk/src/proc-db/makebuilding/makebuilding.c
brlcad/trunk/src/proc-db/mkbuilding.c
Modified: brlcad/trunk/src/proc-db/makebuilding/makebuilding.c
===================================================================
--- brlcad/trunk/src/proc-db/makebuilding/makebuilding.c 2010-10-19
05:11:31 UTC (rev 41085)
+++ brlcad/trunk/src/proc-db/makebuilding/makebuilding.c 2010-10-19
05:18:13 UTC (rev 41086)
@@ -29,38 +29,29 @@
void
-mkbldg_makeWallSegment(char *name, struct rt_wdb *db_fileptr, point_t bbp1,
point_t bbp2 )
+mkbldg_makeWallSegment(char *name, struct rt_wdb *db_fileptr, point_t bbp1,
point_t bbp2)
{
-
struct bu_vls *newName = bu_vls_vlsinit();
-/* build the new object name */
+ /* build the new object name */
bu_vls_strcpy(newName, name);
bu_vls_strcat(newName, "_frame");
-/* make the frame */
+ /* make the frame */
mkbldg_makeframe (newName, db_fileptr, bbp1, bbp2, 1.5*25.4);
bu_vls_vlsfree(newName);
-
-
-
}
-
-
-
-
-
void
mkbldg_makeframe(struct bu_vls *name, struct rt_wdb *db_fileptr, point_t p1,
point_t p2, int thickness)
{
+ unsigned char rgb[3];
point_t bottomP2, topP1, leftP1, leftP2, rightP1, rightP2;
struct bu_vls *newName = bu_vls_vlsinit();
-
-
-/* make the combo: */
+
+ /* make the combo: */
struct wmember combo;
struct bu_list *child_list = &combo.l;
@@ -70,68 +61,64 @@
* Bottom
*/
-/* build name */
+ /* build name */
bu_vls_strcpy(newName, bu_vls_addr(name));
bu_vls_strcat(newName, "_bottom");
-/* calc points */
- VSET(bottomP2, p2[0], p2[1], (p1[2] + thickness) );
-/* make prim */
+ /* calc points */
+ VSET(bottomP2, p2[0], p2[1], (p1[2] + thickness));
+ /* make prim */
mk_rpp(db_fileptr, bu_vls_addr(newName), p1, bottomP2);
-/* Add to child list. */
+ /* Add to child list. */
(void)mk_addmember(bu_vls_addr(newName), child_list, NULL, WMOP_UNION);
/*
* Top
*/
-/* build name */
+ /* build name */
bu_vls_strcpy(newName, bu_vls_addr(name));
bu_vls_strcat(newName, "_top");
-/* calc points */
- VSET(topP1, p1[0], p1[1], (p2[2] - thickness) );
-/* make prim */
+ /* calc points */
+ VSET(topP1, p1[0], p1[1], (p2[2] - thickness));
+ /* make prim */
mk_rpp(db_fileptr, bu_vls_addr(newName), topP1, p2);
-/* Add to child list. */
+ /* Add to child list. */
(void)mk_addmember(bu_vls_addr(newName), child_list, NULL, WMOP_UNION);
/*
* Left
*/
-/* build name */
+ /* build name */
bu_vls_strcpy(newName, bu_vls_addr(name));
bu_vls_strcat(newName, "_left");
-/* calc points */
- VSET(leftP1, p1[0], p1[1], (p1[2] + thickness) );
- VSET(leftP2, p2[0], (p1[1] + thickness), (p2[2] - thickness) );
-/* make prim */
+ /* calc points */
+ VSET(leftP1, p1[0], p1[1], (p1[2] + thickness));
+ VSET(leftP2, p2[0], (p1[1] + thickness), (p2[2] - thickness));
+ /* make prim */
mk_rpp(db_fileptr, bu_vls_addr(newName), leftP1, leftP2);
-/* Add to child list. */
+ /* Add to child list. */
(void)mk_addmember(bu_vls_addr(newName), child_list, NULL, WMOP_UNION);
/*
* Right
*/
-/* build name */
+ /* build name */
bu_vls_strcpy(newName, bu_vls_addr(name));
bu_vls_strcat(newName, "_right");
-/* calc points */
- VSET(rightP1, p1[0], (p2[1] - thickness), (p1[2] + thickness) );
- VSET(rightP2, p2[0], p2[1], (p2[2] - thickness) );
-/* make prim */
+ /* calc points */
+ VSET(rightP1, p1[0], (p2[1] - thickness), (p1[2] + thickness));
+ VSET(rightP2, p2[0], p2[1], (p2[2] - thickness));
+ /* make prim */
mk_rpp(db_fileptr, bu_vls_addr(newName), rightP1, rightP2);
-/* Add to child list. */
+ /* Add to child list. */
(void)mk_addmember(bu_vls_addr(newName), child_list, NULL, WMOP_UNION);
-/* make the combo */
- unsigned char rgb[3];
+ /* make the combo */
VSET(rgb, 64, 180, 96);
mk_lcomb(db_fileptr, bu_vls_addr(name), &combo, 1, NULL, NULL, rgb, 0);
-
-
-
}
@@ -146,6 +133,7 @@
mk_rpp(db_filepointer, name, p1, p2);
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/proc-db/mkbuilding.c
===================================================================
--- brlcad/trunk/src/proc-db/mkbuilding.c 2010-10-19 05:11:31 UTC (rev
41085)
+++ brlcad/trunk/src/proc-db/mkbuilding.c 2010-10-19 05:18:13 UTC (rev
41086)
@@ -31,13 +31,12 @@
fprintf(stderr, "Usage: mkbuilding db_file.g\n");
}
+
int
main(int ac, char *av[])
{
struct rt_wdb *db_filepointer;
-
-
if (ac < 2) {
mkbdlg_usage();
return 1;
@@ -51,14 +50,15 @@
point_t p1, p2;
VSET(p1, 0.0, 0.0, 0.0);
- VSET(p2, (25.4*6), (25.4*12*10), (25.4*12*8) );
+ VSET(p2, (25.4*6), (25.4*12*10), (25.4*12*8));
- mkbldg_makeWallSegment("TestWall",db_filepointer, p1, p2);
+ mkbldg_makeWallSegment("TestWall", db_filepointer, p1, p2);
wdb_close(db_filepointer);
return 0;
}
+
/*
* Local Variables:
* mode: C
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
