Update examples/logo_and_text.scad and expected test results. (Fixes openscad#3566)

Author: thehans

Diff for: examples/Basics/logo_and_text.scad

@@ -4,29 +4,32 @@ use <logo.scad> // Imports the Logo() module from logo.scad into this namespace
 
 // Set the initial viewport parameters
 $vpr = [90, 0, 0];
-$vpt = [250, 0, 80];
-$vpd = 500;
+$vpt = [300, 0, 80];
+$vpd = 1600;
 
 logosize = 120;
 
-
 translate([110, 0, 80]) {
   translate([0, 0, 30]) rotate([25, 25, -40]) Logo(logosize);
-  translate([100, 0, 40]) green() t("Open", 42, ":style=Bold");
-  translate([247, 0, 40]) black() t("SCAD", 42, ":style=Bold");
-  translate([100, 0, 0]) black() t("The Programmers");
+  translate([100, 0, 40])  green() t("Open", s = 42, spacing = 1.05);
+  translate([247, 0, 40])  corn()  t("SCAD" , s = 42, spacing = 0.9);
+  translate([100, 0, 0])   black() t("The Programmers");
   translate([160, 0, -30]) black() t("Solid 3D CAD Modeller");
 }
 
 // Helper to create 3D text with correct font and orientation
-module t(t, s = 18, style = "") {
+module t(t, s = 18, style = ":style=Bold", spacing = 1) {
   rotate([90, 0, 0])
     linear_extrude(height = 1)
-      text(t, size = s, font = str("Liberation Sans", style), $fn = 16);
+      text(t, size = s,
+           spacing=spacing,
+           font = str("Liberation Sans", style),
+           $fn = 16);
 }
 
 // Color helpers
-module green() color([81/255, 142/255, 4/255]) children();
+module green() color([157/255,203/255,81/255]) children();
+module corn() color([249/255,210/255,44/255]) children();
 module black() color([0, 0, 0]) children();
 
 echo(version=version());

Diff for: tests/regression/cgalpngtest/logo_and_text-expected.png

@@ -17,12 +17,12 @@ multmatrix([[1, 0, 0, 110], [0, 1, 0, 0], [0, 0, 1, 80], [0, 0, 0, 1]]) {
 	}
 	multmatrix([[1, 0, 0, 100], [0, 1, 0, 0], [0, 0, 1, 40], [0, 0, 0, 1]]) {
 		group() {
-			color([0.317647, 0.556863, 0.0156863, 1]) {
+			color([0.615686, 0.796078, 0.317647, 1]) {
 				group() {
 					group() {
 						multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
 							linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
-								text(text = "Open", size = 42, spacing = 1, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2);
+								text(text = "Open", size = 42, spacing = 1.05, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2);
 							}
 						}
 					}
@@ -32,12 +32,12 @@ multmatrix([[1, 0, 0, 110], [0, 1, 0, 0], [0, 0, 1, 80], [0, 0, 0, 1]]) {
 	}
 	multmatrix([[1, 0, 0, 247], [0, 1, 0, 0], [0, 0, 1, 40], [0, 0, 0, 1]]) {
 		group() {
-			color([0, 0, 0, 1]) {
+			color([0.976471, 0.823529, 0.172549, 1]) {
 				group() {
 					group() {
 						multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
 							linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
-								text(text = "SCAD", size = 42, spacing = 1, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2);
+								text(text = "SCAD", size = 42, spacing = 0.9, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2);
 							}
 						}
 					}
@@ -52,7 +52,7 @@ multmatrix([[1, 0, 0, 110], [0, 1, 0, 0], [0, 0, 1, 80], [0, 0, 0, 1]]) {
 					group() {
 						multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
 							linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
-								text(text = "The Programmers", size = 18, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2);
+								text(text = "The Programmers", size = 18, spacing = 1, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2);
 							}
 						}
 					}
@@ -67,7 +67,7 @@ multmatrix([[1, 0, 0, 110], [0, 1, 0, 0], [0, 0, 1, 80], [0, 0, 0, 1]]) {
 					group() {
 						multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
 							linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
-								text(text = "Solid 3D CAD Modeller", size = 18, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2);
+								text(text = "Solid 3D CAD Modeller", size = 18, spacing = 1, font = "Liberation Sans:style=Bold", direction = "ltr", language = "en", script = "Latn", halign = "left", valign = "baseline", $fn = 16, $fa = 12, $fs = 2);
 							}
 						}
 					}