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

--Code changes

Browse Source 
-Change some menu capitalization to make the text easier on the eyes.
This commit is contained in:
Person 2019-04-14 23:46:45 -07:00
parent 20f76cd090
commit 5209ead086
6 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Ember/CarToRas.h
View File

@ -182,6 +182,7 @@ public:
/// <param name="singleBufferIndex">The converted single raster buffer index</param>
inline void Convert(Point<T>& point, size_t& singleBufferIndex)
{
//singleBufferIndex = static_cast<size_t>(Round(m_PixPerImageUnitW * point.m_X - m_RasLlX) + (m_RasWidth * Round(m_PixPerImageUnitH * point.m_Y - m_RasLlY)));
singleBufferIndex = static_cast<size_t>(m_PixPerImageUnitW * point.m_X - m_RasLlX) + (m_RasWidth * static_cast<size_t>(m_PixPerImageUnitH * point.m_Y - m_RasLlY));
}

2
Source/Ember/XmlToEmber.cpp
View File

@ -176,9 +176,9 @@ XmlToEmber<T>::XmlToEmber()
{ "angle", "pixel_flow_angle" },
{ "len", "pixel_flow_len" },
{ "width", "pixel_flow_width" },
{ "radial_gaussian_angle", "radial_blur_angle" },
//{ "seed", "pixel_flow_seed" },//randCubes above already uses "seed", but it's just for randomness, so it shouldn't matter.
{ "enable_dc", "pixel_flow_enable_dc" },
{ "radial_gaussian_angle", "radial_blur_angle" },
{ "pr_a", "projective_A" },
{ "pr_b", "projective_B" },
{ "pr_c", "projective_C" },

6
Source/EmberCommon/EmberOptions.h
View File

@ -100,7 +100,7 @@ enum class eOptionIDs : et
OPT_QUALITY,
OPT_DE_MIN,
OPT_DE_MAX,
OPT_SBPKTH,
OPT_SBPCTTH,
OPT_PIXEL_ASPECT,
OPT_STAGGER,
OPT_AVG_THRESH,
@ -406,7 +406,7 @@ public:
INITDOUBLEOPTION(HeightScale, Eod(eOptionUse::OPT_RENDER_ANIM, eOptionIDs::OPT_HS, _T("--hs"), 1.0, SO_REQ_SEP, " --hs=<val> Height scale. The height is scaled by this amount [default: 1.0].\n"));
INITDOUBLEOPTION(QualityScale, Eod(eOptionUse::OPT_RENDER_ANIM, eOptionIDs::OPT_QS, _T("--qs"), 1.0, SO_REQ_SEP, " --qs=<val> Quality scale. All quality values are scaled by this amount [default: 1.0].\n"));
INITDOUBLEOPTION(Quality, Eod(eOptionUse::OPT_RENDER_ANIM, eOptionIDs::OPT_QUALITY, _T("--quality"), 0.0, SO_REQ_SEP, " --quality=<val> Override the quality of the flame if not 0 [default: 0].\n"));
INITDOUBLEOPTION(SBPctPerTh, Eod(eOptionUse::OPT_RENDER_ANIM, eOptionIDs::OPT_SBPKTH, _T("--sbpctth"), 0.025, SO_REQ_SEP, " --sbpctth=<val> The percentage of a sub batch from 0.01 to 1.0 to complete per thread per kernel launch done in OpenCL rendering. This is for performance tuning with OpenCL and does not apply to CPU rendering [default: 0.025 (256 iters)].\n"));
INITDOUBLEOPTION(SBPctPerTh, Eod(eOptionUse::OPT_RENDER_ANIM, eOptionIDs::OPT_SBPCTTH, _T("--sbpctth"), 0.025, SO_REQ_SEP, " --sbpctth=<val> The percentage of a sub batch from 0.01 to 1.0 to complete per thread per kernel launch done in OpenCL rendering. This is for performance tuning with OpenCL and does not apply to CPU rendering [default: 0.025 (256 iters with the default sub batch size of 10k)].\n"));
INITDOUBLEOPTION(DeMin, Eod(eOptionUse::OPT_RENDER_ANIM, eOptionIDs::OPT_DE_MIN, _T("--demin"), -1.0, SO_REQ_SEP, " --demin=<val> Override the minimum size of the density estimator filter radius if not -1 [default: -1].\n"));
INITDOUBLEOPTION(DeMax, Eod(eOptionUse::OPT_RENDER_ANIM, eOptionIDs::OPT_DE_MAX, _T("--demax"), -1.0, SO_REQ_SEP, " --demax=<val> Override the maximum size of the density estimator filter radius if not -1 [default: -1].\n"));
INITDOUBLEOPTION(AspectRatio, Eod(eOptionUse::OPT_USE_ALL, eOptionIDs::OPT_PIXEL_ASPECT, _T("--pixel_aspect"), 1.0, SO_REQ_SEP, " --pixel_aspect=<val> Aspect ratio of pixels (width over height), eg. 0.90909 for NTSC [default: 1.0].\n"));
@ -558,7 +558,7 @@ public:
PARSEOPTION(eOptionIDs::OPT_HS, HeightScale);
PARSEOPTION(eOptionIDs::OPT_QS, QualityScale);
PARSEOPTION(eOptionIDs::OPT_QUALITY, Quality);
PARSEOPTION(eOptionIDs::OPT_SBPKTH, SBPctPerTh);
PARSEOPTION(eOptionIDs::OPT_SBPCTTH, SBPctPerTh);
PARSEOPTION(eOptionIDs::OPT_DE_MIN, DeMin);
PARSEOPTION(eOptionIDs::OPT_DE_MAX, DeMax);
PARSEOPTION(eOptionIDs::OPT_PIXEL_ASPECT, AspectRatio);

