diff --git a/model/common.scad b/model/common.scad index 7c5d781..f80c27d 100644 --- a/model/common.scad +++ b/model/common.scad @@ -1,5 +1,5 @@ -BASE_MODEL_SCALE = [1,1,1]; -BASE_MODEL_TRANSLATE = [0,0,16]; +BASE_MODEL_SCALE = [1.1, 1, 1.1]; +BASE_MODEL_TRANSLATE = [0, 0, 17]; module main_display(){ // Outer dimensions, height currently unknown diff --git a/model/left-half.scad b/model/left-half.scad index ebcbe9c..f3c9203 100644 --- a/model/left-half.scad +++ b/model/left-half.scad @@ -5,7 +5,7 @@ module left_half_components() { } module left_half() { - translate(BASE_MODEL_TRANSLATE) import(file = "left-half.3mf"); + translate(BASE_MODEL_TRANSLATE) scale(BASE_MODEL_SCALE) import(file = "left-half.3mf"); } left_half(); diff --git a/model/right-half.scad b/model/right-half.scad index 7811a4f..a0e1075 100644 --- a/model/right-half.scad +++ b/model/right-half.scad @@ -5,22 +5,31 @@ module right_half_components() { } module right_half_orig() { - translate(BASE_MODEL_TRANSLATE) import(file = "right-half.3mf"); + translate(BASE_MODEL_TRANSLATE) scale(BASE_MODEL_SCALE) import(file = "right-half.3mf"); } // #right_half_orig(); module right_half_door_only() { - translate(BASE_MODEL_TRANSLATE+[10.25, -85, -16]) import(file = "right-half_door-only.stl"); + translate(BASE_MODEL_TRANSLATE+[11.3, -85, -17]) scale(BASE_MODEL_SCALE) import(file = "right-half_door-only.stl"); } // #right_half_door_only(); module right_half_hinge_only() { - translate(BASE_MODEL_TRANSLATE+[0.25, -12.3, -6]) import(file = "right-half_hinge-only.3mf"); + module original() { + translate(BASE_MODEL_TRANSLATE+[0.34, -12.3, -6]) scale(BASE_MODEL_SCALE) import(file = "right-half_hinge-only.3mf", convexity=3); + } + module base_model() { + difference() { + original(); + translate([-20, -108.3, -20]) cube(40); + } + } + base_model(); } // #right_half_hinge_only(); module right_half_connector() { - translate(BASE_MODEL_TRANSLATE+[5.35, -12.3, -11]) import(file = "right-half_connector.3mf"); + translate(BASE_MODEL_TRANSLATE+[5.86, -12.3, -11.5]) scale(BASE_MODEL_SCALE) import(file = "right-half_connector.3mf"); } // #right_half_connector();