mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 05:46:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes:

Browse Source 
Fix crash on startup when no GPU present.
This commit is contained in:
mfeemster
2015-09-21 17:44:19 -07:00
parent 34d6325be8
commit e978e63d5a
13 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Ember/EmberDefines.h
View File

@ -42,7 +42,7 @@
namespace EmberNs
{
#define EMBER_VERSION "0.9.9.0"
#define EMBER_VERSION "0.9.9.1"
#define EPS6 T(1e-6)
#define EPS std::numeric_limits<T>::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way.
#define ISAAC_SIZE 4

8
Source/EmberAnimate/EmberAnimate.rc
View File

@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,9,0
PRODUCTVERSION 0,9,9,0
FILEVERSION 0,9,9,1
PRODUCTVERSION 0,9,9,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -67,12 +67,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Renders fractal flames as animations with motion blur"
VALUE "FileVersion", "0.9.9.0"
VALUE "FileVersion", "0.9.9.1"
VALUE "InternalName", "EmberAnimate.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3"
VALUE "OriginalFilename", "EmberAnimate.exe"
VALUE "ProductName", "Ember Animate"
VALUE "ProductVersion", "0.9.9.0"
VALUE "ProductVersion", "0.9.9.1"
END
END
BLOCK "VarFileInfo"

8
Source/EmberGenome/EmberGenome.rc
View File

@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,9,0
PRODUCTVERSION 0,9,9,0
FILEVERSION 0,9,9,1
PRODUCTVERSION 0,9,9,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -67,12 +67,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Manipulates fractal flames parameter files"
VALUE "FileVersion", "0.9.9.0"
VALUE "FileVersion", "0.9.9.1"
VALUE "InternalName", "EmberGenome.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3"
VALUE "OriginalFilename", "EmberGenome.exe"
VALUE "ProductName", "Ember Genome"
VALUE "ProductVersion", "0.9.9.0"
VALUE "ProductVersion", "0.9.9.1"
END
END
BLOCK "VarFileInfo"

8
Source/EmberRender/EmberRender.rc
View File

@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,9,0
PRODUCTVERSION 0,9,9,0
FILEVERSION 0,9,9,1
PRODUCTVERSION 0,9,9,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -67,12 +67,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Renders fractal flames as single images"
VALUE "FileVersion", "0.9.9.0"
VALUE "FileVersion", "0.9.9.1"
VALUE "InternalName", "EmberRender.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3"
VALUE "OriginalFilename", "EmberRender.exe"
VALUE "ProductName", "Ember Render"
VALUE "ProductVersion", "0.9.9.0"
VALUE "ProductVersion", "0.9.9.1"
END
END
BLOCK "VarFileInfo"

2
Source/Fractorium/AboutDialog.ui
View File

@ -58,7 +58,7 @@
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;Fractorium 0.9.9.0 Beta&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Lead: Matt Feemster&lt;br/&gt;Contributors: Simon Detheridge&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;Fractorium 0.9.9.1 Beta&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Lead: Matt Feemster&lt;br/&gt;Contributors: Simon Detheridge&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>

2
Source/Fractorium/FinalRenderDialog.cpp
View File

@ -84,6 +84,8 @@ FractoriumFinalRenderDialog::FractoriumFinalRenderDialog(FractoriumSettings* set
connect(ui.StopRenderButton, SIGNAL(clicked(bool)), this, SLOT(OnCancelRenderClicked(bool)), Qt::QueuedConnection);
table = ui.DeviceTable;
table->clearContents();
table->setRowCount(0);
if (m_Info.Ok() && !m_Info.Devices().empty())
{

BIN
Source/Fractorium/Fractorium.rc
View File

Binary file not shown.

2
Source/Fractorium/OptionsDialog.cpp
View File

@ -35,6 +35,8 @@ FractoriumOptionsDialog::FractoriumOptionsDialog(FractoriumSettings* settings, Q
ui.OptionsIdentityTable->setCellWidget(2, 1, m_NickEdit);
table = ui.DeviceTable;
table->clearContents();
table->setRowCount(0);
if (m_Info.Ok() && !m_Info.Devices().empty())
{