From 93fcedebd473ecc523de1cdbd0bc1128d34a3866 Mon Sep 17 00:00:00 2001 From: Person Date: Sun, 13 May 2018 11:02:37 -0700 Subject: [PATCH] 1.0.0.9 Release --Bug fixes -Pausing did not work when using OpenCL renderer. --- .../Installer/FractoriumInstaller.wixproj | 2 +- Builds/MSVC/Installer/Product.wxs | 4 ++-- Builds/MSVC/VS2017/Ember.rc | Bin 4502 -> 4502 bytes Builds/MSVC/VS2017/EmberAnimate.rc | 8 ++++---- Builds/MSVC/VS2017/EmberCL.rc | Bin 4528 -> 4528 bytes Builds/MSVC/VS2017/EmberGenome.rc | 8 ++++---- Builds/MSVC/VS2017/EmberRender.rc | 8 ++++---- Builds/MSVC/VS2017/Fractorium.rc | Bin 4470 -> 4470 bytes Data/Version History.txt | 6 +++++- Source/Ember/EmberDefines.h | 2 +- Source/EmberCL/RendererCL.cpp | 4 ++++ Source/Fractorium/AboutDialog.ui | 2 +- debian/changelog | 6 ++++++ 13 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj index a91a64a..4d2384c 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.8 + Fractorium_1.0.0.9 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 deef6ff..f2e9141 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + Sb-bc&;N1hF> delta 44 zcmbQHJWYAS7Y;^?$zM6l87(&Ja_(mWa`y9xZ)V|{z{qUDpfuT#Pj>Sb-bc&;M>!3t diff --git a/Builds/MSVC/VS2017/EmberAnimate.rc b/Builds/MSVC/VS2017/EmberAnimate.rc index e9a887a..1a4ecd1 100644 --- a/Builds/MSVC/VS2017/EmberAnimate.rc +++ b/Builds/MSVC/VS2017/EmberAnimate.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 8 - PRODUCTVERSION 1, 0, 0, 8 + FILEVERSION 1, 0, 0, 9 + PRODUCTVERSION 1, 0, 0, 9 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.8" + VALUE "FileVersion", "1.0.0.9" VALUE "InternalName", "EmberAnimate.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2017, GPL v3" VALUE "OriginalFilename", "EmberAnimate.exe" VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "1.0.0.8" + VALUE "ProductVersion", "1.0.0.9" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/VS2017/EmberCL.rc b/Builds/MSVC/VS2017/EmberCL.rc index 6783574b4be8ff9e93e247878d7fa1439dd144e3..3e4a8766e38bdd48b75a6ddca7c63a82631fa352 100644 GIT binary patch delta 46 zcmdm>yg_-xCk{r-$)7pQSuGiO8Mr2Iyg_-xCk{r7$)7pQSuGfN8Mr2ISZ-bc&;Qv?mZ delta 44 zcmeyS^i65Q84gB^$!9st87(%ma;{_oau|8UHy`6($H;8Kpfp*KPj>SZ-bc&;QlAaF diff --git a/Data/Version History.txt b/Data/Version History.txt index 4e12031..71323f2 100644 --- a/Data/Version History.txt +++ b/Data/Version History.txt @@ -1,4 +1,8 @@ -1.0.0.8 12/22/2017 +1.0.0.9 5/13/2017 +--Bug fixes + -Pausing did not work when using OpenCL renderer. + +1.0.0.8 5/4/2018 --User changes -Change variation spin boxes to only show the precision needed, and also allow scientific notation. -Added pixel_flow variation from user bezo97. diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index ebb0a06..d841125 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.8" +#define EMBER_VERSION "1.0.0.9" #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. #define ISAAC_SIZE 4 diff --git a/Source/EmberCL/RendererCL.cpp b/Source/EmberCL/RendererCL.cpp index fd43163..b86aecd 100644 --- a/Source/EmberCL/RendererCL.cpp +++ b/Source/EmberCL/RendererCL.cpp @@ -997,6 +997,10 @@ bool RendererCL::RunIter(size_t iterCount, size_t temporalSample, si while (b && (atomLaunchesRan.fetch_add(1) + 1 <= launches) && ((itersRemaining = atomItersRemaining.load()) > 0) && !m_Abort) { + //Check if the user wanted to suspend the process. + while (Paused()) + std::this_thread::sleep_for(500ms); + cl_uint argIndex = 0; #ifdef TEST_CL uint fuse = 0; diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index c7cecdb..5c7f3a2 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -58,7 +58,7 @@ QFrame::NoFrame - <html><head/><body><p align="center">Fractorium 1.0.0.8</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=" text-decoration: underline; color:#0000ff;">fractorium.com</span></a><span style=" font-size:10pt;"><br/>Lead: Matt Feemster<br/>Contributors: Simon Detheridge, Michel Mastriani</span></p></body></html> + <html><head/><body><p align="center">Fractorium 1.0.0.9</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=" text-decoration: underline; color:#0000ff;">fractorium.com</span></a><span style=" font-size:10pt;"><br/>Lead: Matt Feemster<br/>Contributors: Simon Detheridge, Michel Mastriani</span></p></body></html> Qt::RichText diff --git a/debian/changelog b/debian/changelog index 49f197b..3474eb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fractorium (1.0.0.9-0ubuntu1) artful; urgency=low + + * release 1.0.0.9 + + -- Matt Feemster Sun, 13 May 2018 14:22:34 -0700 + fractorium (1.0.0.8-0ubuntu1) artful; urgency=low * release 1.0.0.8