Test3dexport by donbright · Pull Request #816 · openscad/openscad

donbright · 2014-05-31T11:46:01Z

Test 3d file format export, by exporting 3d format, creating temporary '.scad' file that import()s the generated 3d file, then re-exporting to PNG, and comparing against the cgalpngtest expected file. The set of tests is somewhat small to begin with, but can be grown by editing CMakeLists.txt

The new tests are named for the 3dformat then 'png'. The first two are

       stlpngtests
       offpngtests

Each 3d format must have import() functionality for these tests to work.

In order to output 'monochrome' tests to deal with the fact that 3d formats like STL have no 'back face'/'front face', there was Major refactoring of entire color subsystem, with 'color schemes' inside colormap.cc / colormap.h and centralization of colorization when calling renderers.

This is not quite as clean a design as i would like but i think it is cleaner than it was before. (Less hard-coding of RGB inside .cc code... and easier to move to a custom color-scheme system in the future )

New cmdnline option --colorscheme, New tests to test colorscheme option

New colorscheme for black-background previewing (Starnight) (there are a lot of websites / etc where people use openscad with black-on-white text in the editor, this should help them. some people find black-on-white to be hard for their eyes to see)

New colorscheme to make 'backface' same color as 'front face' (Monochrome)

Export test is a new .py file based on @t-paul 's design of csgtest.

Known Bugs:

Not 100% backwards compatible. For example, Throwntogether doesnt have the magenta on backwards faces... some work needs to be done to fix that.

Starnight scheme hides the 'x y z' letters on the axes.

Major issue

the threshold of 10% in the ImageMagick Compare test is causing all the tests to pass, even though we are comparing an image with Green backfaces to an image with Gold backfaces, even without feeding --monochrome to the openscad binary. So either the Imagemagick is 'too loose', or the colorscheme refactoring was totally unnecessary. I'm a bit confused how this happened.

…3dexport

…3dexport Conflicts: tests/regression/export3d_off_test/example001-expected.png tests/regression/export3d_off_test/example002-expected.png tests/regression/export3d_off_test/example003-expected.png tests/regression/export3d_off_test/example004-expected.png tests/regression/export3d_off_test/example005-expected.png tests/regression/export3d_off_test/example009-expected.png tests/regression/export3d_off_test/example010-expected.png tests/regression/export3d_off_test/example011-expected.png tests/regression/export3d_off_test/example014-expected.png tests/regression/export3d_off_test/example016-expected.png tests/regression/export3d_off_test/example019-expected.png tests/regression/export3d_off_test/example020-expected.png tests/regression/export3d_off_test/example023-expected.png tests/regression/export3d_off_test/polyhedron-nonplanar-tests-expected.png tests/regression/export3d_stl_test/example001-expected.png tests/regression/export3d_stl_test/example002-expected.png tests/regression/export3d_stl_test/example003-expected.png tests/regression/export3d_stl_test/example004-expected.png tests/regression/export3d_stl_test/example005-expected.png tests/regression/export3d_stl_test/example009-expected.png tests/regression/export3d_stl_test/example010-expected.png tests/regression/export3d_stl_test/example011-expected.png tests/regression/export3d_stl_test/example014-expected.png tests/regression/export3d_stl_test/example016-expected.png tests/regression/export3d_stl_test/example019-expected.png tests/regression/export3d_stl_test/example020-expected.png tests/regression/export3d_stl_test/example023-expected.png tests/regression/export3d_stl_test/polyhedron-nonplanar-tests-expected.png

Conflicts: src/CGAL_renderer.h src/MainWindow.h src/OGL_helper.h src/mainwin.cc src/openscad.cc tests/test_cmdline_tool.py tests/test_pretty_print.py

about a programmer whose system was almost messed up by it.

…3dexport Conflicts: src/CGAL_renderer.h src/MainWindow.h src/OGL_helper.h src/openscad.cc tests/test_cmdline_tool.py tests/test_pretty_print.py

Conflicts: src/CGALRenderer.cc src/CGALRenderer.h

… 'Sea' colorscheme

donbright · 2014-07-09T04:24:11Z

uhmmm ok...

i notice there are no csgpng tests for the text/font stuff?

text.cc toString() doesn't output valid .scad code, it dumps single-quoted strings for one.

for example it uses single quotes. OpenSCAD doesn't support single quotes (yet).

…o ')

…al tests

…port branch

donbright · 2014-07-09T06:08:16Z

