Merge pull request #35 from prasannax1/new_ship

New ships using util functions

src/attack.scad

@@ -0,0 +1,55 @@
+use <util.scad>;
+module at_main_body() {
+    util_saucer(80,40,10);
+    util_body(80,40,5,10);
+}
+
+module at_main_minus() {
+    translate([-14.5,-90,-10])
+        rotate([-15,0,0])
+            cube([29,80,80]);
+
+    translate([0,40.5,-2.5])
+        sphere(1.5, $fn=16);
+
+    translate([-2.5,39,1])
+        rotate([60,0,0])
+            cube([5,5,10]);
+
+    translate([0,-35,0])
+        rotate([45,0,0])
+            cube([40,10,40], center=true);
+}
+
+module at_nacelle_assembly() {
+    translate([12,5,4])
+        rotate([0,-45,0])
+            at_nacelle_2();
+    mirror([1,0,0])
+        translate([12,5,4])
+            rotate([0,-45,0])
+                at_nacelle_2();
+}
+
+module at_nacelle_2() {
+    rotate(90)
+        util_nacelle(45,7.5,12,curved=true,up=false);
+}
+
+
+module at_main() {
+    union() {
+        difference() {
+            rotate(90) 
+                at_main_body();
+            at_main_minus();
+        }
+        at_nacelle_assembly();
+    }
+}
+
+module attack() {
+    scale(.75) at_main();
+}
+
+attack();

src/combined.scad

@@ -1,27 +1,33 @@
-use <mother_ship.scad>;
-use <attack_ship.scad>;
-use <explorer_ship.scad>;
-use <diplomatic_yacht.scad>;
+use <mother.scad>;
+use <attack.scad>;
+use <science.scad>;
+use <scout.scad>;
+use <diplomatic.scad>;
 use <hospital.scad>;
 
 module mother_a() {
-    rotate(180) mothership();
+    rotate(90) mother();
 }
 
-module explorer_a() {
-    translate([0,200,80]) rotate(90) explorer();
+module science_a() {
+    translate([0,220,64]) rotate(90) science();
+    translate([0,180,80]) rotate(90) science();
 }
 
 module attack_a() {
-    translate([0,250,80]) attack();
+    translate([0,220,64]) attack();
 }
 
 module hospital_a() {
-    translate([0,200,80]) hospital();
+    translate([0,225,75]) rotate(90) hospital();
 }
 
 module diplomat_a() {
-    translate([0,250,80]) rotate(90) diplomat();
+    translate([0,250,64]) rotate(90) diplomat();
+}
+
+module scout_a() {
+    translate([0,200,75]) rotate(-90) scout();
 }
 
 module sector(num) {
@@ -32,14 +38,15 @@ module sector(num) {
 
 mother_a();
 sector(0) diplomat_a();
-sector(1) hospital_a();
-sector(2) explorer_a();
-sector(3) explorer_a();
-sector(5) explorer_a();
-sector(6) explorer_a();
+sector(1) scout_a();
+sector(2) hospital_a();
+sector(3) science_a();
+sector(5) science_a();
+sector(6) science_a();
 sector(7) attack_a();
 sector(9) attack_a();
-sector(10) explorer_a();
-sector(11) explorer_a();
-sector(13) explorer_a();
-sector(14) explorer_a();
+sector(10) science_a();
+sector(11) science_a();
+sector(13) science_a();
+sector(14) science_a();
+sector(15) scout_a();

src/diplomatic.scad

@@ -0,0 +1,55 @@
+use <util.scad>;
+
+module dip_saucer() {
+    difference() {
+        util_saucer(27,27,5);
+        //dip_body();
+        translate([13.5,0,2]) 
+            rotate([0,-15,0])
+            cube(5, center=true);
+    }
+
+}
+
+module dip_body() {
+    difference() {
+        translate([-9,0,2])
+            mirror([0,0,1])
+                util_saucer(25,12,7);
+
+        union() {
+            translate([-9,0,-13])
+                cube(18, center=true);
+
+            translate([1.2,0,-1.5])
+                sphere(1.2, $fn=16);
+
+            translate([-21,0,-4])
+                scale([2.5,1,1])
+                rotate([90,0,0])
+                    cylinder(12,4,4, center=true);
+        }
+    }
+}
+
+
+module dip_nacelle_assembly() {
+    translate([-19,0,0.5])
+        util_nacelle_bar(24,5,3,.5);
+
+    util_mirrored([0,1,0])
+        translate([-15,11,4])
+            util_nacelle(18,5,3,curved=true);
+}
+
+module dip_main() {
+    dip_saucer();
+    dip_body();
+    dip_nacelle_assembly();
+}
+
+module diplomat() {
+    scale(1) dip_main();
+}
+
+diplomat();