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

--User changes

Browse Source 
-Add buttons to copy and paste affine transforms.
 -Show xform names on the column headers of the xaos table.
 -Add a color-coded third column to the variations tree which shows any properties of each variation which are non-standard.
 -Draw a transparent circle over hovered xforms.
 -Change how xforms respond to dragging. Rotate only is now the default, and scale will only happen with shift.
 --Optionally do scale and rotate when holding shift, via a setting in the options dialog.

--Bug fixes
 -Snapping when dragging was wrong sometimes.
 -The program would very rarely crash on startup due to some values being in an uninitialized state.

--Code changes
 -Change almost every variation to use fma() in OpenCL when doing computations of the form a * b + c. This provides a slight speedup, mostly in double precision mode.
 -Also apply fma() to affine calcs.
 -Cleanup of OpenGL affine drawing code.
 -Separate the concept of hovering and selecting xforms.
This commit is contained in:
Person
2018-09-15 03:11:12 -07:00
parent dee4304bf2
commit 15fdc860b8
34 changed files with 2149 additions and 1698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Source/EmberTester/EmberTester.cpp
View File

@ -1058,6 +1058,42 @@ bool TestVarAssignVals()
return success;
}
void FindFmaCandidates()
{
auto vlf(VariationList<float>::Instance());
for (size_t i = 0; i < vlf->Size(); i++)
{
auto var = vlf->GetVariation(i);
auto cl = var->OpenCLFuncsString() + "\n" + var->StateInitOpenCLString() + "\n" + var->OpenCLString();
auto splits = Split(cl, '\n');
for (auto& split : splits)
{
if ((split.find("*") != string::npos || split.find("SQR(") != string::npos || split.find("Sqr(") != string::npos) && split.find("+") != string::npos)
cout << "Variation " << var->Name() << " is a potential fma() candidate because of line:\n\t" << split << endl;
}
}
}
void FindFmaImplemented()
{
auto vlf(VariationList<float>::Instance());
for (size_t i = 0; i < vlf->Size(); i++)
{
auto var = vlf->GetVariation(i);
auto cl = var->OpenCLFuncsString() + "\n" + var->StateInitOpenCLString() + "\n" + var->OpenCLString();
auto splits = Split(cl, '\n');
for (auto& split : splits)
{
if ((split.find("fma(") != string::npos))
cout << "Variation " << var->Name() << " has been implemented with fma():\n\t" << split << endl;
}
}
}
bool TestZepsFloor()
{
bool success = true;
@ -2041,25 +2077,25 @@ int _tmain(int argc, _TCHAR* argv[])
//int i;
bool b = true;
Timing t(4);
vector<Ember<float>> fv;
vector<Ember<double>> dv;
list<Ember<float>> fl;
list<Ember<double>> dl;
int w = 1000, h = 1000;
string filename = ".\\testexr.exr";
vector<Rgba> pixels;
pixels.resize(w * h);
/* vector<Ember<float>> fv;
vector<Ember<double>> dv;
list<Ember<float>> fl;
list<Ember<double>> dl;
int w = 1000, h = 1000;
string filename = ".\\testexr.exr";
vector<Rgba> pixels;
pixels.resize(w * h);
for (auto& pix : pixels)
{
for (auto& pix : pixels)
{
pix.r = 1.0;
pix.b = 0.0;
pix.a = 1.0;
//pix.r = std::numeric_limits<float>::max();
}
}
writeRgba1(filename.c_str(), pixels.data(), w, h);
/* TestFuncs();
writeRgba1(filename.c_str(), pixels.data(), w, h);
TestFuncs();
string line = "title=\"cj_aerie\" smooth=no", delim = " =\"";
auto vec = Split(line, delim, true);
@ -2086,6 +2122,11 @@ int _tmain(int argc, _TCHAR* argv[])
return 1;
*/
//MakeTestAllVarsRegPrePostComboFile("testallvarsout.flame");
//cout << (10.0 / 2.0 * 5.0) << endl;
FindFmaCandidates();
//FindFmaImplemented();
//cout << 5 * 3 + 2 << endl;
//cout << 2 + 5 * 3 << endl;
return 0;
/*
TestThreadedKernel();