uhm... export/import of csgpng for text() is completely broken because text.cc toString() doesnt output valid .csg code (first off, it outputs single quotes instead of double quotes).

this was not caught before probably because the 'standard' test suite did not use --enable=test for the dumptests.

fixing that is a little beyond the scope of this particular branch...

therefore i did not --enable=test for dumptest in this branch.

t-paul · 2014-07-09T08:07:18Z

I'll fix the text() CSG export for master. Catching those cases was actually the reason why I added those tests in the first place as offset() had that problem too.

kintel · 2014-07-17T22:37:26Z

@donbright Your commit "undo a few problematic commits" makes this hard to merge with master as it reverts commits in master which has later been amended. Not sure how to proceed as the merging is getting complex - cherrypick commits from this branch back to master perhaps?

This reverts commit 1f6c89b. Conflicts: tests/CMakeLists.txt

Conflicts: tests/CMakeLists.txt tests/export_import_pngtest.py tests/regression/cgalpngtest/text-font-alignment-tests-expected.png tests/regression/cgalpngtest/text-font-direction-tests-expected.png tests/regression/cgalpngtest/text-font-simple-tests-expected.png tests/regression/cgalpngtest/text-font-tests-expected.png tests/regression/cgalpngtest/text_on_cube-expected.png tests/regression/opencsgtest/text-font-alignment-tests-expected.png tests/regression/opencsgtest/text-font-direction-tests-expected.png tests/regression/opencsgtest/text-font-simple-tests-expected.png tests/regression/opencsgtest/text-font-tests-expected.png tests/regression/opencsgtest/text_on_cube-expected.png tests/regression/openscad-camortho/camera-tests-expected.png tests/regression/throwntogethertest/text-font-alignment-tests-expected.png tests/regression/throwntogethertest/text-font-direction-tests-expected.png tests/regression/throwntogethertest/text-font-simple-tests-expected.png tests/regression/throwntogethertest/text-font-tests-expected.png

kintel · 2014-07-22T15:21:10Z

Fixed the above issue by git revert'ing the mentioned commit.

This reverts commit 4a1e19c. Conflicts: src/renderer.cc

