diff --git a/examples/MainsBreakOutBox/stls/foot.png b/examples/MainsBreakOutBox/stls/foot.png index b1e58db..017a793 100644 Binary files a/examples/MainsBreakOutBox/stls/foot.png and b/examples/MainsBreakOutBox/stls/foot.png differ diff --git a/examples/MainsBreakOutBox/stls/socket_box.png b/examples/MainsBreakOutBox/stls/socket_box.png index a214a00..78c2934 100644 Binary files a/examples/MainsBreakOutBox/stls/socket_box.png and b/examples/MainsBreakOutBox/stls/socket_box.png differ diff --git a/global_defs.scad b/global_defs.scad index 1844462..c07b381 100644 --- a/global_defs.scad +++ b/global_defs.scad @@ -34,7 +34,7 @@ layer_height = is_undef($layer_height) ? 0.25 : $layer_height; // lay extrusion_width = is_undef($extrusion_width) ? 0.5 : $extrusion_width; // filament width when printing nozzle = is_undef($nozzle) ? 0.45 : $nozzle; // 3D printer nozzle cnc_bit_r = is_undef($cnc_bit_r) ? 1.2 : $cnc_bit_r; // miniumum tool radius when milling 2D objects -pp1_colour = is_undef($pp1_colour) ? "lime" : $pp1_colour; // printed part colour 1 +pp1_colour = is_undef($pp1_colour) ? [0, 146/255, 0] : $pp1_colour; // printed part colour 1, RepRap logo colour pp2_colour = is_undef($pp2_colour) ? "red" : $pp2_colour; // printed part colour 2 pp3_colour = is_undef($pp3_colour) ? "blue" : $pp3_colour; // printed part colour 3 pp4_colour = is_undef($pp4_colour) ? "darkorange" : $pp4_colour;// printed part colour 4 diff --git a/libtest.png b/libtest.png index d53bbaa..d77a9ef 100644 Binary files a/libtest.png and b/libtest.png differ diff --git a/scripts/render.py b/scripts/render.py index 87da57f..1461177 100755 --- a/scripts/render.py +++ b/scripts/render.py @@ -59,7 +59,7 @@ def render(target, type): if mtime(part_file) > mtime(png_name): png_maker_name = "png.scad" with open(png_maker_name, "w") as f: - f.write('color("lime") import("%s");\n' % part_file) + f.write('color([0, 146/255, 0]) import("%s");\n' % part_file) cam = "--camera=0,0,0,70,0,315,500" if type == 'stl' else "--camera=0,0,0,0,0,0,500" render = "--preview" if type == 'stl' else "--render" tmp_name = 'tmp.png' diff --git a/tests/png/bom.png b/tests/png/bom.png index 9b863bb..02d4521 100644 Binary files a/tests/png/bom.png and b/tests/png/bom.png differ diff --git a/tests/png/box.png b/tests/png/box.png index 9e8c24d..5e4bfaa 100644 Binary files a/tests/png/box.png and b/tests/png/box.png differ diff --git a/tests/png/butt_box.png b/tests/png/butt_box.png index de2dbbc..f4d38ab 100644 Binary files a/tests/png/butt_box.png and b/tests/png/butt_box.png differ diff --git a/tests/png/cable_grommets.png b/tests/png/cable_grommets.png index 89cde9d..55bdcaa 100644 Binary files a/tests/png/cable_grommets.png and b/tests/png/cable_grommets.png differ diff --git a/tests/png/carriers.png b/tests/png/carriers.png index 3f47fc5..c78e12e 100644 Binary files a/tests/png/carriers.png and b/tests/png/carriers.png differ diff --git a/tests/png/corner_block.png b/tests/png/corner_block.png index 48532b0..1eaa0fd 100644 Binary files a/tests/png/corner_block.png and b/tests/png/corner_block.png differ diff --git a/tests/png/door_hinge.png b/tests/png/door_hinge.png index b22ceb7..7a08cdc 100644 Binary files a/tests/png/door_hinge.png and b/tests/png/door_hinge.png differ diff --git a/tests/png/door_latch.png b/tests/png/door_latch.png index 12c9e32..3cddf55 100644 Binary files a/tests/png/door_latch.png and b/tests/png/door_latch.png differ diff --git a/tests/png/fan_guard.png b/tests/png/fan_guard.png index 843ef3f..a017761 100644 Binary files a/tests/png/fan_guard.png and b/tests/png/fan_guard.png differ diff --git a/tests/png/fixing_block.png b/tests/png/fixing_block.png index 75c886d..3befa25 100644 Binary files a/tests/png/fixing_block.png and b/tests/png/fixing_block.png differ diff --git a/tests/png/flat_hinge.png b/tests/png/flat_hinge.png index b76b3a8..b228a2d 100644 Binary files a/tests/png/flat_hinge.png and b/tests/png/flat_hinge.png differ diff --git a/tests/png/foot.png b/tests/png/foot.png index e53a73a..67b9fa7 100644 Binary files a/tests/png/foot.png and b/tests/png/foot.png differ diff --git a/tests/png/handle.png b/tests/png/handle.png index 73a4afa..475c1d8 100644 Binary files a/tests/png/handle.png and b/tests/png/handle.png differ diff --git a/tests/png/inserts.png b/tests/png/inserts.png index d2d40fa..9383143 100644 Binary files a/tests/png/inserts.png and b/tests/png/inserts.png differ diff --git a/tests/png/light_strips.png b/tests/png/light_strips.png index 5c45ac3..2ac5352 100644 Binary files a/tests/png/light_strips.png and b/tests/png/light_strips.png differ diff --git a/tests/png/pcb_mount.png b/tests/png/pcb_mount.png index dbf2ece..f6d43cf 100644 Binary files a/tests/png/pcb_mount.png and b/tests/png/pcb_mount.png differ diff --git a/tests/png/pcbs.png b/tests/png/pcbs.png index d933cd0..e2ccb7e 100644 Binary files a/tests/png/pcbs.png and b/tests/png/pcbs.png differ diff --git a/tests/png/polyholes.png b/tests/png/polyholes.png index 3d84b31..cc77367 100644 Binary files a/tests/png/polyholes.png and b/tests/png/polyholes.png differ diff --git a/tests/png/printed_box.png b/tests/png/printed_box.png index fc5381d..0c16a02 100644 Binary files a/tests/png/printed_box.png and b/tests/png/printed_box.png differ diff --git a/tests/png/psu_shroud.png b/tests/png/psu_shroud.png index 577e523..abbbb1a 100644 Binary files a/tests/png/psu_shroud.png and b/tests/png/psu_shroud.png differ diff --git a/tests/png/ribbon_clamp.png b/tests/png/ribbon_clamp.png index bdb2692..f2c5391 100644 Binary files a/tests/png/ribbon_clamp.png and b/tests/png/ribbon_clamp.png differ diff --git a/tests/png/screw_knob.png b/tests/png/screw_knob.png index a2921b0..62b4d14 100644 Binary files a/tests/png/screw_knob.png and b/tests/png/screw_knob.png differ diff --git a/tests/png/socket_box.png b/tests/png/socket_box.png index 5135910..d589ffc 100644 Binary files a/tests/png/socket_box.png and b/tests/png/socket_box.png differ diff --git a/tests/png/spools.png b/tests/png/spools.png index 2adc977..f2af811 100644 Binary files a/tests/png/spools.png and b/tests/png/spools.png differ diff --git a/tests/png/ssr_shroud.png b/tests/png/ssr_shroud.png index 4967ce9..0856622 100644 Binary files a/tests/png/ssr_shroud.png and b/tests/png/ssr_shroud.png differ diff --git a/tests/png/strap_handle.png b/tests/png/strap_handle.png index a8b6cde..6f55c81 100644 Binary files a/tests/png/strap_handle.png and b/tests/png/strap_handle.png differ diff --git a/tests/png/teardrops.png b/tests/png/teardrops.png index 53c990b..6c28aa4 100644 Binary files a/tests/png/teardrops.png and b/tests/png/teardrops.png differ diff --git a/tests/png/veroboard.png b/tests/png/veroboard.png index 569b09d..c4f06da 100644 Binary files a/tests/png/veroboard.png and b/tests/png/veroboard.png differ diff --git a/tests/png/washers.png b/tests/png/washers.png index 4ad03de..5b7cf6a 100644 Binary files a/tests/png/washers.png and b/tests/png/washers.png differ diff --git a/tests/png/wire.png b/tests/png/wire.png index 447b71a..0272f97 100644 Binary files a/tests/png/wire.png and b/tests/png/wire.png differ