Commit Graph

2431 Commits (cc4b633e436ce028b911345b987e48ba5e96fae8)

Author SHA1 Message Date
Marius Kintel 2cbbf66586 Support high-resolution icons if present 2015-02-10 14:10:25 -05:00
Marius Kintel 0fefd42250 The margin checkerboard was a bit visually disturbing 2015-02-10 12:21:53 -05:00
Marius Kintel c2bd5c3537 Set the following enabled as default: show axes, show scalemarkers, automatic reload. Fixes #1205 2015-02-09 18:46:12 -05:00
Marius Kintel c50d927216 Fixed bug in libtess. Fixes #1210 2015-02-09 18:42:17 -05:00
Marius Kintel 37421bbbfa #1186 bugfix: Use QString in slots 2015-02-05 12:08:38 -05:00
Marius Kintel a203b55205 Reduce excessive degenerate polygon warnings 2015-02-05 12:08:08 -05:00
Marius Kintel e7c684d5c7 Merge remote-tracking branch 'origin/master' into examples-cleanup 2015-02-04 12:36:30 -05:00
Marius Kintel 4ce1a8d92f Move cursor to end of console to avoid inheriting selected paragraph style. Fixes #1186 2015-02-04 01:20:53 -05:00
Marius Kintel 0fcc1fbf83 Force execution of the progress dialog to the GUI thread. Fixes #1194 2015-02-03 14:35:54 -05:00
Marius Kintel 8cb5adf0ca Make sure GUI event processing happens in the GUI thread. Fixes #1194 2015-02-03 00:48:26 -05:00
Marius Kintel 00a3a1777e #793 Don't try to tessellate empty geometry 2015-02-02 19:21:49 -05:00
Marius Kintel 707103b606 #793 Tessellate PolySets before rendering to properly support concave polygons 2015-02-02 18:57:21 -05:00
Marius Kintel 384c6af273 Output timing for convex decomposition when doing minkowski 2015-02-02 16:31:17 -05:00
Marius Kintel 32024588b5 bugfix: Specifying multiple --debug args didn't work 2015-02-02 15:56:35 -05:00
Marius Kintel c0bcb36843 #842 bugfix: handle multiple consecutive NBSP characters 2015-02-02 14:08:53 -05:00
Torsten Paul fa233049c7 Fix translation of combobox values in preferences. 2015-02-01 19:44:11 +01:00
Marius Kintel ea165eeb58 Wops, accidentally committed a change made for testing 2015-01-29 20:43:13 -05:00
Marius Kintel 1d66d2154b Filter empty children before performing minkowski sum. Fixes #1196 2015-01-29 18:35:12 -05:00
Marius Kintel 0ca04759bb Bugfix: We forgot to align the first passed vertex. Fixes #1198 2015-01-29 17:45:09 -05:00
Marius Kintel 07e1894f6e Fixes crash when using rands() with min == max 2015-01-29 12:59:56 -05:00
Marius Kintel c68533d3c6 #1189 Removed unused titles for progressbar and preferences toolbar 2015-01-29 11:26:38 -05:00
Marius Kintel 3fa3317233 minor fix: Call this->quit to correctly end application 2015-01-29 11:18:53 -05:00
Marius Kintel 41642f2cb5 Updated menu mnemonics to cover most of the entries 2015-01-29 11:16:31 -05:00
Marius Kintel 5f496b2554 Be helpful and set default convexity of rotate_extrude to 2 2015-01-29 00:11:52 -05:00
Marius Kintel 597d07f357 Catch infinite recursion in top-level assignments. Fixes #1192 2015-01-28 20:07:15 -05:00
Marius Kintel c755854251 Don't translate messages going to the Library Info dialog 2015-01-25 01:55:46 -05:00
Marius Kintel d6f0b7dc50 Flip faces when transforming using a mirroring transform. Fixes #1174 2015-01-25 01:53:04 -05:00
Marius Kintel 5a0c4b0ba8 Updated copyright year 2015-01-23 01:31:41 -05:00
Marius Kintel 6fc671c961 Merge branch 'master' into examples-cleanup 2015-01-21 18:09:27 -05:00
Marius Kintel 630cb483d7 Added new Preview and Render icons from @atartanian 2015-01-21 17:43:04 -05:00
Marius Kintel 8e75fecacc Display non-manifold warning after F6. Fixes #1162 2015-01-21 11:18:22 -05:00
Marius Kintel ce5a367b8f Clean up incoming polygon. Fixes #1165 2015-01-21 02:13:13 -05:00
Marius Kintel 083bf4313f Allow the state to track cache lookup preference. This is important to allow lookups to prefer Nef polyhedrons in cases where PolySet->Nef fails due to zero triangles. Fixes #1027 2015-01-20 16:03:31 -05:00
Tim Deagan b217b08394 Cleanup of files to add export icons to all export types. 2015-01-17 20:49:18 -06:00
Torsten Paul a3c32e5f87 Add Functions example category. 2015-01-17 19:39:05 +01:00
Marius Kintel e479ffba90 Use new tessellator for PolySet tessellation 2015-01-16 12:45:35 -05:00
Marius Kintel f8a9af0e54 Removed unnecessary console output 2015-01-16 12:03:30 -05:00
Marius Kintel 11dec75290 Merge pull request #1160 from TDeagan/defaulticon
Set Windows Registry Defaulticon For Document Icon
2015-01-16 06:29:38 +01:00
Marius Kintel 0860021a52 Merge branch 'gui-updates' 2015-01-15 23:47:48 -05:00
Marius Kintel d246814a2c Merge branch 'master' into gui-updates
Conflicts:
	src/MainWindow.ui
