From f411c355f392582106a93301fd2e7a93731575f1 Mon Sep 17 00:00:00 2001 From: Person Date: Wed, 7 Apr 2021 08:49:35 -0600 Subject: [PATCH] 21.21.4.1 Release --- .../Installer/FractoriumInstaller.wixproj | 2 +- Builds/MSVC/Installer/Product.wxs | 4 +- Builds/MSVC/VS2019/Ember.rc | Bin 4522 -> 4530 bytes Builds/MSVC/VS2019/EmberAnimate.rc | 10 ++-- Builds/MSVC/VS2019/EmberCL.rc | Bin 4548 -> 4556 bytes Builds/MSVC/VS2019/EmberGenome.rc | 10 ++-- Builds/MSVC/VS2019/EmberRender.rc | 10 ++-- Builds/MSVC/VS2019/Fractorium.rc | Bin 4490 -> 4498 bytes Builds/QtCreator/defaults.pri | 2 +- Data/Fractorium.spec | 2 +- Data/Version History.txt | 43 ++++++++++++++++++ Data/control.package | 2 +- Source/Ember/EmberDefines.h | 2 +- Source/Fractorium/AboutDialog.ui | 5 +- debian/changelog | 6 +++ 15 files changed, 75 insertions(+), 23 deletions(-) diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj index fb456da..8621975 100644 --- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj +++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj @@ -6,7 +6,7 @@ 3.7 {c8096c47-e358-438c-a520-146d46b0637d} 2.0 - Fractorium_1.0.0.21 + Fractorium_21.21.4.1 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index f8693f9..3fb4f9d 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + q__U1qaB=T;_hm|_?W*2G{qS&>_OvH;I2 RM#IUwd2Zq`U^y={3jjl(6qf)1 delta 117 zcmdm_yh?e)BMxCh1|0?k1_LD0X!3Usb!_6BjXAe6iDJ>fU^w|AkN9LUo>hznlMnLT L#Hx8cFEa}O)SDE2 diff --git a/Builds/MSVC/VS2019/EmberAnimate.rc b/Builds/MSVC/VS2019/EmberAnimate.rc index 8d4bbfd..7b0cf5d 100644 --- a/Builds/MSVC/VS2019/EmberAnimate.rc +++ b/Builds/MSVC/VS2019/EmberAnimate.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 21 - PRODUCTVERSION 1, 0, 0, 21 + FILEVERSION 21, 21, 4, 1 + PRODUCTVERSION 21, 21, 4, 1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN VALUE "CompanyName", "Open Source" VALUE "FileDescription", "Renders fractal flames as animations with motion blur" - VALUE "FileVersion", "1, 0, 0, 21" + VALUE "FileVersion", "21, 21, 4, 1" VALUE "InternalName", "EmberAnimate.exe" - VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2020, GPL v3" + VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2021, GPL v3" VALUE "OriginalFilename", "EmberAnimate.exe" VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "1, 0, 0, 21" + VALUE "ProductVersion", "21, 21, 4, 1" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/VS2019/EmberCL.rc b/Builds/MSVC/VS2019/EmberCL.rc index 0021d942d978d725128aacd48eac7f55724fa4a0..ae3de5f3f556859b634f8b7cd3cd6dcab1e45624 100644 GIT binary patch delta 125 zcmX@2d`5Z00}fFm215oN1_cHfZ35y={>-6{U1qZ`=TRncm|_?W*2G{q*^pO!vK-Gk RM#ITxc^=|0;2fU^w|8xA7l*JRgARiNg8>q0H2FM-IyUjm+??~7ut`kb&wZBBU~(_dTWqqM`+1pJ E02;j#fB*mh diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index 74eda27..c39ac0a 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -1,4 +1,4 @@ -VERSION = 1.0.0.21 +VERSION = 21.21.4.1 win32:CONFIG += skip_target_version_ext CONFIG += c++14 diff --git a/Data/Fractorium.spec b/Data/Fractorium.spec index 09963b7..b0423fa 100644 --- a/Data/Fractorium.spec +++ b/Data/Fractorium.spec @@ -2,7 +2,7 @@ %define buildroot %{_topdir}/BUILDROOT Name: Fractorium -Version: 1.0.0.21 +Version: 21.21.4.1 Release: 1 Summary: A fractal flame editor with GPU support diff --git a/Data/Version History.txt b/Data/Version History.txt index 6172a3f..ef0627e 100644 --- a/Data/Version History.txt +++ b/Data/Version History.txt @@ -1,3 +1,46 @@ +21.21.4.1 4/7/2021 + +--User changes + -Sort palette filename combo box. + -GPU rendering improvement on Mac. + -Fix misaligned menu icons in uranium.css stylesheet, requires reload. + -Rotate field now allows continues adjustment and will loop around when reaching 180/-180. + -Tooltip for the show/hide affine toolbar buttons show the keyboard shortcut. + -Add vignette variation. + -Pitch and yaw can now be changed by dragging with the right mouse button while holding Shift and Alt. + -Allow for an opacity greater than 1, which can have the effect of highlighting a specific xform. + -Make a space bar press be the equivalent of a double click when inside of a spin box. This makes it easy to toggle without using the mouse. + -Make Shift+F keys select the flames in the file, and Shift +/- cycle through them. + -Allow for specifying linear or smooth interpolation when generating a sequence in the Library tab (was formerly hardcoded to smooth). This has the effect of exposing the --unsmoother option used in EmberGenome in the GUI. + -Clarify tool tips of the sequence interpolation fields in the animation group on the Flame tab. + -Change caption of the Bounds tab to be Bounds & Log. + -Change versioning scheme to be [TOTAL RELEASE COUNT].[2 DIGIT YEAR OF RELEASE].[MONTH OF RELEASE].[TOTAL RELEASE COUNT FOR THE YEAR]. + +--Bug fixes + -Add support for Chaotica files which specify xform weight as "Base weight" instead of "base_weight". + -Fix bug where Fractorium would crash when a new file was dragged in while previews were still rendering. + --This was done by changing the TreeItemChanged() events in the library tab use a direct connection rather than a queued connection. + --This obviated the need for QCoreApplication::processEvents() calls in the library tree code. + -Fix bug where renaming a flame within a file, then tabbing away did not commit the name change. + -Strip illegal characters from filenames before saving. + -Fix improper usage of rand() in cpow2, cpow3, hypertile1, hypertile3D1, hypertile3D2, juliac, juliaq. + -Fix program crashing during density filtering on some Nvidia cards. + -Parsing phoenix_julia when coming from Apophysis was wrong. + -Pixel_flow sincos x,y was inverted. + -bcircle was not properly setting output values to zero when the bcircle_borderwidth was zero. + -depth_blur2 was wrong. + -ETA in the final render dialog was not correct when doing incremental renders. + -Sequence generation was generating the wrong color curves when a non-default curve had less than 5 nodes in it. + +--Code changes + -Migrate to Qt 5.12.8. + -Clean up some warnings about const variables. + -Upgrade installer to latest update of Visual Studio 2019. + -Optimize juliac, npolar. + -Add a new function Crand() which behaves like the legacy C rand() which returns an integer between 0 and 32766, inclusive. + -Use RandBit() in some places. + -Restructure OpenCL code for density filtering such that it does not hang after being compiled on some Nvidia cards, such as the gtx 1660. Remove barriers from conditionals where possible. + 1.0.0.20 4/11/2020 --Bug fixes -ETA time was wrong with incremental final renders after waiting for a period of time. diff --git a/Data/control.package b/Data/control.package index a130b08..6354ca7 100644 --- a/Data/control.package +++ b/Data/control.package @@ -8,7 +8,7 @@ Homepage: http://fractorium.com/ Vcs-Git: https://bitbucket.org/mfeemster/fractorium Vcs-Browser: https://bitbucket.org/mfeemster/fractorium Package: Fractorium -Version: 1.0.0.20 +Version: 21.21.4.1 Architecture: amd64 Description: A fractal flame editor with GPU support Fractorium diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index e50087c..eb63091 100644 --- a/Source/Ember/EmberDefines.h +++ b/Source/Ember/EmberDefines.h @@ -37,7 +37,7 @@ static void sincos(float x, float* s, float* c) namespace EmberNs { -#define EMBER_VERSION "1.0.0.21" +#define EMBER_VERSION "21.21.4.1" //#define FLAM3_COMPAT 1//Uncomment this if you want full compatibility with flam3 regarding some of the trig-based variations in Variations01.h #define EPS6 T(1e-6) #define EPS std::numeric_limits::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way. diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index 3bf07b0..086101f 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -54,11 +54,14 @@ 12 + + <html><head/><body><p>Version format:</p><p>[TOTAL RELEASE COUNT].</p><p>[2 DIGIT YEAR OF RELEASE].</p><p>[MONTH OF RELEASE].</p><p>[TOTAL RELEASE COUNT FOR THE YEAR]</p></body></html> + QFrame::NoFrame - <html><head/><body><p align="center"><span style=" font-size:10pt;">Fractorium 1.0.0.21</span></p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><a href="http://fractorium.com"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">fractorium.com</span></a></p></body></html> + <html><head/><body><p align="center"><span style=" font-size:10pt;">Fractorium 21.21.4.1</span></p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><a href="http://fractorium.com"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">fractorium.com</span></a></p></body></html> Qt::RichText diff --git a/debian/changelog b/debian/changelog index cfc44d2..e5ba34d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fractorium (21.21.4.1-0ubuntu1) bionic; urgency=low + + * release 21.21.4.1 + + -- Matt Feemster Wed, 7 Apr 2021 08:12:56 -0700 + fractorium (1.0.0.20-0ubuntu1) bionic; urgency=low * release 1.0.0.20