Revision: 45872
http://brlcad.svn.sourceforge.net/brlcad/?rev=45872&view=rev
Author: brlcad
Date: 2011-08-10 03:43:28 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
ws and indent cleanup
Modified Paths:
--------------
brlcad/trunk/src/proc-db/brep_simple.cpp
brlcad/trunk/src/proc-db/brepintersect.cpp
brlcad/trunk/src/proc-db/brepintersect.h
brlcad/trunk/src/proc-db/breplicator.cpp
brlcad/trunk/src/proc-db/brickwall.c
brlcad/trunk/src/proc-db/clutter.c
brlcad/trunk/src/proc-db/common.c
brlcad/trunk/src/proc-db/kurt.c
brlcad/trunk/src/proc-db/lens.c
brlcad/trunk/src/proc-db/masonry.c
brlcad/trunk/src/proc-db/menger.c
brlcad/trunk/src/proc-db/metaball.c
brlcad/trunk/src/proc-db/mkbuilding.h
brlcad/trunk/src/proc-db/room.c
brlcad/trunk/src/proc-db/spltest.c
brlcad/trunk/src/proc-db/surfaceintersect.cpp
brlcad/trunk/src/proc-db/surfaceintersect.h
brlcad/trunk/src/proc-db/tube.c
brlcad/trunk/src/proc-db/wavy.c
Modified: brlcad/trunk/src/proc-db/brep_simple.cpp
===================================================================
--- brlcad/trunk/src/proc-db/brep_simple.cpp 2011-08-10 03:40:05 UTC (rev
45871)
+++ brlcad/trunk/src/proc-db/brep_simple.cpp 2011-08-10 03:43:28 UTC (rev
45872)
@@ -70,7 +70,7 @@
/* Prevent enum conflict with vmath.h */
namespace {
-
+
enum {
A, B, C, D, E, F, G, H
};
@@ -289,13 +289,13 @@
// edge data should be inverted from its default orientation for
// the purposes of loop assembly.
- MakeTwistedCubeFace(brep,
+ MakeTwistedCubeFace(brep,
ABCD, // index of surface geometry
+1, // orientation of surface w.r.t. brep
A, B, C, D, // indices of vertices listed in order
AB, +1, // south edge, orientation w.r.t. trimming
curve
- BC, +1, // east edge, orientation w.r.t. trimming
curve
- CD, +1, // west edge, orientation w.r.t. trimming
curve
+ BC, +1, // east edge, orientation w.r.t. trimming
curve
+ CD, +1, // west edge, orientation w.r.t. trimming
curve
DA, +1);// north edge, orientation w.r.t. trimming
curve
MakeTwistedCubeFace(brep,
@@ -303,8 +303,8 @@
+1, // orientation of surface w.r.t. brep
B, E, H, C, // indices of vertices listed in order
BE, +1, // south edge, orientation w.r.t. trimming
curve
- EH, +1, // east edge, orientation w.r.t. trimming
curve
- HC, +1, // west edge, orientation w.r.t. trimming
curve
+ EH, +1, // east edge, orientation w.r.t. trimming
curve
+ HC, +1, // west edge, orientation w.r.t. trimming
curve
BC, -1);// north edge, orientation w.r.t. trimming
curve
MakeTwistedCubeFace(brep,
@@ -312,8 +312,8 @@
+1, // orientation of surface w.r.t. brep
E, F, G, H, // indices of vertices listed in order
EF, +1, // south edge, orientation w.r.t. trimming
curve
- FG, +1, // east edge, orientation w.r.t. trimming
curve
- GH, +1, // west edge, orientation w.r.t. trimming
curve
+ FG, +1, // east edge, orientation w.r.t. trimming
curve
+ GH, +1, // west edge, orientation w.r.t. trimming
curve
EH, -1);// north edge, orientation w.r.t. trimming
curve
MakeTwistedCubeFace(brep,
@@ -321,8 +321,8 @@
+1, // orientation of surface w.r.t. brep
F, A, D, G, // indices of vertices listed in order
FA, +1, // south edge, orientation w.r.t. trimming
curve
- DA, -1, // east edge, orientation w.r.t. trimming
curve
- DG, +1, // west edge, orientation w.r.t. trimming
curve
+ DA, -1, // east edge, orientation w.r.t. trimming
curve
+ DG, +1, // west edge, orientation w.r.t. trimming
curve
FG, -1);// north edge, orientation w.r.t. trimming
curve
MakeTwistedCubeFace(brep,
@@ -330,8 +330,8 @@
+1, // orientation of surface w.r.t. brep
F, E, B, A, // indices of vertices listed in order
EF, -1, // south edge, orientation w.r.t. trimming
curve
- BE, -1, // east edge, orientation w.r.t. trimming
curve
- AB, -1, // west edge, orientation w.r.t. trimming
curve
+ BE, -1, // east edge, orientation w.r.t. trimming
curve
+ AB, -1, // west edge, orientation w.r.t. trimming
curve
FA, -1);// north edge, orientation w.r.t. trimming
curve
MakeTwistedCubeFace(brep,
@@ -339,8 +339,8 @@
+1, // orientation of surface w.r.t. brep
D, C, H, G, // indices of vertices listed in order
CD, -1, // south edge, orientation w.r.t. trimming
curve
- HC, -1, // east edge, orientation w.r.t. trimming
curve
- GH, -1, // west edge, orientation w.r.t. trimming
curve
+ HC, -1, // east edge, orientation w.r.t. trimming
curve
+ GH, -1, // west edge, orientation w.r.t. trimming
curve
DG, -1);// north edge, orientation w.r.t. trimming
curve
}
@@ -451,10 +451,10 @@
bu_exit(1, "ERROR: unable to make the twisted cube\n");
}
mk_brep(outfp, geom_name, brep);
-
+
unsigned char rgb[] = {255, 255, 255};
mk_region1(outfp, "cube.r", geom_name, "plastic", "", rgb);
-
+
wdb_close(outfp);
delete brep;
Modified: brlcad/trunk/src/proc-db/brepintersect.cpp
===================================================================
--- brlcad/trunk/src/proc-db/brepintersect.cpp 2011-08-10 03:40:05 UTC (rev
45871)
+++ brlcad/trunk/src/proc-db/brepintersect.cpp 2011-08-10 03:43:28 UTC (rev
45872)
@@ -47,7 +47,7 @@
}
/**
- * tests whether a point is inside of the triangle using vector math
+ * tests whether a point is inside of the triangle using vector math
* the point has to be in the same plane as the triangle, otherwise
* it returns false.
*/
@@ -546,7 +546,7 @@
}
if (!dup) {
out[number_found] = P;
- edge[number_found] = i;
+ edge[number_found] = i;
number_found++;
}
}
@@ -698,11 +698,11 @@
for (i = 0; i < (paths[0].Count() - 1); i++) {
/* we check that the intersection is 4 because the segment shares
end points with 4 different pline segments */
ON_3dPoint mid = (paths[0][i] + paths[0][i + 2])/2;
- /* FIXME: compiler doesn't like that the first
- * arguments is passing NULL as a non-pointer
- * parameter. commented out until someone
- * fixes it.
- */
+ /* FIXME: compiler doesn't like that the first
+ * arguments is passing NULL as a non-pointer
+ * parameter. commented out until someone
+ * fixes it.
+ */
if (SegmentPolylineIntersect(paths[0][i], paths[0][(i + 2) %
paths[0].Count()], paths[0], NULL, 1E-9) == 4 && PointInPolyline(mid, paths[0],
1E-9)) {
/* ON_3dPoint tri[3] = {paths[0][i], paths[i + 1], paths[(i +
2) % paths[0].Count()]};
triangles.Append(tri);
@@ -752,14 +752,14 @@
*
* -1 indicates an original point (about which we have no information)
* 0 indicates an outgoing line
- * 1 indicates an incoming line
+ * 1 indicates an incoming line
*/
class TriIntersections {
ON_Polyline edges[3];
ON_SimpleArray<char> dir[3];
ON_SimpleArray<ON_Line> intersections;
double tol;
- public:
+public:
TriIntersections(ON_3dPoint, ON_3dPoint, ON_3dPoint, double);
int InsertPoint(ON_3dPoint, uint8_t, EdgeIndex);
int AddLine(ON_Line);
@@ -768,8 +768,8 @@
TriIntersections::TriIntersections(
- ON_3dPoint A,
- ON_3dPoint B,
+ ON_3dPoint A,
+ ON_3dPoint B,
ON_3dPoint C,
double tolerance
)
@@ -840,7 +840,7 @@
}
for (int i = 0; i < 3; i++) {
- if (edges[i].Count() == 2) { /* the edge was never intersected */
+ if (edges[i].Count() == 2) { /* the edge was never intersected */
segments.Append(ON_Line(edges[i][0], edges[i][0]));
flippable.Append(true);
segexternal.Append(true);
@@ -915,7 +915,7 @@
class PointIndex{
ON_Mesh *mesh;
double tol;
- public:
+public:
PointIndex(ON_Mesh*);
int InsertPoint(ON_3dPoint);
};
@@ -957,9 +957,9 @@
ON_MeshFace face = mesh->m_F[i];
if (face.IsTriangle()) {
n_vertices = 3;
- } else {
+ } else {
n_vertices = 4;
- }
+ }
for (int j = 0; j < n_vertices; j++) {
faces[face.vi[j]].Append(i);
}
Modified: brlcad/trunk/src/proc-db/brepintersect.h
===================================================================
--- brlcad/trunk/src/proc-db/brepintersect.h 2011-08-10 03:40:05 UTC (rev
45871)
+++ brlcad/trunk/src/proc-db/brepintersect.h 2011-08-10 03:43:28 UTC (rev
45872)
@@ -55,7 +55,7 @@
const ON_3dPoint& c,
const ON_3dPoint& p,
const ON_3dPoint& q,
- ON_3dPoint out[2],
+ ON_3dPoint out[2],
double tol
);
Modified: brlcad/trunk/src/proc-db/breplicator.cpp
===================================================================
--- brlcad/trunk/src/proc-db/breplicator.cpp 2011-08-10 03:40:05 UTC (rev
45871)
+++ brlcad/trunk/src/proc-db/breplicator.cpp 2011-08-10 03:43:28 UTC (rev
45872)
@@ -38,7 +38,7 @@
generate_brep(int count, ON_3dPoint *points)
{
ON_Brep *brep = new ON_Brep();
-
+
/* make an arb8 */
// VERTICES
@@ -51,7 +51,7 @@
ON_3dPoint p9 = ON_3dPoint(2.0, 0.0, -1.0);
ON_3dPoint p10 = ON_3dPoint(2.0, 0.0, 3.5);
ON_3dPoint p11 = ON_3dPoint(-1.0, 0.0, 3.5);
-
+
brep->NewVertex(p8, SMALL_FASTF); // 8
brep->NewVertex(p9, SMALL_FASTF); // 9
brep->NewVertex(p10, SMALL_FASTF); // 10
@@ -172,7 +172,7 @@
surf4765->SetCV(1, 1, points[6]);
surf4765->SetCV(0, 1, points[5]);
brep->m_S.Append(surf4765); /* 1 */
-
+
ON_NurbsSurface* surf0451 = new ON_NurbsSurface(3 /*dimension*/, 0
/*nonrational*/, 2 /*u*/, 2 /*v*/, 2 /*#u*/, 2 /*#v*/);
surf0451->SetKnot(0, 0, 0.0); surf0451->SetKnot(0, 1, 1.0);
surf0451->SetKnot(1, 0, 0.0); surf0451->SetKnot(1, 1, 1.0);
surf0451->SetCV(0, 0, points[0]);
@@ -180,7 +180,7 @@
surf0451->SetCV(1, 1, points[5]);
surf0451->SetCV(0, 1, points[1]);
brep->m_S.Append(surf0451); /* 2 */
-
+
ON_NurbsSurface* surf2673 = new ON_NurbsSurface(3 /*dimension*/, 0
/*nonrational*/, 2 /*u*/, 2 /*v*/, 2 /*#u*/, 2 /*#v*/);
surf2673->SetKnot(0, 0, 0.0); surf2673->SetKnot(0, 1, 1.0);
surf2673->SetKnot(1, 0, 0.0); surf2673->SetKnot(1, 1, 1.0);
surf2673->SetCV(0, 0, points[2]);
@@ -188,7 +188,7 @@
surf2673->SetCV(1, 1, points[7]);
surf2673->SetCV(0, 1, points[3]);
brep->m_S.Append(surf2673); /* 3 */
-
+
ON_NurbsSurface* surf1562 = new ON_NurbsSurface(3 /*dimension*/, 0
/*nonrational*/, 2 /*u*/, 2 /*v*/, 2 /*#u*/, 2 /*#v*/);
surf1562->SetKnot(0, 0, 0.0); surf1562->SetKnot(0, 1, 1.0);
surf1562->SetKnot(1, 0, 0.0); surf1562->SetKnot(1, 1, 1.0);
surf1562->SetCV(0, 0, points[1]);
@@ -196,7 +196,7 @@
surf1562->SetCV(1, 1, points[6]);
surf1562->SetCV(0, 1, points[2]);
brep->m_S.Append(surf1562); /* 4 */
-
+
ON_NurbsSurface* surf0374 = new ON_NurbsSurface(3 /*dimension*/, 0
/*nonrational*/, 2 /*u*/, 2 /*v*/, 2 /*#u*/, 2 /*#v*/);
surf0374->SetKnot(0, 0, 0.0); surf0374->SetKnot(0, 1, 1.0);
surf0374->SetKnot(1, 0, 0.0); surf0374->SetKnot(1, 1, 1.0);
surf0374->SetCV(0, 0, points[0]);
@@ -205,7 +205,7 @@
surf0374->SetCV(0, 1, points[4]);
brep->m_S.Append(surf0374); /* 5 */
-
+
// TRIM CURVES
ON_Curve* trimcurve01 = new ON_LineCurve(ON_2dPoint(0, 0), ON_2dPoint(1,
0));
Modified: brlcad/trunk/src/proc-db/brickwall.c
===================================================================
--- brlcad/trunk/src/proc-db/brickwall.c 2011-08-10 03:40:05 UTC (rev
45871)
+++ brlcad/trunk/src/proc-db/brickwall.c 2011-08-10 03:43:28 UTC (rev
45872)
@@ -94,14 +94,14 @@
case 'c':
if ((c=sscanf(bu_optarg, "%d/%d/%d",
&red, &grn, &blu)) == 3)
- (void)sprintf(color, "%d %d %d", red&0x0ff,
- grn&0x0ff, blu&0x0ff);
+ (void)sprintf(color, "%d %d %d", red&0x0ff,
+ grn&0x0ff, blu&0x0ff);
break;
case 'C':
if ((c=sscanf(bu_optarg, "%d/%d/%d",
&red, &grn, &blu)) == 3)
- (void)sprintf(mortar_color, "%d %d %d",
- red&0x0ff, grn&0x0ff, blu&0x0ff);
+ (void)sprintf(mortar_color, "%d %d %d",
+ red&0x0ff, grn&0x0ff, blu&0x0ff);
break;
case 'm':
@@ -334,11 +334,11 @@
/* build the wall
- if (debug)
- (void)fprintf(stderr,
- "bw %g bh %g bd %g ww %g wh %g bn\"%s\"\n",
- brick_width, brick_height, brick_depth,
- wall_width, wall_height, brick_name);
+ if (debug)
+ (void)fprintf(stderr,
+ "bw %g bh %g bd %g ww %g wh %g bn\"%s\"\n",
+ brick_width, brick_height, brick_depth,
+ wall_width, wall_height, brick_name);
*/
horiz_bricks = (int)(wall_width / brick_width);
Modified: brlcad/trunk/src/proc-db/clutter.c
===================================================================
--- brlcad/trunk/src/proc-db/clutter.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/clutter.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -179,7 +179,7 @@
double
crystal_stack(char *cname, double xc, double yc, double size)
- /* center coordinates, z=0+ */
+/* center coordinates, z=0+ */
{
int i;
@@ -243,13 +243,13 @@
double
crystal_layer(char *crname, fastf_t *center, double radius, fastf_t *maj,
fastf_t *min, double var, double ratio, int nsolids)
- /* center coordinates, (min Z) */
- /* cell radius */
- /* main axis of growth */
- /* minor axis of growth */
- /* max degrees of variation off axis (0..90) */
- /* len/width ratio */
- /* number of solids for this layer */
+/* center coordinates, (min Z) */
+/* cell radius */
+/* main axis of growth */
+/* minor axis of growth */
+/* max degrees of variation off axis (0..90) */
+/* len/width ratio */
+/* number of solids for this layer */
{
int todo;
double height = center[Z];
@@ -329,7 +329,7 @@
void
do_plate(char *name, double xc, double yc, double size)
- /* center coordinates, z=0+ */
+/* center coordinates, z=0+ */
{
double esz;
@@ -355,7 +355,7 @@
double
ball_stack(char *bname, double xc, double yc, double size)
- /* center coordinates, z=0+ */
+/* center coordinates, z=0+ */
{
point_t center;
@@ -388,7 +388,7 @@
double
prim_stack(char *pname, double xc, double yc, double size)
- /* center coordinates, z=0+ */
+/* center coordinates, z=0+ */
{
point_t pt[8];
Modified: brlcad/trunk/src/proc-db/common.c
===================================================================
--- brlcad/trunk/src/proc-db/common.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/common.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -77,9 +77,9 @@
do_light(char *name, fastf_t *pos, fastf_t *dir_at, int da_flag, double r,
unsigned char *rgb, struct wmember *headp)
- /* direction or aim point */
- /* 0 = direction, !0 = aim point */
- /* radius of light */
+/* direction or aim point */
+/* 0 = direction, !0 = aim point */
+/* radius of light */
{
Modified: brlcad/trunk/src/proc-db/kurt.c
===================================================================
--- brlcad/trunk/src/proc-db/kurt.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/kurt.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -84,7 +84,7 @@
void
do_cell(struct val *vp, double xc, double yc)
- /* center coordinates, z=0+ */
+/* center coordinates, z=0+ */
{
bn_poly_t polynom;
bn_complex_t roots[4]; /* roots of final equation */
@@ -130,7 +130,7 @@
pnorms(fastf_t (*norms)[3], fastf_t (*verts)[3], fastf_t *out, int npts)
- /* hopefully points outwards */
+/* hopefully points outwards */
{
int i;
@@ -157,9 +157,9 @@
do_light(char *name, fastf_t *pos, fastf_t *dir_at, int da_flag, double r,
unsigned char *rgb)
- /* direction or aim point */
- /* 0 = direction, !0 = aim point */
- /* radius of light */
+/* direction or aim point */
+/* 0 = direction, !0 = aim point */
+/* radius of light */
{
char nbuf[64];
Modified: brlcad/trunk/src/proc-db/lens.c
===================================================================
--- brlcad/trunk/src/proc-db/lens.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/lens.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -34,7 +34,7 @@
*
* This program takes the lensmaker's equation:
*
- *
+ *
* 1 d (n - 1) 1 1
* - = (n - 1) (--------- - -- + --)
* f n R1 R2 R2 R1
@@ -44,7 +44,7 @@
*
* Type (P or D), Diameter of lens,
* focal length (+ for convex, - for concave),
- * n - the refractive index of the lens material,
+ * n - the refractive index of the lens material,
* and d - the thickness of the lens
* at the center the lens along the optical axis).
* The latter two are set to the refractive index of
@@ -81,7 +81,7 @@
vect_t breadth;
if (focal_length > 0) {
- lens_type = 1;
+ lens_type = 1;
} else {
lens_type = -1;
}
@@ -118,8 +118,8 @@
VSET(breadth, 0, 0, 1);
bu_vls_trunc(&str, 0);
bu_vls_printf(&str, "%s-epa.s", prefix);
- mk_epa(file, bu_vls_addr(&str), origin, height, breadth, epa_R, epa_R);
- if (lens_type == 1) {
+ mk_epa(file, bu_vls_addr(&str), origin, height, breadth, epa_R, epa_R);
+ if (lens_type == 1) {
(void)mk_addmember(bu_vls_addr(&str), &lensglass.l, NULL,
WMOP_UNION);
} else {
(void)mk_addmember(bu_vls_addr(&str), &lensglass.l, NULL,
WMOP_SUBTRACT);
@@ -128,7 +128,7 @@
bu_vls_trunc(&str, 0);
bu_vls_printf(&str, "%s.c", prefix);
mk_lcomb(file, bu_vls_addr(&str), &lensglass, 0, NULL, NULL, NULL, 0);
-
+
(void)mk_addmember(bu_vls_addr(&str), &lens.l, NULL, WMOP_UNION);
bu_vls_trunc(&str, 0);
bu_vls_printf(&str, "%s.r", prefix);
@@ -151,7 +151,7 @@
bu_vls_init(&str);
if (focal_length > 0) {
- lens_type = 1;
+ lens_type = 1;
} else {
lens_type = -1;
}
@@ -186,7 +186,7 @@
VSET(breadth, 0, 0, 1);
bu_vls_trunc(&str, 0);
bu_vls_printf(&str, "%s-epa1.s", prefix);
- mk_epa(file, bu_vls_addr(&str), origin, height, breadth, epa_R, epa_R);
+ mk_epa(file, bu_vls_addr(&str), origin, height, breadth, epa_R, epa_R);
if (lens_type == 1) {
(void)mk_addmember(bu_vls_addr(&str), &lensglass.l, NULL,
WMOP_UNION);
} else {
@@ -197,17 +197,17 @@
VSET(breadth, 0, 0, 1);
bu_vls_trunc(&str, 0);
bu_vls_printf(&str, "%s-epa2.s", prefix);
- mk_epa(file, bu_vls_addr(&str), origin, height, breadth, epa_R, epa_R);
+ mk_epa(file, bu_vls_addr(&str), origin, height, breadth, epa_R, epa_R);
if (lens_type == 1) {
(void)mk_addmember(bu_vls_addr(&str), &lensglass.l, NULL,
WMOP_UNION);
} else {
(void)mk_addmember(bu_vls_addr(&str), &lensglass.l, NULL,
WMOP_SUBTRACT);
}
-
+
bu_vls_trunc(&str, 0);
bu_vls_printf(&str, "%s.c", prefix);
mk_lcomb(file, bu_vls_addr(&str), &lensglass, 0, NULL, NULL, NULL, 0);
-
+
(void)mk_addmember(bu_vls_addr(&str), &lens.l, NULL, WMOP_UNION);
bu_vls_trunc(&str, 0);
bu_vls_printf(&str, "%s.r", prefix);
@@ -259,7 +259,6 @@
}
-
int main(int ac, char *av[])
{
struct rt_wdb *db_fp = NULL;
@@ -282,8 +281,8 @@
lens_1side_2side = 2;
bu_vls_printf(&lens_type, "DCX");
bu_vls_printf(&name, "lens_%s_f%.1f_d%.1f", bu_vls_addr(&lens_type),
focal_length, diameter);
-
- /* Process arguments */
+
+ /* Process arguments */
ReadArgs(ac, av, &lens_1side_2side, &ref_ind, &diameter, &thickness,
&focal_length);
/* Create file name if supplied, else use "lens.g" */
@@ -310,7 +309,7 @@
bu_vls_printf(&name, "lens_%s_f%.1f_d%.1f", bu_vls_addr(&lens_type),
focal_length, diameter);
MakeP(db_fp, bu_vls_addr(&name), diameter, focal_length, ref_ind,
thickness);
}
- if (lens_1side_2side == 1 && focal_length < 0) {
+ if (lens_1side_2side == 1 && focal_length < 0) {
bu_log("Making Plano-Concave lens...\n");
bu_vls_trunc(&lens_type, 0);
bu_vls_trunc(&name, 0);
Modified: brlcad/trunk/src/proc-db/masonry.c
===================================================================
--- brlcad/trunk/src/proc-db/masonry.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/masonry.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -293,7 +293,7 @@
op->sz = dy * unit_conv;
op->ex = width * unit_conv;
op->ez = height * unit_conv;
-
+
/* do bounds checking */
if (op->sx < 0.0) op->sx = 0.0;
if (op->sz < 0.0) op->sz = 0.0;
@@ -301,7 +301,7 @@
op->ex = WALL_WIDTH;
if (op->ez > WALL_HEIGHT)
op->ez = WALL_HEIGHT;
-
+
units_lock = 1;
} else {
usage("error parsing -o option\n");
Modified: brlcad/trunk/src/proc-db/menger.c
===================================================================
--- brlcad/trunk/src/proc-db/menger.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/menger.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -55,7 +55,7 @@
slice(struct rt_wdb *fp, point_t origin, fastf_t depth, fastf_t width, fastf_t
height, axes xyz, int exterior, size_t level, const char *prefix, struct
bu_list *comb)
{
/* 3x3x3 => 27 cubes
- *
+ *
* first quadrant coordinate system
*/
vect_t cell[27];
@@ -169,7 +169,7 @@
bu_vls_printf(&celfix, "%s_021_", prefix);
/* 021 */ slice(fp, cell[15], depth, width, height, xyz, exterior,
level, bu_vls_addr(&celfix), comb);
if (!(xyz & YDIR)) {
- bu_vls_printf(&celfix, "%s_121_", prefix);
+ bu_vls_printf(&celfix, "%s_121_", prefix);
/* 121 */ slice(fp, cell[16], depth, width, height, xyz, exterior,
level, bu_vls_addr(&celfix), comb);
}
bu_vls_printf(&celfix, "%s_221_", prefix);
@@ -460,7 +460,7 @@
}
/* make the top-level scene:
- *
+ *
* menger
* \____ u ground.r
* \___ u light0.r
@@ -531,7 +531,7 @@
VSET(pos, EXTENT / 2.0, EXTENT / 2.0, EXTENT / 2.0);
} else {
VSET(pos, EXTENT * 3.0, EXTENT * 3.0, EXTENT * 3.0);
- }
+ }
mk_sph(fp, "light1.sph", pos, EXTENT * 0.01);
mk_addmember("light1.sph", &(light1->l), NULL, WMOP_UNION);
mk_comb(fp, "light1.r", &(light1->l), 1, "light", NULL, rgb, 1000, 0,
0, 100, 0, 0, 0);
Modified: brlcad/trunk/src/proc-db/metaball.c
===================================================================
--- brlcad/trunk/src/proc-db/metaball.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/metaball.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -48,7 +48,7 @@
/**
* Creates one metaball object with 'count' random points using
- * LIBWDB's mk_metaball() interface.
+ * LIBWDB's mk_metaball() interface.
*/
static void
make_meatballs(struct rt_wdb *fp, const char *name, long count)
Modified: brlcad/trunk/src/proc-db/mkbuilding.h
===================================================================
--- brlcad/trunk/src/proc-db/mkbuilding.h 2011-08-10 03:40:05 UTC (rev
45871)
+++ brlcad/trunk/src/proc-db/mkbuilding.h 2011-08-10 03:43:28 UTC (rev
45872)
@@ -30,7 +30,6 @@
#define USE2X6 2
-
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
@@ -43,7 +42,6 @@
#include "wdb.h"
-
void mkbldg_makeWallSegment(char *name, struct rt_wdb *db_filepointer, point_t
p1, point_t p2);
void mkbldg_makeframe(struct bu_vls *name, struct rt_wdb *db_fileptr, point_t
p1, point_t p2, int thickness);
Modified: brlcad/trunk/src/proc-db/room.c
===================================================================
--- brlcad/trunk/src/proc-db/room.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/room.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -156,7 +156,7 @@
void
make_room(char *rname, fastf_t *imin, fastf_t *imax, fastf_t *thickness,
struct wmember *headp)
- /* Interior RPP min point */
+/* Interior RPP min point */
{
@@ -185,7 +185,7 @@
void
make_walls(char *rname, fastf_t *imin, fastf_t *imax, fastf_t *thickness, int
bits, struct wmember *headp)
- /* Interior RPP min point */
+/* Interior RPP min point */
{
@@ -256,7 +256,7 @@
make_pillar(char *prefix, int ix, int iy, fastf_t *center, fastf_t *lwh,
struct wmember *headp)
- /* center of base */
+/* center of base */
{
Modified: brlcad/trunk/src/proc-db/spltest.c
===================================================================
--- brlcad/trunk/src/proc-db/spltest.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/spltest.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -39,7 +39,7 @@
#define SSET(_fp, _srf, _col, _row, _val) { \
_fp = &_srf->ctl_points[((_col*_srf->s_size[1])+_row)*3]; \
VMOVE(_fp, _val); \
-}
+ }
void
@@ -86,7 +86,7 @@
SSET(fp, srf, 0, 1, b);
SSET(fp, srf, 1, 0, d);
SSET(fp, srf, 1, 1, c);
-
+
s->srfs[s->nsrf++] = srf;
}
@@ -108,7 +108,7 @@
} else {
filename = "spltest.g";
}
-
+
if ((fp = wdb_fopen(filename)) == NULL) {
perror("unable to open geometry database for writing");
bu_exit(1, "unable to open new database [%s]\n", filename);
@@ -127,7 +127,7 @@
si->srfs = (struct face_g_snurb **)bu_malloc(sizeof(struct face_g_snurb
*)*100, "allocate snurb ptrs");
make_face(si, a, b, c, d, 2);
-
+
/* wdb_export */
mk_export_fwrite(fp, "spltest", (genptr_t)si, ID_BSPLINE);
Modified: brlcad/trunk/src/proc-db/surfaceintersect.cpp
===================================================================
--- brlcad/trunk/src/proc-db/surfaceintersect.cpp 2011-08-10 03:40:05 UTC
(rev 45871)
+++ brlcad/trunk/src/proc-db/surfaceintersect.cpp 2011-08-10 03:43:28 UTC
(rev 45872)
@@ -791,7 +791,7 @@
out[curve].Append(ON_2dPoint(x[i].m_a[0],
intervals[(1 - dir) + (2 * curve)].Min()));
}
}
- out[1 - curve].Append(ON_2dPoint(x[i].m_b[0],
x[i].m_b[1]));
+ out[1 - curve].Append(ON_2dPoint(x[i].m_b[0], x[i].m_b[1]));
}
}
}
@@ -1021,7 +1021,7 @@
}
void
-MakeTwistedCubeEdges2(ON_Brep& brep)
+MakeTwistedCubeEdges2(ON_Brep& brep)
{
MakeTwistedCubeEdge(brep, E, F, EF);
MakeTwistedCubeEdge(brep, F, G, FG);
Modified: brlcad/trunk/src/proc-db/surfaceintersect.h
===================================================================
--- brlcad/trunk/src/proc-db/surfaceintersect.h 2011-08-10 03:40:05 UTC (rev
45871)
+++ brlcad/trunk/src/proc-db/surfaceintersect.h 2011-08-10 03:43:28 UTC (rev
45872)
@@ -22,7 +22,7 @@
*
*/
-#include "common.h"
+#include "common.h"
/* common interface headers */
#include "raytrace.h"
@@ -48,7 +48,7 @@
* @brief analogous to ON_X_EVENT but between ON_BrepFaces
*/
class Face_X_Event{
- public:
+public:
ON_BrepFace *face1;
ON_BrepFace *face2;
ON_Curve *curve1;
Modified: brlcad/trunk/src/proc-db/tube.c
===================================================================
--- brlcad/trunk/src/proc-db/tube.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/tube.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -400,7 +400,7 @@
size_t nmass;
float kx, ky, kz;
int nmassval;
-
+
buf[0] = '\0';
if (bu_fgets(buf, sizeof(buf), fp) == NULL) return -1;
/* center of mass #, +X, +Z, -Y (chg of coordinates) */
@@ -507,7 +507,7 @@
}
fprintf(stderr, "xfinddir: x=%g is past last segment, using final
direction\n", x);
i = nsamples-2;
- out:
+out:
VSUB2(dir, sample[i+1], sample[i]);
ratio = (x-sample[i][X]) / (sample[i+1][X]-sample[i][X]);
VJOIN1(loc, sample[i], ratio, dir);
Modified: brlcad/trunk/src/proc-db/wavy.c
===================================================================
--- brlcad/trunk/src/proc-db/wavy.c 2011-08-10 03:40:05 UTC (rev 45871)
+++ brlcad/trunk/src/proc-db/wavy.c 2011-08-10 03:43:28 UTC (rev 45872)
@@ -53,7 +53,7 @@
surfs = (struct face_g_snurb **)bu_calloc(2, sizeof(struct face_g_snurb
*), "surfaces");
surfs[0] = srf;
surfs[1] = NULL;
-
+
return surfs;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
