From 6db97a231a96b812aecc1bde95a78cbf07cdf72a Mon Sep 17 00:00:00 2001 From: Person Date: Mon, 17 Jul 2023 10:16:51 -0600 Subject: [PATCH] --Code changes -Begin preparation for 23.23.8.1 release. --- .../Installer/FractoriumInstaller.wixproj | 2 +- Builds/MSVC/Installer/Product.wxs | 4 ++-- Builds/MSVC/Solution/Ember.rc | Bin 4530 -> 4530 bytes Builds/MSVC/Solution/EmberAnimate.rc | 8 ++++---- Builds/MSVC/Solution/EmberCL.rc | Bin 4556 -> 4556 bytes Builds/MSVC/Solution/EmberGenome.rc | 8 ++++---- Builds/MSVC/Solution/EmberRender.rc | 8 ++++---- Builds/MSVC/Solution/Fractorium.rc | Bin 4498 -> 4498 bytes Builds/QtCreator/defaults.pri | 2 +- Source/Ember/EmberDefines.h | 2 +- Source/EmberCL/DllMain.cpp | 11 ++++++----- Source/EmberRender/EmberRender.cpp | 6 ++---- Source/Fractorium/AboutDialog.ui | 2 +- 13 files changed, 26 insertions(+), 27 deletions(-) diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj index d75748c..b017940 100644 --- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj +++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj @@ -1,7 +1,7 @@ 3.7 - Fractorium_22.21.4.2 + Fractorium_23.23.8.1 $(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\ diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index 043d7ca..c3b116c 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 cb01a8f49e5447d6dfa472460f8d24ff23fbb6c9..71c1484f18141ff1b27c1fabb2eb6e49fb4e0687 100644 GIT binary patch delta 118 zcmdm_yh(Y(6An>h1|0?k1|tRtZ2{&PPX5WEj$LN6Dd$!u>{632@`!I1<7s2WF1>jp HFCz;8w*eCC delta 118 zcmdm_yh(Y(6An=$1|0?k1|tSTFl_?iP5#NDj$LN6Dd$!u>{632@`!I1<7s2WF1>jp HFCz;8u~QP$ diff --git a/Builds/MSVC/Solution/EmberAnimate.rc b/Builds/MSVC/Solution/EmberAnimate.rc index d66215e..b814dff 100644 --- a/Builds/MSVC/Solution/EmberAnimate.rc +++ b/Builds/MSVC/Solution/EmberAnimate.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 22, 21, 4, 2 - PRODUCTVERSION 22, 21, 4, 2 + FILEVERSION 23, 23, 8, 1 + PRODUCTVERSION 23, 23, 8, 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", "22, 21, 4, 2" + VALUE "FileVersion", "23, 23, 8, 1" VALUE "InternalName", "EmberAnimate.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2021, GPL v3" VALUE "OriginalFilename", "EmberAnimate.exe" VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "22, 21, 4, 2" + VALUE "ProductVersion", "23, 23, 8, 1" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/Solution/EmberCL.rc b/Builds/MSVC/Solution/EmberCL.rc index 7c3ecaad42486a386fdee9f2e7d3d0aad5314fb9..6ece78b14c096354d04787e0a5c8fba93804a369 100644 GIT binary patch delta 118 zcmX@3d`5Z0BMwnx1|0?k1|tRtZ2{&PPX5lJj$LN6G3QYx>{62ta*J{62ta*J1|0?k1|tSTFl_?iO}@yXj$LLmFXwzF98w3lcQfLUn#jw@0stF5 B5j_9^ diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index b8ed0d7..928601e 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -1,4 +1,4 @@ -VERSION = 22.21.4.2 +VERSION = 23.23.8.1 win32:CONFIG += skip_target_version_ext CONFIG += c++2a diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index 2c44573..7a7242a 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 "22.21.4.2" +#define EMBER_VERSION "23.23.8.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/EmberCL/DllMain.cpp b/Source/EmberCL/DllMain.cpp index 74681ae..3048a72 100644 --- a/Source/EmberCL/DllMain.cpp +++ b/Source/EmberCL/DllMain.cpp @@ -11,12 +11,13 @@ BOOL APIENTRY DllMain( HMODULE hModule, { switch (ul_reason_for_call) { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; } + return TRUE; } #endif diff --git a/Source/EmberRender/EmberRender.cpp b/Source/EmberRender/EmberRender.cpp index 823b8de..19b9742 100644 --- a/Source/EmberRender/EmberRender.cpp +++ b/Source/EmberRender/EmberRender.cpp @@ -463,13 +463,11 @@ bool EmberRender(int argc, _TCHAR* argv[], EmberOptions& opt) Join(writeFileThreads); }); - //if (!rendererCL) // break; } - - // if (!rendererCL) - //break; + // if (!rendererCL) + //break; } if (opt.EmberCL() && opt.DumpKernel()) diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index 5b6290b..03dfac0 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 22.21.4.2</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.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