Commit Graph

214 Commits (7294d29789606111dcc2c9eafd451ce660f2cb15)

Author SHA1 Message Date
Marius Kintel 52dfffd97b Merge branch 'master' into threading
Conflicts:
	RELEASE_NOTES
2012-01-04 23:29:08 +01:00
Marius Kintel fdce8d15fc Merge branch 'master' into boost_filesystem
Conflicts:
	boost.pri
	src/lexer.l
	tests/CMakeLists.txt
2012-01-04 23:07:32 +01:00
don bright 277c762912 changes to enable building on NetBSD 2012-01-03 18:21:28 +01:00
Marius Kintel bc3454f369 Refactored normalization into a separate class, hard-limited normalization to stop at 5000 nodes to keep from normalizing 'forever' 2011-12-26 19:15:51 +01:00
Marius Kintel 0be212e75d Merge branch 'master' into threading 2011-12-26 16:38:11 +01:00
Marius Kintel cbabbaed70 Merge branch 'master' into boost_filesystem
Conflicts:
	openscad.pro
	src/module.h
2011-12-26 16:37:00 +01:00
Marius Kintel 4ff2d1af44 Some light refactoring attempts, didn't get very far.. 2011-12-26 16:34:47 +01:00
Marius Kintel 7c48b345b1 Perform CGAL evaluation in a separate thread. First steps towards better GUI responsiveness and parallelization 2011-12-25 23:00:30 +01:00
Marius Kintel 0ab51d2d23 Extracted librarydir initialization to separate function 2011-12-24 22:02:37 +01:00
Marius Kintel 9fa18d5392 Fixed CSG regression reported by Ed Nisley; bounding boxes are now transformed correctly 2011-12-23 14:33:40 +01:00
Don Bright 52655b3b5f -fno-strict-aliasing fix for GCC bug & link to wikibooks build instructions. 2011-12-17 13:17:11 -06:00
Don Bright a7ebe94199 fix qmake under mingw-cross-compile 2011-12-16 21:03:10 -06:00
don 609e59d4cc fix OPENSCAD_LIBRARIES on FreeBSD 2011-12-17 01:56:24 -06:00
don bright b6a01a76b9 fix compilation on Fedora: boost, flex, and OPENSCAD_LIBRARIES 2011-12-16 17:33:31 -08:00
don b8be38ce8b improve OPENSCAD_LIBRARIES for freebsd 2011-12-16 21:51:42 -06:00
Marius Kintel 6aa1a6d4c8 Some more build system cleaning 2011-12-15 05:17:04 +01:00
Marius Kintel b74bb392af generalized MACOSX_DEPLOY_DIR into the platform-independent OPENSCAD_LIBRARIES 2011-12-15 04:59:15 +01:00
Marius Kintel d61b274dad Started documenting env. variables 2011-12-13 01:22:33 +01:00
Marius Kintel 9ed8d9a673 Some small refactoring of color handling to support using the color() module to change only alpha 2011-12-11 23:45:14 +01:00
Marius Kintel f577f91d25 Better warnings and GL info related to OpenCSG capabilities and OpenGL 1.x 2011-12-09 03:43:06 +01:00
Marius Kintel 679b8d05c8 bugfix: 2D hull() now works with for loops. Thanks to nophead to reasserting this bug. 2011-12-07 05:21:11 +01:00
Marius Kintel 96c480b1bd Ported QCache and related code away from Qt 2011-11-09 03:18:32 +01:00
Marius Kintel ee7603badb Compile DEBUG builds with -DDEBUG 2011-11-08 03:37:43 +01:00
don bright 8baead275a Merge remote-tracking branch 'upstream/master' 2011-11-06 10:19:09 -08:00
Marius Kintel 45161d4356 Slight refactoring of builtin function and module handling 2011-11-06 18:37:12 +01:00
don bright 9ab95e6d72 provide helpful error message when 'qmake' for qt3 is run 2011-11-06 14:28:35 +01:00
Marius Kintel 3bc0371351 Applied configurable PREFIX patch from chrysn 2011-11-03 15:13:33 +01:00
Marius Kintel 696c061eec extracted version config to separate .pri file 2011-10-30 02:15:25 +01:00
Don Bright 5f58255bcf integrate Brad Pitcher's cross compile linux->win32-mingw qmake stuff 2011-10-25 19:10:28 -05:00
don bright 36895ff2e5 confine date detection to win32-msvc, set VERSION, hide debug message 2011-10-24 21:47:22 -05:00
don bright 82ff5a12ec fdef getopt.h for MSVC, cleanup makefile, ignore another msvc warning 2011-10-23 22:41:03 -05:00
don bright 9afee60563 auto detect date in windows qmake 2011-10-23 20:14:35 -05:00
don b534f40aa0 eigen align tweak 2011-10-21 01:49:34 +00:00
User 98530546c9 fix freebsd build 2011-10-20 06:49:52 -05:00
don b 1a1ab5b5ab improve freebsd build. also remove windows unicode preamble from .cc 2011-10-17 23:16:02 -05:00
Marius Kintel b12b086175 cleanup: use -DEIGEN_DONT_ALIGN for all except Mac 2011-10-16 18:56:08 +02:00
Don Bright 7332ec9fe2 clean up linux changes to fit with win32 changes. 2011-10-15 20:14:35 -05:00
don bright 17ccbace5f improve documentation. move EIGEN_DONT_ALIGN to makefile. win32 build fixes. 2011-10-15 15:48:41 -05:00
don bright 31592577d3 enable building of opencsgtest, throwntogethertest, on WinXP 2011-10-10 21:46:27 -05:00
don bright a1c698f422 enable build of cgalpngtest under windowsXP 2011-10-10 18:01:51 -05:00
Marius Kintel 2f239205a8 Redefined version() to return the version as a vector. Added version_num() to return a comparable number 2011-10-04 00:09:04 +02:00
Marius Kintel 84e98b178a Cleaned up some unnecessary includes 2011-10-01 01:36:30 +02:00
Marius Kintel bf3fb9634c Renamed some files and classnames for clarification 2011-09-30 03:11:28 +02:00
Marius Kintel 1f52da35ef helper to include TR1 stuff 2011-09-11 11:10:48 +02:00
Marius Kintel 95949cf961 Implemented CGAL caching 2011-09-11 10:51:55 +02:00
Marius Kintel 18e97e0bd3 Fixed bug introduced by the new PolySet cache; string filtering done in the wrong place, refactored cache into separate class 2011-09-11 09:10:31 +02:00
Marius Kintel 27a99044d8 Implemented OFF import, refactored PolySet/Polyhedron conversion 2011-09-07 22:04:59 +02:00
Marius Kintel 1e4e18c524 minkowski sums should now work again 2011-09-06 14:57:24 +02:00
Marius Kintel 781dab0493 Filename case fix 2011-09-04 01:57:26 +02:00
Marius Kintel 821c7df1fe Extracted handle_dep() to separate source file 2011-09-04 00:03:16 +02:00
Marius Kintel ed8a99ed55 Refactoring: Moved color functionality into separate module and node 2011-09-02 23:35:10 +02:00
Marius Kintel 1633fb0344 Refactoring of CGAL functionality to allow for forward-declaration of CGAL classes in header files, reducing coupling and thus compilation times 2011-09-01 04:09:06 +02:00
Marius Kintel 428d5bfc0e Refactored cgal_nef3_to_polyset() to cgal wrapper class 2011-08-22 19:31:56 +02:00
Marius Kintel cf4821c589 De-Qt-ified AbstractNode 2011-08-04 04:58:17 +02:00
Marius Kintel 2af5648eda Merge branch 'master' into visitor
Conflicts:
	src/OpenCSGRenderer.cc
	src/csgops.cc
	src/mainwin.cc
	src/polyset.cc
	src/projection.cc
