Commit Graph

985 Commits (b68537b6ac032cb138e4c6225c6be8680f9664f7)

Author SHA1 Message Date
Marius Kintel b68537b6ac Merge pull request #20 from donbright/visitorwinxp
fix build errors on windows
2011-08-27 13:09:48 -07:00
Marius Kintel b3dd77d252 Merge branch 'master' into visitor
Conflicts:
	src/mainwin.cc
2011-08-27 21:42:50 +02:00
Marius Kintel 065e1de739 compile fixes after last batch of changes 2011-08-27 21:41:54 +02:00
Marius Kintel 76a781d2fb Added square() bugfix 2011-08-27 21:12:09 +02:00
Marius Kintel 947b683ae2 Added note about missing dependency tracking for libraries 2011-08-27 21:11:51 +02:00
Marius Kintel 94d3424d63 bugfix: Automatic reload and compile got broken during the rendering refactoring 2011-08-27 21:11:27 +02:00
Marius Kintel 08c83d306e Merge branch 'master' into visitor
Conflicts:
	src/primitives.cc
2011-08-25 17:46:21 +02:00
Marius Kintel cb0fe366cf Use feature tests for cgal 2011-08-25 17:44:25 +02:00
Marius Kintel a32007e66c bugfix: Flush caches now also flushes the use'd module cache 2011-08-25 16:54:56 +02:00
Marius Kintel 0823b1f3c0 bugfix: Flush caches now also flushes the use'd module cache 2011-08-25 16:54:02 +02:00
Marius Kintel 3c87c07318 compile fixes for older versions of CGAL + newer versions of gcc 2011-08-24 22:25:15 +02:00
Marius Kintel 428d5bfc0e Refactored cgal_nef3_to_polyset() to cgal wrapper class 2011-08-22 19:31:56 +02:00
Giles Bathgate 8196385438 Fix for crash caused by 0-sized square as reported by chrysn. 2011-08-14 20:59:22 +01:00
don bright ec85e65ee9 fix build errors on windows 2011-08-12 18:48:59 -05:00
Marius Kintel be63c6eeac Added modifier test cases for OpenCSG 2011-08-06 01:14:08 +02:00
Marius Kintel bdf1fda89b Handle highlight and background modifiers 2011-08-06 01:08:32 +02:00
Marius Kintel cfea2f8934 bugfix: background and highlight was broken after refactoring 2011-08-06 01:08:11 +02:00
Marius Kintel 2245725859 verbose option 2011-08-05 23:13:40 +02:00
Marius Kintel b9608dd2f8 Implemented rudimentary image compare for OpenCSG regression tests 2011-08-05 03:48:35 +02:00
Marius Kintel 0340d4e0a1 Improved view distance 2011-08-05 03:27:17 +02:00
Marius Kintel 38f50db0e0 Initially show object at an angle 2011-08-05 02:17:26 +02:00
Marius Kintel 80e526880a Started on getBoundingBox functionality, refactored some vector code as part of this initiative 2011-08-05 02:11:20 +02:00
Marius Kintel a586a96503 Return a reference to the internal vector 2011-08-04 18:28:47 +02:00
Marius Kintel 1d4b36a5c6 Added FIXME for new alpha handling 2011-08-04 18:28:29 +02:00
Marius Kintel 1bd45c1891 Added some opencsgtest tests. Image compare code is still missing 2011-08-04 18:28:04 +02:00
Marius Kintel dbb0b3442b Write output PNG to stdout 2011-08-04 18:26:49 +02:00
Marius Kintel ef39e400f8 Reenabled csgtexttest and csgtermtest 2011-08-04 18:26:25 +02:00
Marius Kintel c0c56a0c30 Added hull() test 2011-08-04 18:26:04 +02:00
Marius Kintel 76263f3a8f Updated cache to new location 2011-08-04 17:01:49 +02:00
Marius Kintel 01388c9e62 Renderer->Evaluator rename 2011-08-04 05:11:48 +02:00
Marius Kintel cf4821c589 De-Qt-ified AbstractNode 2011-08-04 04:58:17 +02:00
Marius Kintel e3e31c0f4f some leftover conflicts from the last merge 2011-08-04 04:56:31 +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
Don Bright f78d4f74b2 Merge remote branch 'upstream/master' 2011-08-03 16:37:51 -05:00
Marius Kintel a35c801eec Improved (more detailed) CGAL error messages 2011-08-03 01:12:54 +02:00
Marius Kintel e43315363d Reinstated combine callback. Thanks to Giles for pointing it out 2011-08-03 00:37:39 +02:00
Marius Kintel c65a3f5d74 Merge branch 'master' into visitor 2011-08-02 23:48:13 +02:00
Marius Kintel cacfbd94b9 bug crept into the opencsg check 2011-08-02 23:47:52 +02:00
Marius Kintel daebff80c7 Apply FBO patch to OpenCSG 2011-08-02 17:42:24 +02:00
Marius Kintel e8dac70bcd Patch to allow OpenCSG to render into an FBO instead of into the system-provided framebuffer 2011-08-02 17:41:59 +02:00
Marius Kintel cdb62b116f moved location 2011-08-02 01:44:14 +02:00
Marius Kintel 0846b4c2ea Minor updates. This works now, but needs a bugfix in OpenCSG 2011-08-02 01:43:29 +02:00
Marius Kintel 8dc35b539b Require glew to be initialized outside the renderer. cosmetics 2011-08-02 01:39:25 +02:00
Marius Kintel 2b0035175d One step further on a Qt-free offscreen renderer 2011-07-31 03:12:27 +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 dd9dfcb4ec fixed merge conflicts 2011-07-31 01:09:16 +02:00
Marius Kintel c79ad5010e Merge remote branch 'remotes/local/master' into gl-refactor 2011-07-30 21:48:18 +02:00
Marius Kintel 4e60d215de removed unused member variable 'enableOpenCSG' 2011-07-30 21:42:31 +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