mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 13:56:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 41a886fdac Merge branch 'master' into travis Simon Detheridge 2015-06-29 10:56:38 +01:00
  • 770ff4622c --User changes -Allow for continuous update during interactive rendering. mfeemster 2015-06-28 17:48:26 -07:00
  • e8af1050b3 --User changes -Eliminate delay when switching between single and double precision. mfeemster 2015-06-28 14:04:30 -07:00
  • 4a235c7491 Merge branch 'master' into travis Simon Detheridge 2015-06-26 21:24:11 +01:00
  • 3cd970a347 --User changes Add linked xform support, with new button and icon on the xforms tab. mfeemster 2015-06-24 20:49:09 -07:00
  • c43dfb6786 Merge pull request #18 from gh2k/osx-pthread-schedprio Matt Feemster 2015-06-22 07:26:02 -07:00
  • f51ff1e051 Replace pthread_setschedprio for osx, as it doesn't exist Simon Detheridge 2015-06-22 15:03:15 +01:00
  • 3fc1645b7a Merge branch 'master' into travis Simon Detheridge 2015-06-21 09:51:58 +01:00
  • d80343a28b --User changes -Better default/min/max sizes for docks/tabs. -Add a reset workspace menu item. mfeemster 2015-06-20 11:35:08 -07:00
  • 5f3e70c6a8 --User changes Allow for detaching of top level tabs in the dock widget so workspaces can be customized. Save workspace between runs. Only correct variation names/params during parsing when the source of the Xml file is not from Ember/Fractorium. mfeemster 2015-06-17 20:05:53 -07:00
  • 91006edf34 Merge branch 'master' into travis Simon Detheridge 2015-06-04 17:24:42 +01:00
  • 5bd593b42f --User changes Allow for setting rendering thread priorities from the command line and final render dialog. Currently only implemented on Windows. Show estimated time left on the final render dialog. Sort palette list by name, instead of by index in the palette file. Sorting can be flipped by clicking the column headers of the palette table. mfeemster 2015-05-30 22:14:34 -07:00
  • 1e88aa740c Merge branch 'master' into travis Simon Detheridge 2015-05-30 10:17:09 +01:00
  • c97946c660 --Code changes Add DoubleSpinBoxTableItemDelegate.h to Fractorium.pro to get it building on Linux. mfeemster 2015-05-29 21:57:09 -07:00
  • 83ad93aadf --User changes More efficient table on the Xaos tab when using xaos on a flame with a large number of xforms. mfeemster 2015-05-29 21:08:44 -07:00
  • 64fdcbdfb2 Add travis config Simon Detheridge 2015-05-28 14:21:45 +01:00
  • 74056d4c31 Merge pull request #15 from gh2k/gcc-template-pedantism Matt Feemster 2015-05-27 08:09:15 -07:00
  • 5707617312 Fix pedantic gcc error about missing template keyword Simon Detheridge 2015-05-27 15:51:21 +01:00
  • cb54605878 --User changes Implement copying and pasting xforms between flames. mfeemster 2015-05-19 19:31:33 -07:00
  • 48ccce69f6 Merge pull request #14 from gh2k/missing-qmake-file Matt Feemster 2015-05-18 06:45:05 -07:00
  • 822c787a6c Add missing FractoriumXformsSelect.cpp to qmake build Simon Detheridge 2015-05-18 11:50:24 +01:00
  • 3c51e58379 --User changes Add the ability to click the right mouse button and drag to adjust values in spinners. Filling the palette controls will now also select the proper palette filename (if not empty) in the combo box. Allow for toggling row and column of affine tables. mfeemster 2015-05-15 18:52:31 -07:00
  • 2561708ae0 oops mfeemster 2015-05-15 18:45:15 -07:00
  • e005b4c20e --User changes Add the ability to set the current xform by pressing F1 - F32. Add the ability to toggle an entire row or column of xaos values. mfeemster 2015-05-03 17:13:14 -07:00
  • cd5669d0ef Merge pull request #12 from gh2k/buildfixes mfeemster 2015-04-26 22:19:41 -07:00
  • be8e9a5e02 --User changes Add the ability to apply operations to a selection of xforms, rather than just the current one. Update tool tips accordingly. mfeemster 2015-04-26 22:11:56 -07:00
  • 949bc93fdd Fix ambiguous call to pow due to uncast float literal Simon Detheridge 2015-04-20 11:57:10 +01:00
  • a8a39f4ac0 Add required using declarations for new member variables in Renderer Simon Detheridge 2015-04-20 11:10:02 +01:00
  • afad780c7d Update fractorium .pro with new files Simon Detheridge 2015-04-20 11:09:11 +01:00
  • 63b8a3134d Explicitly namespace calls to sqrt and isnan Simon Detheridge 2015-04-13 12:32:58 +01:00
  • 0a5a492ab6 Ensure GlobalRand is specialized before implicitly instantiated Simon Detheridge 2015-04-13 12:18:33 +01:00
  • 3f5db01a06 Move NowMs() to EmberDefines Simon Detheridge 2015-04-13 12:12:38 +01:00
  • e8bbfdd2d4 Rename FractoriumXformsXaos.cpp to FractoriumXaos.cpp to reflect that it's no longer a per-xform part of the UI. mfeemster 2015-04-08 18:30:07 -07:00
  • 053a9fcf95 Allow for multiple palette files rather than hard coding to flam3-palettes.xml. mfeemster 2015-04-08 18:23:29 -07:00
  • 4067422075 Fix bug with xaos interpolation, by setting all xaos values to zero first. mfeemster 2015-03-30 17:46:52 -07:00
  • e746ae33ab Add filename padding option to EmberAnimate Simon Detheridge 2015-03-26 21:03:45 +00:00
  • b5b660e2a0 Use a non-imbued stringstream to generate output filename Simon Detheridge 2015-03-26 19:47:20 +00:00
  • 3d206c1d22 Fix bug where xform fields that were not specified for motion interpolation were still getting interpolated. mfeemster 2015-03-25 20:47:57 -07:00
  • 53db8907ff Forgot to remove OpenCLWrapper::ProgramBuildErrors(). mfeemster 2015-03-22 12:49:43 -07:00
  • ef01380e6d This is commit of Simon Detheridge's pull request "osx-opencl" with a few modifications. mfeemster 2015-03-22 12:46:10 -07:00
  • fa6ec63447 Merge branch 'osx-opencl' of https://github.com/gh2k/fractorium mfeemster 2015-03-21 16:28:42 -07:00
  • ee0f437d50 Merge branch 'retina-glwidget' of https://github.com/gh2k/fractorium mfeemster 2015-03-21 16:23:29 -07:00
  • d69c83d5b0 Merge branch 'options-device-selection' of https://github.com/gh2k/fractorium mfeemster 2015-03-21 16:14:37 -07:00
  • 07592c9d78 Remove ReadMe.txt from all project files. mfeemster 2015-03-21 15:27:37 -07:00
  • f334ce1704 Merge branch 'debug' of https://github.com/gh2k/fractorium mfeemster 2015-03-08 20:35:26 -07:00
  • f3987d2858 Fix call to in FinalAccumOpenCLKernelCreator.cpp to use real_t, not T() Simon Detheridge 2015-03-01 16:49:16 +00:00
  • eef9a30cad Ensure correct opencl device is populated when platform setting is changed Simon Detheridge 2015-03-01 15:52:56 +00:00
  • 33b59b2f72 Fix status bar height on retina displays Simon Detheridge 2015-03-01 12:18:22 +00:00
  • 1762d8251f Multiply x and y mouse event coords by device pixel ratio Simon Detheridge 2015-02-28 22:18:07 +00:00
  • f906e06927 Ditch T(f) define in opencl programs in preference to already-defined real_t. Simon Detheridge 2015-02-26 21:18:55 +00:00
  • 022ccf1472 Whitespace fixes Simon Detheridge 2015-02-25 13:20:03 +00:00
  • 045d6ac6e0 Force all float literals in opencl variations to correct precision Simon Detheridge 2015-02-25 13:02:50 +00:00
  • b222ed4cc3 Update osx ambiguous-call fix to support the varying-precision mechanism Simon Detheridge 2015-02-21 13:32:15 +00:00
  • cf4f5d9899 Show program build errors from BuildIterProgramForEmber Simon Detheridge 2015-02-21 13:08:56 +00:00
  • d05231f082 Fix 'error: call to 'clamp' is ambiguous' error when compiling opencl program Simon Detheridge 2015-02-21 08:50:51 +00:00
  • 582bd93dea Show opencl program build errors on info tab, when compilation fails Simon Detheridge 2015-02-20 20:36:01 +00:00
  • 2dc392a1cc Use different output directory for debug build Simon Detheridge 2015-02-20 16:12:40 +00:00
  • eef2c548db Don't omit frame pointer in debug version Simon Detheridge 2015-02-09 11:06:20 +00:00
  • c01f444d52 Add option to display affines in polar coords. mfeemster 2015-02-03 17:11:16 -08:00
  • b1d5db261b Additional changes to work with Simon's pull request. mfeemster 2015-01-29 18:22:15 -08:00
  • 301b6ee452 Add .gch directories to gitignore Simon Detheridge 2015-01-26 20:17:29 +00:00
  • c1031bbfee Update qt build script to set nvidia or native configs from commandline Simon Detheridge 2015-01-26 18:13:53 +00:00
  • 52f6415085 Add nvidia config to build nvidia-compatible binary on osx/linux Simon Detheridge 2015-01-26 17:50:41 +00:00
  • 6e929a7aaf Tidy shared_settings to group platform-specific items together Simon Detheridge 2015-01-26 17:23:41 +00:00
  • 8bafa3ddbc Add linux/osx intermediate files to gitignore Simon Detheridge 2015-01-26 17:18:29 +00:00
  • 254bf89469 Refactor .pro files to keep shared settings all in one place Simon Detheridge 2015-01-26 17:17:51 +00:00
  • 5a610601af Don't strip symbols on osx release build Simon Detheridge 2015-01-26 12:03:43 +00:00
  • 0f0035e37c Add helper script to [re]build all QtCreator projects Simon Detheridge 2015-01-26 12:01:15 +00:00
  • 73cd4f9718 Fix incorrect parsing of legacy "symmetry" xform Xml element. mfeemster 2015-01-23 18:26:18 -08:00
  • c2ef02a8bf Write all non-xml data to cerr from EmberGenome Simon Detheridge 2015-01-21 13:34:34 +00:00
  • cc2ce44140 Don't prematurely terminate if doCross1 is not specified Simon Detheridge 2015-01-21 10:51:26 +00:00
  • 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. mfeemster 2015-01-19 08:39:50 -08:00
  • 2999cd159f Work around segfault in LLVM on osx by removing lambda default parameters Simon Detheridge 2015-01-14 13:15:23 +00:00
  • fbdd160061 Fix destructor exception-permissiveness errors in a less idiotic way Simon Detheridge 2015-01-14 13:10:25 +00:00
  • 940c51f16a Fix fractorium project file for osx Simon Detheridge 2015-01-14 11:39:49 +00:00
  • 8342c97efb Fix project files for EmberGenome/Render/Animate for osx Simon Detheridge 2015-01-14 10:51:55 +00:00
  • 36cb7535c4 Fix compiler error due to tbb member having more restrictive exception filter Simon Detheridge 2015-01-14 10:41:17 +00:00
  • 4d977f6e3a Fix opengl header inclusion on osx Simon Detheridge 2015-01-14 10:40:24 +00:00
  • a5fc85b17e Fix compiler error due to usage of << to close a template instantiation Simon Detheridge 2015-01-14 10:37:40 +00:00
  • 3c4dc80342 Fix pro file for EmberCL on osx Simon Detheridge 2015-01-14 10:36:18 +00:00
  • 3a1919dd03 Add CL header missing on osx Simon Detheridge 2015-01-14 10:35:38 +00:00
  • 958a4786ab Use correct file handle structure on osx Simon Detheridge 2015-01-14 09:48:16 +00:00
  • 5ec065a66b Fix compiler error due to tbb member having more restrictive exception filter Simon Detheridge 2015-01-14 09:47:15 +00:00
  • 3791853a80 Fix compiler error due to missing 'template' keyword Simon Detheridge 2015-01-14 09:42:44 +00:00
  • 6576f4b290 Fix ember library includes for osx Simon Detheridge 2015-01-14 09:40:32 +00:00
  • 3ceafa176f Fix compiler error by explicitly instantiating static objects Simon Detheridge 2015-01-14 09:39:42 +00:00
  • 1cd3ec86fe Add necessary osx changes to ember project file Simon Detheridge 2015-01-14 09:35:58 +00:00
  • 397af59c12 Exclude osx build output in gitignore Simon Detheridge 2015-01-14 09:31:10 +00:00
  • 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. mfeemster 2015-01-02 15:11:36 -08:00
  • 3cf6141e27 Derive from QOpenGLWidget instead of QGLWidget. mfeemster 2015-01-01 07:17:05 -08:00
  • 9502ae57ab Linux. mfeemster 2014-12-14 20:25:46 -08:00
  • a004f71888 Windows. mfeemster 2014-12-14 17:12:01 -08:00
  • c0f98bf632 Linux. mfeemster 2014-12-12 02:37:29 -08:00
  • 713007dadd Windows. mfeemster 2014-12-12 00:54:03 -08:00
  • 2531b1215e linux mfeemster 2014-12-11 18:57:49 -08:00
  • f32eaadd3d Linux/Windows sync. mfeemster 2014-12-11 15:13:26 -08:00
  • 6abd04058a Windows/Linux sync. mfeemster 2014-12-11 09:02:42 -08:00
  • a9ecb6a78e More linux work. mfeemster 2014-12-10 21:50:15 -08:00
  • 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. mfeemster 2014-12-09 20:15:44 -08:00
  • 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. mfeemster 2014-12-09 20:15:02 -08:00