Merge branch 'master' of github.com:openscad/openscad

master
Marius Kintel 2015-01-25 01:50:39 -05:00
commit 3722ce5d81
14 changed files with 2698 additions and 1649 deletions

View File

@ -165,6 +165,7 @@ int main(int argc, char *argv[])
N = new CGAL_Nef_polyhedron(new CGAL_Nef_polyhedron3);
std::ifstream stream(filename.c_str());
stream >> *N->p3;
std::cerr << "Imported Nef polyhedron" << std::endl;
}
}
else {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1 @@
render() mirror([1,0,0]) cube();

View File

@ -1122,6 +1122,7 @@ list(APPEND EXPORT3D_TEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/3D/features
${CMAKE_SOURCE_DIR}/../testdata/scad/3D/features/polyhedron-tests.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/3D/features/rotate_extrude-tests.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/3D/features/union-coincident-test.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/3D/features/mirror-tests.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/null-polygons.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/internal-cavity.scad
${CMAKE_SOURCE_DIR}/../testdata/scad/misc/internal-cavity-polyhedron.scad

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

@ -0,0 +1,7 @@
group() {
render(convexity = 1) {
multmatrix([[-1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
cube(size = [1, 1, 1], center = false);
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB