Commit Graph

1037 Commits

Author SHA1 Message Date
mfeemster
c01f444d52 Add option to display affines in polar coords. 2015-02-03 17:11:16 -08:00
mfeemster
b1d5db261b Additional changes to work with Simon's pull request.
-Remove unneeded glFinish() call in GLWidget.
-Remove unneeded AMD_OS_WIN preprocessor in several projects.
-Define NVIDIA in all projects that use the NvidiaRelease build and depend on OpenCL.
2015-01-29 18:22:15 -08:00
Simon Detheridge
301b6ee452 Add .gch directories to gitignore 2015-01-26 20:17:29 +00:00
Simon Detheridge
c1031bbfee Update qt build script to set nvidia or native configs from commandline 2015-01-26 18:13:53 +00:00
Simon Detheridge
52f6415085 Add nvidia config to build nvidia-compatible binary on osx/linux
Also added config to build a cpu-native binary to take advantage of additional CPU features
2015-01-26 17:50:41 +00:00
Simon Detheridge
6e929a7aaf Tidy shared_settings to group platform-specific items together 2015-01-26 17:23:41 +00:00
Simon Detheridge
8bafa3ddbc Add linux/osx intermediate files to gitignore 2015-01-26 17:18:29 +00:00
Simon Detheridge
254bf89469 Refactor .pro files to keep shared settings all in one place 2015-01-26 17:17:51 +00:00
Simon Detheridge
5a610601af Don't strip symbols on osx release build
This avoids clang error in release mode: atom not found in symbolIndex(__ZN7EmberNs11EmberReport23StaticErrorReportStringERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEE) for architecture x86_64
2015-01-26 16:01:10 +00:00
Simon Detheridge
0f0035e37c Add helper script to [re]build all QtCreator projects 2015-01-26 16:00:59 +00:00
mfeemster
73cd4f9718 Fix incorrect parsing of legacy "symmetry" xform Xml element. 2015-01-23 18:26:18 -08:00
Simon Detheridge
c2ef02a8bf Write all non-xml data to cerr from EmberGenome
The command is intended to write XML output to stdout for piping into an xml file, but adds diagnostic information and warnings to the output, generating invalid XML.
2015-01-21 13:34:34 +00:00
Simon Detheridge
cc2ce44140 Don't prematurely terminate if doCross1 is not specified 2015-01-21 10:51:26 +00:00
mfeemster
4059767dc4 0.4.1.8 Beta - Date pending testing.
--User changes
 Thread image writing in EmberAnimate and when doing animation sequence in final render dialog.
 Add total time output for verbose mode in EmberAnimate to match EmberRender.

--Bug Fixes
 Fix incorrect iters ran/requested percentage in EmberAnimate to match EmberRender.
 Fix motion blur being disabled when doing animations in final render dialog.
 Allow for boolean command line options which default to true to be set to false.

--Code Changes
 Minor changes to enable a Mac build.
 Double the memory required for the final output buffer in RendererBase::MemoryRequired() when threading image writing.
 Reuse same buffer for RgbaToRgb() in EmberRender and EmberAnimate.
 Only resize in RgbaToRgb() if the two vectors are not the same.
 Add a final output buffer ping-ponging mechanism to facilitate threaded writes in controllers.
2015-01-19 08:39:50 -08:00
Simon Detheridge
2999cd159f Work around segfault in LLVM on osx by removing lambda default parameters
It's an ugly hack, but it's the only workaround I could find.
2015-01-14 13:15:23 +00:00
Simon Detheridge
fbdd160061 Fix destructor exception-permissiveness errors in a less idiotic way 2015-01-14 13:10:25 +00:00
Simon Detheridge
940c51f16a Fix fractorium project file for osx 2015-01-14 11:39:49 +00:00
Simon Detheridge
8342c97efb Fix project files for EmberGenome/Render/Animate for osx 2015-01-14 10:52:00 +00:00
Simon Detheridge
36cb7535c4 Fix compiler error due to tbb member having more restrictive exception filter 2015-01-14 10:41:17 +00:00
Simon Detheridge
4d977f6e3a Fix opengl header inclusion on osx 2015-01-14 10:40:24 +00:00
Simon Detheridge
a5fc85b17e Fix compiler error due to usage of << to close a template instantiation 2015-01-14 10:37:40 +00:00
Simon Detheridge
3c4dc80342 Fix pro file for EmberCL on osx 2015-01-14 10:36:18 +00:00
Simon Detheridge
3a1919dd03 Add CL header missing on osx 2015-01-14 10:35:38 +00:00
Simon Detheridge
958a4786ab Use correct file handle structure on osx 2015-01-14 10:21:36 +00:00
Simon Detheridge
5ec065a66b Fix compiler error due to tbb member having more restrictive exception filter 2015-01-14 10:21:36 +00:00
Simon Detheridge
3791853a80 Fix compiler error due to missing 'template' keyword 2015-01-14 10:21:36 +00:00
Simon Detheridge
6576f4b290 Fix ember library includes for osx 2015-01-14 10:21:36 +00:00
Simon Detheridge
3ceafa176f Fix compiler error by explicitly instantiating static objects
Gave error about implicit instantiation having happened first
2015-01-14 10:21:36 +00:00
Simon Detheridge
1cd3ec86fe Add necessary osx changes to ember project file 2015-01-14 10:21:27 +00:00
Simon Detheridge
397af59c12 Exclude osx build output in gitignore 2015-01-14 09:31:10 +00:00
mfeemster
5354e96fe2 0.4.1.7 Beta 01/02/2015
--User changes
 Use actual strips count when computing memory requirements in the final render dialog.
 Output CL_DEVICE_ADDRESS_BITS when passing --openclinfo to command line programs.
 Warn if single/total allocations are greater than the max allowed for OpenCL in the final render dialog.
 Make about box properly sized for different fonts.
 Dock widget is slightly resizable now.
 Center scroll area when loading a new ember.

