summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/mount.c43
-rw-r--r--examples/triangle_tip.c2
-rw-r--r--inc/cad/debug.h5
-rw-r--r--src/debug.c43
-rw-r--r--src/solve.c125
-rw-r--r--test/solve.c3
6 files changed, 106 insertions, 115 deletions
diff --git a/examples/mount.c b/examples/mount.c
index 7f4ba15..bd0ace5 100644
--- a/examples/mount.c
+++ b/examples/mount.c
@@ -1,46 +1,5 @@
#include "cad.h"
-
-static const char *component_type_name[] = {
- [COM_POINT] = "point",
- [COM_LINE] = "line",
-};
-
-static void print_subassemblies(struct constraints *c, struct subassembly *assemblies, size_t assemblies_num) {
- fprintf(stderr, "=== Subassemblies: %zu ===\n", assemblies_num);
- for(size_t i = 0; i < assemblies_num; i++) {
- struct subassembly *a = &assemblies[i];
- fprintf(stderr, "Assembly %zu: %zu steps, fix=%zu, fixed=%s\n",
- i, a->steps_num, a->fix, a->fixed ? "yes" : "no");
-
- if(a->articulation_num > 0) {
- fprintf(stderr, " Articulations (%zu):\n", a->articulation_num);
- for(size_t j = 0; j < a->articulation_num; j++) {
- struct component *comp = a->articulation[j];
- fprintf(stderr, " [%zu] %s %p\n", j, component_type_name[comp->type], (void*)comp);
- }
- }
-
- fprintf(stderr, " Constraints used:\n");
- for(size_t j = 0; j < c->length; j++) {
- struct constraint *ct = &c->elements[j];
- if(ct->used != i + 1) continue;
- fprintf(stderr, " [%zu] %s v=%.2f (%s %p, %s %p)\n",
- j, constraint_type_name[ct->type], ct->v,
- component_type_name[ct->c1->type], (void*)ct->c1,
- component_type_name[ct->c2->type], (void*)ct->c2);
- }
- }
- fprintf(stderr, " Unused constraints:\n");
- for(size_t j = 0; j < c->length; j++) {
- struct constraint *ct = &c->elements[j];
- if(ct->used != 0) continue;
- fprintf(stderr, " [%zu] %s v=%.2f (%s %p, %s %p)\n",
- j, constraint_type_name[ct->type], ct->v,
- component_type_name[ct->c1->type], (void*)ct->c1,
- component_type_name[ct->c2->type], (void*)ct->c2);
- }
- fprintf(stderr, "=========================\n");
-}
+#include "cad/debug.h"
void draw_from_constraints(struct constraints *c, struct topology *t, struct canvas *cv) {
struct drawing drawing = {};
diff --git a/examples/triangle_tip.c b/examples/triangle_tip.c
index 4da57da..0781377 100644
--- a/examples/triangle_tip.c
+++ b/examples/triangle_tip.c
@@ -1,4 +1,5 @@
#include "cad.h"
+#include "cad/debug.h"
void draw_from_constraints(struct constraints *c, struct topology *t, struct canvas *cv) {
struct drawing drawing = {};
@@ -18,6 +19,7 @@ void draw_from_constraints(struct constraints *c, struct topology *t, struct can
free(params);
reconstruct_drawing(c, assemblies, &assemblies_num);
+ print_subassemblies(c, assemblies, assemblies_num);
begin_drawing(cv);
draw_topology(cv, t);
diff --git a/inc/cad/debug.h b/inc/cad/debug.h
new file mode 100644
index 0000000..b08463f
--- /dev/null
+++ b/inc/cad/debug.h
@@ -0,0 +1,5 @@
+#include "cad/solve.h"
+
+#include <stdint.h>
+
+void print_subassemblies(struct constraints *c, struct subassembly *assemblies, size_t assemblies_num);
diff --git a/src/debug.c b/src/debug.c
new file mode 100644
index 0000000..6027ed4
--- /dev/null
+++ b/src/debug.c
@@ -0,0 +1,43 @@
+#include "cad/debug.h"
+
+static const char *component_type_name[] = {
+ [COM_POINT] = "point",
+ [COM_LINE] = "line",
+};
+
+void print_subassemblies(struct constraints *c, struct subassembly *assemblies, size_t assemblies_num) {
+ fprintf(stderr, "=== Subassemblies: %zu ===\n", assemblies_num);
+ for(size_t i = 0; i < assemblies_num; i++) {
+ struct subassembly *a = &assemblies[i];
+ fprintf(stderr, "Assembly %zu: %zu steps, fix=%zu, fixed=%s\n",
+ i, a->steps_num, a->fix, a->fixed ? "yes" : "no");
+
+ if(a->articulation_num > 0) {
+ fprintf(stderr, " Articulations (%zu):\n", a->articulation_num);
+ for(size_t j = 0; j < a->articulation_num; j++) {
+ struct component *comp = a->articulation[j];
+ fprintf(stderr, " [%zu] %s %p\n", j, component_type_name[comp->type], (void*)comp);
+ }
+ }
+
+ fprintf(stderr, " Constraints used:\n");
+ for(size_t j = 0; j < c->length; j++) {
+ struct constraint *ct = &c->elements[j];
+ if(ct->used != i + 1) continue;
+ fprintf(stderr, " [%zu] %s v=%.2f (%s %p, %s %p)\n",
+ j, constraint_type_name[ct->type], ct->v,
+ component_type_name[ct->c1->type], (void*)ct->c1,
+ component_type_name[ct->c2->type], (void*)ct->c2);
+ }
+ }
+ fprintf(stderr, " Unused constraints:\n");
+ for(size_t j = 0; j < c->length; j++) {
+ struct constraint *ct = &c->elements[j];
+ if(ct->used != 0) continue;
+ fprintf(stderr, " [%zu] %s v=%.2f (%s %p, %s %p)\n",
+ j, constraint_type_name[ct->type], ct->v,
+ component_type_name[ct->c1->type], (void*)ct->c1,
+ component_type_name[ct->c2->type], (void*)ct->c2);
+ }
+ fprintf(stderr, "=========================\n");
+}
diff --git a/src/solve.c b/src/solve.c
index 1d7d70c..a79e669 100644
--- a/src/solve.c
+++ b/src/solve.c
@@ -221,10 +221,10 @@ static bool try_fix_component(struct constraints *constraints_in, struct compone
bool f;
struct component *oppo;
if(constraints[i].c1 == c) {
- oppo = constraints[i].c1;
+ oppo = constraints[i].c2;
f = false;
} else if(constraints[i].c2 == c) {
- oppo = constraints[i].c2;
+ oppo = constraints[i].c1;
f = true;
} else {
continue;
@@ -232,30 +232,29 @@ static bool try_fix_component(struct constraints *constraints_in, struct compone
if(!oppo->fixed) continue;
- if(constraints[i].type != CT_LINE_LINE_ANGLE) {
- *not_angle = &constraints[i];
- *f1 = f;
- break;
- }
+ *not_angle = &constraints[i];
+ *f1 = f;
+ break;
}
// No way to fix this component was found
if(*not_angle == NULL) return false;
- // Find something that is compatible with the other constraint,
- // possibly a transferred angle
+ // Look for another distance constraint
for(size_t i = 0; i < constraints_num; i++) {
if(constraints[i].used) continue;
+ if(constraints[i].type == CT_LINE_LINE_ANGLE) continue;
+
// We already selected this one, we can't use it again
if(&constraints[i] == *not_angle) continue;
bool f;
struct component *oppo;
if(constraints[i].c1 == c) {
- oppo = constraints[i].c1;
+ oppo = constraints[i].c2;
f = false;
} else if(constraints[i].c2 == c) {
- oppo = constraints[i].c2;
+ oppo = constraints[i].c1;
f = true;
} else {
continue;
@@ -263,16 +262,52 @@ static bool try_fix_component(struct constraints *constraints_in, struct compone
if(!oppo->fixed) continue;
- if(constraints[i].type == CT_LINE_LINE_ANGLE) {
- if(!find_angle(constraints, constraints_num, f ? constraints[i].c2 : constraints[i].c1, f1 ? (*not_angle)->c2 : (*not_angle)->c1, constraints[i].path)) continue;
- }
-
*possibly_angle = &constraints[i];
*f2 = f;
+ break;
+ }
+
+ if(*possibly_angle == NULL) {
+ // We can't find any distance constraint to use, look for an angle
+ // constraint
+ for(size_t i = 0; i < constraints_num; i++) {
+ if(constraints[i].used) continue;
+ if(constraints[i].type != CT_LINE_LINE_ANGLE) continue;
+
+ // We already selected this one, we can't use it again
+ if(&constraints[i] == *not_angle) continue;
+
+ // Unlike for distance constraints, we support doing a walk through
+ // angle constraints that relate to the same singular point. This
+ // means we have to process ALL the currently unused angle
+ // constraints where one half is fixed.
+ bool f;
+ struct component *oppo;
+ if(constraints[i].c1->fixed) {
+ oppo = constraints[i].c2;
+ f = true;
+ } else if(constraints[i].c2->fixed) {
+ oppo = constraints[i].c1;
+ f = false;
+ } else {
+ continue;
+ }
+
+ if(oppo -> fixed) continue;
+ assert(!oppo->fixed);
+
+ if(oppo != c) {
+ if(!find_angle(constraints, constraints_num, oppo, c, constraints[i].path))
+ continue;
+ }
+
+ *possibly_angle = &constraints[i];
+ *f2 = f;
+ }
}
// No way to fix this component was found
- if(*possibly_angle == NULL) return false;;
+ if(*possibly_angle == NULL) return false;
return true;
}
@@ -287,7 +322,6 @@ static size_t build_triangles(struct constraints *constraints_in, struct compone
for(size_t i = 0; i < component_num; i++) {
// Reset all the fixed points
components[i]->fixed = false;
- components[i]->fixed = false;
}
for(size_t i = 0; i < constraints_num; i++) {
@@ -345,6 +379,7 @@ static size_t build_triangles(struct constraints *constraints_in, struct compone
bool f2;
if(try_fix_component(constraints_in, components[i], &not_angle, &f1, &possibly_angle, &f2)) {
+ add_frontier(components[i]);
not_angle->used = useid;
not_angle->order = order++;
possibly_angle->used = useid;
@@ -358,62 +393,6 @@ static size_t build_triangles(struct constraints *constraints_in, struct compone
}
}
- // for(size_t i = 0; i < constraints_num; i++) {
- // if(constraints[i].used) continue;
-
- // struct component *oppo_i;
- // bool i_forward;
-
- // if(frontier_scan(constraints[i].c1)) {
- // oppo_i = constraints[i].c2;
- // i_forward = true;
- // } else if(frontier_scan(constraints[i].c2)) {
- // oppo_i = constraints[i].c1;
- // i_forward = false;
- // } else continue;
-
- // for(size_t j = i+1; j < constraints_num; j++) {
- // if(constraints[j].used) continue;
-
- // struct component *oppo_j;
- // bool j_forward;
-
- // if(frontier_scan(constraints[j].c1)) {
- // oppo_j = constraints[j].c2;
- // j_forward = true;
- // } else if(frontier_scan(constraints[j].c2)) {
- // oppo_j = constraints[j].c1;
- // j_forward = false;
- // } else continue;
-
- // // One of the constraints can't be an angle one
- // if(constraints[i].type == CT_LINE_LINE_ANGLE && constraints[j].type == CT_LINE_LINE_ANGLE) continue;
-
- // if(oppo_i != oppo_j) {
- // if(constraints[i].type == CT_LINE_LINE_ANGLE) {
- // if(!find_angle(constraints, constraints_num, oppo_i, oppo_j, constraints[i].path)) continue;
-
- // oppo_i = oppo_j;
- // } else if(constraints[j].type == CT_LINE_LINE_ANGLE) {
- // if(!find_angle(constraints, constraints_num, oppo_j, oppo_i, constraints[j].path)) continue;
-
- // oppo_j = oppo_i;
- // } else continue;
- // }
-
- // add_frontier(oppo_i);
- // constraints[i].used = useid;
- // constraints[i].order = order++;
- // constraints[j].used = useid;
- // constraints[j].order = order++;
- // steps[steps_i].i = i;
- // steps[steps_i].j = j;
- // steps[steps_i].i_forward = i_forward;
- // steps[steps_i].j_forward = j_forward;
- // steps_i++;
- // goto candidate_found;
- // }
- // }
// No candidate found
break;
diff --git a/test/solve.c b/test/solve.c
index 65b51d6..ae54597 100644
--- a/test/solve.c
+++ b/test/solve.c
@@ -29,6 +29,7 @@ int main(int argc, char *argv[]) {
free_constraints(&constraints);
}
+ memset(assemblies, 0, sizeof(assemblies));
{
printf("Triangle by 2 angles and a distance\n");
struct constraints constraints = {};
@@ -66,6 +67,7 @@ int main(int argc, char *argv[]) {
free_constraints(&constraints);
}
+ memset(assemblies, 0, sizeof(assemblies));
{
printf("Two triangles sharing a point one defined by angles\n");
struct constraints constraints = {};
@@ -115,6 +117,7 @@ int main(int argc, char *argv[]) {
free_constraints(&constraints);
}
+ memset(assemblies, 0, sizeof(assemblies));
{
printf("Two triangles sharing a point with an angle constrained base\n");
struct constraints constraints = {};
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 18:15:14 +0000