vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity
5,064 Commits
29 Branches
9 Tags
31 MiB
Commit Graph

332 Commits (670d9a0833f8f11a64477466cb773385ee761ef6)

Author SHA1 Message Date
Torsten Paul e7d3025753 Merge branch 'master' into launchingscreen 
Conflicts:
	openscad.pro
	openscad.pro.user
	src/MainWindow.h
	src/Preferences.cc
	src/Preferences.h
	src/Preferences.ui
	src/mainwin.cc
	src/openscad.cc
 2014-09-13 21:19:44 +02:00
Marius Kintel e3960304bd #879 Implemented wheel zoom for scintilla editor 2014-08-23 01:18:51 -04:00
Marius Kintel 79f44ae7fa Fix file drops to legacy editor, misc. cosmetics 2014-08-22 14:17:24 -04:00
Marius Kintel 138d5bc57e Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	src/MainWindow.h
	src/Preferences.ui
	src/mainwin.cc
 2014-08-22 12:59:10 -04:00
Marius Kintel de6bcb1786 small reorg of cgalutils namespace 2014-08-19 22:02:08 -04:00
Marius Kintel 6405456c8a Renamed CGAL_renderer to CGAL_OGL_Polyhedron for clarity 2014-08-15 13:04:34 -04:00
Marius Kintel e70bc04197 Colormap functionality from pull request #816, mostly by Don Bright, includes new colormaps by shaina 2014-08-14 17:16:24 -04:00
shaina7837 ad11bd8cd2 launching screen 2014-08-01 22:32:55 +05:30
Marius Kintel af8c3ee9d1 Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	src/PlatformUtils.cc
 2014-07-22 14:48:45 -04:00
Marius Kintel 28864037ee Split info() function into separate file as it depends on too many defines and external libs 2014-07-22 13:32:44 -04:00
Marius Kintel 68962e1c01 Allow building without scintilla 2014-07-17 15:28:23 -04:00
Marius Kintel 6270441341 Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	openscad.pro
	src/mainwin.cc
 2014-07-17 15:07:42 -04:00
Marius Kintel 458d60faa6 Refactored the camera handling a bit, added --viewall cmd-line parameter 2014-06-19 17:47:38 -04:00
shaina7837 25bf6dd20b new lexer added 2014-06-17 21:45:04 +05:30
shaina7837 5936bc2243 added 2014-06-17 21:27:28 +05:30
shaina7837 9d35c792ed scad lexer added 2014-06-17 21:04:54 +05:30
Marius Kintel 11ca82dbb5 Moved scintilla config to scintilla.pri, enabled scintilla by default 2014-06-13 14:41:40 -04:00
Marius Kintel a5a3d8f4cf Some minor cleanup 2014-06-10 00:14:45 -04:00
Marius Kintel 27a2be8411 Applied Oskar's libc++ patches from #828 to master 2014-06-09 23:36:24 -04:00
shaina 950ffe9722 layout problem of editor is solved 2014-06-07 17:43:52 +02:00
Marius Kintel 22e884d08f Quick and dirty fixup 2014-06-07 17:43:52 +02:00
shaina 59a71b7e6e added scintilla editor classes 2014-06-07 17:43:52 +02:00
shaina 5a0df4e6d9 legacyeditor 2014-06-07 17:43:46 +02:00
Marius Kintel 2cba2a1b55 Merge branch 'master' into text-module 
Conflicts:
	scripts/macosx-build-homebrew.sh
	scripts/mingw-x-build-dependencies.sh
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
	src/GeometryEvaluator.h
	src/MainWindow.ui
	src/clipper-utils.h
	src/mainwin.cc
	tests/CMakeLists.txt
 2014-04-26 22:08:31 -04:00