Conflicts: src/Camera.cc src/PlatformUtils.cc tests/CMakeLists.txt tests/regression/cgalpngtest/arc-expected.png tests/regression/cgalpngtest/circle-advanced-expected.png tests/regression/cgalpngtest/circle-double-expected.png tests/regression/cgalpngtest/circle-expected.png tests/regression/cgalpngtest/circle-small-expected.png tests/regression/cgalpngtest/circle-tests-expected.png tests/regression/cgalpngtest/control-hull-dimension-expected.png tests/regression/cgalpngtest/difference-2d-tests-expected.png tests/regression/cgalpngtest/ellipse-arc-expected.png tests/regression/cgalpngtest/ellipse-arc-rot-expected.png tests/regression/cgalpngtest/ellipse-expected.png tests/regression/cgalpngtest/ellipse-reverse-expected.png tests/regression/cgalpngtest/ellipse-rot-expected.png tests/regression/cgalpngtest/flat_body-expected.png tests/regression/cgalpngtest/hull2-tests-expected.png tests/regression/cgalpngtest/import_dxf-tests-expected.png tests/regression/cgalpngtest/intersection2-tests-expected.png tests/regression/cgalpngtest/issue585-expected.png tests/regression/cgalpngtest/issue612-expected.png tests/regression/cgalpngtest/lwpolyline2-expected.png tests/regression/cgalpngtest/minkowski2-hole-tests-expected.png tests/regression/cgalpngtest/minkowski2-tests-expected.png tests/regression/cgalpngtest/multiple-layers-expected.png tests/regression/cgalpngtest/null-polygons-expected.png tests/regression/cgalpngtest/offset-tests-expected.png tests/regression/cgalpngtest/polygon-concave-expected.png tests/regression/cgalpngtest/polygon-concave-hole-expected.png tests/regression/cgalpngtest/polygon-concave-simple-expected.png tests/regression/cgalpngtest/polygon-holes-touch-expected.png tests/regression/cgalpngtest/polygon-intersect-expected.png tests/regression/cgalpngtest/polygon-many-holes-expected.png tests/regression/cgalpngtest/polygon-mesh-expected.png tests/regression/cgalpngtest/polygon-overlap-expected.png tests/regression/cgalpngtest/polygon-riser-expected.png tests/regression/cgalpngtest/polygon-self-intersect-expected.png tests/regression/cgalpngtest/polygon-tests-expected.png tests/regression/cgalpngtest/polygon8-expected.png tests/regression/cgalpngtest/polygons-expected.png tests/regression/cgalpngtest/projection-tests-expected.png tests/regression/cgalpngtest/render-2d-tests-expected.png tests/regression/cgalpngtest/resize-2d-tests-expected.png tests/regression/cgalpngtest/rotate_extrude_dxf-tests-expected.png tests/regression/cgalpngtest/scale2D-tests-expected.png tests/regression/cgalpngtest/square-tests-expected.png tests/regression/cgalpngtest/text-search-test-expected.png tests/regression/cgalpngtest/transform-insert-expected.png tests/regression/cgalpngtest/triangle-with-duplicate-vertex-expected.png tests/regression/opencsgtest/arc-expected.png tests/regression/opencsgtest/circle-advanced-expected.png tests/regression/opencsgtest/circle-double-expected.png tests/regression/opencsgtest/circle-expected.png tests/regression/opencsgtest/circle-small-expected.png tests/regression/opencsgtest/circle-tests-expected.png tests/regression/opencsgtest/control-hull-dimension-expected.png tests/regression/opencsgtest/difference-2d-tests-expected.png tests/regression/opencsgtest/ellipse-arc-expected.png tests/regression/opencsgtest/ellipse-arc-rot-expected.png tests/regression/opencsgtest/ellipse-expected.png tests/regression/opencsgtest/ellipse-reverse-expected.png tests/regression/opencsgtest/ellipse-rot-expected.png tests/regression/opencsgtest/flat_body-expected.png tests/regression/opencsgtest/hull2-tests-expected.png tests/regression/opencsgtest/import_dxf-tests-expected.png tests/regression/opencsgtest/intersection2-tests-expected.png tests/regression/opencsgtest/issue585-expected.png tests/regression/opencsgtest/issue612-expected.png tests/regression/opencsgtest/lwpolyline2-expected.png tests/regression/opencsgtest/minkowski2-hole-tests-expected.png tests/regression/opencsgtest/minkowski2-tests-expected.png tests/regression/opencsgtest/multiple-layers-expected.png tests/regression/opencsgtest/null-polygons-expected.png tests/regression/opencsgtest/offset-tests-expected.png tests/regression/opencsgtest/polygon-concave-expected.png tests/regression/opencsgtest/polygon-concave-hole-expected.png tests/regression/opencsgtest/polygon-concave-simple-expected.png tests/regression/opencsgtest/polygon-holes-touch-expected.png tests/regression/opencsgtest/polygon-intersect-expected.png tests/regression/opencsgtest/polygon-many-holes-expected.png tests/regression/opencsgtest/polygon-mesh-expected.png tests/regression/opencsgtest/polygon-overlap-expected.png tests/regression/opencsgtest/polygon-riser-expected.png tests/regression/opencsgtest/polygon-self-intersect-expected.png tests/regression/opencsgtest/polygon-tests-expected.png tests/regression/opencsgtest/polygon8-expected.png tests/regression/opencsgtest/polygons-expected.png tests/regression/opencsgtest/projection-tests-expected.png tests/regression/opencsgtest/render-2d-tests-expected.png tests/regression/opencsgtest/resize-2d-tests-expected.png tests/regression/opencsgtest/rotate_extrude_dxf-tests-expected.png tests/regression/opencsgtest/scale2D-tests-expected.png tests/regression/opencsgtest/square-tests-expected.png tests/regression/opencsgtest/text-search-test-expected.png tests/regression/opencsgtest/transform-insert-expected.png tests/regression/opencsgtest/triangle-with-duplicate-vertex-expected.png tests/regression/throwntogethertest/arc-expected.png tests/regression/throwntogethertest/circle-advanced-expected.png tests/regression/throwntogethertest/circle-double-expected.png tests/regression/throwntogethertest/circle-expected.png tests/regression/throwntogethertest/circle-small-expected.png tests/regression/throwntogethertest/circle-tests-expected.png tests/regression/throwntogethertest/control-hull-dimension-expected.png tests/regression/throwntogethertest/difference-2d-tests-expected.png tests/regression/throwntogethertest/ellipse-arc-expected.png tests/regression/throwntogethertest/ellipse-arc-rot-expected.png tests/regression/throwntogethertest/ellipse-expected.png tests/regression/throwntogethertest/ellipse-reverse-expected.png tests/regression/throwntogethertest/ellipse-rot-expected.png tests/regression/throwntogethertest/flat_body-expected.png tests/regression/throwntogethertest/hull2-tests-expected.png tests/regression/throwntogethertest/import_dxf-tests-expected.png tests/regression/throwntogethertest/intersection2-tests-expected.png tests/regression/throwntogethertest/lwpolyline2-expected.png tests/regression/throwntogethertest/minkowski2-hole-tests-expected.png tests/regression/throwntogethertest/minkowski2-tests-expected.png tests/regression/throwntogethertest/multiple-layers-expected.png tests/regression/throwntogethertest/null-polygons-expected.png tests/regression/throwntogethertest/offset-tests-expected.png tests/regression/throwntogethertest/polygon-concave-expected.png tests/regression/throwntogethertest/polygon-concave-hole-expected.png tests/regression/throwntogethertest/polygon-concave-simple-expected.png tests/regression/throwntogethertest/polygon-holes-touch-expected.png tests/regression/throwntogethertest/polygon-intersect-expected.png tests/regression/throwntogethertest/polygon-many-holes-expected.png tests/regression/throwntogethertest/polygon-mesh-expected.png tests/regression/throwntogethertest/polygon-overlap-expected.png tests/regression/throwntogethertest/polygon-riser-expected.png tests/regression/throwntogethertest/polygon-self-intersect-expected.png tests/regression/throwntogethertest/polygon-tests-expected.png tests/regression/throwntogethertest/polygon8-expected.png tests/regression/throwntogethertest/polygons-expected.png tests/regression/throwntogethertest/projection-tests-expected.png tests/regression/throwntogethertest/render-2d-tests-expected.png tests/regression/throwntogethertest/resize-2d-tests-expected.png tests/regression/throwntogethertest/rotate_extrude_dxf-tests-expected.png tests/regression/throwntogethertest/scale2D-tests-expected.png tests/regression/throwntogethertest/square-tests-expected.png tests/regression/throwntogethertest/text-search-test-expected.png tests/regression/throwntogethertest/transform-insert-expected.png tests/regression/throwntogethertest/triangle-with-duplicate-vertex-expected.png

