# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1460381301 -7200
# Node ID eee3dd2ddc13f19fd28885a10b9029d1a52cb33d
# Parent  b223381924337c9f5ca5a3fa9902aa1a7cf4d72f
Fixed positioning of the pieces when apart, renaming SPACE_APART to SEPARATION.

diff -r b22338192433 -r eee3dd2ddc13 cartridge.scad
--- a/cartridge.scad	Mon Apr 11 13:56:43 2016 +0200
+++ b/cartridge.scad	Mon Apr 11 15:28:21 2016 +0200
@@ -85,7 +85,6 @@
 	/* For printing: APART = 1; PCB = 0; */
 
 	APART = 1;
-	SPACE_APART = 10;
 	PCB = 0;
 
 	/* To check overlaps: INTERSECT = 1; CLOSED = 1; */
@@ -93,6 +92,10 @@
 	INTERSECT = 0;
 	CLOSED = 0;
 
+	/* Separation when not apart and not closed. */
+
+	SEPARATION = 10;
+
 	/* To save time (before printing): FILLET = 0; */
 
 	FILLET = 1;
@@ -1405,7 +1408,7 @@
 	the same way, if APART is defined.
 	*/
 
-	front_displacement_together = CLOSED ? front_back_overlap : front_back_overlap - SPACE_APART;
+	front_displacement_together = CLOSED ? front_back_overlap : APART ? 0 : front_back_overlap - SEPARATION;
 	front_displacement = APART ? -connector_width * 0.6 : 0;
 	back_displacement = APART ? connector_width * 0.6 : 0;
 	back_rotation = APART ? 180 : 0;