Skip to content

Commit

Permalink
format pass #2 -- braces around statements
Browse files Browse the repository at this point in the history
  • Loading branch information
@Phytolizer
Phytolizer committed Jan 6, 2022
1 parent 778fa1b commit 8db9360
Show file tree
Hide file tree
Showing 8 changed files with 383 additions and 144 deletions.
247 changes: 179 additions & 68 deletions source_files/obsidian_main/aj_map.cc
View file

Large diffs are not rendered by default.

155 changes: 111 additions & 44 deletions source_files/obsidian_main/aj_poly.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@ void edge_c::Recompute() {
p_length = hypot(pdx, pdy);
p_angle = ComputeAngle(pdx, pdy);

if (p_length <= 0)
if (p_length <= 0) {
Appl_FatalError("INTERNAL ERROR: edge has zero length!\n");
}

p_perp = psy * pdx - psx * pdy;
p_para = -psx * pdx - psy * pdy;
Expand Down Expand Up @@ -186,23 +187,27 @@ inline void CalcIntersection(edge_c *cur, edge_c *part, double perp_c,
// 0 = start, 1 = end
double ds = perp_c / (perp_c - perp_d);

if (cur->pdx == 0)
if (cur->pdx == 0) {
*x = cur->psx;
else
} else {
*x = cur->psx + (cur->pdx * ds);
}

if (cur->pdy == 0)
if (cur->pdy == 0) {
*y = cur->psy;
else
} else {
*y = cur->psy + (cur->pdy * ds);
}
}

void AddIntersection(intersect_c **cut_list, vertex_c *vert, edge_c *part) {
intersect_c *cut;

// check if vertex already present
for (cut = (*cut_list); cut; cut = cut->next) {
if (vert == cut->vertex) return;
if (vert == cut->vertex) {
return;
}
}

// create new intersection
Expand All @@ -223,17 +228,23 @@ void AddIntersection(intersect_c **cut_list, vertex_c *vert, edge_c *part) {
for (next = (*cut_list); next && next->next; next = next->next) {
}

while (next && cut->along_dist < next->along_dist) next = next->prev;
while (next && cut->along_dist < next->along_dist) {
next = next->prev;
}

cut->next = next ? next->next : (*cut_list);
cut->prev = next;

if (next) {
if (next->next) next->next->prev = cut;
if (next->next) {
next->next->prev = cut;
}

next->next = cut;
} else {
if (*cut_list) (*cut_list)->prev = cut;
if (*cut_list) {
(*cut_list)->prev = cut;
}

(*cut_list) = cut;
}
Expand Down Expand Up @@ -287,10 +298,11 @@ int EvalPartition(edge_c *part, edge_c *edge_list) {

// check for being on the same line
if (a_side == 0 && b_side == 0) {
if (check->pdx * part->pdx + check->pdy * part->pdy < 0)
if (check->pdx * part->pdx + check->pdy * part->pdy < 0) {
ADD_LEFT();
else
} else {
ADD_RIGHT();
}

continue;
}
Expand Down Expand Up @@ -351,7 +363,9 @@ int EvalPartition(edge_c *part, edge_c *edge_list) {

// show a slight preference for purely horizontally or vertical
// partition lines.
if (part->pdx != 0 && part->pdy != 0) cost += 60;
if (part->pdx != 0 && part->pdy != 0) {
cost += 60;
}

#if DEBUG_POLY
Appl_Printf(
Expand All @@ -372,7 +386,9 @@ void DivideAnEdge(edge_c *cur, edge_c *part, edge_c **left_list,
double a = part->PerpDist(cur->psx, cur->psy);
double b = part->PerpDist(cur->pex, cur->pey);

if (part->source_line && cur->source_line == part->source_line) a = b = 0;
if (part->source_line && cur->source_line == part->source_line) {
a = b = 0;
}

int a_side = (fabs(a) <= DIST_EPSILON) ? 0 : (a < 0) ? -1 : +1;
int b_side = (fabs(b) <= DIST_EPSILON) ? 0 : (b < 0) ? -1 : +1;
Expand All @@ -396,17 +412,25 @@ void DivideAnEdge(edge_c *cur, edge_c *part, edge_c **left_list,

// check for right side
if (a_side >= 0 && b_side >= 0) {
if (a_side == 0) AddIntersection(cut_list, cur->start, part);
if (b_side == 0) AddIntersection(cut_list, cur->end, part);
if (a_side == 0) {
AddIntersection(cut_list, cur->start, part);
}
if (b_side == 0) {
AddIntersection(cut_list, cur->end, part);
}

InsertEdge(right_list, cur);
return;
}

// check for left side
if (a_side <= 0 && b_side <= 0) {
if (a_side == 0) AddIntersection(cut_list, cur->start, part);
if (b_side == 0) AddIntersection(cut_list, cur->end, part);
if (a_side == 0) {
AddIntersection(cut_list, cur->start, part);
}
if (b_side == 0) {
AddIntersection(cut_list, cur->end, part);
}

InsertEdge(left_list, cur);
return;
Expand Down Expand Up @@ -443,7 +467,9 @@ edge_c *ChoosePartition(edge_c *edge_list, int depth) {

for (edge_c *part = edge_list; part; part = part->next) {
// ignore edges which are not from a linedef
if (!part->linedef) continue;
if (!part->linedef) {
continue;
}

int cost = EvalPartition(part, edge_list);

Expand All @@ -456,7 +482,9 @@ edge_c *ChoosePartition(edge_c *edge_list, int depth) {
#endif

// unsuitable or too costly?
if (cost < 0 || cost >= best_cost) continue;
if (cost < 0 || cost >= best_cost) {
continue;
}

best = part;
best_cost = cost;
Expand Down Expand Up @@ -493,7 +521,9 @@ void DivideEdges(edge_c *edge_list, edge_c *part, edge_c **left_list,

void EdgesAlongPartition(edge_c *part, edge_c **left_list, edge_c **right_list,
intersect_c *cut_list) {
if (!cut_list) return;
if (!cut_list) {
return;
}

#if DEBUG_POLY
Appl_Printf("CUT LIST:\n");
Expand All @@ -515,8 +545,9 @@ void EdgesAlongPartition(edge_c *part, edge_c **left_list, edge_c **right_list,
while (cur && next) {
double len = next->along_dist - cur->along_dist;

if (len < -0.1)
if (len < -0.1) {
Appl_FatalError("INTERNAL ERROR: intersect list not sorted\n");
}

if (len > 0.2) {
cur = next;
Expand All @@ -534,9 +565,13 @@ void EdgesAlongPartition(edge_c *part, edge_c **left_list, edge_c **right_list,
next->after);
#endif

if (!cur->before && next->before) cur->before = next->before;
if (!cur->before && next->before) {
cur->before = next->before;
}

if (!cur->after && next->after) cur->after = next->after;
if (!cur->after && next->after) {
cur->after = next->after;
}

#if DEBUG_POLY
Appl_Printf("---> merged (%1.0f,%1.0f) [%d/%d]\n", cur->vertex->x,
Expand All @@ -558,7 +593,9 @@ void EdgesAlongPartition(edge_c *part, edge_c **left_list, edge_c **right_list,
for (cur = cut_list; cur && cur->next; cur = cur->next) {
next = cur->next;

if (!cur->after && !next->before) continue;
if (!cur->after && !next->before) {
continue;
}

// check for some nasty OPEN/CLOSED or CLOSED/OPEN cases
if ((cur->after && !next->before) || (!cur->after && next->before)) {
Expand Down Expand Up @@ -625,7 +662,9 @@ void EdgesAlongPartition(edge_c *part, edge_c **left_list, edge_c **right_list,
int polygon_c::CountEdges() const {
int count = 0;

for (edge_c *cur = edge_list; cur; cur = cur->next) count++;
for (edge_c *cur = edge_list; cur; cur = cur->next) {
count++;
}

return count;
}
Expand Down Expand Up @@ -654,7 +693,9 @@ bool polygon_c::ContainsPoint(double x, double y) const {
for (edge_c *E = edge_list; E; E = E->next) {
double d = E->PerpDist(x, y);

if (d < -epsilon) return false;
if (d < -epsilon) {
return false;
}
}

return true;
Expand All @@ -674,18 +715,24 @@ void polygon_c::ClockwiseOrder() {
#endif

// count edges and create an array to manipulate them
for (cur = edge_list; cur; cur = cur->next) total++;
for (cur = edge_list; cur; cur = cur->next) {
total++;
}

// use local array if small enough
if (total <= 32)
if (total <= 32) {
array = edge_buffer;
else
} else {
array = new edge_c *[total];
}

for (cur = edge_list, i = 0; cur; cur = cur->next, i++) array[i] = cur;
for (cur = edge_list, i = 0; cur; cur = cur->next, i++) {
array[i] = cur;
}

if (i != total)
if (i != total) {
Appl_FatalError("INTERNAL ERROR: ClockwiseOrder miscounted\n");
}

// sort them by angle (from the middle point to the start vertex).
// the desired order (clockwise) means descending angles.
Expand All @@ -705,7 +752,9 @@ void polygon_c::ClockwiseOrder() {
array[i + 1] = A;

// bubble down
if (i > 0) i--;
if (i > 0) {
i--;
}
} else {
// bubble up
i++;
Expand All @@ -720,7 +769,9 @@ void polygon_c::ClockwiseOrder() {
edge_list = array[i];
}

if (total > 32) delete[] array;
if (total > 32) {
delete[] array;
}

#if 0 // DEBUGGING
Appl_Printf("Sorted edges around (%1.1f %1.1f)\n", poly->mid_x, poly->mid_y);
Expand Down Expand Up @@ -788,27 +839,33 @@ bool RecursiveDivideEdges(edge_c *edge_list, int depth) {
DivideEdges(edge_list, part, &lefts, &rights, &cut_list);

/* sanity checks... */
if (!rights)
if (!rights) {
Appl_FatalError(
"INTERNAL ERROR: Separated edge-list has no RIGHT side\n");
}

if (!lefts)
if (!lefts) {
Appl_FatalError(
"INTERNAL ERROR: Separated edge-list has no LEFT side\n");
}

EdgesAlongPartition(part, &lefts, &rights, cut_list);

#if DEBUG_POLY
Appl_Printf("Build: Going LEFT\n");
#endif

if (!RecursiveDivideEdges(lefts, depth + 1)) return false;
if (!RecursiveDivideEdges(lefts, depth + 1)) {
return false;
}

#if DEBUG_POLY
Appl_Printf("Build: Going RIGHT\n");
#endif

if (!RecursiveDivideEdges(rights, depth + 1)) return false;
if (!RecursiveDivideEdges(rights, depth + 1)) {
return false;
}

#if DEBUG_POLY
Appl_Printf("Build: DONE\n");
Expand All @@ -830,18 +887,24 @@ bool ProcessSectors() {
sector_c *sec = Sector(i);

// skip unused sectors
if (!sec->edge_list) continue;
if (!sec->edge_list) {
continue;
}

// skip dummy sectors
if (sec->is_dummy) continue;
if (sec->is_dummy) {
continue;
}

#if DEBUG_POLY
Appl_Printf("-------------------------------\n");
Appl_Printf("Processing Sector #%d\n", i);
Appl_Printf("-------------------------------\n");
#endif

if (!ProcessOneSector(sec)) return false;
if (!ProcessOneSector(sec)) {
return false;
}
}

return true; // OK
Expand Down Expand Up @@ -889,14 +952,16 @@ void CreateEdges() {
linedef_c *line = Linedef(i);

// ignore dummy sectors
if (line->right && line->right->sector && line->right->sector->is_dummy)
if (line->right && line->right->sector &&
line->right->sector->is_dummy) {
continue;
}

right = CreateAnEdge(line, line->start, line->end, line->right, 0);

if (line->is_border)
if (line->is_border) {
left = NULL;
else {
} else {
left = CreateAnEdge(line, line->end, line->start, line->left, 1);
}

Expand Down Expand Up @@ -971,7 +1036,9 @@ bool Polygonate(bool require_border) {

CreateEdges();

if (need_outer) CreateOuterEdges();
if (need_outer) {
CreateOuterEdges();
}

bool was_ok = ProcessSectors();

Expand Down
8 changes: 6 additions & 2 deletions source_files/obsidian_main/aj_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@ namespace ajpoly {
double ComputeAngle(double dx, double dy) {
double angle;

if (dx == 0) return (dy > 0) ? 90.0 : 270.0;
if (dx == 0) {
return (dy > 0) ? 90.0 : 270.0;
}

angle = atan2((double)dy, (double)dx) * 180.0 / M_PI;

if (angle < 0) angle += 360.0;
if (angle < 0) {
angle += 360.0;
}

return angle;
}
Expand Down
Loading

0 comments on commit 8db9360

Please sign in to comment.