Conflicts: tests/CMakeLists.txt tests/export_import_pngtest.py tests/regression/offpngtest/demo_cut-expected.png tests/regression/offpngtest/difference-expected.png tests/regression/offpngtest/fence-expected.png tests/regression/offpngtest/rounded_box-expected.png tests/regression/offpngtest/surface-expected.png tests/regression/offpngtest/translation-expected.png tests/regression/stlpngtest/demo_cut-expected.png tests/regression/stlpngtest/difference-expected.png tests/regression/stlpngtest/fence-expected.png tests/regression/stlpngtest/rounded_box-expected.png tests/regression/stlpngtest/surface-expected.png tests/regression/stlpngtest/translation-expected.png tests/test_pretty_print.py

Conflicts: tests/CMakeLists.txt

Conflicts: tests/export_import_pngtest.py tests/regression/offpngtest/text_on_cube-expected.png tests/regression/stlpngtest/text_on_cube-expected.png

…includes new colormaps by shaina

Conflicts: tests/CMakeLists.txt

kintel · 2014-08-14T21:21:47Z

All of this has been merged to master now

donbright · 2014-11-13T01:51:07Z

sorry about that...

donbright and others added 30 commits January 30, 2014 17:50

enable basic test-exporting of 3d files in test suite

f4f7063

add expected images for OFF/STL export3d tests. disable example021

c17f943

Merge branch 'test3dexport' of github.com:openscad/openscad into test…

907c0f9

…3dexport

add expected test images

b835c46

attempt to refactor the entire color system to simplify & centralize

b9df6ac

fix build i just broke

2cdd22d

add test3dexport tests and colorscheme tests

3b73fee

add colormap.cc

179cd7c

Merge branch 'master' into test3dexport

7ec0be9

Conflicts: src/CGAL_renderer.h src/MainWindow.h src/OGL_helper.h src/mainwin.cc src/openscad.cc tests/test_cmdline_tool.py tests/test_pretty_print.py

Merge branch 'master' into test3dexport

917104f

cosmetics

68b86fb

Make colorscheme box expand

867a1c1

Merge branch 'master' into test3dexport

02510aa

Make rebuildPolygon() work properly

