--User changes

-Remove the Type field from the variations tree and instead just put the type indicator icon next to the variation name. -Double clicking to toggle variation parameter spinners now resets the value to the default if there is one, else it uses zero. If it is already using the default, it is toggled to 0. -Add a new button to toggle xaos on and off. -When duplicating a flame, insert it immediately after the one being duplicated instead of at the end of the file. -When switching between flames in a file, keep the same xform index selected rather than resetting it to the first xform each time. -Create a threaded writer for the final render and EmberAnimate so the rendering process does not get delayed by file saving which may take a long time. -Remove warning which said "Frames per rot cannot be greater than one while Rotations is zero" when generating a sequence. -Add the Circle_Rand variation from Chaotica. -Add tool tips to clarify the following items: --Auto Unique Filenames checkbox in the options dialog. --Xaos table headers. --Bug fixes -Generating sequences using the following variations would be done incorrectly: circletrans1, collideoscope, crob, curlsp, glynnsim1, glynnsim2, hypercrop, julian, julian, mobiusn, nblur, waves2, wavesn. -Adding/removing nodes from the color curve had accidentally been disabled. -The applied xaos weight table was not showing normalized weight values. -Changing the size of a flame was not observing the Apply To All checkbox. -Do not clamp the Rotate field to +/-180, because this causes the rotation to switch from CW to CCW during sequence generation. Instead, leave it exactly as the user entered it so the rotations proceed in the same direction.
2025-06-30 21:36:33 -04:00 · 2023-11-21 22:58:22 -07:00
parent 1a1cb8b0f2
commit 745f06d29d
47 changed files with 616 additions and 326 deletions
--- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj
+++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj
@ -1,7 +1,7 @@
 <Project Sdk="WixToolset.Sdk/4.0.0">
  <PropertyGroup>
    <ProductVersion>3.7</ProductVersion>
-    <OutputName>Fractorium_23.23.8.1</OutputName>
+    <OutputName>Fractorium_23.23.8.100</OutputName>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <OutputPath>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutputPath>
--- a/Builds/MSVC/Installer/Product.wxs
+++ b/Builds/MSVC/Installer/Product.wxs
@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-	<?define ProductVersion="23.23.8.1" ?>
+	<?define ProductVersion="23.23.8.100" ?>
 	<?define ProductName="Fractorium $(var.ProductVersion) ($(var.GpuType))" ?>
 	<?define UpgradeCode="{4714cd15-bfba-44f6-8059-9e1466ebfa6e}"?>
 	<?define Manufacturer="Fractorium"?>
@ -12,7 +12,7 @@
 	<!--
 	Change this for every release.
 	-->
-	<?define ProductCode="{533C4A1B-B52A-4843-8A5A-C7461E0B05EF}"?>
+	<?define ProductCode="{03DF885D-6E38-4185-8C2F-AA95EEAC6CB9}"?>
 	
 	<Package Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)" InstallerVersion="400" Scope="perMachine" ProductCode="$(var.ProductCode)">
 		<SummaryInformation Keywords="Installer" Description="$(var.Manufacturer)" Manufacturer="$(var.Manufacturer)" />
--- a/Builds/MSVC/Solution/Ember.rc
+++ b/Builds/MSVC/Solution/Ember.rc
--- a/Builds/MSVC/Solution/EmberAnimate.rc
+++ b/Builds/MSVC/Solution/EmberAnimate.rc
@ -49,8 +49,8 @@
 	//

 	VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 23, 23, 8, 1
-	PRODUCTVERSION 23, 23, 8, 1
+	FILEVERSION 23, 23, 8, 100
+	PRODUCTVERSION 23, 23, 8, 100
 	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", "23, 23, 8, 1"
+	VALUE "FileVersion", "23, 23, 8, 100"
 	VALUE "InternalName", "EmberAnimate.exe"
 	VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2021, GPL v3"
 	VALUE "OriginalFilename", "EmberAnimate.exe"
 	VALUE "ProductName", "Ember Animate"
-	VALUE "ProductVersion", "23, 23, 8, 1"
+	VALUE "ProductVersion", "23, 23, 8, 100"
 	END
 	END
 	BLOCK "VarFileInfo"
--- a/Builds/MSVC/Solution/EmberCL.rc
+++ b/Builds/MSVC/Solution/EmberCL.rc
--- a/Builds/MSVC/Solution/EmberGenome.rc
+++ b/Builds/MSVC/Solution/EmberGenome.rc
@ -49,8 +49,8 @@
 	//

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

 	VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 23, 23, 8, 1
-	PRODUCTVERSION 23, 23, 8, 1
+	FILEVERSION 23, 23, 8, 100
+	PRODUCTVERSION 23, 23, 8, 100
 	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", "23, 23, 8, 1"
+	VALUE "FileVersion", "23, 23, 8, 100"
 	VALUE "InternalName", "EmberRender.exe"
 	VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2021, GPL v3"
 	VALUE "OriginalFilename", "EmberRender.exe"
 	VALUE "ProductName", "Ember Render"
-	VALUE "ProductVersion", "23, 23, 8, 1"
+	VALUE "ProductVersion", "23, 23, 8, 100"
 	END
 	END
 	BLOCK "VarFileInfo"
--- a/Builds/MSVC/Solution/Fractorium.rc
+++ b/Builds/MSVC/Solution/Fractorium.rc
--- a/Builds/MSVC/Solution/Fractorium.sln
+++ b/Builds/MSVC/Solution/Fractorium.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2036
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34202.233
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ember", "Ember.vcxproj", "{2BDB7A54-BB1A-476B-A6E5-F81E90AD4E67}"
 EndProject
@ -17,7 +17,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberGenome", "EmberGenome.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmberCL", "EmberCL.vcxproj", "{F6A9102C-69A9-48FB-BC4B-49E49AF43236}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "FractoriumInstaller", "..\Installer\FractoriumInstaller.wixproj", "{C8096C47-E358-438C-A520-146D46B0637D}"
+Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "FractoriumInstaller", "..\Installer\FractoriumInstaller.wixproj", "{C8096C47-E358-438C-A520-146D46B0637D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F6A9102C-69A9-48FB-BC4B-49E49AF43236} = {F6A9102C-69A9-48FB-BC4B-49E49AF43236}
 		{4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29} = {4A191F4C-03AC-4F1B-AFFD-F5483ECEBD29}