From b30ffe25e1b834aca7e2a1a6519c4593ddda3ba8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 13 Feb 2016 20:46:08 +0000 Subject: [PATCH] sealing-box: Rename some internal things (nfc) --- sealing-box.scad.m4 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sealing-box.scad.m4 b/sealing-box.scad.m4 index 21d54ec..2cb20f8 100644 --- a/sealing-box.scad.m4 +++ b/sealing-box.scad.m4 @@ -64,8 +64,8 @@ ts_cidoff = (ts_cnrrad * (1-.7) + wallthick * .8) * [1,1]; ts_xbox_lin = ts_xbox - ts_cnrrad*2; ts_ybox_lin = ts_ybox - ts_cnrrad*2; -m4_dnl TestSealDoBoxShape(`profile(profileargs)'); -m4_define(`TestSealDoBoxShape',` +m4_dnl BoxDoShapeRect(`profile(profileargs)'); +m4_define(`BoxDoShapeRect',` Box_Part(0, ts_cnrrad, 0,0, Linear,`ts_ybox_lin', `$1' ) Box_Part(0, ts_ybox-ts_cnrrad, 0,0, Arc,`-ts_cnrrad,90' , `$1' ) Box_Part(ts_cnrrad, ts_ybox, -90,0, Linear,`ts_xbox_lin', `$1' ) @@ -78,17 +78,17 @@ m4_define(`TestSealDoBoxShape',` m4_dnl ' -module WallProfile(){ +module SealingBox_WallProfile(){ z = ts_zbox - innertube - tubesealrad; translate([0, -0.1]) square([wallthick, z]); translate([tubesealrad, z]) circle(r=tubesealrad, $fn=20); } -module FloorProfile(){ +module SealingBox_FloorProfile(){ mirror([0,1]) square([wallthick, floorth]); } -module LidProfile(){ +module SealingBox_LidProfile(){ rad = tubesealrad + innertube; morex = wallthick; difference(){ @@ -110,17 +110,17 @@ module LidProfile(){ } } -module CeilProfile(){ +module SealingBox_CeilProfile(){ translate([0, ts_zbox]) square([wallthick*2, ceilth]); } module TestSealBoxBox(){ - TestSealDoBoxShape(WallProfile();); - hull(){ TestSealDoBoxShape(FloorProfile();); } + BoxDoShapeRect(SealingBox_WallProfile();); + hull(){ BoxDoShapeRect(SealingBox_FloorProfile();); } } module TestSealBoxLid(){ ////toplevel - TestSealDoBoxShape(LidProfile();); - hull(){ TestSealDoBoxShape(CeilProfile();); } + BoxDoShapeRect(SealingBox_LidProfile();); + hull(){ BoxDoShapeRect(SealingBox_CeilProfile();); } } -- 2.30.2