4
Source/Fractorium/FinalRenderDialog.ui
View File

@ -439,10 +439,10 @@
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The percentage of a sub batch to execute on each thread per kernel call when using OpenCL. Default: 0.025 (256 iters).&lt;/p&gt;&lt;p&gt;Increase this number for slightly faster render times.&lt;/p&gt;&lt;p&gt;Note that this can cause a crash and subsequent restart of the graphics driver if each kernel call takes too long. So reduce the value if you encounter such a problem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The percentage of a sub batch to execute on each thread per kernel call when using OpenCL. Default: 0.025 (256 iters with a 10k sub batch size).&lt;/p&gt;&lt;p&gt;Increase this number for slightly faster render times.&lt;/p&gt;&lt;p&gt;Note that this can cause a crash and subsequent restart of the graphics driver if each kernel call takes too long. So reduce the value if you encounter such a problem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefix">
<string>OpenCL Sub Batch Percent Per Thread </string>
<string>OpenCL sub batch percent per thread </string>
</property>
<property name="decimals">
<number>3</number>

71
Source/Fractorium/Fractorium.ui
View File

@ -8200,10 +8200,10 @@
<normaloff>:/Fractorium/Icons/layers-stack.png</normaloff>:/Fractorium/Icons/layers-stack.png</iconset>
</property>
<property name="text">
<string>New Floc&amp;k</string>
<string>New floc&amp;k</string>
</property>
<property name="iconText">
<string>New Flock</string>
<string>New flock</string>
</property>
<property name="toolTip">
<string>Clear any existing flames and create a new file with 10 random flames in it</string>
@ -8239,7 +8239,7 @@
<normaloff>:/Fractorium/Icons/database-medium.png</normaloff>:/Fractorium/Icons/database-medium.png</iconset>
</property>
<property name="text">
<string>Save &amp;Current as Xml</string>
<string>Save &amp;current as xml</string>
</property>
<property name="toolTip">
<string>Save the current flame as an xml file</string>
@ -8272,7 +8272,10 @@
<normaloff>:/Fractorium/Icons/cog.png</normaloff>:/Fractorium/Icons/cog.png</iconset>
</property>
<property name="text">
<string>Final &amp;Render</string>
<string>Final &amp;render</string>
</property>
<property name="iconText">
<string>Final render</string>
</property>
</action>
<action name="ActionSaveCurrentScreen">
@ -8281,7 +8284,7 @@
<normaloff>:/Fractorium/Icons/monitor.png</normaloff>:/Fractorium/Icons/monitor.png</iconset>
</property>
<property name="text">
<string>Save Current Scree&amp;n</string>
<string>Save current scree&amp;n</string>
</property>
<property name="toolTip">
<string>Save the current screen as an image</string>
@ -8293,7 +8296,7 @@
<normaloff>:/Fractorium/Icons/068123-3d-transparent-glass-icon-alphanumeric-question-mark3.png</normaloff>:/Fractorium/Icons/068123-3d-transparent-glass-icon-alphanumeric-question-mark3.png</iconset>
</property>
<property name="text">
<string>New &amp;Random Flame</string>
<string>New &amp;random Flame</string>
</property>
<property name="toolTip">
<string>Add a new random flame to the end of the current file</string>
@ -8308,10 +8311,10 @@
<normaloff>:/Fractorium/Icons/databases.png</normaloff>:/Fractorium/Icons/databases.png</iconset>
</property>
<property name="text">
<string>Save Entire &amp;File as Xml</string>
<string>Save entire &amp;file as xml</string>
</property>
<property name="iconText">
<string>Save Entire File as Xml</string>
<string>Save entire file as xml</string>
</property>
<property name="toolTip">
<string>Save all flames as a single xml file</string>
@ -8326,7 +8329,7 @@
<normaloff>:/Fractorium/Icons/proxy.png</normaloff>:/Fractorium/Icons/proxy.png</iconset>
</property>
<property name="text">
<string>Add R&amp;eflective Symmetry</string>
<string>Add r&amp;eflective symmetry</string>
</property>
<property name="toolTip">
<string>Add reflective symmetry</string>
@ -8338,7 +8341,7 @@
<normaloff>:/Fractorium/Icons/display-brightness-off.png</normaloff>:/Fractorium/Icons/display-brightness-off.png</iconset>
</property>
<property name="text">
<string>Add R&amp;otational Symmetry</string>
<string>Add r&amp;otational symmetry</string>
</property>
<property name="toolTip">
<string>Add rotational symmetry</string>
@ -8346,7 +8349,7 @@
</action>
<action name="ActionAddBothSymmetry">
<property name="text">
<string>Add Reflective &amp;and Rotational Symmetry</string>
<string>Add reflective &amp;and rotational symmetry</string>
</property>
<property name="toolTip">
<string>Add reflective and rotational symmetry</string>
@ -8358,7 +8361,7 @@
<normaloff>:/Fractorium/Icons/layer--plus.png</normaloff>:/Fractorium/Icons/layer--plus.png</iconset>
</property>
<property name="text">
<string>New &amp;Empty Flame</string>
<string>New &amp;empty flame</string>
</property>
<property name="toolTip">
<string>Add a new empty flame to the end of the current file</string>
@ -8373,7 +8376,7 @@
<normaloff>:/Fractorium/Icons/layers.png</normaloff>:/Fractorium/Icons/layers.png</iconset>
</property>
<property name="text">
<string>Add Co&amp;py of Flame</string>
<string>Add co&amp;py of flame</string>
</property>
<property name="toolTip">
<string>Add a copy of the current flame to the end of the current file</string>
@ -8388,7 +8391,7 @@
<normaloff>:/Fractorium/Icons/016938-3d-transparent-glass-icon-symbols-shapes-shape-square-clear-16.png</normaloff>:/Fractorium/Icons/016938-3d-transparent-glass-icon-symbols-shapes-shape-square-clear-16.png</iconset>
</property>
<property name="text">
<string>&amp;Clear Flame</string>
<string>&amp;Clear flame</string>
</property>
<property name="toolTip">
<string>Delete all but one xform, clear its variations and set pre and post affine to the identity matrix.</string>
@ -8400,10 +8403,10 @@
<normaloff>:/Fractorium/Icons/page_copy.png</normaloff>:/Fractorium/Icons/page_copy.png</iconset>
</property>
<property name="text">
<string>&amp;Copy Xml</string>
<string>&amp;Copy xml</string>
</property>
<property name="toolTip">
<string>Copy Xml for the current flame</string>
<string>Copy xml for the current flame</string>
</property>
<property name="shortcut">
<string>Ctrl+C</string>
@ -8411,7 +8414,7 @@
</action>
<action name="ActionPasteXmlOver">
<property name="text">
<string>Paste Xml &amp;Over</string>
<string>Paste xml &amp;over</string>
</property>
<property name="toolTip">
<string>Paste Xml over the current flame in the current file</string>
@ -8422,10 +8425,10 @@
</action>
<action name="ActionCopyAllXml">
<property name="text">
<string>Copy &amp;All Xmls</string>
<string>Copy &amp;all xmls</string>
</property>
<property name="toolTip">
<string>Copy Xmls for all flames as a single string</string>
<string>Copy xmls for all flames as a single string</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+C</string>
@ -8437,7 +8440,7 @@
<normaloff>:/Fractorium/Icons/stop.png</normaloff>:/Fractorium/Icons/stop.png</iconset>
</property>
<property name="text">
<string>&amp;Stop Rendering Previews</string>
<string>&amp;Stop rendering previews</string>
</property>
<property name="toolTip">
<string>Stop rendering previews</string>
@ -8449,7 +8452,7 @@
<normaloff>:/Fractorium/Icons/application_side_boxes.png</normaloff>:/Fractorium/Icons/application_side_boxes.png</iconset>
</property>
<property name="text">
<string>Render &amp;Previews</string>
<string>Render &amp;previews</string>
</property>
<property name="toolTip">
<string>Render previews</string>
@ -8485,10 +8488,10 @@
<normaloff>:/Fractorium/Icons/page_paste.png</normaloff>:/Fractorium/Icons/page_paste.png</iconset>
</property>
<property name="text">
<string>Paste Xml A&amp;ppend</string>
<string>Paste xml a&amp;ppend</string>
</property>
<property name="toolTip">
<string>Paste Xml as a new flame in the current file</string>
<string>Paste xml as a new flame in the current file</string>
</property>
<property name="shortcut">
<string>Ctrl+V</string>
@ -8520,7 +8523,7 @@
</action>
<action name="ActionCopySelectedXforms">
<property name="text">
<string>Copy Selected &amp;Xforms</string>
<string>Copy selected &amp;xforms</string>
</property>
<property name="toolTip">
<string>Copy selected xforms to the clipboard</string>
@ -8531,7 +8534,7 @@
</action>
<action name="ActionPasteSelectedXforms">
<property name="text">
<string>Paste Selected X&amp;forms</string>
<string>Paste selected x&amp;forms</string>
</property>
<property name="toolTip">
<string>Paste copied xforms into the current flame</string>
@ -8542,7 +8545,7 @@
</action>
<action name="ActionResetWorkspace">
<property name="text">
<string>&amp;Reset Workspace</string>
<string>&amp;Reset workspace</string>
</property>
<property name="toolTip">
<string>Reset workspace</string>
@ -8648,7 +8651,7 @@
<normaloff>:/Fractorium/Icons/pic.png</normaloff>:/Fractorium/Icons/pic.png</iconset>
</property>
<property name="text">
<string>Show/Hide Image</string>
<string>Show/Hide image</string>
</property>
<property name="toolTip">
<string>Show/Hide Image</string>
@ -8666,10 +8669,10 @@
<normaloff>:/Fractorium/Icons/grid.png</normaloff>:/Fractorium/Icons/grid.png</iconset>
</property>
<property name="text">
<string>Show/Hide Grid</string>
<string>Show/Hide grid</string>
</property>
<property name="toolTip">
<string>Show/Hide Grid</string>
<string>Show/Hide grid</string>
</property>
</action>
<action name="ActionDrawXforms">
@ -8681,15 +8684,15 @@
<normaloff>:/Fractorium/Icons/Function-512.png</normaloff>:/Fractorium/Icons/Function-512.png</iconset>
</property>
<property name="text">
<string>Show/Hide Xforms</string>
<string>Show/Hide xforms</string>
</property>
<property name="toolTip">
<string>Show/Hide Xforms</string>
<string>Show/Hide xforms</string>
</property>
</action>
<action name="ActionAlternateEditorImage">
<property name="text">
<string>Alternate Editor/Image</string>
<string>Alternate editor/image</string>
</property>
<property name="shortcut">
<string>Ctrl+W</string>
@ -8697,12 +8700,12 @@
</action>
<action name="ActionResetScale">
<property name="text">
<string>Reset Scale</string>
<string>Reset scale</string>
</property>
</action>
<action name="ActionCopyKernel">
<property name="text">
<string>Copy &amp;Kernel</string>
<string>Copy &amp;kernel</string>
</property>
<property name="statusTip">
<string>Copy the OpenCL program to the clipboard for debugging.</string>

