Almost assemblies

2 files changed, 15 insertions, 0 deletions

diff --git a/inc/cad/construction.h b/inc/cad/construction.h
index ef36421..71add62 100644
--- a/inc/cad/construction.h
+++ b/inc/cad/construction.h
@@ -18,6 +18,9 @@ enum operation {
 	// cases
 	CMD_LINE_CIRCLE_CIRCLE_TANGENT,
 	CMD_LINE_LINE_DISTANCE_PARALLEL,
+
+	// Handle assemblies
+	CMD_IMPORT_POINT_LINE,
 };
 
 struct point {
@@ -61,6 +64,11 @@ struct command {
 	size_t index;
 	bool dir;
 
+	// Only used for import
+	struct subassembly *d;
+	struct element *attachp;
+	struct element *attachl;
+
 	struct element *arg1;
 	struct element *arg2;
 	struct element *arg3;
diff --git a/inc/cad/solve.h b/inc/cad/solve.h
index a4fc42f..9a0c56d 100644
--- a/inc/cad/solve.h
+++ b/inc/cad/solve.h
@@ -9,6 +9,8 @@ enum component_type {
 	COM_LINE,
 };
 
+struct subassembly;
+
 struct component {
 	enum component_type type;
 
@@ -22,6 +24,8 @@ struct component {
 	bool drawn;
 
 	bool fixed;
+	struct subassembly* in;
+	struct subassembly* ein;
 };
 
 struct alias {
@@ -112,6 +116,9 @@ struct subassembly {
 	struct element **articulation_position;
 	size_t articulation_num;
 
+	struct command *first_command;
+	struct command *last_command;
+
 	bool fixed;
 };