9618125

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

788632d

Conflicts: src/CGAL_renderer.h src/MainWindow.h src/OGL_helper.h src/mainwin.cc src/openscad.cc tests/test_cmdline_tool.py tests/test_pretty_print.py

do not run sudo in here, per bug report from several months ago

676e2b4

about a programmer whose system was almost messed up by it.

Merge branch 'test3dexport' of github.com:openscad/openscad into test…

ce838c6

…3dexport Conflicts: src/CGAL_renderer.h src/MainWindow.h src/OGL_helper.h src/openscad.cc tests/test_cmdline_tool.py tests/test_pretty_print.py

remove setSyntaxHighlighter function

7171487

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

440d186

Conflicts: src/CGALRenderer.cc src/CGALRenderer.h

merging master again

d950bd4

rewrite test3dexport using Torsten Paul's csgpng test design

08c5040

introduce stlpng and offpng 3d export/import tests.

ab8da73

colorscheme Severny->Starnight. remove obsolete test-disables. remove…

3e990ba

… 'Sea' colorscheme

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

a365616

mark heavy tests for offpng and stlpng

0ee50a6

PRINT->PRINTD (debug only). tab fixes

5d4c05c

restore old pointsize. fix tabs.

69c814d

restore old linewidth

84f4fd7

restore default window size to what is in master branch

2d83f65

donbright added 6 commits July 8, 2014 21:37

undo a few problematic commits

1f6c89b

--enable=text for all tests. make text.cc output proper .scad code (n…

f103400

…o ')

new text_on_cube expected result images

d1e11a2

redo on_cube expected reulsts now that --enable=text is standard for …

0a2d34d

…al tests

revert to prior version... too confusing to have this in the test3dex…

44be09b

…port branch

move back to 'master' version of expected csg with text()

c8c73bb

kintel added 2 commits July 22, 2014 11:04

Revert "undo a few problematic commits"

98f84c8

This reverts commit 1f6c89b. Conflicts: tests/CMakeLists.txt

kintel added 9 commits July 22, 2014 11:49

Merge remote-tracking branch 'origin/master' into test3dexport

61a1bd2

Revert "also clarify test suite opencsg problems"

4de0e5e

This reverts commit 4a1e19c. Conflicts: src/renderer.cc

test_3d_export.py replaced by export_import_pngtest.py

82d9429

unused include

64042a0

Merge remote-tracking branch 'origin/master' into test3dexport

48c6ea2

Conflicts: tests/CMakeLists.txt

Merge remote-tracking branch 'origin/master' into test3dexport

46dbd2e

Conflicts: tests/export_import_pngtest.py tests/regression/offpngtest/text_on_cube-expected.png tests/regression/stlpngtest/text_on_cube-expected.png

Some colormap cleanup

214a11c

kintel added a commit that referenced this pull request Aug 14, 2014

Colormap functionality from pull request #816, mostly by Don Bright, …

e70bc04

…includes new colormaps by shaina

kintel added 2 commits August 14, 2014 17:18

Merge remote-tracking branch 'origin/master' into test3dexport

75ee5a7

Conflicts: tests/CMakeLists.txt

Merge remote-tracking branch 'origin/master' into test3dexport

d44a9cd

kintel closed this Aug 14, 2014

donbright mentioned this pull request Aug 17, 2014

export directly to stl from nef polyhedron w/o manifold check [$10] #337

Closed

3 tasks

t-paul deleted the test3dexport branch September 4, 2014 17:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Test3dexport#816

Test3dexport#816
donbright wants to merge 135 commits intomasterfrom
test3dexport

donbright commented May 31, 2014

Uh oh!

donbright commented Jul 9, 2014

Uh oh!

donbright commented Jul 9, 2014

Uh oh!

t-paul commented Jul 9, 2014

Uh oh!

kintel commented Jul 17, 2014

Uh oh!

kintel commented Jul 22, 2014

Uh oh!

kintel commented Aug 14, 2014

Uh oh!

donbright commented Nov 13, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

donbright commented May 31, 2014

Uh oh!

donbright commented Jul 9, 2014

Uh oh!

donbright commented Jul 9, 2014

Uh oh!

t-paul commented Jul 9, 2014

Uh oh!

kintel commented Jul 17, 2014

Uh oh!

kintel commented Jul 22, 2014

Uh oh!

kintel commented Aug 14, 2014

Uh oh!

donbright commented Nov 13, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants