From 5209ead08689855675c0906a26957ed4f7852a36 Mon Sep 17 00:00:00 2001 From: Person Date: Sun, 14 Apr 2019 23:46:45 -0700 Subject: [PATCH] --Code changes -Change some menu capitalization to make the text easier on the eyes. --- Source/Ember/CarToRas.h | 1 + Source/Ember/XmlToEmber.cpp | 2 +- Source/EmberCommon/EmberOptions.h | 6 +-- Source/Fractorium/FinalRenderDialog.ui | 4 +- Source/Fractorium/Fractorium.ui | 71 ++++++++++++++------------ Source/Fractorium/OptionsDialog.ui | 6 +-- 6 files changed, 47 insertions(+), 43 deletions(-) diff --git a/Source/Ember/CarToRas.h b/Source/Ember/CarToRas.h index 54bf2a7..5750161 100644 --- a/Source/Ember/CarToRas.h +++ b/Source/Ember/CarToRas.h @@ -182,6 +182,7 @@ public: /// The converted single raster buffer index inline void Convert(Point& point, size_t& singleBufferIndex) { + //singleBufferIndex = static_cast(Round(m_PixPerImageUnitW * point.m_X - m_RasLlX) + (m_RasWidth * Round(m_PixPerImageUnitH * point.m_Y - m_RasLlY))); singleBufferIndex = static_cast(m_PixPerImageUnitW * point.m_X - m_RasLlX) + (m_RasWidth * static_cast(m_PixPerImageUnitH * point.m_Y - m_RasLlY)); } diff --git a/Source/Ember/XmlToEmber.cpp b/Source/Ember/XmlToEmber.cpp index f757720..03d5e57 100644 --- a/Source/Ember/XmlToEmber.cpp +++ b/Source/Ember/XmlToEmber.cpp @@ -176,9 +176,9 @@ XmlToEmber::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" }, diff --git a/Source/EmberCommon/EmberOptions.h b/Source/EmberCommon/EmberOptions.h index 0ef7f00..05360f7 100644 --- a/Source/EmberCommon/EmberOptions.h +++ b/Source/EmberCommon/EmberOptions.h @@ -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= 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= 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= 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= 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= 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= 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= 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= 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); diff --git a/Source/Fractorium/FinalRenderDialog.ui b/Source/Fractorium/FinalRenderDialog.ui index c5b2cad..1329375 100644 --- a/Source/Fractorium/FinalRenderDialog.ui +++ b/Source/Fractorium/FinalRenderDialog.ui @@ -439,10 +439,10 @@ - <html><head/><body><p>The percentage of a sub batch to execute on each thread per kernel call when using OpenCL. Default: 0.025 (256 iters).</p><p>Increase this number for slightly faster render times.</p><p>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.</p></body></html> + <html><head/><body><p>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).</p><p>Increase this number for slightly faster render times.</p><p>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.</p></body></html> - OpenCL Sub Batch Percent Per Thread + OpenCL sub batch percent per thread 3 diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui index 2c872a3..c020994 100644 --- a/Source/Fractorium/Fractorium.ui +++ b/Source/Fractorium/Fractorium.ui @@ -8200,10 +8200,10 @@ :/Fractorium/Icons/layers-stack.png:/Fractorium/Icons/layers-stack.png - New Floc&k + New floc&k - New Flock + New flock Clear any existing flames and create a new file with 10 random flames in it @@ -8239,7 +8239,7 @@ :/Fractorium/Icons/database-medium.png:/Fractorium/Icons/database-medium.png - Save &Current as Xml + Save &current as xml Save the current flame as an xml file @@ -8272,7 +8272,10 @@ :/Fractorium/Icons/cog.png:/Fractorium/Icons/cog.png - Final &Render + Final &render + + + Final render @@ -8281,7 +8284,7 @@ :/Fractorium/Icons/monitor.png:/Fractorium/Icons/monitor.png - Save Current Scree&n + Save current scree&n Save the current screen as an image @@ -8293,7 +8296,7 @@ :/Fractorium/Icons/068123-3d-transparent-glass-icon-alphanumeric-question-mark3.png:/Fractorium/Icons/068123-3d-transparent-glass-icon-alphanumeric-question-mark3.png - New &Random Flame + New &random Flame Add a new random flame to the end of the current file @@ -8308,10 +8311,10 @@ :/Fractorium/Icons/databases.png:/Fractorium/Icons/databases.png - Save Entire &File as Xml + Save entire &file as xml - Save Entire File as Xml + Save entire file as xml Save all flames as a single xml file @@ -8326,7 +8329,7 @@ :/Fractorium/Icons/proxy.png:/Fractorium/Icons/proxy.png - Add R&eflective Symmetry + Add r&eflective symmetry Add reflective symmetry @@ -8338,7 +8341,7 @@ :/Fractorium/Icons/display-brightness-off.png:/Fractorium/Icons/display-brightness-off.png - Add R&otational Symmetry + Add r&otational symmetry Add rotational symmetry @@ -8346,7 +8349,7 @@ - Add Reflective &and Rotational Symmetry + Add reflective &and rotational symmetry Add reflective and rotational symmetry @@ -8358,7 +8361,7 @@ :/Fractorium/Icons/layer--plus.png:/Fractorium/Icons/layer--plus.png - New &Empty Flame + New &empty flame Add a new empty flame to the end of the current file @@ -8373,7 +8376,7 @@ :/Fractorium/Icons/layers.png:/Fractorium/Icons/layers.png - Add Co&py of Flame + Add co&py of flame Add a copy of the current flame to the end of the current file @@ -8388,7 +8391,7 @@ :/Fractorium/Icons/016938-3d-transparent-glass-icon-symbols-shapes-shape-square-clear-16.png:/Fractorium/Icons/016938-3d-transparent-glass-icon-symbols-shapes-shape-square-clear-16.png - &Clear Flame + &Clear flame Delete all but one xform, clear its variations and set pre and post affine to the identity matrix. @@ -8400,10 +8403,10 @@ :/Fractorium/Icons/page_copy.png:/Fractorium/Icons/page_copy.png - &Copy Xml + &Copy xml - Copy Xml for the current flame + Copy xml for the current flame Ctrl+C @@ -8411,7 +8414,7 @@ - Paste Xml &Over + Paste xml &over Paste Xml over the current flame in the current file @@ -8422,10 +8425,10 @@ - Copy &All Xmls + Copy &all xmls - Copy Xmls for all flames as a single string + Copy xmls for all flames as a single string Ctrl+Shift+C @@ -8437,7 +8440,7 @@ :/Fractorium/Icons/stop.png:/Fractorium/Icons/stop.png - &Stop Rendering Previews + &Stop rendering previews Stop rendering previews @@ -8449,7 +8452,7 @@ :/Fractorium/Icons/application_side_boxes.png:/Fractorium/Icons/application_side_boxes.png - Render &Previews + Render &previews Render previews @@ -8485,10 +8488,10 @@ :/Fractorium/Icons/page_paste.png:/Fractorium/Icons/page_paste.png - Paste Xml A&ppend + Paste xml a&ppend - Paste Xml as a new flame in the current file + Paste xml as a new flame in the current file Ctrl+V @@ -8520,7 +8523,7 @@ - Copy Selected &Xforms + Copy selected &xforms Copy selected xforms to the clipboard @@ -8531,7 +8534,7 @@ - Paste Selected X&forms + Paste selected x&forms Paste copied xforms into the current flame @@ -8542,7 +8545,7 @@ - &Reset Workspace + &Reset workspace Reset workspace @@ -8648,7 +8651,7 @@ :/Fractorium/Icons/pic.png:/Fractorium/Icons/pic.png - Show/Hide Image + Show/Hide image Show/Hide Image @@ -8666,10 +8669,10 @@ :/Fractorium/Icons/grid.png:/Fractorium/Icons/grid.png - Show/Hide Grid + Show/Hide grid - Show/Hide Grid + Show/Hide grid @@ -8681,15 +8684,15 @@ :/Fractorium/Icons/Function-512.png:/Fractorium/Icons/Function-512.png - Show/Hide Xforms + Show/Hide xforms - Show/Hide Xforms + Show/Hide xforms - Alternate Editor/Image + Alternate editor/image Ctrl+W @@ -8697,12 +8700,12 @@ - Reset Scale + Reset scale - Copy &Kernel + Copy &kernel Copy the OpenCL program to the clipboard for debugging. diff --git a/Source/Fractorium/OptionsDialog.ui b/Source/Fractorium/OptionsDialog.ui index c8f4a03..08270d6 100644 --- a/Source/Fractorium/OptionsDialog.ui +++ b/Source/Fractorium/OptionsDialog.ui @@ -317,7 +317,7 @@ <html><head/><body><p>The number of ~8M iteration chunks ran using OpenCL in interactive mode for each mouse movement.</p><p>Increase this number for a higher quality image on each mouse movement, at the expense of responsiveness.</p></body></html> - OpenCL Chunks per Mouse Movement + OpenCL chunks per mouse movement 1 @@ -380,7 +380,7 @@ <html><head/><body><p>The number of ~10,000 iteration chunks ran per thread on the CPU in interactive mode for each mouse movement.</p><p>Increase this number for a higher quality image on each mouse movement, at the expense of responsiveness.</p><p>The number of iterations done in each chunk is controlled by the Sub Batch Size field in the Flame tab.</p></body></html> - CPU Chunks per Mouse Movement + CPU chunks per mouse movement 1 @@ -428,7 +428,7 @@ <html><head/><body><p>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).</p><p>Increase this number for a higher quality image on each mouse movement, at the expense of responsiveness.</p><p>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.</p></body></html> - OpenCL Sub Batch Percent Per Thread + OpenCL sub batch percent per thread 3