Marius Kintel
528ef22104
Merge branch 'master' into unstable
...
Conflicts:
src/openscad.cc
2014-02-03 22:55:58 -05:00
Marius Kintel
c4e41d76e1
Added --csglimit parameter
2014-02-03 22:53:54 -05:00
Marius Kintel
db20a3afac
Added --debug to usage
2014-02-01 13:26:15 -05:00
Marius Kintel
cdd23c5d63
Merge branch 'unstable' into printd0
2014-02-01 12:56:20 -05:00
Don Bright
36d5bde12b
add '--debug=' option to openscad cmdline. see printutils.h for usage
2014-01-30 18:29:34 -06:00
Don Bright
2e3729ab22
redo assemblePath for Win. redo openscad.com to handle spaces in filenames
2014-01-28 23:08:04 -06:00
Marius Kintel
59fca2674a
Merge branch 'master' into issue527
...
Conflicts:
tests/regression/cgalpngtest/minkowski2-tests-expected.png
tests/regression/opencsgtest/minkowski2-tests-expected.png
tests/regression/throwntogethertest/minkowski2-tests-expected.png
2014-01-18 18:31:06 -05:00
Marius Kintel
f881efe477
killed warning
2014-01-18 18:26:38 -05:00
Marius Kintel
d4be9b4153
bugfix: Allow rendering empty images
2014-01-09 02:06:36 -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
f4ae95d9e5
Handle shared_ptr in signals/slots
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
11b7624bbf
Made CGAL_Nef_polyhedron a Geometry subtype, implemented 3D transforms, implemented projection, implemented render
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
20938506b6
Mac fix: We need to use bundled resources when running bundled apps in cmd-line node
2014-01-07 15:44:28 -05:00
Marius Kintel
e3f416db27
Added missing --version and --info to help output
2014-01-03 14:57:06 -05:00
Marius Kintel
3d5b844679
Keep cmd-line and GUI separate in terms of preferences, handle experimental tests separately, minor cleanups
2014-01-03 02:31:57 -05:00
Torsten Paul
72865e17da
Add feature registry.
2014-01-02 23:27:52 +01:00
Marius Kintel
eb046015d2
#559 Fix Qt font rendering on OS X 10.9
2013-12-08 15:17:17 -05:00
Marius Kintel
7872e7a229
Re-fix: don't add path to empty files. Fixes #536
2013-11-08 00:53:58 -05:00
Henner Zeller
a218869770
Invocation of openscad with an absolute path failed:
...
./openscad /home/username/foo.scad
.. because the curent working directory was always prepended; so
internally, it attempted to open $PWD + /home/username/foo.scad
Use platform aware QDir functionality to only prepend the absolute
current working directory prefix, if the given path is relative.
2013-10-29 20:55:32 -07:00
Marius Kintel
60ce9748de
Use PRINTB for output which might be grabbed by OS launchers
2013-10-25 00:48:31 -04:00
Marius Kintel
752f35eab6
bugfix: Allow unknown parameters. This fixes exit-on-launch issue on Mac
2013-10-25 00:45:24 -04:00
Marius Kintel
1fd3bec4fe
bugfix: starting without arguments caused a warning
2013-10-22 19:39:51 -04:00
Marius Kintel
178309f357
bugfix: Don't use QApplication before it's instantiated
2013-10-22 11:30:15 -04:00
Marius Kintel
aa1752a3a0
Mac needs to know if we're a GUI app in order to find bundled libraries, Use Qt to find application path if available
2013-10-07 15:47:08 -07:00
Marius Kintel
793ee8eb88
Mac build fix
2013-10-04 15:11:16 -07:00
Marius Kintel
5ed3e28b7a
Mac build fix for openscad_nogui
2013-10-03 23:34:59 -04:00
Marius Kintel
7273e5b5a9
Make recent examplesdir changws work for MDI mode
2013-10-03 23:21:26 -04:00
Don Bright
204b3de3a0
fix broken build
2013-10-02 17:37:38 -05:00
Don Bright
7804a398a3
Merge branch 'master' of github.com:openscad/openscad into issue480
...
Conflicts:
src/openscad.cc
2013-10-02 17:27:42 -05:00
Vicnet
d3cb7e4a17
remove unused stuff
2013-09-25 13:43:32 +02:00
Don Bright
8c11a091d5
use debug symbols for test binaries. also remove echostream pointer
2013-09-21 10:25:36 -05:00
Don Bright
efc6731774
make echotest work on BSD, by adding .echo as recognized extension
2013-09-21 09:04:01 -05:00
Don Bright
47ed2f1b12
moving towards making tests work on bsd again
2013-09-21 00:12:42 -05:00
Don Bright
5f36117b8f
restore missing digits. make --info work better. fix parser / path bug
2013-09-20 01:54:53 -05:00
Don Bright
3eda281be1
allow openscad binary to be compiled with or without QT. use non-QT for tests.
2013-09-20 00:19:09 -05:00
Marius Kintel
ead8749e99
Merge pull request #476 from openscad/testfixes
...
Testfixes
2013-09-12 22:06:17 -07:00
Don Bright
30fd8b250a
little tweaks, cleanups, tab fixing, eliminating comments
2013-09-12 20:03:27 -05:00
Don Bright
6af6c311a1
cmdline throwntogether, integrate w chrysn tests, update resize tests
2013-09-12 00:17:17 -05:00
Don Bright
ea92d9ce19
fix issue #430
2013-09-11 19:52:31 -05:00
chrysn
b7170fe349
add .term output for CSG term export
2013-06-25 14:25:03 +02:00
chrysn
2006824c24
drop moduledumptest, use `openscad -o ${NAME}.ast`
...
src/openscad.cc code was copy/pasted from .csg section; some refactoring
might make things nicer, but i didn't dare change too much for lack of
language knowledge
2013-06-25 13:41:49 +02:00
chrysn
7d53e564aa
use openscad as a replacement for dumptest and echotest
...
the echotest and dumptest still contain hacks to keep the delta to the
original unit tests minimal; possibly, some of these changes will make
it into the openscad program, at which time they can go away from there.
2013-06-25 13:41:48 +02:00
Marius Kintel
60e0edb211
Removed 'Root Context' debug output
2013-06-17 23:24:01 -04:00
Marius Kintel
14e1ad2363
Forgot to actually add most files in previous commit ( #217 )
2013-05-09 12:12:58 +02: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
9a297ecee5
Refactoring: Split out FileModule from Module, Added LocalScope renamed some confusing 'evaluate' methods to 'instantiate', added FileContext (not yet used)
2013-04-26 17:45:03 -04:00
Marius Kintel
151593705f
Disable context debug output
2013-04-09 01:04:36 -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
don bright
c7f83aa3e3
remove redundant code, root_node and absolute_root_node
2013-04-02 20:51:20 -07:00
Marius Kintel
6b8a5e266c
Handle files with non-ascii filenames. Only rudimentary tested. Fixes #113 #290
2013-03-11 22:14:00 -04:00
Marius Kintel
5f03fbee6b
Merge branch 'master' of github.com:maandree/openscad into maandree-master
2013-03-11 21:07:49 -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
974abf1304
fix strecthing with --imgsize per bug rept from Marius Kintel
2013-03-05 21:10:10 -06:00
Mattias Andrée
30ab30f32a
Fix (tested on gnu/linux): non-ascii file names could not be opened via the command line
...
Signed-off-by: Mattias Andrée <maandree@operamail.com>
2013-03-04 15:39:52 +01:00
don bright
94d4acf765
cleanup tab spacing
2013-03-03 20:23:03 -06:00
don bright
42ca2151b1
cleanups
2013-03-03 19:47:07 -06:00
don bright
58de93af95
add --projection=ortho|perspective option to cmdline
2013-03-03 13:48:23 -06:00
don bright
653cb36ce8
fix bug in --imgsize
2013-03-03 12:40:08 -06:00
don bright
d7b07893df
simplify camera parameters down to --camera
2013-03-03 12:30:04 -06:00
don bright
f190b9605c
add imgsize cmdline parameter for png output
2013-03-03 12:20:18 -06:00
don bright
9f5c6133bf
update manpage
2013-03-03 11:54:34 -06:00
don bright
2b2dc7a078
make Camera into single class, simplify code
2013-03-03 10:52:25 -06:00
don bright
bfae32fe99
remove boost::variant stuff. trim code. add 'vector cam' cmdline option
2013-03-03 10:11:56 -06:00
don bright
13b0fe4b3f
rework Camera using boost::variant. first working --gimbalcam version
2013-02-27 00:37:37 -06:00
don bright
50489c4287
begin to implement --viewport option, by adding Camera class + children
2013-02-25 22:32:57 -06:00
don bright
9896b6f15e
first working version of opencsg png export from gui binary
...
also guiopencsgtest introduced. passes 100% of 'normal' tests
2013-02-24 21:07:37 -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
Marius Kintel
fa00547507
First version of automatic updates for Mac
2013-02-05 00:36:25 -05:00
don bright
47a6970899
bracket got misplaced during master merge - repair
2013-01-31 05:06:04 +01:00
don bright
44bb37fdee
move 'delete root_node' where it was before merging master. cleanup
2013-01-31 04:26:53 +01: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
5263
97c8f40200
enable csg output when compiled without CGAL
2013-01-30 19:13:32 +01:00
don bright
fc72c86185
windows needs binary-mode set for exporting png
2013-01-26 22:43:06 +01:00
don bright
6535b16a31
enable root-modifier (! character) on gui-cmdline output. reduce duplicate code.
2013-01-26 19:31:37 +01:00
don bright
e82b056e81
basic parse of .png output filename. basic command line option "--render"
2013-01-24 03:51:15 +01:00
don bright
202c57773e
allow dxf deps writing
2013-01-17 03:51:33 +01:00
Marius Kintel
087b9bb7c3
Catch exceptions as const references. Related to #204
2012-10-08 20:49:02 -04:00
Marius Kintel
7bca8b414b
minor code compacting
2012-08-21 21:06:56 -04:00
Marius Kintel
694382bba9
Merge branch 'master' into value
...
Conflicts:
src/parsersettings.cc
2012-07-05 09:41:15 -04:00
Marius Kintel
0e6b800155
Output filenames relative to document path when exporting .csg files from the command-line. Fixes #128
2012-06-23 23:05:46 +02:00
Marius Kintel
dc82399ce2
cosmetics
2012-05-02 11:56:39 -04:00
Marius Kintel
bddf392281
Bugfix: Unknown cmd-line options caused a crash. Reported by nop head.
2012-02-19 11:17:24 +01:00
Marius Kintel
accb71b546
Simplify file reading
2012-02-15 01:32:37 +01:00
Marius Kintel
b9d218e137
Initial implementation of ModuleCache and dependency tracking of used modules
2012-02-15 01:32:37 +01:00
Marius Kintel
25f6593484
Fix bug including files from within an included file inside a folder. Reported by nop head.
2012-02-14 21:01:51 +01:00
Marius Kintel
5056de8d1c
bugfix: scad files without a newline as the last character could leave a commented out line open, shadowing command-line parameters. Fixes #76
2012-01-31 22:00:00 +01:00
Marius Kintel
eff1f7f8c9
Ported printutils away from Qt
2012-01-25 03:11:12 +01:00
Marius Kintel
16c05eb533
Temporarily removed progress output from file exporting to remove Qt dependency. When reinstating this, use another mechanism
2012-01-25 02:59:02 +01:00
Marius Kintel
01c23788d7
bugfix: Handle empty filename parameter to OpenSCAD exe
2012-01-15 02:47:32 +01:00
donb
65a1c9cf6c
add boosty.h for compatability with boost <1.44
2012-01-14 05:02:15 +01:00
Marius Kintel
54fa85501a
bugfix: Opening absolute filenames from the command-line broke after porting to boost filesystem. Fixes #63
2012-01-11 01:14:58 +01:00
don bright
1920eb1842
prevent crash: make path absolute so that it has a parent to cwd to
2012-01-08 18:54:04 -08: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
Marius Kintel
27983e001b
bugfix: Fix assertion fail trying to export a non-2D file to dxf
2011-12-27 03:44:48 +01:00
Marius Kintel
312a25f270
Removed Qt dependency from parser_init()
2011-12-25 15:09:52 +01:00
Marius Kintel
9293b591c7
Ported currentdir handling from Qt to boost filesystem
2011-12-25 00:22:03 +01:00
Marius Kintel
0ab51d2d23
Extracted librarydir initialization to separate function
2011-12-24 22:02:37 +01:00
Marius Kintel
bb0ec94290
#undef NDEBUG before including any CGAL headers
2011-12-06 01:43:44 +01:00
Marius Kintel
96c480b1bd
Ported QCache and related code away from Qt
2011-11-09 03:18:32 +01:00
Marius Kintel
f8090c2a53
Reinstated old -x and -s cmd-line parameters for backwards compatibility
2011-11-06 22:13:31 +01:00
Marius Kintel
45161d4356
Slight refactoring of builtin function and module handling
2011-11-06 18:37:12 +01:00
Marius Kintel
ae37a04ee9
Give app version to Qt
2011-11-06 15:41:23 +01:00
Marius Kintel
5466efe7ef
bugfix: PI constant didn't work in cmd-line mode. refactored away duplicate code
2011-11-05 17:04:09 +01:00
Marius Kintel
7c7d151aed
don't use curly braces in cmd-line usage message. Patch from chrysn
2011-11-03 18:38:15 +01:00
Marius Kintel
a898a518d0
Merge branch 'master' into visitortests
2011-10-20 15:17:22 +02:00
Marius Kintel
038767f6a6
Experimental support for exporting the compiled CSG tree as a text file
2011-10-19 17:35:14 +02:00
Marius Kintel
610d7508d9
Merge branch 'master' into visitor
2011-09-27 22:33:29 +02:00
Don Bright
6d70855a4d
added png and image comparison, enabling testing on linux
2011-09-17 16:13:37 -05:00
Don Bright
f5f06c8e97
merge
...
Merge remote branch 'upstream/visitor' into visitortests
Conflicts:
src/export.cc
src/openscad.cc
src/polyset.cc
src/transform.cc
tests/CMakeLists.txt
tests/FindGLEW.cmake
tests/csgtermtest.cc
2011-09-12 17:40:51 -05:00
Don Bright
007c40848d
merge
2011-09-12 17:39:29 -05:00
Don Bright
3783f1ddc2
merge
2011-09-12 17:32:37 -05:00
Don Bright
133a705fee
merging
...
Merge remote branch 'upstream/master' into visitortests
Conflicts:
src/cgaladv.cc
src/export.cc
src/openscad.cc
src/polyset.cc
src/transform.cc
2011-09-12 17:31:02 -05:00
Marius Kintel
95949cf961
Implemented CGAL caching
2011-09-11 10:51:55 +02:00
Marius Kintel
b927e9e151
dummy commit
2011-09-08 08:19:12 +02:00
Marius Kintel
673d73cf31
Don't try exporting a non-3D object to stl or off
2011-09-08 06:54:50 +02:00
Marius Kintel
90f7e4f82e
bugfix: off export from the command-line was broken
2011-09-08 05:20:11 +02:00
Marius Kintel
512e7bb1be
bugfix: command-line crash on parser error
2011-09-08 05:14:29 +02:00
Marius Kintel
c398bc7e3d
fixed merge conflict
2011-09-08 03:39:14 +02:00
Marius Kintel
80afa32ae9
merged with master
2011-09-08 03:31:59 +02:00
Marius Kintel
072d7170e6
Catch a non-simple polyhedron before export as this crashes CGAL
2011-09-08 03:23:42 +02:00
Marius Kintel
75784844ea
Implemented OFF export
2011-09-07 22:04:02 +02:00
Marius Kintel
821c7df1fe
Extracted handle_dep() to separate source file
2011-09-04 00:03:16 +02:00
Marius Kintel
6041c34f0b
Refactored some non-CGAL functionality into separate functions in PolySetCGALEvaluator
2011-09-01 17:03:34 +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
2fe2f37fbc
bugfix: -x option didn't work
2011-08-28 04:34:46 +02: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
2f740380dc
Merged with master
2011-04-28 17:36:56 -04:00
Marius Kintel
c8dd96b76f
Must specify both long and short options
2011-04-12 22:37:49 +02:00
Marius Kintel
df5b742169
bugfix: Pass short options to boost program_options
2011-04-12 21:51:45 +02:00
Marius Kintel
d24b3cc84d
Ported recent changes to master into the visitor branch
2011-04-12 20:35:44 +02:00
Marius Kintel
5739d33cd5
Bugfix: Handling of input-file was not working
2011-04-10 17:41:32 +02:00
Marius Kintel
53d0b59470
bugfix: no bounds checking on program_options in non-MDI mode
2011-04-07 00:51:29 +02:00
Marius Kintel
4a00f2ddb2
bugfix: check size of program options before indexing
2011-04-06 17:18:09 +02:00
Marius Kintel
b59ec0cbac
gcc compile fix
2011-04-06 15:27:51 +02:00
meta
46f8a1508c
convert from getopt to boost::program_options
2011-01-22 02:02:45 +01:00
Marius Kintel
91c640fb5e
Copyright updates
2011-01-21 02:21:09 +01:00
Marius Kintel
93c00f9efe
Allow render_polyset() to return NULL
2010-11-07 17:50:57 -05:00
Marius Kintel
264608981c
Fixed some issues with PolySetRenderer, causing e.g. extrusions to fail in OpenCSG mode
2010-11-03 19:26:06 +01: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
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
3f66c23731
Reenabled CGAL rendering
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
e46f9dab2f
export to stream for stdout/stderr output support
2010-10-31 02:42:37 +02:00
Marius Kintel
e8e213b3c9
Another refactoring session:
...
o mk_cache_id() obsoleted by removing the node index from the dump
o node index output removed from each node and make optional in NodeDumper
o The visitors are no longer global, but associated with a tree
o Added Tree class to manage node trees and the (now implicit) dump cache
o Moved PolySet cache into PolySetRenderer
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
3396706e24
Added CGALRenderer + some minor fixes
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
clifford
20cf2c9be3
Clifford Wolf:
...
Indent fixes
git-svn-id: http://svn.clifford.at/openscad/trunk@522 b57f626f-c46c-0410-a088-ec61d464b74c
2010-04-15 15:40:42 +00:00