6
Source/Fractorium/OptionsDialog.ui
View File

@ -317,7 +317,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The number of ~8M iteration chunks ran using OpenCL in interactive mode for each mouse movement.&lt;/p&gt;&lt;p&gt;Increase this number for a higher quality image on each mouse movement, at the expense of responsiveness.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefix">
<string>OpenCL Chunks per Mouse Movement </string>
<string>OpenCL chunks per mouse movement </string>
</property>
<property name="minimum">
<number>1</number>
@ -380,7 +380,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The number of ~10,000 iteration chunks ran per thread on the CPU in interactive mode for each mouse movement.&lt;/p&gt;&lt;p&gt;Increase this number for a higher quality image on each mouse movement, at the expense of responsiveness.&lt;/p&gt;&lt;p&gt;The number of iterations done in each chunk is controlled by the Sub Batch Size field in the Flame tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefix">
<string>CPU Chunks per Mouse Movement </string>
<string>CPU chunks per mouse movement </string>
</property>
<property name="minimum">
<number>1</number>
@ -428,7 +428,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The percentage of a sub batch to execute on each thread per kernel call when using OpenCL in interactive mode. Default: 0.025 (256 iters).&lt;/p&gt;&lt;p&gt;Increase this number for a higher quality image on each mouse movement, at the expense of responsiveness.&lt;/p&gt;&lt;p&gt;Note that this can cause a crash and subsequent restart of the graphics driver if each kernel call takes too long. So reduce the value if you encounter such a problem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefix">
<string>OpenCL Sub Batch Percent Per Thread </string>
<string>OpenCL sub batch percent per thread </string>
</property>
<property name="decimals">
<number>3</number>