diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) | 
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) | 
| commit | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (patch) | |
| tree | c68db815a72cc767b6d51be0a57e9946c5f0a619 /tests/regression/dumptest | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
	boost.pri
	tests/CMakeLists.txt
Diffstat (limited to 'tests/regression/dumptest')
| -rw-r--r-- | tests/regression/dumptest/hull2-tests-expected.txt | 24 | 
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/regression/dumptest/hull2-tests-expected.txt b/tests/regression/dumptest/hull2-tests-expected.txt index 87365a6..d060d1d 100644 --- a/tests/regression/dumptest/hull2-tests-expected.txt +++ b/tests/regression/dumptest/hull2-tests-expected.txt @@ -32,4 +32,28 @@  			}  		}  	} +	multmatrix([[1, 0, 0, 30], [0, 1, 0, -25], [0, 0, 1, 0], [0, 0, 0, 1]]) { +		group() { +			hull() { +				group() { +					group() { +						multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { +							circle($fn = 0, $fa = 12, $fs = 1, r = 3); +						} +						multmatrix([[1, 0, 0, 0], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) { +							circle($fn = 0, $fa = 12, $fs = 1, r = 3); +						} +					} +					group() { +						multmatrix([[1, 0, 0, 10], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { +							circle($fn = 0, $fa = 12, $fs = 1, r = 3); +						} +						multmatrix([[1, 0, 0, 10], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) { +							circle($fn = 0, $fa = 12, $fs = 1, r = 3); +						} +					} +				} +			} +		} +	}  | 
