Commit Graph

84 Commits

Author SHA1 Message Date
EReckase dd35aba4f4 fixing conflict[ 2018-04-12 13:25:34 -06:00
EReckase 8735697ace wrong element reference 2018-04-12 13:23:56 -06:00
Erik Reckase f3fbff1366 color_speed was not handled properly for motion elements (#19)
* updated for aclocal 1.15

* libtool update after configure

* aclocal needed refresh

* localhost

* color speed is a motion element variable

* if mult motion elements present, was not using correct vals
2018-04-12 08:08:35 -04:00
EReckase 5e0e265181 if mult motion elements present, was not using correct vals 2018-04-12 06:03:15 -06:00
EReckase 80283c4eb9 Merge branch 'master' of https://github.com/scottdraves/flam3 into erik_dev 2018-04-08 06:45:29 -06:00
EReckase 7d9423e34f color speed is a motion element variable 2018-04-08 06:11:22 -06:00
Erik Reckase 2a090163a3 Update versions of automake, aclocal (#18)
* updated for aclocal 1.15

* libtool update after configure

* aclocal needed refresh

* localhost
2018-04-07 15:19:45 -04:00
kitchenstaff 8631217337 localhost 2018-04-07 08:40:46 -06:00
kitchenstaff 63cb87f8ad aclocal needed refresh 2018-04-07 08:40:07 -06:00
kitchenstaff 33afe587ad libtool update after configure 2018-04-07 08:37:31 -06:00
kitchenstaff ccdee7340a updated for aclocal 1.15 2018-04-07 08:29:27 -06:00
Erik Reckase e080154353 Merge pull request #9 from FractalBrew/fix-win32
Fix an undefined variable on windows builds.
2015-08-03 18:26:08 -06:00
Dave Townsend be1b9278b6 Fix an undefined variable on windows builds. 2015-08-03 17:00:00 -07:00
Scott Draves ba790dfc3e to sync with tag v3.1.1 2015-06-12 02:44:16 +00:00
Scott Draves cf992d1f25 correct version 2015-06-12 02:34:35 +00:00
Scott Draves 3b9b792e02 version to 3.1.0 2015-06-12 02:31:12 +00:00
Scott Draves 1876a2a266 Update README.txt v3.0.2 v3.1.0 2015-05-17 14:10:38 -04:00
Scott Draves f67447a609 Update README.txt 2015-05-17 12:53:02 -04:00
Scott Draves 1252833105 increase version to 3.0.2, eliminate duplicated version string, rerun autoconf stuff 2015-05-16 14:27:59 -04:00
Scott Draves 035ab3d4e9 Merge pull request #8 from scottdraves/erik_dev
hsv_rgb_palette_blend implementation
2015-04-28 21:53:38 -04:00
EReckase cbc41cd4aa new parameter, hsv_rgb_palette_blend, which applies to hsv_circular palette interpolation only. 0 -> hsv, 1 -> rgb. 2015-04-27 20:48:50 -06:00
EReckase 7f69d64ebf still need to parse "hsv" mode from the input genome 2015-04-26 11:21:17 -06:00
Scott Draves 01f29fe20c Merge pull request #7 from scottdraves/erik_dev
switched to git version rather than subversion
2015-04-26 11:34:50 -04:00
EReckase 8d34fd4c01 added --dirty to indicate the compiled directory has changes that are not checked in 2015-04-12 09:25:34 -06:00
EReckase d52cd965e7 switched to git version rather than subversion 2015-04-12 09:19:17 -06:00
Scott Draves facfbd6292 fix typo and update constant with new name 2015-04-12 09:23:32 -04:00
Scott Draves 0eb68c545d Merge pull request #5 from EReckase/master
Short-way hue interpolation tweaks
2015-04-12 09:18:56 -04:00
EReckase 4242535339 changed to hsv_circular, now the default 2015-04-11 17:50:27 -06:00
EReckase d8fbddac62 still need to change interp mode to hsv_circular 2015-04-11 17:44:36 -06:00
EReckase a1065bee5c took care of crashing O3 builds v3.0.1 2015-04-11 07:02:28 -06:00
Scott Draves 91325a0110 update to new gnu auto tools 2015-03-22 02:36:21 +00:00
Scott Draves dbd4d54f6e add file made by automake --add-missing 2015-03-22 02:33:39 +00:00
Scott Draves 35e37ce3d9 Merge pull request #3 from EReckase/dev
got rid of compile warnings, added -Wall to AM_CFLAGS for now
2015-03-09 11:44:58 -04:00
osboxes.org efe4a24b7e got rid of compile warnings, added -Wall to AM_CFLAGS for now 2015-03-09 09:07:49 -06:00
osboxes.org 42c050c29f updated configure chain to more recent versions. removed compiler optimization from -O3 that was causing problems for us (-ftree-vectorize). 2015-03-08 21:55:33 -06:00
Scott Draves 19ea9b8c87 bring content out of subdir 2015-02-15 12:24:03 -05:00
Scott Draves d29fd65614 various updates
git-svn-id: https://flam3.googlecode.com/svn/trunk@165 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:15 -05:00
Erik Reckase fb1c90e18b Modified for libpng 1.5 API support.
git-svn-id: https://flam3.googlecode.com/svn/trunk@164 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:15 -05:00
Erik Reckase 39e3709d6f s array in interpolate_n was one element too small
git-svn-id: https://flam3.googlecode.com/svn/trunk@163 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:15 -05:00
Erik Reckase 026dba70a7 moved #defines from filters.h to flam3.h so that they can be used by external programs
git-svn-id: https://flam3.googlecode.com/svn/trunk@162 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:15 -05:00
Erik Reckase 16b94f9257 was incorrectly adding symmetry xforms when a final xform was present, as well as a bug in handling final xforms in genetic crosses. thanks david bitseff
git-svn-id: https://flam3.googlecode.com/svn/trunk@161 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:15 -05:00
Erik Reckase 0346f58852 When using motion elements with the final xform, the closing tag on the final xform was incorrectly written as </xform>.
git-svn-id: https://flam3.googlecode.com/svn/trunk@160 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:15 -05:00
Erik Reckase 7c5ed6d5c2 fixed flam3_version for 'exported' SVN_REV
git-svn-id: https://flam3.googlecode.com/svn/trunk@159 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:15 -05:00
Erik Reckase 5ac641382d roundoff error was introducing some strangeness in smoothly interpolated genome palettes - now ensure that all 1.0 alpha channels -> 1.0 alpha in output
git-svn-id: https://flam3.googlecode.com/svn/trunk@156 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:15 -05:00
Erik Reckase ce2bbf871f handled missing unistd.h on windows
git-svn-id: https://flam3.googlecode.com/svn/trunk@155 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:14 -05:00
Erik Reckase 3274d1b51b in some circumstances, temporary files are not created as they are supposed to (windows tries to create it in a place protected by Admin.) We need to be able to try to create them in the location pointed to by the TEMP env var. Note that this is not threadsafe, but it's unlikely to cause a problem at the moment.
git-svn-id: https://flam3.googlecode.com/svn/trunk@154 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:14 -05:00
Erik Reckase 6cfbf0cbb1 CMAP_SIZE can be used when creating the dmap - I had erroneously thought that cmap_size was necessary (the apo-corrected number of elements in the palette)
git-svn-id: https://flam3.googlecode.com/svn/trunk@153 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:14 -05:00
Erik Reckase 6be5e2e3f2 apophysis only uses the bottom 255 elements of the palette (instead of all 256). In many cases this does not have a noticable effect on images, but in others, the color difference is very striking. the env var 'apo_palette' may be set to 1 in order to render the image in flam3 as it would appear in apophysis.
git-svn-id: https://flam3.googlecode.com/svn/trunk@152 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:14 -05:00
Erik Reckase 0053026871 added mobius variation (the one with 8 params, eralex's).
git-svn-id: https://flam3.googlecode.com/svn/trunk@151 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:14 -05:00
Erik Reckase 4565e804f1 updated version to 3.0.1
git-svn-id: https://flam3.googlecode.com/svn/trunk@150 77852712-ef1d-11de-8684-7d64432d61a3
2015-02-15 12:20:14 -05:00