diff --git a/.gitignore b/.gitignore index 48b7a89..a9c6d62 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ scad/conf/machine.scad scad/stl.scad dummy.csg - +Thumbs.db diff --git a/scad/conf/colors.scad b/scad/conf/colors.scad index d50d61a..9046997 100644 --- a/scad/conf/colors.scad +++ b/scad/conf/colors.scad @@ -55,7 +55,7 @@ bed_color = "firebrick"; d_pillar_color = grey90; d_plug_shell_color = grey80; d_plug_insulator_color = grey20; -extruder_insulator_color = "goldenrod" +extruder_insulator_color = "goldenrod"; extruder_nozzle_color = "yellow"; cable_strip_color = use_realistic_colors ? cable_strip_real_color : "fuchsia"; belt_color = use_realistic_colors ? belt_real_color : "yellow"; diff --git a/scad/conf/config.scad b/scad/conf/config.scad index de16b6c..b5fb63c 100644 --- a/scad/conf/config.scad +++ b/scad/conf/config.scad @@ -10,7 +10,14 @@ bom = 2; // 0 no bom, 1 assemblies and stls, 2 vitamins as well exploded = false; // true for exploded view + +// Real-world colors for various parts & vitamins use_realistic_colors = true; // true for "real" colors, false for "distinct" colors (useful during design) +printed_plastic_color = "blue"; +cable_strip_real_color = "fuchsia"; +belt_real_color = "yellow"; +bulldog_real_color ="black"; + eta = 0.01; // small fudge factor to stop CSG barfing on coincident faces. $fa = 5; $fs = 0.5; diff --git a/scad/conf/huxley_config.scad b/scad/conf/huxley_config.scad index f43e841..6ee2992 100644 --- a/scad/conf/huxley_config.scad +++ b/scad/conf/huxley_config.scad @@ -9,11 +9,6 @@ // echo("Huxley:"); -// Real-world colors for various parts & vitamins -printed_plastic_color = "blue"; -cable_strip_real_color = "fuchsia"; -belt_real_color = "yellow"; -bulldog_real_color ="black"; Z_bearings = LM6UU; Y_bearings = LM6UU; diff --git a/scad/conf/mendel_config.scad b/scad/conf/mendel_config.scad index fa26e09..1125e04 100644 --- a/scad/conf/mendel_config.scad +++ b/scad/conf/mendel_config.scad @@ -9,12 +9,6 @@ // echo("Mendel:"); -// Real-world colors for various parts & vitamins -printed_plastic_color = "blue"; -cable_strip_real_color = "fuchsia"; -belt_real_color = "yellow"; -bulldog_real_color ="black"; - Z_bearings = LM8UU; Y_bearings = LM8UU; X_bearings = LM8UU; diff --git a/scad/conf/sturdy_config.scad b/scad/conf/sturdy_config.scad index 1da5f5e..494305b 100644 --- a/scad/conf/sturdy_config.scad +++ b/scad/conf/sturdy_config.scad @@ -9,12 +9,6 @@ // echo("Sturdy:"); -// Real-world colors for various parts & vitamins -printed_plastic_color = "blue"; -cable_strip_real_color = "fuchsia"; -belt_real_color = "yellow"; -bulldog_real_color ="black"; - Z_bearings = LM10UU; Y_bearings = LM10UU; X_bearings = LM10UU;