From 37d2d41beca6722d7374fcabfd63afe62ee0769a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Beaune?= Date: Mon, 15 Oct 2018 23:39:25 +0200 Subject: [PATCH] Minor UI and code tweaks --- .../appleseedrenderer/appleseedrenderer.cpp | 5 +- .../appleseedrendererparamdlg.cpp | 2 +- .../appleseedrenderer/projectbuilder.cpp | 39 ++++------ .../appleseedrenderer/renderersettings.cpp | 74 +++++++------------ 4 files changed, 42 insertions(+), 78 deletions(-) diff --git a/src/appleseed-max-impl/appleseedrenderer/appleseedrenderer.cpp b/src/appleseed-max-impl/appleseedrenderer/appleseedrenderer.cpp index 1849c7d..444945e 100644 --- a/src/appleseed-max-impl/appleseedrenderer/appleseedrenderer.cpp +++ b/src/appleseed-max-impl/appleseedrenderer/appleseedrenderer.cpp @@ -241,6 +241,7 @@ namespace this->yscale = -this->devAspect * this->xscale; } + this->antialias = false; this->nearRange = 0.0f; this->farRange = 0.0f; @@ -357,7 +358,7 @@ void AppleseedRendererPBlockAccessor::Get( break; // - // Path-Tracer. + // Path Tracer. // case ParamIdEnableGI: @@ -998,7 +999,7 @@ ParamBlockDesc2 g_param_block_desc( p_accessor, &g_pblock_accessor, p_end, - // --- Parameters specifications for Path-Tracer rollup --- + // --- Parameters specifications for Path Tracer rollup --- ParamIdEnableGI, L"enable_global_illumination", TYPE_BOOL, P_TRANSIENT, 0, p_ui, ParamMapIdPathTracer, TYPE_SINGLECHEKBOX, IDC_CHECK_GI, diff --git a/src/appleseed-max-impl/appleseedrenderer/appleseedrendererparamdlg.cpp b/src/appleseed-max-impl/appleseedrenderer/appleseedrendererparamdlg.cpp index ecea4f4..44d8899 100644 --- a/src/appleseed-max-impl/appleseedrenderer/appleseedrendererparamdlg.cpp +++ b/src/appleseed-max-impl/appleseedrenderer/appleseedrendererparamdlg.cpp @@ -494,7 +494,7 @@ struct AppleseedRendererParamDlg::Impl rend_params, g_module, MAKEINTRESOURCE(IDD_FORMVIEW_RENDERERPARAMS_PATH_TRACING), - L"Path-Tracing", + L"Path Tracing", 0); m_pmap_postprocessing = CreateRParamMap2( diff --git a/src/appleseed-max-impl/appleseedrenderer/projectbuilder.cpp b/src/appleseed-max-impl/appleseedrenderer/projectbuilder.cpp index 1fafd19..4149cc7 100644 --- a/src/appleseed-max-impl/appleseedrenderer/projectbuilder.cpp +++ b/src/appleseed-max-impl/appleseedrenderer/projectbuilder.cpp @@ -1401,24 +1401,15 @@ namespace { switch (filter_type) { - case 0: - return "blackman-harris"; - case 1: - return "box"; - case 2: - return "catmull"; - case 3: - return "bspline"; - case 4: - return "gaussian"; - case 5: - return "lanczos"; - case 6: - return "mitchell"; - case 7: - return "triangle"; - default: - return "box"; + case 0: return "blackman-harris"; + case 1: return "box"; + case 2: return "catmull"; + case 3: return "bspline"; + case 4: return "gaussian"; + case 5: return "lanczos"; + case 6: return "mitchell"; + case 7: return "triangle"; + default: return "box"; } } @@ -1426,14 +1417,10 @@ namespace { switch (denoise_mode) { - case 0: - return "off"; - case 1: - return "on"; - case 2: - return "write_outputs"; - default: - return "off"; + case 0: return "off"; + case 1: return "on"; + case 2: return "write_outputs"; + default: return "off"; } } diff --git a/src/appleseed-max-impl/appleseedrenderer/renderersettings.cpp b/src/appleseed-max-impl/appleseedrenderer/renderersettings.cpp index cff09e0..3363da2 100644 --- a/src/appleseed-max-impl/appleseedrenderer/renderersettings.cpp +++ b/src/appleseed-max-impl/appleseedrenderer/renderersettings.cpp @@ -122,54 +122,30 @@ const char* get_shader_override_type(const int shader_override_type) { switch (shader_override_type) { - case 0: - return "no_override"; - case 1: - return "albedo"; - case 2: - return "ambient_occlusion"; - case 3: - return "assembly_instances"; - case 4: - return "barycentric"; - case 5: - return "bitangent"; - case 6: - return "coverage"; - case 7: - return "depth"; - case 8: - return "facing_ratio"; - case 9: - return "geometric_normal"; - case 10: - return "materials"; - case 11: - return "object_instances"; - case 12: - return "original_shading_normal"; - case 13: - return "primitives"; - case 14: - return "ray_spread"; - case 15: - return "regions"; - case 16: - return "screen_space_wireframe"; - case 17: - return "shading_normal"; - case 18: - return "sides"; - case 19: - return "tangent"; - case 20: - return "uv"; - case 21: - return "world_space_position"; - case 22: - return "world_space_wireframe"; - default: - return "coverage"; + case 0: return "no_override"; + case 1: return "albedo"; + case 2: return "ambient_occlusion"; + case 3: return "assembly_instances"; + case 4: return "barycentric"; + case 5: return "bitangent"; + case 6: return "coverage"; + case 7: return "depth"; + case 8: return "facing_ratio"; + case 9: return "geometric_normal"; + case 10: return "materials"; + case 11: return "object_instances"; + case 12: return "original_shading_normal"; + case 13: return "primitives"; + case 14: return "ray_spread"; + case 15: return "regions"; + case 16: return "screen_space_wireframe"; + case 17: return "shading_normal"; + case 18: return "sides"; + case 19: return "tangent"; + case 20: return "uv"; + case 21: return "world_space_position"; + case 22: return "world_space_wireframe"; + default: return "coverage"; } } @@ -337,7 +313,7 @@ bool RendererSettings::save(ISave* isave) const isave->EndChunk(); // - // Path-Tracer settings. + // Path Tracer settings. // isave->BeginChunk(ChunkSettingsPathtracer);