Marius Kintel 9613e992da Suppress unused local typedef warning for gcc. Fixes #757 2014-04-24 00:01:42 -04:00
Don Bright 1ecf715476 add mime-type under linux during make install ( issue #696 ) 2014-04-02 18:16:31 -05:00
Torsten Paul 49dc984bef Add offset() module to inset/outset polygons using Clipper (fixes #483). 2014-03-30 23:41:37 +02:00
Marius Kintel 19de4c9d15 Merge branch 'master' into unstable 2014-03-10 10:42:53 -04:00
Marius Kintel e54d0cca6e Moved MACOSX_DEPLOYMENT_TARGET to the deploy script to allow building against the current system 2014-03-03 21:32:52 -05:00
Marius Kintel ab6192e465 Merge branch 'master' into unstable 
Conflicts:
	src/openscad.cc
	src/printutils.h
 2014-03-02 22:41:05 -05:00
Marius Kintel 1d211498c6 Added note to encourage people to build with experimental features enabled 2014-03-01 15:11:52 -05:00
Don Bright afcf7239ab fix broken linux gui build!! 2014-02-26 18:29:57 -06:00
Don Bright 36e0d73e69 enable qtaccessibility plugin so that screenreading of QAction menu works 
(tested on Jaws screenreader demo on Windows 7, per bug report to mailing list
by Robert Jaquiss 2/25/2014)
 2014-02-25 20:20:14 -06:00
Marius Kintel 3ac8895d7a Enable experimental features only for snapshot builds 2014-02-23 15:47:26 -05:00
Marius Kintel 34333941d3 Merge branch 'master' into unstable 2014-02-05 01:08:44 -05:00
Marius Kintel b80c6c7bf4 Qt5 qmake needs explicit includpath 2014-02-04 01:21:35 -05:00
Torsten Paul 284a93972a Add dialog to show all registered fonts. 2014-02-02 18:01:08 -05:00
Torsten Paul 8bb32da1c4 Add libraries to qmake config. 2014-02-02 18:00:44 -05:00
Torsten Paul bb45e7e52a Add implementation of text() module. 2014-02-02 18:00:44 -05:00
Marius Kintel 24986eec91 Added Geometry::isEmpty, some cleanups of CGAL_Nef_polyhedron, fixed some 2D-3D-mix issues 2014-01-09 02:06:37 -05:00
Marius Kintel 0c65fec41a Added a separate component for dealing with vertex reindexing 2014-01-09 02:06:37 -05:00
Marius Kintel ace3668736 Cleanup: Removed redundant code 2014-01-09 02:06:35 -05:00
Marius Kintel dc9429acac Use GeometryEvaluator instead of CGALEvaluator. A bunch of refactoring and fixes as a result of that. Renamed GUI menu items to reflect preview vs. render 2014-01-09 02:06:35 -05:00
Marius Kintel 1ef92f55f2 Clipper is bundled 2014-01-09 02:06:34 -05:00
Marius Kintel 1f488f851d Refactoring to facilitate more sharing of code between CGALEvaluator, GeometryEvaluator and CGALUtils 2014-01-09 02:06:34 -05:00
Marius Kintel af59b1983c Implemented non-cut projection using ClipperLib. Upgraded ClipperLib to V6 2014-01-09 02:06:33 -05:00
Marius Kintel b8c15cfb8a Preliminary large refactoring: Created GeometryEvaluator as a replacement for PolySetEvaluator. Use ClipperLib for 2D CSG (first baby steps). This design is far from perfect but sacrifice design for staying in the green. This version is broken, but can render primitives. 2014-01-09 02:06:32 -05:00
Marius Kintel acd08b6f1a Green refactoring, but uncertain if we should keep it 2014-01-09 02:06:32 -05:00
Marius Kintel 62b9746ab1 Mac fixes: Moved sparkle config to sparkle.pri. Link with ApplicationServices 2014-01-04 18:03:33 -05:00
Marius Kintel bee5233a91 Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat 
Conflicts:
	src/Preferences.ui
 2014-01-03 13:17:58 -05:00
Torsten Paul 72865e17da Add feature registry. 2014-01-02 23:27:52 +01:00
Torsten Paul b49f51dab3 Moved get_fragments_from_r into Calc 2013-12-27 17:48:15 -05:00
Miro Hrončok 90edc3b5f7 `make install` installs manpage and appdata file 2013-12-24 02:11:20 +01:00
Brody Kenrick 0717c67c9f Unicode support for strings 
Add suport for using unicode strings in .scad files. Support iterating
across them/accessing them via [] and searching.
--------
Add GLIB (to build for test and normal build -- both with installed and
built locally development files).
Add support for unicode chars to length and search builtin functions and
[] for strings.
Added unicode testing functions.
Ad GLIB to library info page.
 2013-12-05 18:28:40 +11:00
Don Bright cf9f19818c prevent crash in CGAL nef3. fix #issue 410 . also deal w qmake bug re .h files 2013-11-26 20:04:57 -06:00
Don Bright 49af42cfd0 a few fixes for netbsd 2013-06-08 23:49:21 -05:00
Don Bright 31c88a434b merge branch to get windows "library path" working. tweak build system, 
eliminate several compiler warnings.
 2013-05-25 22:37:26 -05:00
Marius Kintel 13e4bcd50e Added meny entry for disclosing the library path. Part of #125 2013-05-21 18:02:16 -04:00
Marius Kintel e2772c70b8 Initial Windows implementation of built-in library path. Part of #125 2013-05-21 17:45:24 -04:00
Marius Kintel b5079a189a wops, duplicate parser files 2013-05-10 00:55:04 +02:00
Marius Kintel 7a8b6f5c51 Put back lex/yacc - we're not using any bison-specific stuff after all 2013-05-09 18:48:27 +02:00
Marius Kintel 14e1ad2363 Forgot to actually add most files in previous commit (#217) 2013-05-09 12:12:58 +02:00
Marius Kintel ba20c0e800 Modified parse to allow overloading of variables in local blocks. Also did some minor cleanups while at it. Test cases missing 2013-04-26 18:32:19 -04:00
Marius Kintel 9b740b558d Further refactoring of scope/context mechanisms. Mostly related to the new FileContext class. Not quite there yet, but almost 2013-04-26 17:45:03 -04:00
Marius Kintel 58bd9c9e3f Cleaned up argument list handling, related to #116 2013-04-18 18:34:14 -04:00
Marius Kintel 49a288cd34 Merge branch 'noqt' into testing 2013-04-10 14:28:51 -04:00
Marius Kintel a37813a899 Refactored context handling into using separate Module contexts and Eval contexts. This allows for recursive module calls, and cascading children. I believe this fixes issue #116 2013-04-09 00:28:16 -04:00
Marius Kintel dccc039211 Got rid of remaining Qt dependencies. The test framework should now be Qt-free 2013-03-12 01:14:58 -04:00
Marius Kintel a1308a6a5e Merge branch 'master' of github.com:openscad/openscad 
Conflicts:
	openscad.pro
 2013-03-11 10:20:40 -04:00
Marius Kintel 20b2a709f9 Somehow MACOSX_DEPLOYMENT_TARGET cannot be lower then 10.6 without developing on old boxes 2013-03-11 10:19:27 -04:00
Marius Kintel 8711bd2500 Set preprocessor define for deployment builds. Don't include sparkle in development builds. Note: Development snapshots are considered deployment builds 2013-03-09 13:04:36 -05:00
don bright 1221b66edb use pkgconfig for eigen + fix mingw builds 2013-03-08 20:07:40 -06:00
don bright 13b0fe4b3f rework Camera using boost::variant. first working --gimbalcam version 2013-02-27 00:37:37 -06:00
don bright 707118ce94 move enable_opencsg_shaders, fix indenting, split out display_opencsg_warning 
also update docs, and try to make enable_opencsg_shaders the same between
qgl and offscreengl
 2013-02-24 11:21:45 -06:00
don bright 91896e0d96 tweaks for mergeing master 2013-02-23 21:55:16 -06:00
don bright ca41979ee5 Merge branch 'master' of github.com:openscad/openscad into issue11_2 
Conflicts:
	RELEASE_NOTES
	openscad.pro
	src/mainwin.cc
 2013-02-23 21:54:53 -06:00
don bright 0f977609b4 put qglview.h into mainwin for deps. unify camera functions into glview. 
remove duplicate code.
 2013-02-23 18:50:20 -06:00
don bright 5389107aa6 create GLView as parent of OffscreenView and QGLView. combine setRenderer() 2013-02-23 15:34:06 -06:00
don bright fc2d9341fa begin process of unifying GLView and OffscreenView. renames, objrot, objtran 2013-02-20 19:56:30 -06:00
don bright 09edcdf822 fix build errors, display 'not implemented' message on win32/linux 2013-02-17 04:48:30 +01:00
Marius Kintel b87e574e09 Added document icon for Mac 2013-02-11 21:50:53 -05:00
Marius Kintel f3731d8ce1 Added support for signing binaries 2013-02-11 21:44:48 -05:00
Marius Kintel 4bd23c9091 Support Sparkle's Install on Quit 2013-02-07 15:01:31 -05:00
Marius Kintel fa00547507 First version of automatic updates for Mac 2013-02-05 00:36:25 -05:00
don bright 997a0afac3 Merge branch 'master' and fix bugs 
Conflicts:
	src/openscad.cc
	tests/CMakeLists.txt
 2013-01-31 03:58:34 +01:00
Marius Kintel 256eb2c2f2 Mac OS X build fixes 2013-01-28 14:56:17 -05:00
don bright d4c15a8fc4 fixups for mingw32 cross compilation 2013-01-26 21:19:42 +01:00
don bright c116a0849c undo experiment with object orientation 2013-01-26 01:36:55 +01:00
don bright 2d59f7acf6 move png export to sep file to make compilation time bearable. expand stubs. 2013-01-24 04:35:04 +01:00
don bright cf32594c9e add lodepng.cpp, fix compiler warnings, fix qmake buildfile 2013-01-24 04:13:45 +01:00
don bright 009baca904 move imageutils platform stuff to qmake build file mv system-gl. fix gcc warning 2013-01-24 04:10:24 +01:00
don bright 1bec7aad09 modify qmake buildfile, move offscreen rendering to main src directory 2013-01-24 04:01:34 +01:00
don bright 1af090c7b3 add wrapper code from nop head, mod build scripts 2013-01-21 14:25:14 +01:00
don bright 70d810b666 cleanup 2012-12-29 17:14:13 -06:00
don bright b753e41dea cleaning up 2012-12-29 17:13:16 -06:00
don bright ed97940f56 make RPATH work on uni-build-dependencies with GLEW on 64 bit machines 2012-12-29 22:27:44 +01:00
don bright 7afcc417b3 prevent LD_LIBRARY_PATH problems on unix (not OSX) systems with 
dependency builds, by using RPATH during build. remove the shell script
workaround that was added during the previous commit, as it is 'less
clean' a solution.
 2012-12-29 14:26:59 -06:00
don bright ad45e8a8c5 detect netbsd / freebsd after linux not before, for bison/flex. 2012-12-23 17:14:58 -06:00
don bright f3cd856282 netbsd fixes 2012-12-23 01:00:48 +01:00
don bright 4ecd9fa8a4 refactor, cleanup, put code where it belongs, make simple logging class 2012-10-28 08:56:23 -05:00