--User changes

-Add variations changes to the list of functionality that can be applied to all xforms using the Select tab.
 -Allow for graphical affine adjustments to apply to multiple selected xforms.
 -Slight optimization of the pie variation.
 -Undo state is only saved when the render completes and the mouse buttons are released. This helps avoid intermediate steps for quickly completing renders while dragging.
 -Add some keyboard shortcuts for toolbar and menu items.
 -Make info tab tree always expanded.

--Bug fixes
 -Make precalcs for all hypertile variations safer by using Zeps() for denominators.
 -Changing the current xform with more than one selected would set all xform's color index value that of the current one.
 -Use hard found palette path information for randoms as well.
 -OpenCL build and assignment errors for Z value in epispiral variation.
 -Unitialized local variables in hexaplay3D, crob, pRose3D.

--Code changes
 -Change static member variables from m_ to s_.
 -Get rid of excessive endl and replace with "\n".
 -Remove old IMAGEGL2D define from before Nvidia supported OpenCL 1.2.
 -Remove old CriticalSection code and use std::recursive_mutex.
 -Make Affine2D Rotate() and RotateTrans() take radians instead of angles.
 -More C++11 work.
 -General cleanup.
This commit is contained in:
mfeemster
2016-02-11 21:38:21 -08:00
parent a345e2d5e1
commit a800b08b67
69 changed files with 981 additions and 1094 deletions

View File

@ -1962,6 +1962,28 @@ void DistribTester()
}
}
template <typename T>
void TestAffine()
{
v2T x(1, 0), y(0, 1), t(1, 0);
Affine2D<T> af(x, y, t);
auto af2 = af;
cout << af.ToString() << "\n\n";
af.RotateTrans(90);
cout << af.ToString() << "\n\n";
af2.RotateTrans(-90);
cout << af2.ToString() << "\n\n";
}
template <typename T>
void TestRotate()
{
T angle = 45;
v3T x(1, 0, 0), y(0, 1, 0), xy(1, 1, 0);
auto xtrans = glm::translate(m4T(1), xy);
auto xrot = glm::rotate(xtrans, angle * DEG_2_RAD_T, v3T(0, 0, 1));
}
#define DO_NVIDIA 1
int _tmain(int argc, _TCHAR* argv[])
@ -1971,7 +1993,12 @@ int _tmain(int argc, _TCHAR* argv[])
Timing t(4);
QTIsaac<ISAAC_SIZE, ISAAC_INT> rand(1, 2, 3);
mt19937 meow(1729);
/* MakeTestAllVarsRegPrePostComboFile("testallvarsout.flame");
/* TestAffine<float>();
TestAffine<double>();*/
/* TestRotate<float>();
TestRotate<double>();
return 1;
MakeTestAllVarsRegPrePostComboFile("testallvarsout.flame");
return 0;
@ -2175,28 +2202,28 @@ int _tmain(int argc, _TCHAR* argv[])
#endif
}
#ifdef DO_DOUBLE
//t.Tic();
//TestCpuGpuResults<double>();
//t.Toc("TestCpuGpuResults<double>()");
if (b)
{
t.Tic();
TestAllVarsCLBuild<double>(0, 0, true);
t.Toc("TestAllVarsCLBuild<double>()");
if (b)
{
#ifdef DO_NVIDIA
t.Tic();
TestAllVarsCLBuild<double>(1, 0, true);
t.Toc("TestAllVarsCLBuild<double>()");
#endif
}
}
#endif
//#ifdef DO_DOUBLE
//
// //t.Tic();
// //TestCpuGpuResults<double>();
// //t.Toc("TestCpuGpuResults<double>()");
// if (b)
// {
// t.Tic();
// TestAllVarsCLBuild<double>(0, 0, true);
// t.Toc("TestAllVarsCLBuild<double>()");
//
// if (b)
// {
//#ifdef DO_NVIDIA
// t.Tic();
// TestAllVarsCLBuild<double>(1, 0, true);
// t.Toc("TestAllVarsCLBuild<double>()");
//#endif
// }
// }
//
//#endif
#endif
//PrintAllVars();
//_CrtDumpMemoryLeaks();