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

Add "ISO-8859-1" as the encoding type when reading Xml files.

Browse Source 
Fix small bug when setting the current ember in the final render dialog when showing it.

Have Wix installer point to proper location for installed vcredist DLLs.

Remove VS2010 builds dir.
This commit is contained in:
mfeemster
2014-12-05 20:04:41 -08:00
parent a15f6d6b32
commit 8a3521206b
36 changed files with 33 additions and 5425 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.4.1.6"
#define EMBER_VERSION "0.4.1.7"
#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

1
Source/Ember/EmberToXml.h
View File

@ -79,6 +79,7 @@ public:
if ((append && start) || !append)
{
temp = "<flames>\n";
//temp = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<flames>\n";
f.write(temp.c_str(), temp.size());
}

2
Source/Ember/XmlToEmber.h
View File

@ -267,7 +267,7 @@ public:
xmlPtr = (const char*)(&buf[0]);
bufSize = strlen(xmlPtr);
embers.reserve(bufSize / 2500);//The Xml text for an ember is around 2500 bytes, but can be much more. Pre-allocate to aovid unnecessary resizing.
doc = xmlReadMemory(xmlPtr, (int)bufSize, filename, nullptr, XML_PARSE_NONET);//Forbid network access during read.
doc = xmlReadMemory(xmlPtr, (int)bufSize, filename, "ISO-8859-1", XML_PARSE_NONET);//Forbid network access during read.
//t.Toc("xmlReadMemory");
if (doc == nullptr)

8
Source/EmberAnimate/EmberAnimate.rc
View File

@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,4,1,6
PRODUCTVERSION 0,4,1,6
FILEVERSION 0,4,1,7
PRODUCTVERSION 0,4,1,7
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.4.1.6"
VALUE "FileVersion", "0.4.1.7"
VALUE "InternalName", "EmberAnimate.rc"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3"
VALUE "OriginalFilename", "EmberAnimate.rc"
VALUE "ProductName", "Ember Animate"
VALUE "ProductVersion", "0.4.1.6"
VALUE "ProductVersion", "0.4.1.7"
END
END
BLOCK "VarFileInfo"

6
Source/EmberCL/DEOpenCLKernelCreator.h
View File

@ -76,10 +76,4 @@ private:
bool m_NVidia;
};
//template EMBERCL_API class DEOpenCLKernelCreator<float>;
//
//#ifdef DO_DOUBLE
// template EMBERCL_API class DEOpenCLKernelCreator<double>;
//#endif
}

6
Source/EmberCL/FinalAccumOpenCLKernelCreator.h
View File

@ -78,10 +78,4 @@ private:
string m_FinalAccumLateClipWithoutAlphaCalcWithAlphaAccumKernel;//False, true.
string m_FinalAccumLateClipWithoutAlphaCalcWithAlphaAccumEntryPoint;
};
//template EMBERCL_API class FinalAccumOpenCLKernelCreator<float>;
//
//#ifdef DO_DOUBLE
// template EMBERCL_API class FinalAccumOpenCLKernelCreator<double>;
//#endif
}

6
Source/EmberCL/RendererCL.h
View File

@ -196,10 +196,4 @@ private:
pair<string, vector<T>> m_Params;
Ember<T> m_LastBuiltEmber;
};
//template EMBERCL_API class RendererCL<float>;
//
//#ifdef DO_DOUBLE
// template EMBERCL_API class RendererCL<double>;
//#endif
}

8
Source/EmberGenome/EmberGenome.rc
View File

@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,4,1,6
PRODUCTVERSION 0,4,1,6
FILEVERSION 0,4,1,7
PRODUCTVERSION 0,4,1,7
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.4.1.6"
VALUE "FileVersion", "0.4.1.7"
VALUE "InternalName", "EmberGenome.rc"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3"
VALUE "OriginalFilename", "EmberGenome.rc"
VALUE "ProductName", "Ember Genome"
VALUE "ProductVersion", "0.4.1.6"
VALUE "ProductVersion", "0.4.1.7"
END
END
BLOCK "VarFileInfo"

8
Source/EmberRender/EmberRender.rc
View File

@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,4,1,6
PRODUCTVERSION 0,4,1,6
FILEVERSION 0,4,1,7
PRODUCTVERSION 0,4,1,7
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.4.1.6"
VALUE "FileVersion", "0.4.1.7"
VALUE "InternalName", "EmberRender.rc"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2013, GPL v3"
VALUE "OriginalFilename", "EmberRender.rc"
VALUE "ProductName", "Ember Render"
VALUE "ProductVersion", "0.4.1.6"
VALUE "ProductVersion", "0.4.1.7"
END
END
BLOCK "VarFileInfo"

2
Source/Fractorium/AboutDialog.ui
View File

@ -52,7 +52,7 @@
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Fractorium 0.4.1.6 Beta&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;&lt;br/&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;Matt Feemster&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;&lt;span style=&quot; font-size:12pt;&quot;&gt;Fractorium 0.4.1.7 Beta&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;&lt;br/&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;Matt Feemster&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>

11
Source/Fractorium/FinalRenderDialog.cpp
View File

@ -580,6 +580,7 @@ void FractoriumFinalRenderDialog::showEvent(QShowEvent* e)
{
if (CreateControllerFromGUI(true))
{
int index = m_Fractorium->m_Controller->Index() + 1;
#ifdef DO_DOUBLE
Ember<double> ed;
EmberFile<double> efi;
@ -601,8 +602,11 @@ void FractoriumFinalRenderDialog::showEvent(QShowEvent* e)
});//Copy the whole file, will take about 0.2ms per ember in the file.
#endif
m_Controller->SetEmberFile(efi);//Copy the temp file into the final render controller.
m_Controller->SetEmber(m_Fractorium->m_Controller->Index());//Set the currently selected ember to the one that was being edited.
ui.FinalRenderCurrentSpin->setMaximum(efi.Size());
ui.FinalRenderCurrentSpin->blockSignals(true);
ui.FinalRenderCurrentSpin->setValue(index);//Set the currently selected ember to the one that was being edited.
ui.FinalRenderCurrentSpin->blockSignals(false);
OnFinalRenderCurrentSpinChanged(index);//Force update in case the ember was new, but at the same index as the previous one.
m_Controller->m_ImageCount = 0;
SetMemory();
m_Controller->ResetProgress();
@ -640,6 +644,8 @@ void FractoriumFinalRenderDialog::reject()
bool FractoriumFinalRenderDialog::CreateControllerFromGUI(bool createRenderer)
{
bool ok = true;
int index = Current() - 1;
#ifdef DO_DOUBLE
size_t size = Double() ? sizeof(double) : sizeof(float);
#else
@ -677,7 +683,10 @@ bool FractoriumFinalRenderDialog::CreateControllerFromGUI(bool createRenderer)
//Restore the ember and ember file.
if (m_Controller.get())
{
m_Controller->SetEmberFile(efd);//Convert float to double or set double verbatim;
m_Controller->SetEmber(index);
}
}
if (m_Controller.get())

2
Source/Fractorium/FinalRenderEmberController.cpp
View File

@ -345,7 +345,7 @@ void FinalRenderEmberController<T>::SetEmber(size_t index)
m_Ember = &(m_EmberFile.m_Embers[index]);
SyncCurrentToGui();
}
else
else if (m_EmberFile.Size() > 1)
{
m_Ember = &(m_EmberFile.m_Embers[0]);//Should never happen.
}

BIN
Source/Fractorium/Fractorium.rc
View File

Binary file not shown.