--Bug Fixes
 Fix bad values left in an ember when a render with strips > 1 fails in the final render dialog.
 Fix incorrect calculation in dc_cube variation when using OpenCL.

--Code Changes
 Major work to get it running on Linux.
 Migrate from QGLWidget to QOpenGLWidget.
 Delayed init due to QOpenGLWidget.
 Break RendererBase::MemoryRequired() into two functions, it and HistMemRequired() and return a tuple.
 Add GlobalMemSize() and MaxAllocSize() functions in OpenCLWrapper.
 Change CHOOSE_XFORM_GRAIN to be 16384, so we can & with 16383 instead of using modulo when selecting an xform. This results in a 9% speed increase on the CPU.
 Save each newly loaded ember in a file called "last.flame" in the executable folder. This will help diagnose crashes that occur when switching embers.
 Use nullptr instead of NULL in the Fractorium project. It had previously been done in all other places.
2015-01-02 15:11:36 -08:00
mfeemster
3cf6141e27 Derive from QOpenGLWidget instead of QGLWidget.
Derive from QOpenGLWidget instead of QGLWidget.
More commits to follow.
2015-01-01 07:17:05 -08:00
mfeemster
9502ae57ab Linux. 2014-12-14 20:25:46 -08:00
mfeemster
a004f71888 Windows. 2014-12-14 17:12:01 -08:00
mfeemster
c0f98bf632 Linux. 2014-12-12 02:37:29 -08:00
mfeemster
713007dadd Windows. 2014-12-12 00:54:03 -08:00
mfeemster
2531b1215e linux 2014-12-11 18:57:49 -08:00
mfeemster
f32eaadd3d Linux/Windows sync. 2014-12-11 15:13:26 -08:00
mfeemster
6abd04058a Windows/Linux sync. 2014-12-11 09:02:42 -08:00
mfeemster
a9ecb6a78e More linux work. 2014-12-10 21:50:15 -08:00
mfeemster
0438827ba5 Change CHOOSE_XFORM_GRAIN to be 16384, so we can & with 16383 instead of using modulo. This results in a 9% speed increase on the CPU. 2014-12-09 20:15:44 -08:00
mfeemster
7abecaf7be Change CHOOSE_XFORM_GRAIN to be 16384, so we can & with 16383 instead of using modulo. This results in a 9% speed increase on the CPU. 2014-12-09 20:15:02 -08:00
mfeemster
d42cdfafe4 Followon commit 2014-12-09 02:03:54 -08:00
mfeemster
3e70b8eec6 Report memory required in final render dialog.
Fix broken state of ember during failed render with strips.
2014-12-09 00:24:28 -08:00
mfeemster
9263906cb5 linux work
Merge branch 'master' of https://github.com/mfeemster/fractorium
2014-12-08 02:19:29 -08:00
mfeemster
9947cd1c84 More Linux work, getting started with QtCreator. 2014-12-08 02:18:16 -08:00
mfeemster
fad9206229 Additional casting work. 2014-12-07 00:59:26 -08:00
mfeemster
623d417f0f More Linux work. Convert all casts to new style, away from legacy. 2014-12-06 23:51:44 -08:00
mfeemster
47dd9fe35c Replace unsigned int, and char with uint and uchar. 2014-12-05 21:05:09 -08:00
mfeemster
8a3521206b Add "ISO-8859-1" as the encoding type when reading Xml files.
Fix small bug when setting the current ember in the final render dialog when showing it.

Have Wix installer point to proper location for installed vcredist DLLs.

Remove VS2010 builds dir.
2014-12-05 20:04:41 -08:00