move command to carrier

prasannax1 · Oct 2, 2024 · a08b325 · a08b325
1 parent ca55c49
commit a08b325
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/src/unified/disk4.scad b/src/unified/disk4.scad
@@ -1,6 +1,7 @@
 use <../lib/util.scad>
 include <common.scad>
 use <disks.scad>
+use <disk0.scad>
 
 
 width_ = disk_4_width - disk_4_upper;
@@ -53,15 +54,15 @@ module disk_4_part_2() {
 }
 
 module disk_4_part_3() {
-    translate([-disk_4_upper/2-disk_2_width/2, 0, disk_4_height/2])
-    difference() {
-        cylinder(h=disk_4_height, d1=disk_1_width+20, d2=disk_2_width+20, center=true, $fn=faces_convex);
+    translate([-(disk_4_width + disk_4_upper)/4,0,disk_4_height/2])
+    cube([100, 50, disk_4_height],center=true);
 
-        translate([0,0,disk_4_height/2])
-        cylinder(h=12-.1, d2=disk_2_width+10, d1=disk_2_width, center=true, $fn=faces_concave);
-    }
+    translate([-(disk_4_width + disk_4_upper)/4,0,disk_4_height-.01])
+    disk_0();
 }
 
+
+
 module disk_4() {
     disk_4_part_1();
     disk_4_part_2();

diff --git a/src/unified/engine4.scad b/src/unified/engine4.scad
@@ -37,8 +37,13 @@ module class_4_body_base() {
 
     class_4_secondary_bar();
 
-    translate([-disk_4_upper/2-disk_2_width/2, 0, -10])
-    cylinder(h=20.5, d1=disk_1_width*.75+50, d2=disk_1_width*.75, $fn=faces_convex, center=true);
+    hull() {
+        translate([-disk_4_upper/2-disk_2_width/2, 0, -10])
+        cylinder(h=20.5, d1=disk_1_width*.75+50, d2=disk_1_width*.75, $fn=faces_convex, center=true);
+
+        translate([-500,0,-10-.01])
+        cylinder(h=20.5, d1=disk_2_width+60, d2=disk_2_width+10, $fn=faces_convex, center=true);
+    }
 }
 
 module class_4_secondary_bar_basic(width) {
@@ -83,6 +88,9 @@ module class_4_body_minus() {
         translate([-disk_1_width,0,0])
         cube([2*disk_1_width, disk_1_width-1, 100], center=true);
     }
+
+    translate([-500, 0, 0]) 
+    cylinder(d=disk_2_width, h=12-.05, center=true, $fn=faces_concave);
 }
 
 module class_4_body() {
@@ -94,8 +102,7 @@ module class_4_body() {
     translate([0,0,-10-.01])
     disk_0();
 
-    translate([-500,0,-10-.01])
-    disk_0();
+
 }
 
 module class_4_secondary(nacelles=false) {

diff --git a/src/unified/main.scad b/src/unified/main.scad
@@ -16,15 +16,15 @@ module main() {
 
     translate([0,0,0]) labs();
 
-    translate([-disk_2_width/2-disk_4_upper/2,0,disk_4_height-6-.5]) command_saucer();
+    translate([-500,0,-6]) command_saucer();
 
     carrier();
 
     util_mirrored([0,1,0])
     translate([-disk_4_width-10,class_4_nacelle_disp+.2*disk_1_width-.01,disk_1_width/3-20])
     warp();
 
-    translate([-class_4_tail_l+disk_1_width, 0, -3-10])
+    translate([-class_4_tail_l+disk_1_width, 0, -3-15])
     escort();
 }