vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

bugfix: Dumptest failed to dump the highlight modifier

master
Marius Kintel 2014-05-17 11:53:11 -04:00
parent 76e152f300
commit e931c8ab83
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nodedumper.cc
View File

@ -49,6 +49,7 @@ std::string NodeDumper::dumpChildren(const AbstractNode &node)
iter++) { iter++) {
assert(isCached(**iter)); assert(isCached(**iter));
if ((*iter)->modinst->isBackground()) dump << "%"; if ((*iter)->modinst->isBackground()) dump << "%";
if ((*iter)->modinst->isHighlight()) dump << "#";
dump << this->cache[**iter] << "\n"; dump << this->cache[**iter] << "\n";
} }

3
testdata/scad/features/for-tests.scad vendored
View File

@ -2,6 +2,9 @@
for(); for();
// No children // No children
for(i=2) { } for(i=2) { }
// Modifier and no children
%for(i=2) { }
#for(i=2) { }
// Null // Null
translate([-10,0,0]) for() cylinder(r=4); translate([-10,0,0]) for() cylinder(r=4);

2
tests/regression/dumptest/difference-2d-tests-expected.csg
View File

@ -17,7 +17,7 @@ group() {
multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() { difference() {
square(size = [0, 10], center = true); square(size = [0, 10], center = true);
circle($fn = 0, $fa = 12, $fs = 2, r = 4); # circle($fn = 0, $fa = 12, $fs = 2, r = 4);
} }
} }
multmatrix([[1, 0, 0, 0], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 0], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {

2
tests/regression/dumptest/difference-tests-expected.csg
View File

@ -33,7 +33,7 @@ group() {
multmatrix([[1, 0, 0, 24], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 24], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() { difference() {
cube(size = [0, 10, 10], center = true); cube(size = [0, 10, 10], center = true);
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true); # cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
} }
} }
multmatrix([[1, 0, 0, 24], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, 24], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {

2
tests/regression/dumptest/for-tests-expected.csg
View File

@ -1,6 +1,8 @@
group() { group() {
group(); group();
group(); group();
% group();
# group();
multmatrix([[1, 0, 0, -10], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { multmatrix([[1, 0, 0, -10], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
group(); group();
} }

10
tests/regression/dumptest/highlight-and-background-modifier-expected.csg
View File

@ -1,12 +1,12 @@
group() { group() {
difference() { difference() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10); sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
% cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true); %# cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
% group() { %# group() {
cube(size = [25, 6, 3], center = true); cube(size = [25, 6, 3], center = true);
} }
} }
% multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) { %# multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() { difference() {
color([0, 0.501961, 0, 1]) { color([0, 0.501961, 0, 1]) {
cube(size = [10, 4, 10], center = true); cube(size = [10, 4, 10], center = true);
@ -26,7 +26,7 @@ group() {
cube(size = [25, 6, 3], center = true); cube(size = [25, 6, 3], center = true);
} }
} }
multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) { # multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() { difference() {
color([0, 0.501961, 0, 1]) { color([0, 0.501961, 0, 1]) {
cube(size = [10, 4, 10], center = true); cube(size = [10, 4, 10], center = true);
@ -39,7 +39,7 @@ group() {
} }
} }
} }
multmatrix([[1, 0, 0, 26], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { # multmatrix([[1, 0, 0, 26], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() { difference() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10); sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true); cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);

6
tests/regression/dumptest/highlight-modifier-expected.csg
View File

@ -1,12 +1,12 @@
group() { group() {
difference() { difference() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10); sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true); # cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
} }
group() { # group() {
cube(size = [25, 6, 3], center = true); cube(size = [25, 6, 3], center = true);
} }
multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) { # multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() { difference() {
color([0, 0.501961, 0, 1]) { color([0, 0.501961, 0, 1]) {
cube(size = [10, 4, 10], center = true); cube(size = [10, 4, 10], center = true);