2011-08-04 04:02:42 +02:00
Don Bright 00d7bb401c fix broken build on systems that use case sensitive filenames (linux) 2011-08-03 17:45:40 -05:00
Marius Kintel 6882228058 Merge branch 'master' into visitor
Conflicts:
	src/GLView.h
	src/glview.cc
	src/mainwin.cc
	src/render-opencsg.cc
2011-07-31 01:58:51 +02:00
Marius Kintel 887f7eb99f Refactored GL rendering inspired by Giles' work on RapCad. The ultimate goal is to become independent of Qt 2011-07-30 21:29:40 +02:00
Marius Kintel 7a58f11986 Merge branch 'cgal-renderer-refactor' of gitorious.org:openscad/openscad into cgal-renderer-refactor 2011-07-23 22:02:55 +02:00
Marius Kintel d24b3cc84d Ported recent changes to master into the visitor branch 2011-04-12 20:35:44 +02:00
Giles Bathgate 9cc441025c Basic implementation of convex hull for 2d polyhedra.
The code was provided to me by Len Trigg via email.
2011-04-09 10:27:50 +01:00
Giles Bathgate 2066a440d0 Restored the original OGL_helper.h from CGAL. 2011-04-09 05:51:58 +01:00
Marius Kintel fffb399fa4 Merge branch 'master' into windows 2011-04-06 17:18:59 +02:00
meta 9f1c837e15 update build files 2011-01-25 00:21:36 +01:00
Marius Kintel 0419cd8232 Merge branch 'meta23-master' 2011-01-21 23:04:13 +01:00
Marius Kintel 5a1fc30fc6 Added support for specifying a VARIANT variable 2011-01-21 22:39:34 +01:00
meta 52a474eb52 Merge branch 'master' of https://github.com/meta23/openscad
Conflicts:
	openscad.pro
