21.21.4.1 Release

Builds/MSVC/Installer/FractoriumInstaller.wixproj

@@ -6,7 +6,7 @@
     <ProductVersion>3.7</ProductVersion>
     <ProjectGuid>{c8096c47-e358-438c-a520-146d46b0637d}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Fractorium_1.0.0.21</OutputName>
+    <OutputName>Fractorium_21.21.4.1</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

Builds/MSVC/Installer/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<?define ProductVersion="1.0.0.21" ?>
+	<?define ProductVersion="21.21.4.1" ?>
 	<?define ProductName="Fractorium $(var.ProductVersion) ($(var.GpuType))" ?>
 	<?define UpgradeCode="{4714cd15-bfba-44f6-8059-9e1466ebfa6e}"?>
 	<?define Manufacturer="Fractorium"?>
@@ -13,7 +13,7 @@
 	<!--
 	Change this for every release.
 	-->
-	<?define ProductCode="{3BDFCE16-0944-4463-B475-82748BDC0AF1}"?>
+	<?define ProductCode="{ADD54CBF-04FF-4E45-996B-F071FFE5D65B}"?>
 	
 	<Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
 		<Package

Builds/MSVC/VS2019/EmberAnimate.rc

@@ -49,8 +49,8 @@
 	//
 
 	VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 1, 0, 0, 21
+	FILEVERSION 21, 21, 4, 1
-	PRODUCTVERSION 1, 0, 0, 21
+	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"

Builds/MSVC/VS2019/EmberGenome.rc

@@ -49,8 +49,8 @@
 	//
 
 	VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 1, 0, 0, 21
+	FILEVERSION 21, 21, 4, 1
-	PRODUCTVERSION 1, 0, 0, 21
+	PRODUCTVERSION 21, 21, 4, 1
 	FILEFLAGSMASK 0x3fL
 	#ifdef _DEBUG
 		FILEFLAGS 0x1L
@@ -67,12 +67,12 @@
 	BEGIN
 	VALUE "CompanyName", "Open Source"
 	VALUE "FileDescription", "Manipulates fractal flame parameter files"
-	VALUE "FileVersion", "1, 0, 0, 21"
+	VALUE "FileVersion", "21, 21, 4, 1"
 	VALUE "InternalName", "EmberGenome.exe"
-	VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2020, GPL v3"
+	VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2021, GPL v3"
 	VALUE "OriginalFilename", "EmberGenome.exe"
 	VALUE "ProductName", "Ember Genome"
-	VALUE "ProductVersion", "1, 0, 0, 21"
+	VALUE "ProductVersion", "21, 21, 4, 1"
 	END
 	END
 	BLOCK "VarFileInfo"

Builds/MSVC/VS2019/EmberRender.rc

@@ -49,8 +49,8 @@
 	//
 
 	VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 1, 0, 0, 21
+	FILEVERSION 21, 21, 4, 1
-	PRODUCTVERSION 1, 0, 0, 21
+	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 single images"
-	VALUE "FileVersion", "1, 0, 0, 21"
+	VALUE "FileVersion", "21, 21, 4, 1"
 	VALUE "InternalName", "EmberRender.exe"
-	VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2020, GPL v3"
+	VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2021, GPL v3"
 	VALUE "OriginalFilename", "EmberRender.exe"
 	VALUE "ProductName", "Ember Render"
-	VALUE "ProductVersion", "1, 0, 0, 21"
+	VALUE "ProductVersion", "21, 21, 4, 1"
 	END
 	END
 	BLOCK "VarFileInfo"

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
 

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
 

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.

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

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<T>::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way.

Source/Fractorium/AboutDialog.ui

@@ -54,11 +54,14 @@
      <pointsize>12</pointsize>
     </font>
    </property>
+   <property name="toolTip">
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Version format:&lt;/p&gt;&lt;p&gt;[TOTAL RELEASE COUNT].&lt;/p&gt;&lt;p&gt;[2 DIGIT YEAR OF RELEASE].&lt;/p&gt;&lt;p&gt;[MONTH OF RELEASE].&lt;/p&gt;&lt;p&gt;[TOTAL RELEASE COUNT FOR THE YEAR]&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
    <property name="frameShape">
     <enum>QFrame::NoFrame</enum>
    </property>
    <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Fractorium 1.0.0.21&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;http://fractorium.com&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;fractorium.com&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Fractorium 21.21.4.1&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;http://fractorium.com&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;fractorium.com&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
    <property name="textFormat">
     <enum>Qt::RichText</enum>

debian/changelog

@@ -1,3 +1,9 @@
+fractorium (21.21.4.1-0ubuntu1) bionic; urgency=low
+
+  * release 21.21.4.1
+
+ -- Matt Feemster <matt.feemster@gmail.com>  Wed, 7 Apr 2021 08:12:56 -0700
+
 fractorium (1.0.0.20-0ubuntu1) bionic; urgency=low
 
   * release 1.0.0.20