2015-01-15 23:47:36 -05:00
Marius Kintel 29d9d4e614 Revert "cosmetics" - this is apparently needed when using boost-1.46
This reverts commit 7283d06294.
2015-01-15 23:16:11 -05:00
Marius Kintel 4fa3b71422 Merge pull request #1159 from openscad/extend-help-menu
Add cheat-sheet link to help menu
2015-01-15 22:53:36 -05:00
Marius Kintel 7283d06294 cosmetics 2015-01-15 22:51:50 -05:00
Marius Kintel a038d693c7 debug output tweak 2015-01-15 22:51:38 -05:00
Marius Kintel b23ca0407f #1156 bugfix: Fix for polygons using the same vertex multiple times, but not consecutively 2015-01-15 22:01:30 -05:00
Marius Kintel 3f4e6705e8 #1156 bugfix: We were assuming monotone polygon indices with no duplicates. Caused a out of bounds write 2015-01-15 17:55:58 -05:00
Marius Kintel fb55e1485b #1156 PRINTDB bugfix 2015-01-15 17:25:57 -05:00
Tim Deagan c54a2e8f0c Removed redundant #include <QDir> statement
QDir was already being conditionally included prior to the gui function, including it at the top of the file was redundant.

	modified:   src/openscad.cc
2015-01-15 15:48:23 -06:00
Marius Kintel 39e7442b92 #1156 Bugfix: We don't have userdata any longer 2015-01-15 16:07:06 -05:00
Marius Kintel 0e23303cbc doc 2015-01-15 15:05:04 -05:00
Marius Kintel 9087369863 Merge remote-tracking branch 'origin/master' into libtess2 2015-01-15 14:47:13 -05:00
Marius Kintel 1c52fad1d3 Moved libtess2-based tessellation to GeometryUtils, related refactoring 2015-01-15 14:47:05 -05:00
Marius Kintel 90b647ec48 Use iterator as dest instead of a vector, for flexibility 2015-01-15 14:38:34 -05:00
Marius Kintel d7175c7d01 Added hash_value() for Vector3f 2015-01-15 14:38:04 -05:00
Tim Deagan c0760e9904 Removal of openscad.cc cmdline section for registry change
Removal of the code block in the cmdline() section of openscad.cc that sets the Document Icon.  This was necessary due to the follow:

"This is also used from the test framework which does not link with Qt. See Travis log:
/home/travis/build/openscad/openscad/src/openscad.cc:46:16: fatal error: QDir: No such file or directory"

modified:   src/openscad.cc
2015-01-15 11:14:01 -06:00
Torsten Paul dcda8faa3d Remove setting WhitespaceBackgroundColor from noColor() too. 2015-01-15 16:59:46 +01:00
Torsten Paul 1e14e63947 Add cheat-sheet link to help menu 2015-01-14 20:01:53 +01:00
Marius Kintel c30eeecfa2 Make sure we export the on-screen image. Fixes #1154 2015-01-13 22:29:33 -05:00
Marius Kintel 2e79055edc sync with upstream 2015-01-13 21:39:00 -05:00
Marius Kintel fc68e3571e Convert all coordinates to float; the tessellator works in floats 2015-01-13 19:56:18 -05:00
Marius Kintel 39d6823872 Turn off gridding again 2015-01-13 19:21:46 -05:00
Marius Kintel 7b16891cc5 Merge remote-tracking branch 'origin/master' into libtess2 2015-01-13 18:56:41 -05:00
Marius Kintel f32eb7e84d Grid Nef3 vertices when converting to PolySet 2015-01-13 18:54:35 -05:00
Marius Kintel cd8607d87d Always normalize normal vector, for safety 2015-01-13 18:51:00 -05:00
Marius Kintel e3103c69c2 Don't tessellate triangles, ignore self-intersections, convert all coordinates to TESSfloat 2015-01-13 18:46:09 -05:00
Marius Kintel da8f4d9933 Upstream sync 2015-01-13 18:35:20 -05:00
Marius Kintel b0c822988b sync with upstream 2015-01-13 16:52:23 -05:00
Marius Kintel 0b1925a417 Less intense debug output 2015-01-13 16:51:02 -05:00
Marius Kintel e1c62ea152 Added some forgotten libraries 2015-01-13 13:30:50 -05:00
Marius Kintel 0e15b4bf54 Merge branch 'master' of github.com:openscad/openscad 2015-01-13 13:18:14 -05:00
Marius Kintel 4b60231d3b Merge branch 'master' into libtess2 2015-01-13 13:14:51 -05:00
Marius Kintel df2dae4e59 Added new tessellator using libtess2 instead of CGAL 2015-01-13 13:14:09 -05:00
Torsten Paul 366663610f Clarify editor zoom to be font size change and add proper icons. 2015-01-13 02:26:12 +01:00
Torsten Paul 303217d0b9 Always set both height and viewer_distance (fixes #1153).
The only exception is the initialization in the Constructor which seems
to matter for the test suite where the Camera is initialized with type
NONE. This still needs some investigation as unifying both variables into
a single one does break tests on Travis (but not locally).
2015-01-12 17:48:24 +01:00
Torsten Paul 7b33e9eb67 Highlight export warnings in console window. 2015-01-12 17:31:14 +01:00
Tim Deagan ce5b38d96e Add on-launch code to set Document Icon in windows registry
Since OpenSCAD doesn't distribute with additional image files, this means a new icon needs to be built into the .exe. This is accomplished by adding a line to the end of openscad_win32.rc file consisting of something like the following:
IDI_ICON2 ICON DISCARDABLE "icons/openscad_doc.ico"
which will get built into the exe as icon index 1 (icon index 0 is the current app icon.)

In the cmdline and gui functions in openscad.cc I added code to set the HKEY_CURRENT_USER/Software/Classes/OpenSCAD_File/DefaultIcon/Default value to the icon index 1 of openscad.exe

	modified:   openscad_win32.rc
	modified:   src/openscad.cc
2015-01-11 18:21:08 -06:00
Torsten Paul 094bc92090 Scale icons depending on font size. 2015-01-10 17:21:56 +01:00
Torsten Paul 197dd5ef3b Add scale marker icon for dark theme. 2015-01-10 02:06:19 +01:00
Torsten Paul ddd1228a51 Add settings entry to enable/disable warning display in the 3D view. 2015-01-10 00:54:52 +01:00
Torsten Paul 1ae9ed5ada Allow true/false for boolean settings. 2015-01-10 00:54:13 +01:00
Torsten Paul 670d9a0833 Enable word wrap to prevent the message forcing a bigger viewport size. 2015-01-10 00:35:45 +01:00
Marius Kintel 4fc31db780 Merge branch 'master' of github.com:openscad/openscad 2015-01-09 18:14:27 -05:00
Torsten Paul cd5ecb5eeb Make welcome screen work for dark themes. 2015-01-09 20:20:29 +01:00
Torsten Paul bb7adc83cb Add white icons. 2015-01-09 19:24:04 +01:00
Torsten Paul ceae9d57d0 Merge branch 'toolbar' of https://github.com/openscad/openscad into gui-updates
Conflicts:
	openscad.qrc
	src/MainWindow.ui
2015-01-09 19:09:22 +01:00
Torsten Paul 5943704194 Fix icon selection for dark theme. 2015-01-09 19:04:43 +01:00
Torsten Paul 166e3df850 Remove setting the font size for the warning/error bar. 2015-01-09 18:20:07 +01:00
Torsten Paul 13ba427bb4 Extend Windows version detection (fixes #1076).
As GetVersionEx() is deprecated and will not report Windows 8.1 without
additional resource file manipulation this is now using the code from
http://hg.m1xa.com/findversion (by M1xA / MIT license) which is using the
VerifyVersionInfo API.
2015-01-09 02:00:33 +01:00
Torsten Paul 6e85c54fc4 Validate size of search vector entries (fixes #1147). 2015-01-08 22:11:45 +01:00
Torsten Paul 10bee498e6 Fix duplicated output of DEPRECATED marker. 2015-01-08 19:34:37 +01:00
Torsten Paul e3441b50a1 Move winconsole to separate folder. 2015-01-08 19:12:13 +01:00
Marius Kintel 35d25f394c Normalize calculated normal vector also for polygons without holes 2015-01-08 00:16:45 -05:00
Marius Kintel e44c103b72 Fixed merge error 2015-01-07 23:55:38 -05:00
Marius Kintel b893834c86 Merge remote-tracking branch 'origin/master' into warning-in-viewport 2015-01-07 23:51:45 -05:00
Marius Kintel 93a9db4917 Merge branch 'master' into warning-in-viewport 2015-01-07 23:42:15 -05:00
Marius Kintel c8097c411e Merge pull request #1131 from TDeagan/scalemarkers_numbered
Scalemarkers numbered
2015-01-07 23:41:38 -05:00
Torsten Paul da657d7543 Treat deprecation as warning message (fixes #1143). 2015-01-07 17:05:50 +01:00
Marius Kintel 47fcde8d5c Merge branch 'gridfix' 2015-01-07 10:56:31 -05:00
Marius Kintel 0bd0129f8f bugfix: Apparently execution order wasn't deterministic, caused bugs on older gcc's 2015-01-07 02:09:37 -05:00
Marius Kintel 8c53981cfa Killed compiler warnings 2015-01-07 02:06:25 -05:00
Marius Kintel 55b5d26965 Bugfix: Integer norm is only available in Eigen 3.2.3 -> 2015-01-07 01:02:29 -05:00
Marius Kintel 74a93a3be8 Merge remote-tracking branch 'origin/gridfix' 2015-01-06 23:58:19 -05:00
Marius Kintel 1941a7fc0d #1105 Workaround for CGAL problem: Don't trust normal vectors from Nef polyhedrons, normalize calculated normal vectors 2015-01-06 22:51:44 -05:00
Marius Kintel 5537e82274 Added printPolyhedron 2015-01-06 22:50:40 -05:00
Marius Kintel 2eda0b60a0 cosmetics 2015-01-06 22:50:07 -05:00
Marius Kintel b302cb172b Merge remote-tracking branch 'origin/master' into gridfix 2015-01-06 22:47:43 -05:00
Torsten Paul dda527dabd Show error/warning status in viewport. 2015-01-07 03:14:46 +01:00
Torsten Paul 7b2d01ff51 Use double backslashes to quote fontconfig input. 2015-01-07 00:50:58 +01:00
Marius Kintel 08fd033293 Be conservative and don't apply the CGAL hull fix to unknown versions without testing 2015-01-06 17:55:42 -05:00
Marius Kintel 31f42ee81d Merge remote-tracking branch 'origin/master' into gridfix
Conflicts:
	src/cgalutils.cc
2015-01-06 12:44:17 -05:00
Marius Kintel 61c17092e1 #1089 Only apply convex_hull_3 bugfix to appropriate CGAL versions 2015-01-06 12:24:53 -05:00
Marius Kintel 82dbabac92 Apply convex hull bugfix from CGAL, work around next issue by avoiding using std::set iterators, updated test cases. Fixes #1089 2015-01-06 11:12:03 -05:00
Marius Kintel 073b2e7740 Merge remote-tracking branch 'origin/master' into gridfix 2015-01-06 00:21:43 -05:00
Marius Kintel abf9a96881 Fix crash when checking if invalid Nef3 is valid 2015-01-05 23:30:51 -05:00
Marius Kintel 87e483095b Merge remote-tracking branch 'origin/master' into gridfix 2015-01-05 22:36:29 -05:00
Marius Kintel 966add80a8 Run fixed bug test cases as part of the normal regression tests 2015-01-05 21:43:17 -05:00
Marius Kintel 27f8370c7b Export blank image on empty top-level objects, instead of no image 2015-01-05 21:41:05 -05:00
Marius Kintel 32b2d2ec97 Fixed buggy vertex quantizing and polygon tessellation. Should improve some corner cases 2015-01-05 18:22:58 -05:00
Marius Kintel 26f8742023 Added convexValue() 2015-01-05 17:38:42 -05:00
Marius Kintel 5a2b89981c Minor fix: If we know that a PolySet is convex, there is no need to perform a computationally expensive test. Should improve #1090 2015-01-05 17:37:14 -05:00
Marius Kintel 1ad4af8b0b Collapse consequtive identical vertices instead of deleting the whole polygon. Fixes #1138 2015-01-05 16:04:48 -05:00
Marius Kintel f79414a208 More debug output 2015-01-05 15:57:42 -05:00
Marius Kintel 1896c3f09a Gracefully handle malformed PolySets in minkowski. Fixes #1137 2015-01-05 14:33:54 -05:00
Marius Kintel 1a1f36035d polyhedron debug output had indices reversed 2015-01-05 13:38:26 -05:00
Marius Kintel d0cee28898 Merge branch 'master' of github.com:openscad/openscad 2015-01-05 13:36:06 -05:00
Marius Kintel 0cf6de75a4 Updated hosting issue. Fixes #1136 2015-01-05 13:36:03 -05:00
Torsten Paul 3c337449e9 Unify zoom handling for perspective and orthogonal mode. 2015-01-05 18:34:08 +01:00
Marius Kintel 578b70c40d Merge pull request #1134 from openscad/orthogonal-zoom-fix
Orthogonal zoom fix
2015-01-05 11:04:20 -05:00
Marius Kintel 2fd06f4b78 #1089 Correctly handle CGAL exception behavior 2015-01-04 13:38:06 -05:00
Marius Kintel d920a29a3e Merge pull request #1133 from openscad/svg-scaling-fix
Remove border from SVG viewport to fix scaling issues (fixes #1122).
2015-01-04 11:54:32 -05:00
Torsten Paul 8d401d3534 Use viewport height as "distance" for the status text in orthogonal mode.
While this is not strictly correct as the actual distance has no effect
in orthogonal mode, it's giving the user an indication of the zoom factor.
2015-01-04 17:09:27 +01:00
Torsten Paul 712049795f Use correct eye position in orthogonal projection mode (fixes #1058). 2015-01-04 17:09:27 +01:00
Torsten Paul 0e20a7cb17 Remove border from SVG viewport to fix scaling issues (fixes #1122). 2015-01-04 16:09:44 +01:00
Marius Kintel 86daffdfd7 Merge branch 'master' of github.com:openscad/openscad 2015-01-03 16:44:16 -05:00
Marius Kintel d997226f3c #1089 Provide error message instead of crashing hard on CGAL hull exceptions 2015-01-03 16:43:28 -05:00
Torsten Paul 7cefaa7300 Drop setting the WhitespaceBackgroundColor.
QScintilla uses this color even when the whitespace is selected instead of
drawing it in the selection background color. This causes selection to
look strange when the whitespace display is enabled.
2015-01-03 19:28:42 +01:00
Tim Deagan 358ba86fc8 Swap out spaces for tabs
modified:   src/GLView.h
	modified:   src/MainWindow.h
	modified:   src/QGLView.h
	modified:   src/mainwin.cc

QtCreator ignores the prefs and will only put in spaces instead of tabs.  These are manual fixes in Notepad++ to try and keep the indents in the standard mode.
2015-01-02 01:32:37 -06:00
Marius Kintel 09e7bfc96d #1129 Fixed crash when performing empty projection 2015-01-01 23:01:09 -05:00
Marius Kintel 648b7acc22 Prefix some missing errors with 'ERROR:' to make highlighting work. Fixes #1123 2014-12-31 13:49:54 -05:00
Marius Kintel 15d1dbce28 Merge branch 'master' of github.com:openscad/openscad 2014-12-31 02:52:58 -05:00
Marius Kintel 4eaf8797c2 Small refactoring: Split out Polyhedron-related functions to from cgalutils.cc to cgalutils-polyhedron.cc 2014-12-31 02:52:56 -05:00
Torsten Paul bebe08483f The WrapFlagInMargin value is only available in QScintilla 2.7 and later.
This is a workaround for Debian 7 which has QScintilla 2.6.2. The "Margin"
setting is simply ignored and behaves as "None".
2014-12-30 13:58:48 +01:00
Torsten Paul 8d4d83f168 Fix build with Qt4. 2014-12-30 13:03:51 +01:00
Marius Kintel bc30dca513 Merge pull request #1119 from openscad/scintilla-updates
Scintilla updates
2014-12-30 02:51:38 -05:00
Marius Kintel e69513fa2e #1119 Added missing slot to change tab key function 2014-12-30 02:49:47 -05:00
Tim Deagan 7a71e59f2d Fix layout of number 6 character & add comments
The layout of the array that drives the 6 char was wrong.  Additional
commenting added
2014-12-29 21:23:46 -06:00
Torsten Paul 9bcb38df48 Change settings handling to use Value objects. 2014-12-30 02:37:16 +01:00
Tim Deagan 1826aa98f7 Addition of header to support function to print scale marker position values on large axes.
modified:   src/GLView.h
2014-12-29 15:00:37 -06:00
Tim Deagan 4823f26706 Addition of function to generate scale maker numeric values on large axes.
modified:   src/GLView.cc

The added function takes the length of the axis (l), the currrent position on the axis (i) and the size of the divisions between i and uses a variety of arrays to decode the characters of the position into GL_LINES, GL_LINE_STRIPs, GL_LINE_LOOPs as appropriate.  The various orientations required by the axis are handled by abstracting the line vertex sequences into arrays (set per axis.)
2014-12-29 14:55:15 -06:00
Torsten Paul 2c89f562a3 Update GUI to make options a bit clearer for the user. 2014-12-29 03:49:45 +01:00