2011-01-21 22:09:18 +01:00
meta 94748bb8d2 update qmake file for visual C++ builds 2011-01-21 22:06:50 +01:00
meta 5f740ff14d indent properly
git-svn-id: http://svn.clifford.at/openscad/trunk@590 b57f626f-c46c-0410-a088-ec61d464b74c
2011-01-16 05:34:33 +00:00
meta 91e33a87c4 make the default VERSION initialization work on windows
git-svn-id: http://svn.clifford.at/openscad/trunk@589 b57f626f-c46c-0410-a088-ec61d464b74c
2011-01-16 05:33:44 +00:00
Marius Kintel 26fa3d7521 forgot header file dependency 2010-11-03 19:23:05 +01:00
kintel 1611f6230e Reverted accidental commits
git-svn-id: http://svn.clifford.at/openscad/trunk@573 b57f626f-c46c-0410-a088-ec61d464b74c
2010-10-31 01:58:50 +00:00
kintel e0c5673e1b Reverted accidental commits
git-svn-id: http://svn.clifford.at/openscad/trunk@573 b57f626f-c46c-0410-a088-ec61d464b74c
2010-10-31 01:58:50 +00:00
kintel 6ed27af139 Committed current version of visitor refactoring
git-svn-id: http://svn.clifford.at/openscad/trunk@571 b57f626f-c46c-0410-a088-ec61d464b74c
2010-10-31 01:19:06 +00:00
kintel 53337ff654 Committed current version of visitor refactoring
git-svn-id: http://svn.clifford.at/openscad/trunk@571 b57f626f-c46c-0410-a088-ec61d464b74c
2010-10-31 01:19:06 +00:00
Marius Kintel 049b16608a Added CSGTermRenderer 2010-10-31 02:42:39 +02:00
Marius Kintel 75d18642cc Compile fixes after working in test-code/ 2010-10-31 02:42:38 +02:00
Marius Kintel 53a9953b7d build fixed after rebase conflict 2010-10-31 02:42:35 +02:00
Marius Kintel 99f406d994 Removed temporary REMOVE_DUMP define 2010-10-31 02:42:35 +02:00
Marius Kintel 184d0e041f Initial implementation of CGALRenderer 2010-10-31 02:42:35 +02:00
Marius Kintel 7468c94067 Mostly completed test implementation of text-based CGALRenderer 2010-10-31 02:42:34 +02:00
Marius Kintel 3396706e24 Added CGALRenderer + some minor fixes 2010-10-31 02:42:34 +02:00
Marius Kintel 9bb4fc829a Added REMOVE_DUMP define 2010-10-31 02:42:34 +02:00
Marius Kintel 393c5a19fe Committed current version of visitor refactoring 2010-10-31 02:42:34 +02:00
kintel d9b08b1659 Use DEPLOYDIR independant of deploy config
git-svn-id: http://svn.clifford.at/openscad/trunk@542 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-10 17:43:42 +00:00
kintel db3e447809 Use DEPLOYDIR independant of deploy config
git-svn-id: http://svn.clifford.at/openscad/trunk@542 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-10 17:43:42 +00:00
kintel 4185b3128b Build fat 32- and 64-bit binary when in deploy mode
git-svn-id: http://svn.clifford.at/openscad/trunk@535 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-08 03:57:31 +00:00
kintel f3de61c992 Build fat 32- and 64-bit binary when in deploy mode
git-svn-id: http://svn.clifford.at/openscad/trunk@535 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-08 03:57:31 +00:00
kintel 186ed3bdf3 Removed obsolete config
git-svn-id: http://svn.clifford.at/openscad/trunk@534 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-08 03:57:28 +00:00
kintel 0fa1c053d6 Removed obsolete config
git-svn-id: http://svn.clifford.at/openscad/trunk@534 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-08 03:57:28 +00:00
kintel f5b3b30e51 Improved Mac OS X deployment - hopefully this doesn't break builds on other platforms
git-svn-id: http://svn.clifford.at/openscad/trunk@529 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-07 16:24:26 +00:00
kintel 0f9802ec3a Improved Mac OS X deployment - hopefully this doesn't break builds on other platforms
git-svn-id: http://svn.clifford.at/openscad/trunk@529 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-07 16:24:26 +00:00
kintel f2d193c25a Don't enable qcodeedit as default
git-svn-id: http://svn.clifford.at/openscad/trunk@507 b57f626f-c46c-0410-a088-ec61d464b74c
2010-04-03 03:05:36 +00:00
kintel b699cbd859 Try compiling now with qcodeedit enabled
git-svn-id: http://svn.clifford.at/openscad/trunk@502 b57f626f-c46c-0410-a088-ec61d464b74c
2010-04-03 03:05:16 +00:00
kintel 9f58225754 Changes that were supposed to be commited in last commit
git-svn-id: http://svn.clifford.at/openscad/trunk@501 b57f626f-c46c-0410-a088-ec61d464b74c
2010-04-03 03:05:14 +00:00
kintel 334f15c0d6 Minor build system fixes
git-svn-id: http://svn.clifford.at/openscad/trunk@492 b57f626f-c46c-0410-a088-ec61d464b74c
2010-03-31 00:25:04 +00:00
clifford 1cbb05babf Clifford Wolf:
Little progress with 2d minkowski code



git-svn-id: http://svn.clifford.at/openscad/trunk@480 b57f626f-c46c-0410-a088-ec61d464b74c
2010-03-03 19:27:22 +00:00
kintel 8bb879c6f0 fixed default eigen2 include for mac
git-svn-id: http://svn.clifford.at/openscad/trunk@476 b57f626f-c46c-0410-a088-ec61d464b74c
2010-03-02 20:58:00 +00:00
clifford 108f050891 Clifford Wolf:
Moved "-O3 -march=pentium" to linux release script



git-svn-id: http://svn.clifford.at/openscad/trunk@473 b57f626f-c46c-0410-a088-ec61d464b74c
2010-03-02 06:18:09 +00:00
clifford 2febe5944a Clifford Wolf:
Lets try the progresswidget on all architectures



git-svn-id: http://svn.clifford.at/openscad/trunk@462 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-28 14:26:05 +00:00