mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-06-30 13:26:02 -04:00
--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:
@ -439,7 +439,7 @@ public:
|
||||
|
||||
case eOptionIDs::OPT_VERSION:
|
||||
{
|
||||
cout << EmberVersion() << endl;
|
||||
cout << EmberVersion() << "\n";
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -540,8 +540,8 @@ public:
|
||||
}
|
||||
else
|
||||
{
|
||||
cout << "Invalid argument: " << args.OptionText() << endl;
|
||||
cout << "\tReason: " << GetLastErrorText(errorCode) << endl;
|
||||
cout << "Invalid argument: " << args.OptionText() << "\n";
|
||||
cout << "\tReason: " << GetLastErrorText(errorCode) << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
@ -608,15 +608,15 @@ public:
|
||||
{
|
||||
ostringstream os;
|
||||
|
||||
for (auto entry : m_BoolArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << endl;
|
||||
for (auto entry : m_BoolArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << "\n";
|
||||
|
||||
for (auto entry : m_IntArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << endl;
|
||||
for (auto entry : m_IntArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << "\n";
|
||||
|
||||
for (auto entry : m_UintArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << endl;
|
||||
for (auto entry : m_UintArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << "\n";
|
||||
|
||||
for (auto entry : m_DoubleArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << endl;
|
||||
for (auto entry : m_DoubleArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << "\n";
|
||||
|
||||
for (auto entry : m_StringArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << endl;
|
||||
for (auto entry : m_StringArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_DocString << "\n";
|
||||
|
||||
return os.str();
|
||||
}
|
||||
@ -631,15 +631,15 @@ public:
|
||||
ostringstream os;
|
||||
os << std::boolalpha;
|
||||
|
||||
for (auto entry : m_BoolArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << endl;
|
||||
for (auto entry : m_BoolArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << "\n";
|
||||
|
||||
for (auto entry : m_IntArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << endl;
|
||||
for (auto entry : m_IntArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << "\n";
|
||||
|
||||
for (auto entry : m_UintArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << endl;
|
||||
for (auto entry : m_UintArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << "\n";
|
||||
|
||||
for (auto entry : m_DoubleArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << endl;
|
||||
for (auto entry : m_DoubleArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << "\n";
|
||||
|
||||
for (auto entry : m_StringArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << endl;
|
||||
for (auto entry : m_StringArgs) if (et(entry->m_OptionUse) & et(optUsage)) os << entry->m_NameWithoutDashes << ": " << (*entry)() << "\n";
|
||||
|
||||
return os.str();
|
||||
}
|
||||
@ -650,25 +650,25 @@ public:
|
||||
/// <param name="optUsage">The specified program usage</param>
|
||||
void ShowUsage(eOptionUse optUsage)
|
||||
{
|
||||
cout << DescriptionString << " version " << EmberVersion() << endl << endl;
|
||||
cout << DescriptionString << " version " << EmberVersion() << "\n\n";
|
||||
|
||||
if (optUsage == eOptionUse::OPT_USE_RENDER)
|
||||
{
|
||||
cout << "Usage:\n"
|
||||
"\tEmberRender.exe --in=test.flam3 [--out=outfile --format=png --verbose --progress --opencl]\n" << endl;
|
||||
"\tEmberRender.exe --in=test.flam3 [--out=outfile --format=png --verbose --progress --opencl]\n\n";
|
||||
}
|
||||
else if (optUsage == eOptionUse::OPT_USE_ANIMATE)
|
||||
{
|
||||
cout << "Usage:\n"
|
||||
"\tEmberAnimate.exe --in=sequence.flam3 [--format=png --verbose --progress --opencl]\n" << endl;
|
||||
"\tEmberAnimate.exe --in=sequence.flam3 [--format=png --verbose --progress --opencl]\n\n";
|
||||
}
|
||||
else if (optUsage == eOptionUse::OPT_USE_GENOME)
|
||||
{
|
||||
cout << "Usage:\n"
|
||||
"\tEmberGenome.exe --sequence=test.flam3 > sequenceout.flam3\n" << endl;
|
||||
"\tEmberGenome.exe --sequence=test.flam3 > sequenceout.flam3\n\n";
|
||||
}
|
||||
|
||||
cout << GetUsage(optUsage) << endl;
|
||||
cout << GetUsage(optUsage) << "\n";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
Reference in New Issue
Block a user