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
clifford
d3a2971206
Clifford Wolf:
...
Added libraries path detection for UNIX
Added libs and examples to 'make install'
git-svn-id: http://svn.clifford.at/openscad/trunk@455 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-27 10:38:13 +00:00
clifford
332e835f87
Clifford Wolf:
...
Added cgaladv.cc with advanced transformations via CGAL
(as of now only 3d minkowksi sum is implemented but more is planned)
git-svn-id: http://svn.clifford.at/openscad/trunk@446 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-20 14:37:20 +00:00
kintel
12ad2eda30
Extracted OpenCSG code to separate files
...
git-svn-id: http://svn.clifford.at/openscad/trunk@434 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-10 16:43:43 +00:00
kintel
8038ee0406
Moved progress display to status bar. Disabled by default but can be enabled in .pro file with CONFIG += progresswidget. Please test and enable as default if it looks good on all platforms.
...
git-svn-id: http://svn.clifford.at/openscad/trunk@432 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-10 15:13:12 +00:00
kintel
c7b9a49c15
Cleaned up progress handling, implemented cancel function. Needs more testing
...
git-svn-id: http://svn.clifford.at/openscad/trunk@420 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-09 13:48:09 +00:00
kintel
234a3bf8ef
qmake's default settings work better on Mac
...
git-svn-id: http://svn.clifford.at/openscad/trunk@411 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-02 02:10:49 +00:00
kintel
72513cb5cf
Experimental Apple Event hack; you can now do 'tell application "OpenSCAD" to reload'
...
git-svn-id: http://svn.clifford.at/openscad/trunk@409 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-02 01:01:58 +00:00
kintel
c7b0301a63
Always MDI on Mac, remove redundant debug flags
...
git-svn-id: http://svn.clifford.at/openscad/trunk@393 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-01 00:26:04 +00:00
clifford
ea77e90a54
Clifford Wolf:
...
Fixed EIGEN2_DIR and OPENCSG_DIR qmake handling
git-svn-id: http://svn.clifford.at/openscad/trunk@383 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-31 00:31:26 +00:00
kintel
daa35369a7
Support the EIGEN2DIR env. variable
...
git-svn-id: http://svn.clifford.at/openscad/trunk@378 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-30 18:42:54 +00:00
clifford
2da1551129
Clifford Wolf:
...
Started to use eigen2 for linear algebra problems
git-svn-id: http://svn.clifford.at/openscad/trunk@376 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-30 18:30:54 +00:00
clifford
fc1914a43c
Clifford Wolf:
...
Added projection() statement
git-svn-id: http://svn.clifford.at/openscad/trunk@372 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-30 07:41:55 +00:00
kintel
3ff0eeefaa
minor build fix
...
git-svn-id: http://svn.clifford.at/openscad/trunk@368 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-30 04:37:00 +00:00
kintel
9b3d816122
resource and build system update
...
git-svn-id: http://svn.clifford.at/openscad/trunk@366 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-30 04:27:59 +00:00
kintel
63948eeb15
Evaluate env.var at make-time, not qmake-time
...
git-svn-id: http://svn.clifford.at/openscad/trunk@342 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-22 17:00:01 +00:00
kintel
0a3a7b1579
Added first mockup of a color scheme chooser
...
git-svn-id: http://svn.clifford.at/openscad/trunk@332 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-21 19:18:21 +00:00
kintel
35b17c4680
Keep default setting in .pro file, control release builds from cmd-line
...
git-svn-id: http://svn.clifford.at/openscad/trunk@327 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-21 12:49:56 +00:00
meta
f2926d6630
windows msys build script
...
git-svn-id: http://svn.clifford.at/openscad/trunk@321 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-15 21:08:18 +00:00
clifford
df291f7874
Clifford Wolf:
...
Re-disabled mdi support
git-svn-id: http://svn.clifford.at/openscad/trunk@307 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-15 08:13:58 +00:00
kintel
f2bad69cf5
Started collecting GL colors in one place; added Preferences class which will become a preferences dialog, forked CGAL OGL_Helper to make colors configurable
...
git-svn-id: http://svn.clifford.at/openscad/trunk@301 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-15 01:00:41 +00:00
kintel
92526f372b
Experimental CGAL tesselation - does not support holes yet
...
git-svn-id: http://svn.clifford.at/openscad/trunk@295 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-14 11:09:36 +00:00
clifford
53f26d0308
Clifford Wolf:
...
Added options for gprof to openscad.pro
(commented out)
git-svn-id: http://svn.clifford.at/openscad/trunk@260 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-10 13:20:00 +00:00
kintel
bc88fb8c39
Mac compile for for non-cgal builds
...
git-svn-id: http://svn.clifford.at/openscad/trunk@212 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-06 04:14:01 +00:00
clifford
a02e00083f
Clifford Wolf:
...
New hack for 2d transformations:
create DxfData, transform, tess to polyset, recreate nef
git-svn-id: http://svn.clifford.at/openscad/trunk@203 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-05 19:09:01 +00:00
clifford
00ce953c0a
Clifford Wolf:
...
Re-disabled mdi support per default
git-svn-id: http://svn.clifford.at/openscad/trunk@196 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-03 09:35:09 +00:00
kintel
0340e12082
Make the OPENCSGDIR variable optional on all platforms
...
git-svn-id: http://svn.clifford.at/openscad/trunk@194 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-03 01:31:09 +00:00
kintel
e3011f42a5
Added support for OpenCSG-1.2.0, enabled MDI as default for Mac OS X
...
git-svn-id: http://svn.clifford.at/openscad/trunk@193 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-03 00:10:55 +00:00
clifford
9363b6f229
Karl Ostmo et al:
...
Added -frounding-math for all platforms
git-svn-id: http://svn.clifford.at/openscad/trunk@185 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-25 18:02:05 +00:00
kintel
fc7ee9cc39
Use a datestamp for development builds
...
git-svn-id: http://svn.clifford.at/openscad/trunk@171 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-13 21:21:23 +00:00
kintel
0847ea818b
Slowly getting the build system under control, added version number in app, added OpenSCAD to window title, note that VERSION needs to be set for deployment in the deployment scripts
...
git-svn-id: http://svn.clifford.at/openscad/trunk@168 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-13 00:22:07 +00:00
kintel
6e32acbe65
Implemented support for opening files from the Mac OS X Finder, e.g. double-click, file type association
...
git-svn-id: http://svn.clifford.at/openscad/trunk@164 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-12 21:27:54 +00:00
clifford
4381677aae
Clifford Wolf:
...
One more time: openscad.pro compiler flags
git-svn-id: http://svn.clifford.at/openscad/trunk@160 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-12 07:10:06 +00:00
clifford
83d17d4538
Clifford Wolf:
...
More openscad.pro stuff
git-svn-id: http://svn.clifford.at/openscad/trunk@159 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-11 21:42:00 +00:00
clifford
ed6094dd64
Clifford Wolf:
...
Added release build settings
git-svn-id: http://svn.clifford.at/openscad/trunk@158 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-11 21:38:28 +00:00
kintel
1a3769d595
Extracted MainWindow.h from openscad.h, moved GUI definition to MainWindow.ui. NB! This is not thoroughly tested yet
...
git-svn-id: http://svn.clifford.at/openscad/trunk@155 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-09 14:25:09 +00:00
clifford
0032ea235e
Clifford Wolf:
...
Tab indenting fix
git-svn-id: http://svn.clifford.at/openscad/trunk@151 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-09 09:52:06 +00:00
kintel
212a53f5a4
Be consistent when using defines; #if vs. #ifdef
...
git-svn-id: http://svn.clifford.at/openscad/trunk@150 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-09 02:45:36 +00:00
kintel
071b6abc22
Added icon suggestion for Mac OS X. Raw files also supplied for other platforms
...
git-svn-id: http://svn.clifford.at/openscad/trunk@145 b57f626f-c46c-0410-a088-ec61d464b74c
2009-12-07 13:00:48 +00:00
clifford
57c3213abb
Clifford Wolf:
...
Added syntax error highlighting
git-svn-id: http://svn.clifford.at/openscad/trunk@127 b57f626f-c46c-0410-a088-ec61d464b74c
2009-11-01 18:26:38 +00:00
clifford
0cd451bbf9
Clifford Wolf:
...
Added MDI support
git-svn-id: http://svn.clifford.at/openscad/trunk@124 b57f626f-c46c-0410-a088-ec61d464b74c
2009-10-28 20:11:56 +00:00
clifford
dc1450e47f
Marius Kintel:
...
Some patches for MacOS X
Set text editor font to QFont::TypeWriter
git-svn-id: http://svn.clifford.at/openscad/trunk@120 b57f626f-c46c-0410-a088-ec61d464b74c
2009-10-25 20:35:03 +00:00
clifford
0b61257ca8
Clifford Wolf:
...
Added command line mode (stl export only)
git-svn-id: http://svn.clifford.at/openscad/trunk@106 b57f626f-c46c-0410-a088-ec61d464b74c
2009-10-18 08:50:01 +00:00
clifford
a6b4efc78f
Stefan Farthofer, Clifford Wolf:
...
Fixed openscad.pro for win32 builds
git-svn-id: http://svn.clifford.at/openscad/trunk@105 b57f626f-c46c-0410-a088-ec61d464b74c
2009-10-16 21:23:30 +00:00
clifford
6a12327e2a
Clifford Wolf:
...
Added support for ASCII stl files
git-svn-id: http://svn.clifford.at/openscad/trunk@102 b57f626f-c46c-0410-a088-ec61d464b74c
2009-10-14 12:34:50 +00:00
clifford
b485a2861f
Clifford Wolf:
...
Added 'surface' module
git-svn-id: http://svn.clifford.at/openscad/trunk@76 b57f626f-c46c-0410-a088-ec61d464b74c
2009-07-25 02:37:21 +00:00
clifford
c66c51ce1e
Clifford Wolf:
...
Added dxf dimension function
(still incomplete)
git-svn-id: http://svn.clifford.at/openscad/trunk@73 b57f626f-c46c-0410-a088-ec61d464b74c
2009-07-24 20:50:30 +00:00
clifford
cb829a3fe0
Clifford Wolf:
...
Added Grid2d/Grid3d API
Moved dxf tesselation to extra file
git-svn-id: http://svn.clifford.at/openscad/trunk@62 b57f626f-c46c-0410-a088-ec61d464b74c
2009-07-21 19:33:39 +00:00
clifford
bd89f254ef
Clifford Wolf:
...
Improved DXF support
git-svn-id: http://svn.clifford.at/openscad/trunk@61 b57f626f-c46c-0410-a088-ec61d464b74c
2009-07-20 17:45:39 +00:00
clifford
6de5c3dc35
Clifford Wolf:
...
Added rotation extrude
Added dxf extrude example
git-svn-id: http://svn.clifford.at/openscad/trunk@58 b57f626f-c46c-0410-a088-ec61d464b74c
2009-07-17 00:34:15 +00:00
clifford
d05ea4453b
Clifford Wolf:
...
Added first steps towards dxf extrusion support
git-svn-id: http://svn.clifford.at/openscad/trunk@57 b57f626f-c46c-0410-a088-ec61d464b74c
2009-07-16 23:11:08 +00:00
clifford
f950feace3
Clifford Wolf:
...
Fixed cylinders, added "render" statement
git-svn-id: http://svn.clifford.at/openscad/trunk@55 b57f626f-c46c-0410-a088-ec61d464b74c
2009-07-14 05:25:55 +00:00
clifford
79b350cc80
Clifford Wolf:
...
Some minor changes
git-svn-id: http://svn.clifford.at/openscad/trunk@50 b57f626f-c46c-0410-a088-ec61d464b74c
2009-07-03 13:56:34 +00:00
clifford
a70715ab8c
Clifford Wolf:
...
Added assign() and if()
Added first for() outline
git-svn-id: http://svn.clifford.at/openscad/trunk@38 b57f626f-c46c-0410-a088-ec61d464b74c
2009-06-30 08:38:31 +00:00
clifford
221ae18327
Clifford Wolf:
...
Some housekeeping..
git-svn-id: http://svn.clifford.at/openscad/trunk@28 b57f626f-c46c-0410-a088-ec61d464b74c
2009-06-26 22:09:50 +00:00
clifford
cdc62b4f28
Clifford Wolf:
...
Sphere bugfix and OpenCSG progress
git-svn-id: http://svn.clifford.at/openscad/trunk@23 b57f626f-c46c-0410-a088-ec61d464b74c
2009-06-26 10:56:50 +00:00
clifford
a05c91bcec
Clifford Wolf:
...
Added generic config variables
Added ${fs,fa}_{render,preview}
git-svn-id: http://svn.clifford.at/openscad/trunk@22 b57f626f-c46c-0410-a088-ec61d464b74c
2009-06-26 04:32:52 +00:00
clifford
4f7d83c00f
Clifford Wolf:
...
Added CsgChain structure
Added first OpenCSG demo code
git-svn-id: http://svn.clifford.at/openscad/trunk@19 b57f626f-c46c-0410-a088-ec61d464b74c
2009-06-25 08:12:41 +00:00