From 45d936b60ce629b52faafcf9a58d2d958d22a98f Mon Sep 17 00:00:00 2001 From: Person Date: Sat, 16 Mar 2024 10:28:30 -0600 Subject: [PATCH] --Code changes -Bump version to 23.23.8.103. --This is only a dev version. --- .../Installer/FractoriumInstaller.wixproj | 2 +- Builds/MSVC/Installer/Product.wxs | 4 ++-- Builds/MSVC/Solution/Ember.rc | Bin 4546 -> 4546 bytes Builds/MSVC/Solution/EmberAnimate.rc | 8 ++++---- Builds/MSVC/Solution/EmberCL.rc | Bin 4572 -> 4572 bytes Builds/MSVC/Solution/EmberGenome.rc | 8 ++++---- Builds/MSVC/Solution/EmberRender.rc | 8 ++++---- Builds/MSVC/Solution/Fractorium.rc | Bin 4514 -> 4514 bytes Source/Ember/EmberDefines.h | 2 +- Source/Fractorium/AboutDialog.ui | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj index 5df449a..3d48cd8 100644 --- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj +++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj @@ -1,7 +1,7 @@ 3.7 - Fractorium_23.23.8.102 + Fractorium_23.23.8.103 $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index b48581d..e6b632c 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -1,5 +1,5 @@  - + @@ -12,7 +12,7 @@ - + diff --git a/Builds/MSVC/Solution/Ember.rc b/Builds/MSVC/Solution/Ember.rc index 59d493f7e029eeaa0ce3a1e80702a8df865e9a8e..e68b377c1deca517ee3470bebc36f6f05acb2f32 100644 GIT binary patch delta 38 scmX@4d`Nl29}Y(2$$vTQ8I3pFa-L-Za&)=HH!JbXV+4vEhH(f|Me diff --git a/Builds/MSVC/Solution/EmberAnimate.rc b/Builds/MSVC/Solution/EmberAnimate.rc index 4ab8d77..29c05a1 100644 --- a/Builds/MSVC/Solution/EmberAnimate.rc +++ b/Builds/MSVC/Solution/EmberAnimate.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 23, 23, 8, 102 - PRODUCTVERSION 23, 23, 8, 102 + FILEVERSION 23, 23, 8, 103 + PRODUCTVERSION 23, 23, 8, 103 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, 102" + VALUE "FileVersion", "23, 23, 8, 103" 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, 102" + VALUE "ProductVersion", "23, 23, 8, 103" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/Solution/EmberCL.rc b/Builds/MSVC/Solution/EmberCL.rc index 43e727a3616142532c358e3fe1379161dc58d058..ef15b29d2617efc36b8e831bd6aa147209d951e0 100644 GIT binary patch delta 44 zcmV+{0Mq~6Bitjf`Un9tlluri1v3B*01A`A2^F(c3B&@E?hF{SFbt{z0W-7P4FLpT CHx6U~ delta 46 zcmcbkd`Ef1FAhed$-g=5S&bNY8Mr1N@5&9`|OSpaqO B4wL`@ diff --git a/Builds/MSVC/Solution/EmberGenome.rc b/Builds/MSVC/Solution/EmberGenome.rc index 5e50567..dfc7440 100644 --- a/Builds/MSVC/Solution/EmberGenome.rc +++ b/Builds/MSVC/Solution/EmberGenome.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 23, 23, 8, 102 - PRODUCTVERSION 23, 23, 8, 102 + FILEVERSION 23, 23, 8, 103 + PRODUCTVERSION 23, 23, 8, 103 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, 102" + VALUE "FileVersion", "23, 23, 8, 103" 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, 102" + VALUE "ProductVersion", "23, 23, 8, 103" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/Solution/EmberRender.rc b/Builds/MSVC/Solution/EmberRender.rc index 1d77e64..26e19ff 100644 --- a/Builds/MSVC/Solution/EmberRender.rc +++ b/Builds/MSVC/Solution/EmberRender.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 23, 23, 8, 102 - PRODUCTVERSION 23, 23, 8, 102 + FILEVERSION 23, 23, 8, 103 + PRODUCTVERSION 23, 23, 8, 103 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, 102" + VALUE "FileVersion", "23, 23, 8, 103" 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, 102" + VALUE "ProductVersion", "23, 23, 8, 103" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/Solution/Fractorium.rc b/Builds/MSVC/Solution/Fractorium.rc index 9f281939da0ef33ce8fc11c6f5a1e7cd88dbd591..44aed8f2ea4e7929faa75c8fa16e35806eba48f6 100644 GIT binary patch delta 38 scmZ3ayhwS&6%Iz@$yYh-8I3oKa&Bh=a^!i$H$UOt!w3{v$jitA0Qk2Hx&QzG delta 38 scmZ3ayhwS&6%IzD$yYh-8I3lJa&Bh=a^!i$H$UOt!w3{v$jitA0QhPPwg3PC diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index 83ca675..e062c0a 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 "23.23.8.102" +#define EMBER_VERSION "23.23.8.103" //#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 1752bfd..0632ff8 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -61,7 +61,7 @@ QFrame::NoFrame - <html><head/><body><p align="center"><span style=" font-size:10pt;">Fractorium 23.23.8.102</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 23.23.8.103</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