From edd1a0c9cc30215540c582c2755e6a97b5de243a Mon Sep 17 00:00:00 2001 From: mfeemster Date: Tue, 21 Jun 2016 19:27:37 -0700 Subject: [PATCH] --Bug fixes -Highlight power values less than 0 were accidentally disabled on the UI. --- .../Installer/FractoriumInstaller.wixproj | 2 +- Builds/MSVC/Installer/Product.wxs | 4 ++-- Builds/MSVC/VS2013/Ember.rc | Bin 4502 -> 4502 bytes Builds/MSVC/VS2013/EmberAnimate.rc | 8 ++++---- Builds/MSVC/VS2013/EmberCL.rc | Bin 4528 -> 4528 bytes Builds/MSVC/VS2013/EmberGenome.rc | 8 ++++---- Builds/MSVC/VS2013/EmberRender.rc | 8 ++++---- Builds/MSVC/VS2013/Fractorium.rc | Bin 4470 -> 4470 bytes Data/Version History.txt | 4 ++++ Source/Ember/EmberDefines.h | 2 +- Source/Fractorium/AboutDialog.ui | 2 +- Source/Fractorium/FractoriumParams.cpp | 2 +- 12 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj index 084c8e2..e124eba 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.0 + Fractorium_1.0.0.1 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 7f37127..b777f28 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - + Sb-bc&;M0O30 delta 44 zcmbQHJWYAS7Y;^)$zM6l84Wh;a_(mWa`y9xZ)V|{z{qUCpfuT#Pj>Sb-bc&;L=g>% diff --git a/Builds/MSVC/VS2013/EmberAnimate.rc b/Builds/MSVC/VS2013/EmberAnimate.rc index ff2531f..ee3be3e 100644 --- a/Builds/MSVC/VS2013/EmberAnimate.rc +++ b/Builds/MSVC/VS2013/EmberAnimate.rc @@ -49,8 +49,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 0, 0, 0 - PRODUCTVERSION 1, 0, 0, 0 + FILEVERSION 1, 0, 0, 1 + PRODUCTVERSION 1, 0, 0, 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.0" + VALUE "FileVersion", "1.0.0.1" VALUE "InternalName", "EmberAnimate.exe" VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2016, GPL v3" VALUE "OriginalFilename", "EmberAnimate.exe" VALUE "ProductName", "Ember Animate" - VALUE "ProductVersion", "1.0.0.0" + VALUE "ProductVersion", "1.0.0.1" END END BLOCK "VarFileInfo" diff --git a/Builds/MSVC/VS2013/EmberCL.rc b/Builds/MSVC/VS2013/EmberCL.rc index 3ebd5cc96ead9159590dc4cd07a5e3ddda55fad8..8072a75d71827ffbecd16c9c9b8a59ed8c6f9fe6 100644 GIT binary patch delta 46 zcmdm>yg_-xCk{r#$)7pQSq&L@8Mr2Iyg_-xCk{q~$)7pQSq&I?8Mr2ISZ-bc&;PuvZj delta 44 zcmeyS^i65Q84gB+$!9st84WhGa;{_oau|8UHy`6($H;8Jpfp*KPj>SZ-bc&;Pj?NP diff --git a/Data/Version History.txt b/Data/Version History.txt index 908ba41..d500ee3 100644 --- a/Data/Version History.txt +++ b/Data/Version History.txt @@ -1,3 +1,7 @@ +1.0.0.1 06/21/2016 +--Bug fixes + -Highlight power values less than 0 were accidentally disabled on the UI. + 1.0.0.0 06/17/2016 --User changes -Officially transition out of beta into a full 1.0 release. diff --git a/Source/Ember/EmberDefines.h b/Source/Ember/EmberDefines.h index 729d436..16bb876 100644 --- a/Source/Ember/EmberDefines.h +++ b/Source/Ember/EmberDefines.h @@ -40,7 +40,7 @@ static void sincos(float x, float* s, float* c) namespace EmberNs { -#define EMBER_VERSION "1.0.0.0" +#define EMBER_VERSION "1.0.0.1" #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/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index 7a4a6e1..6d9d479 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -58,7 +58,7 @@ QFrame::NoFrame - <html><head/><body><p align="center"><br/>Fractorium 1.0.0.0</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">fractorium.com</a><span style=" font-size:10pt;"><br/>Lead: Matt Feemster<br/>Contributors: Simon Detheridge</span></p></body></html> + <html><head/><body><p align="center"><br/>Fractorium 1.0.0.1</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">fractorium.com</a><span style=" font-size:10pt;"><br/>Lead: Matt Feemster<br/>Contributors: Simon Detheridge</span></p></body></html> Qt::RichText diff --git a/Source/Fractorium/FractoriumParams.cpp b/Source/Fractorium/FractoriumParams.cpp index 3be193a..b31689a 100644 --- a/Source/Fractorium/FractoriumParams.cpp +++ b/Source/Fractorium/FractoriumParams.cpp @@ -26,7 +26,7 @@ void Fractorium::InitParamsUI() SetupSpinner(table, this, row, 1, m_GammaSpin, spinHeight, 1, 9999, 0.5, SIGNAL(valueChanged(double)), SLOT(OnGammaChanged(double)), true, 4.0, 4.0, 4.0); SetupSpinner(table, this, row, 1, m_GammaThresholdSpin, spinHeight, 0, 10, 0.01, SIGNAL(valueChanged(double)), SLOT(OnGammaThresholdChanged(double)), true, 0.1, 0.1, 0.0); SetupSpinner(table, this, row, 1, m_VibrancySpin, spinHeight, 0, 30, 0.01, SIGNAL(valueChanged(double)), SLOT(OnVibrancyChanged(double)), true, 1.0, 1.0, 0.0); - SetupSpinner(table, this, row, 1, m_HighlightSpin, spinHeight, 1.0, 10, 0.1, SIGNAL(valueChanged(double)), SLOT(OnHighlightPowerChanged(double)), true, -1.0, -1.0, -1.0); + SetupSpinner(table, this, row, 1, m_HighlightSpin, spinHeight, -1.0, 10, 0.1, SIGNAL(valueChanged(double)), SLOT(OnHighlightPowerChanged(double)), true, 1.0, -1.0, -1.0); m_GammaThresholdSpin->setDecimals(4); m_BackgroundColorButton = new QPushButton("...", table); m_BackgroundColorButton->setMinimumWidth(21);