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
Marius Kintel
51b83ff8dd
bugfix: There is a bug in the stdc++ library on Mac OS 10.5 which messes up some STL templates. This should fix it, courtesy of http://stackoverflow.com/questions/3484043/os-x-program-runs-on-dev-machine-crashing-horribly-on-others
2012-08-22 00:22:35 -04:00
don bright
5d31f56d93
look for EIGENDIR env var. (also look for EIGEN2DIR for backwards compatability)
2012-08-19 08:10:33 -05:00
don bright
c4d68588a6
modify build system to auto-detect eigen3, and fallback to eigen2
2012-08-19 00:14:17 +02:00
don bright
9f6819e685
initial rework to enable eigen3 per issue #174 .
...
1. enable eigen3 in qmake build system
2. convert Transform3d and cwise() per the eigen2->eigen3 porting faq online
3. get rid of 'using namespace boost::filesystem' as it conflicts with eigen3
2012-08-18 22:28:36 +02:00
don bright
4cc87c32f4
Add info to 'about' window with acknowledgements, etc.
2012-08-04 11:49:45 -05:00
don bright
b22951af47
enable build of glew + opencsg with clang from script
2012-07-20 15:51:40 -05:00
don bright
dec26f84dd
initial steps towards support of clang compiler
2012-07-20 15:23:16 -05:00
Marius Kintel
3267ba2d56
Merge pull request #146 from openscad/mingwcross1
...
Mingwcross1
2012-07-16 18:55:31 -07:00
don bright
9123ad8d5e
fix build bug on some DSO linux systems
2012-07-15 18:13:50 -05:00
don bright
be9c424a15
cleanup
2012-07-15 22:13:20 +02:00
don bright
06420a3ef9
fix documentation
2012-07-15 22:11:04 +02:00
don bright
cd81cecc3a
put .o files of cross into separate directory. handle git issue.
2012-07-15 18:47:18 +02:00
don bright
018211a863
check versions of libraries at compile time - warn users. fix FIXME in openscad.pro
2012-07-13 03:40:07 +02:00
don bright
c2f19f450b
more reliable way of ensuring GLU is linked on new DSO linux systems.
2012-06-03 16:16:40 +02:00
Marius Kintel
b9d218e137
Initial implementation of ModuleCache and dependency tracking of used modules
2012-02-15 01:32:37 +01:00
Marius Kintel
23f6b0623c
Merge branch 'master' into threading
...
Conflicts:
RELEASE_NOTES
2012-01-09 03:29:24 +01:00
Marius Kintel
3c18145b13
Merge branch 'master' into boost_filesystem
2012-01-08 19:14:30 +01:00
Marius Kintel
9495f11be0
Added Linux desktop icon and .desktop file from chrysn
2012-01-05 00:00:29 +01:00
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