From c915ecfde036ae1677bb2830b5fa071454a1d5fc Mon Sep 17 00:00:00 2001 From: Torsten Paul Date: Wed, 7 Jan 2015 17:25:15 +0100 Subject: [PATCH 1/7] Change license for example files. --- examples/Advanced/offset.scad | 16 +++- examples/Basics/logo_and_text.scad | 16 +++- examples/Basics/text_on_cube.scad | 16 +++- examples/COPYING-CC0.txt | 121 +++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+), 9 deletions(-) create mode 100644 examples/COPYING-CC0.txt diff --git a/examples/Advanced/offset.scad b/examples/Advanced/offset.scad index 18cc2e4b..9476ca16 100644 --- a/examples/Advanced/offset.scad +++ b/examples/Advanced/offset.scad @@ -1,6 +1,16 @@ -// Example for offset() usage -// (c) 2014 Torsten Paul -// CC-BY-SA 4.0 +// offset.scad - Example for offset() usage in OpenSCAD +// +// Written in 2014 by Torsten Paul +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . +// $fn = 40; diff --git a/examples/Basics/logo_and_text.scad b/examples/Basics/logo_and_text.scad index 140ff248..9dbc3d2a 100644 --- a/examples/Basics/logo_and_text.scad +++ b/examples/Basics/logo_and_text.scad @@ -1,6 +1,16 @@ -// Example for text() usage -// (c) 2014 Torsten Paul -// CC-BY-SA 4.0 +// logo_and_text.scad - Example for text() usage in OpenSCAD +// +// Written in 2014 by Torsten Paul +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . +// echo(version=version()); diff --git a/examples/Basics/text_on_cube.scad b/examples/Basics/text_on_cube.scad index 046be735..ad592bea 100644 --- a/examples/Basics/text_on_cube.scad +++ b/examples/Basics/text_on_cube.scad @@ -1,6 +1,16 @@ -// Example for text() usage -// (c) 2014 Torsten Paul -// CC-BY-SA 4.0 +// text_on_cube.scad - Example for text() usage in OpenSCAD +// +// Written in 2014 by Torsten Paul +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . +// echo(version=version()); diff --git a/examples/COPYING-CC0.txt b/examples/COPYING-CC0.txt new file mode 100644 index 00000000..0e259d42 --- /dev/null +++ b/examples/COPYING-CC0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. From 156d7ccefb0d02a2f812df93a5f548795f4b7f41 Mon Sep 17 00:00:00 2001 From: Torsten Paul Date: Wed, 7 Jan 2015 19:35:41 +0100 Subject: [PATCH 2/7] Clarify license for basic examples. --- examples/Advanced/offset.scad | 25 +++++++++++++------------ examples/Basics/difference_cube.scad | 15 +++++++++++++++ examples/Basics/difference_sphere.scad | 15 +++++++++++++++ examples/Basics/intersection.scad | 15 +++++++++++++++ examples/Basics/logo_and_text.scad | 24 ++++++++++++------------ examples/Basics/surface.scad | 16 ++++++++++++++++ examples/Basics/text_on_cube.scad | 25 +++++++++++++------------ examples/Basics/translate.scad | 16 ++++++++++++++++ examples/Basics/union.scad | 15 +++++++++++++++ 9 files changed, 130 insertions(+), 36 deletions(-) diff --git a/examples/Advanced/offset.scad b/examples/Advanced/offset.scad index 9476ca16..5f1ebdfa 100644 --- a/examples/Advanced/offset.scad +++ b/examples/Advanced/offset.scad @@ -1,16 +1,4 @@ // offset.scad - Example for offset() usage in OpenSCAD -// -// Written in 2014 by Torsten Paul -// -// To the extent possible under law, the author(s) have dedicated all -// copyright and related and neighboring rights to this software to the -// public domain worldwide. This software is distributed without any -// warranty. -// -// You should have received a copy of the CC0 Public Domain -// Dedication along with this software. -// If not, see . -// $fn = 40; @@ -41,3 +29,16 @@ translate([0, 0, foot_height]) { %cylinder(r = 14, h = 100); %translate([0, 0, 100]) sphere(r = 30); + + + +// Written in 2014 by Torsten Paul +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/difference_cube.scad b/examples/Basics/difference_cube.scad index c8127844..c4b210ec 100644 --- a/examples/Basics/difference_cube.scad +++ b/examples/Basics/difference_cube.scad @@ -1,3 +1,5 @@ +// difference_cube.scad - Example for difference() usage in OpenSCAD + echo(version=version()); module difference_cube() @@ -10,3 +12,16 @@ module difference_cube() difference_cube(); + + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/difference_sphere.scad b/examples/Basics/difference_sphere.scad index 3d80d626..67d6dee9 100644 --- a/examples/Basics/difference_sphere.scad +++ b/examples/Basics/difference_sphere.scad @@ -1,3 +1,5 @@ +// difference_sphere.scad - Example for difference() usage in OpenSCAD + echo(version=version()); module difference_sphere() @@ -25,3 +27,16 @@ module difference_sphere() difference_sphere(); + + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/intersection.scad b/examples/Basics/intersection.scad index 082b72e7..ac2046bb 100644 --- a/examples/Basics/intersection.scad +++ b/examples/Basics/intersection.scad @@ -1,3 +1,5 @@ +// intersection.scad - Example for intersection() usage in OpenSCAD + echo(version=version()); module example_intersection() @@ -22,3 +24,16 @@ module example_intersection() example_intersection(); + + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/logo_and_text.scad b/examples/Basics/logo_and_text.scad index 9dbc3d2a..bddaa336 100644 --- a/examples/Basics/logo_and_text.scad +++ b/examples/Basics/logo_and_text.scad @@ -1,16 +1,4 @@ // logo_and_text.scad - Example for text() usage in OpenSCAD -// -// Written in 2014 by Torsten Paul -// -// To the extent possible under law, the author(s) have dedicated all -// copyright and related and neighboring rights to this software to the -// public domain worldwide. This software is distributed without any -// warranty. -// -// You should have received a copy of the CC0 Public Domain -// Dedication along with this software. -// If not, see . -// echo(version=version()); @@ -56,3 +44,15 @@ translate([110, 0, 80]) { translate([160, 0, -40]) black() t("Solid 3D CAD Modeller"); } + + +// Written in 2014 by Torsten Paul +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/surface.scad b/examples/Basics/surface.scad index dbf93485..e49605e2 100644 --- a/examples/Basics/surface.scad +++ b/examples/Basics/surface.scad @@ -1,3 +1,5 @@ +// surface.scad - Example for surface() usage in OpenSCAD +// // surface.dat generated using octave: // d = (sin(1:0.2:10)' * cos(1:0.2:10)) * 10; // save("surface.dat", "d"); @@ -13,3 +15,17 @@ intersection() surface(file = "surface.dat", center = true, convexity = 5); } + + + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/text_on_cube.scad b/examples/Basics/text_on_cube.scad index ad592bea..35647cf1 100644 --- a/examples/Basics/text_on_cube.scad +++ b/examples/Basics/text_on_cube.scad @@ -1,16 +1,4 @@ // text_on_cube.scad - Example for text() usage in OpenSCAD -// -// Written in 2014 by Torsten Paul -// -// To the extent possible under law, the author(s) have dedicated all -// copyright and related and neighboring rights to this software to the -// public domain worldwide. This software is distributed without any -// warranty. -// -// You should have received a copy of the CC0 Public Domain -// Dedication along with this software. -// If not, see . -// echo(version=version()); @@ -48,3 +36,16 @@ difference() { translate([0, 0, o]) letter("\u263A"); translate([0, 0, -o - letter_height]) letter("\u263C"); } + + + +// Written in 2014 by Torsten Paul +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/translate.scad b/examples/Basics/translate.scad index 1aaa674c..a7c8fe9e 100644 --- a/examples/Basics/translate.scad +++ b/examples/Basics/translate.scad @@ -1,3 +1,5 @@ +// translate.scad - Example for translate() usage in OpenSCAD + echo(version=version()); module example_translate() @@ -19,3 +21,17 @@ module example_translate() } example_translate(); + + + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/union.scad b/examples/Basics/union.scad index 1b410e2c..681c5823 100644 --- a/examples/Basics/union.scad +++ b/examples/Basics/union.scad @@ -1,3 +1,5 @@ +// union.scad - Example for union() usage in OpenSCAD + echo(version=version()); module example_union() @@ -19,3 +21,16 @@ module example_union() example_union(); + + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . From c30eeecfa2ce1672b8858e8e4c66df4ed2eeacfd Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Tue, 13 Jan 2015 22:29:33 -0500 Subject: [PATCH 3/7] Make sure we export the on-screen image. Fixes #1154 --- src/QGLView.cc | 2 ++ src/mainwin.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/QGLView.cc b/src/QGLView.cc index 25ca07a2..372e0e16 100644 --- a/src/QGLView.cc +++ b/src/QGLView.cc @@ -299,6 +299,8 @@ void QGLView::mouseReleaseEvent(QMouseEvent*) bool QGLView::save(const char *filename) { + // Force reading from front buffer. Some configurations will read from the back buffer here. + glReadBuffer(GL_FRONT); QImage img = grabFrameBuffer(); return img.save(filename, "PNG"); } diff --git a/src/mainwin.cc b/src/mainwin.cc index 123bfd4d..7e91f4cf 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -1753,6 +1753,8 @@ void MainWindow::csgRender() } if (viewActionAnimate->isChecked() && e_dump->isChecked()) { + // Force reading from front buffer. Some configurations will read from the back buffer here. + glReadBuffer(GL_FRONT); QImage img = this->qglview->grabFrameBuffer(); QString filename; double s = this->e_fsteps->text().toDouble(); From b2692d9a98d13a8a9dfc1ea48ad920df2ec169ff Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Tue, 13 Jan 2015 23:51:56 -0500 Subject: [PATCH 4/7] Changed license of most remaining examples to CC0 --- examples/Advanced/advance_intersection.scad | 12 + examples/Advanced/demo_cut.scad | 12 + examples/Advanced/difference.scad | 12 + examples/Advanced/intersecting.scad | 11 + examples/Advanced/iteration.scad | 11 + examples/Advanced/search.scad | 12 + examples/Advanced/translation.scad | 12 + examples/Basics/LetterBlock.scad | 28 ++ examples/Extrusion/cut_view.scad | 11 + examples/Extrusion/fan_view.scad | 11 + examples/Extrusion/text.scad | 12 + examples/Shapes/M.stl | 450 ++++++++++++++++++++ examples/Shapes/chopped_blocks.scad | 22 +- examples/Shapes/chopped_blocks.stl | Bin 6484 -> 6484 bytes examples/Shapes/fence.scad | 11 + examples/Shapes/flat_body.scad | 11 + examples/Shapes/polyhedron.scad | 12 + examples/Shapes/rounded_box.scad | 11 + examples/Shapes/sphere.scad | 20 +- examples/Shapes/tripod.scad | 11 + 20 files changed, 679 insertions(+), 13 deletions(-) create mode 100644 examples/Basics/LetterBlock.scad create mode 100644 examples/Shapes/M.stl diff --git a/examples/Advanced/advance_intersection.scad b/examples/Advanced/advance_intersection.scad index 5b415211..11ea6337 100644 --- a/examples/Advanced/advance_intersection.scad +++ b/examples/Advanced/advance_intersection.scad @@ -11,3 +11,15 @@ intersection() linear_extrude(height = 100, center = true, convexity= 3) import(file = "advance_intersection.dxf"); } + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Advanced/demo_cut.scad b/examples/Advanced/demo_cut.scad index 0b42c612..a63a76ed 100644 --- a/examples/Advanced/demo_cut.scad +++ b/examples/Advanced/demo_cut.scad @@ -31,3 +31,15 @@ module demo_cut() translate([ -30, 0, 0 ]) demo_proj(); translate([ +30, 0, 0 ]) demo_cut(); + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Advanced/difference.scad b/examples/Advanced/difference.scad index 790f25db..5cf6da7f 100644 --- a/examples/Advanced/difference.scad +++ b/examples/Advanced/difference.scad @@ -75,3 +75,15 @@ translate([ 30, 0, 0 ]) nut(); spring(); + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Advanced/intersecting.scad b/examples/Advanced/intersecting.scad index 9cf62689..36537723 100644 --- a/examples/Advanced/intersecting.scad +++ b/examples/Advanced/intersecting.scad @@ -8,3 +8,14 @@ intersection_for(i = [ ]) rotate(i) cube([100, 20, 20], center = true); +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Advanced/iteration.scad b/examples/Advanced/iteration.scad index 25c51735..3895ffe7 100644 --- a/examples/Advanced/iteration.scad +++ b/examples/Advanced/iteration.scad @@ -43,3 +43,14 @@ module example006() example006(); +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Advanced/search.scad b/examples/Advanced/search.scad index b4f44f03..dff02254 100644 --- a/examples/Advanced/search.scad +++ b/examples/Advanced/search.scad @@ -20,3 +20,15 @@ module clock_hour_words(word_offset=20.0,word_height=2.0) { } clock_hour_words(word_offset=16.0,word_height=5.0); + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Advanced/translation.scad b/examples/Advanced/translation.scad index 417557a1..aaecd2ff 100644 --- a/examples/Advanced/translation.scad +++ b/examples/Advanced/translation.scad @@ -22,3 +22,15 @@ for (i = [1:4]) } } } + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Basics/LetterBlock.scad b/examples/Basics/LetterBlock.scad new file mode 100644 index 00000000..7eee768d --- /dev/null +++ b/examples/Basics/LetterBlock.scad @@ -0,0 +1,28 @@ +echo(version=version()); + +module LetterBlock(letter, size=30) { + difference() { + translate([0,0,size/4]) + cube([size,size,size/2], center=true); + translate([0,0,size/6]) + linear_extrude(height=size, convexity=3) + text(letter, + size=size*22/30, + font="Tahoma", + halign="center", + valign="center"); + } +} + +LetterBlock("M"); + +// Written by Marius Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Extrusion/cut_view.scad b/examples/Extrusion/cut_view.scad index 7d11b917..07a558b0 100644 --- a/examples/Extrusion/cut_view.scad +++ b/examples/Extrusion/cut_view.scad @@ -64,3 +64,14 @@ translate([0, 0, -10]) // cutview(); +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Extrusion/fan_view.scad b/examples/Extrusion/fan_view.scad index 5ea81811..37bcb1d5 100644 --- a/examples/Extrusion/fan_view.scad +++ b/examples/Extrusion/fan_view.scad @@ -29,3 +29,14 @@ intersection() import(file = "fan_view.dxf", layer = "fan_side", origin = fan_side_center); } +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Extrusion/text.scad b/examples/Extrusion/text.scad index 891cc0f0..838f70d7 100644 --- a/examples/Extrusion/text.scad +++ b/examples/Extrusion/text.scad @@ -31,3 +31,15 @@ difference() import(file = "text.dxf", layer = "X"); } } + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Shapes/M.stl b/examples/Shapes/M.stl new file mode 100644 index 00000000..699a7e0c --- /dev/null +++ b/examples/Shapes/M.stl @@ -0,0 +1,450 @@ +solid OpenSCAD_Model + facet normal -1 0 0 + outer loop + vertex -15 15 0 + vertex -15 -15 0 + vertex -15 -15 15 + endloop + endfacet + facet normal -1 -0 -0 + outer loop + vertex -15 15 15 + vertex -15 15 0 + vertex -15 -15 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 6.88264 -10.8438 15 + vertex -6.49335 -10.8438 15 + vertex 15 -15 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -9.24535 11.3642 15 + vertex -15 15 15 + vertex -9.24535 -10.8438 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 5.72964 11.3642 15 + vertex -5.22034 11.3642 15 + vertex 0.351639 -0.977737 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -15 15 15 + vertex -15 -15 15 + vertex -9.24535 -10.8438 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -5.22034 11.3642 15 + vertex -15 15 15 + vertex -9.24535 11.3642 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 15 15 15 + vertex -15 15 15 + vertex -5.22034 11.3642 15 + endloop + endfacet + facet normal 0 -0 1 + outer loop + vertex 9.82664 11.3642 15 + vertex 15 15 15 + vertex 5.72964 11.3642 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 15 15 15 + vertex -5.22034 11.3642 15 + vertex 5.72964 11.3642 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 9.82664 -10.8438 15 + vertex 15 15 15 + vertex 9.82664 11.3642 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 15 -15 15 + vertex 9.82664 -10.8438 15 + vertex 6.88264 -10.8438 15 + endloop + endfacet + facet normal 0 -0 1 + outer loop + vertex 15 -15 15 + vertex 15 15 15 + vertex 9.82664 -10.8438 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -15 -15 15 + vertex 15 -15 15 + vertex -6.49335 -10.8438 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -6.49335 -10.8438 15 + vertex 1.07065 -4.69974 15 + vertex -0.726349 -4.69974 15 + endloop + endfacet + facet normal 0 -0 1 + outer loop + vertex 6.88264 -10.8438 15 + vertex 6.88264 8.29724 15 + vertex 1.07065 -4.69974 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -15 -15 15 + vertex -6.49335 -10.8438 15 + vertex -9.24535 -10.8438 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 6.88264 -10.8438 15 + vertex 1.07065 -4.69974 15 + vertex -6.49335 -10.8438 15 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -6.49335 8.29724 15 + vertex -6.49335 -10.8438 15 + vertex -0.726349 -4.69974 15 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 15 -15 15 + vertex 15 -15 0 + vertex 15 15 0 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 15 15 15 + vertex 15 -15 15 + vertex 15 15 0 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 15 15 0 + vertex -15 15 0 + vertex -15 15 15 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 15 15 15 + vertex 15 15 0 + vertex -15 15 15 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 15 -15 0 + vertex -15 -15 0 + vertex -15 15 0 + endloop + endfacet + facet normal -0 -0 -1 + outer loop + vertex 15 15 0 + vertex 15 -15 0 + vertex -15 15 0 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex -15 -15 15 + vertex -15 -15 0 + vertex 15 -15 0 + endloop + endfacet + facet normal -0 -1 -0 + outer loop + vertex 15 -15 15 + vertex -15 -15 15 + vertex 15 -15 0 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -6.49335 8.29724 5 + vertex -9.24535 -10.8438 5 + vertex -6.49335 -10.8438 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -6.49335 8.29724 5 + vertex -9.24535 11.3642 5 + vertex -9.24535 -10.8438 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 1.07065 -4.69974 5 + vertex 0.351639 -0.977737 5 + vertex -0.726349 -4.69974 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 0.351639 -0.977737 5 + vertex -6.49335 8.29724 5 + vertex -0.726349 -4.69974 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -5.22034 11.3642 5 + vertex -9.24535 11.3642 5 + vertex -6.49335 8.29724 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 9.82664 -10.8438 5 + vertex 6.88264 8.29724 5 + vertex 6.88264 -10.8438 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 9.82664 11.3642 5 + vertex 6.88264 8.29724 5 + vertex 9.82664 -10.8438 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 9.82664 11.3642 5 + vertex 5.72964 11.3642 5 + vertex 6.88264 8.29724 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 6.88264 8.29724 5 + vertex 0.351639 -0.977737 5 + vertex 1.07065 -4.69974 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 5.72964 11.3642 5 + vertex 0.351639 -0.977737 5 + vertex 6.88264 8.29724 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 0.351639 -0.977737 5 + vertex -5.22034 11.3642 5 + vertex -6.49335 8.29724 5 + endloop + endfacet + facet normal 0.914058 0.405584 0 + outer loop + vertex -0.726349 -4.69974 5 + vertex -6.49335 8.29724 5 + vertex -6.49335 8.29724 15 + endloop + endfacet + facet normal 0.914058 0.405584 0 + outer loop + vertex -0.726349 -4.69974 15 + vertex -0.726349 -4.69974 5 + vertex -6.49335 8.29724 15 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 1.07065 -4.69974 5 + vertex -0.726349 -4.69974 5 + vertex -0.726349 -4.69974 15 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 1.07065 -4.69974 15 + vertex 1.07065 -4.69974 5 + vertex -0.726349 -4.69974 15 + endloop + endfacet + facet normal -0.912882 0.408223 0 + outer loop + vertex 6.88264 8.29724 5 + vertex 1.07065 -4.69974 5 + vertex 1.07065 -4.69974 15 + endloop + endfacet + facet normal -0.912882 0.408223 0 + outer loop + vertex 6.88264 8.29724 15 + vertex 6.88264 8.29724 5 + vertex 1.07065 -4.69974 15 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 6.88264 -10.8438 15 + vertex 6.88264 -10.8438 5 + vertex 6.88264 8.29724 5 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 6.88264 8.29724 15 + vertex 6.88264 -10.8438 15 + vertex 6.88264 8.29724 5 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 9.82664 -10.8438 5 + vertex 6.88264 -10.8438 5 + vertex 6.88264 -10.8438 15 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 9.82664 -10.8438 15 + vertex 9.82664 -10.8438 5 + vertex 6.88264 -10.8438 15 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex 9.82664 11.3642 5 + vertex 9.82664 -10.8438 5 + vertex 9.82664 -10.8438 15 + endloop + endfacet + facet normal -1 -0 -0 + outer loop + vertex 9.82664 11.3642 15 + vertex 9.82664 11.3642 5 + vertex 9.82664 -10.8438 15 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 5.72964 11.3642 15 + vertex 5.72964 11.3642 5 + vertex 9.82664 11.3642 5 + endloop + endfacet + facet normal -0 -1 -0 + outer loop + vertex 9.82664 11.3642 15 + vertex 5.72964 11.3642 15 + vertex 9.82664 11.3642 5 + endloop + endfacet + facet normal 0.916746 -0.399471 0 + outer loop + vertex 0.351639 -0.977737 15 + vertex 0.351639 -0.977737 5 + vertex 5.72964 11.3642 5 + endloop + endfacet + facet normal 0.916746 -0.399471 0 + outer loop + vertex 5.72964 11.3642 15 + vertex 0.351639 -0.977737 15 + vertex 5.72964 11.3642 5 + endloop + endfacet + facet normal -0.911421 -0.411475 -0 + outer loop + vertex -5.22034 11.3642 15 + vertex -5.22034 11.3642 5 + vertex 0.351639 -0.977737 5 + endloop + endfacet + facet normal -0.911421 -0.411475 -0 + outer loop + vertex 0.351639 -0.977737 15 + vertex -5.22034 11.3642 15 + vertex 0.351639 -0.977737 5 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex -9.24535 11.3642 15 + vertex -9.24535 11.3642 5 + vertex -5.22034 11.3642 5 + endloop + endfacet + facet normal -0 -1 -0 + outer loop + vertex -5.22034 11.3642 15 + vertex -9.24535 11.3642 15 + vertex -5.22034 11.3642 5 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex -9.24535 -10.8438 15 + vertex -9.24535 -10.8438 5 + vertex -9.24535 11.3642 5 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex -9.24535 11.3642 15 + vertex -9.24535 -10.8438 15 + vertex -9.24535 11.3642 5 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex -6.49335 -10.8438 5 + vertex -9.24535 -10.8438 5 + vertex -9.24535 -10.8438 15 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex -6.49335 -10.8438 15 + vertex -6.49335 -10.8438 5 + vertex -9.24535 -10.8438 15 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex -6.49335 8.29724 5 + vertex -6.49335 -10.8438 5 + vertex -6.49335 -10.8438 15 + endloop + endfacet + facet normal -1 -0 -0 + outer loop + vertex -6.49335 8.29724 15 + vertex -6.49335 8.29724 5 + vertex -6.49335 -10.8438 15 + endloop + endfacet +endsolid OpenSCAD_Model diff --git a/examples/Shapes/chopped_blocks.scad b/examples/Shapes/chopped_blocks.scad index ea5e27ac..30e24bc4 100644 --- a/examples/Shapes/chopped_blocks.scad +++ b/examples/Shapes/chopped_blocks.scad @@ -1,10 +1,5 @@ -// chopped_blocks.stl is derived from Mblock.stl -// (c) 2009 Will Langford licensed under -// the Creative Commons - GNU GPL license. -// http://www.thingiverse.com/thing:753 -// -// Jonas Pfeil converted the file to binary -// STL and duplicated its content. +// chopped_blocks.stl is derived from Basics/LetterBlock.scad +// The exported STL was converted to binary using MeshLab echo(version=version()); @@ -21,7 +16,7 @@ module blk2() { } module chop() { - translate([ -14, 0, 0 ]) + translate([ -18, 0, 0 ]) import(file = "chopped_blocks.stl", convexity = 12); } @@ -36,3 +31,14 @@ difference() { } } +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Shapes/chopped_blocks.stl b/examples/Shapes/chopped_blocks.stl index c24cdf7768a13e36b53b58e7e23148d7e8b9b39a..0291b9fe848c3b5fafc747a9140f7af638d152a3 100644 GIT binary patch literal 6484 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 PGZ+c`{(uJeD`1 and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Shapes/flat_body.scad b/examples/Shapes/flat_body.scad index a18a94a7..135d8fbc 100644 --- a/examples/Shapes/flat_body.scad +++ b/examples/Shapes/flat_body.scad @@ -27,3 +27,14 @@ module shape() // linear_extrude(convexity = 10, center = true) shape(); +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Shapes/polyhedron.scad b/examples/Shapes/polyhedron.scad index 6aa44357..c0947f98 100644 --- a/examples/Shapes/polyhedron.scad +++ b/examples/Shapes/polyhedron.scad @@ -16,3 +16,15 @@ polyhedron( [4, 0, 3] ] ); + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Shapes/rounded_box.scad b/examples/Shapes/rounded_box.scad index aac5fd2f..48b1e5f6 100644 --- a/examples/Shapes/rounded_box.scad +++ b/examples/Shapes/rounded_box.scad @@ -36,3 +36,14 @@ module roundedBox(size, radius, sidesonly) translate([-15,0,0])roundedBox([20,30,40], 5, true); translate([15,0,0]) roundedBox([20,30,40], 5, false); +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Shapes/sphere.scad b/examples/Shapes/sphere.scad index 6e808acd..37cf3d4a 100644 --- a/examples/Shapes/sphere.scad +++ b/examples/Shapes/sphere.scad @@ -1,6 +1,4 @@ -// example012.stl is Mblock.stl, (c) 2009 Will Langford -// licensed under the Creative Commons - GNU GPL license. -// http://www.thingiverse.com/thing:753 +// M.stl is generated from Basics/LetterBlock.scad echo(version=version()); @@ -8,6 +6,18 @@ difference() { sphere(20); - translate([ -2.92, 0.5, +20 ]) rotate([180, 0, 180]) - import("sphere.stl", convexity = 5); + translate([ 0, 0.5, +20 ]) rotate([180, 0, 180]) + import("M.stl", convexity = 5); } + +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . diff --git a/examples/Shapes/tripod.scad b/examples/Shapes/tripod.scad index c46d2cc4..bedc0f57 100644 --- a/examples/Shapes/tripod.scad +++ b/examples/Shapes/tripod.scad @@ -156,3 +156,14 @@ if (mode == "exploded") if (mode == "assembled") assembled(); +// Written by Clifford Wolf and Marius +// Kintel +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . From 4af38828d227a6a7f63a30f3a0969e010aa52ba5 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 14 Jan 2015 11:47:56 -0500 Subject: [PATCH 5/7] Remaining example -> CC0 --- examples/Advanced/fractal.scad | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/examples/Advanced/fractal.scad b/examples/Advanced/fractal.scad index 871222a4..bab5eb15 100644 --- a/examples/Advanced/fractal.scad +++ b/examples/Advanced/fractal.scad @@ -1,6 +1,4 @@ // Menger Sponge -// By Nathan Hellweg, Emmett Lalish and Marius Kintel May 13, 2013 -// CC-BY-SA license // Size of edge of sponge D=100; @@ -32,3 +30,14 @@ difference() { rotate([45, atan(1/sqrt(2)), 0]) menger(); translate([0,0,-D]) cube(2*D, center=true); } + +// Written by Nathan Hellweg, Emmett Lalish and Marius Kintel May 13, 2013 +// +// To the extent possible under law, the author(s) have dedicated all +// copyright and related and neighboring rights to this software to the +// public domain worldwide. This software is distributed without any +// warranty. +// +// You should have received a copy of the CC0 Public Domain +// Dedication along with this software. +// If not, see . From b6d76e370cb68c5640ca9f8cb9faba107c9aa7d0 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Thu, 15 Jan 2015 10:04:18 -0500 Subject: [PATCH 6/7] update: no SVG/AMF import in this release --- releases/2014.QX.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/2014.QX.md b/releases/2014.QX.md index 15500944..c8e9a87f 100644 --- a/releases/2014.QX.md +++ b/releases/2014.QX.md @@ -13,8 +13,8 @@ * MDI * FIXME: Windows cmd-line fixes * Qt5, retina -* SVG import/export -* AMF import/export +* SVG export +* AMF export * Color schemes for viewer and editor can be user-edited * Improved editor * Splash screen From 33425115c578338646e6348bdd47a4b6a2bfe7e8 Mon Sep 17 00:00:00 2001 From: Torsten Paul Date: Thu, 15 Jan 2015 17:29:11 +0100 Subject: [PATCH 7/7] Update dumptest reference files. --- .../dumptest-examples/LetterBlock-expected.csg | 15 +++++++++++++++ .../dumptest-examples/chopped_blocks-expected.csg | 8 ++++---- .../dumptest-examples/sphere-expected.csg | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 tests/regression/dumptest-examples/LetterBlock-expected.csg diff --git a/tests/regression/dumptest-examples/LetterBlock-expected.csg b/tests/regression/dumptest-examples/LetterBlock-expected.csg new file mode 100644 index 00000000..3fbaf903 --- /dev/null +++ b/tests/regression/dumptest-examples/LetterBlock-expected.csg @@ -0,0 +1,15 @@ +group() { + group(); + group() { + difference() { + multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 7.5], [0, 0, 0, 1]]) { + cube(size = [30, 30, 15], center = true); + } + multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 5], [0, 0, 0, 1]]) { + linear_extrude(height = 30, center = false, convexity = 3, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) { + text(text = "M", size = 22, spacing = 1, font = "Tahoma", direction = "ltr", language = "en", script = "latin", halign = "center", valign = "center", $fn = 0, $fa = 12, $fs = 2); + } + } + } + } +} diff --git a/tests/regression/dumptest-examples/chopped_blocks-expected.csg b/tests/regression/dumptest-examples/chopped_blocks-expected.csg index 816d33ef..93410a7b 100644 --- a/tests/regression/dumptest-examples/chopped_blocks-expected.csg +++ b/tests/regression/dumptest-examples/chopped_blocks-expected.csg @@ -17,7 +17,7 @@ group() { } } group() { - multmatrix([[1, 0, 0, -14], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + multmatrix([[1, 0, 0, -18], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { import(file = "chopped_blocks.stl", layer = "", origin = [0, 0], scale = 1, convexity = 12, $fn = 0, $fa = 12, $fs = 2); } } @@ -36,7 +36,7 @@ group() { } } group() { - multmatrix([[1, 0, 0, -14], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + multmatrix([[1, 0, 0, -18], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { import(file = "chopped_blocks.stl", layer = "", origin = [0, 0], scale = 1, convexity = 12, $fn = 0, $fa = 12, $fs = 2); } } @@ -55,7 +55,7 @@ group() { } } group() { - multmatrix([[1, 0, 0, -14], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + multmatrix([[1, 0, 0, -18], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { import(file = "chopped_blocks.stl", layer = "", origin = [0, 0], scale = 1, convexity = 12, $fn = 0, $fa = 12, $fs = 2); } } @@ -74,7 +74,7 @@ group() { } } group() { - multmatrix([[1, 0, 0, -14], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + multmatrix([[1, 0, 0, -18], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { import(file = "chopped_blocks.stl", layer = "", origin = [0, 0], scale = 1, convexity = 12, $fn = 0, $fa = 12, $fs = 2); } } diff --git a/tests/regression/dumptest-examples/sphere-expected.csg b/tests/regression/dumptest-examples/sphere-expected.csg index e6f46184..688301ea 100644 --- a/tests/regression/dumptest-examples/sphere-expected.csg +++ b/tests/regression/dumptest-examples/sphere-expected.csg @@ -2,9 +2,9 @@ group() { group(); difference() { sphere($fn = 0, $fa = 12, $fs = 2, r = 20); - multmatrix([[1, 0, 0, -2.92], [0, 1, 0, 0.5], [0, 0, 1, 20], [0, 0, 0, 1]]) { + multmatrix([[1, 0, 0, 0], [0, 1, 0, 0.5], [0, 0, 1, 20], [0, 0, 0, 1]]) { multmatrix([[-1, 0, 0, 0], [0, 1, 0, 0], [0, 0, -1, 0], [0, 0, 0, 1]]) { - import(file = "sphere.stl", layer = "", origin = [0, 0], scale = 1, convexity = 5, $fn = 0, $fa = 12, $fs = 2); + import(file = "M.stl", layer = "", origin = [0, 0], scale = 1, convexity = 5, $fn = 0, $fa = 12, $fs = 2); } } }