This patch implements the list panel system D7490 for modifiers. It also moves modifier drawing to a callback in ModifierTypeInfo in line with the extensible architecture refactoring goal T75724. This adds a PanelRegister callback and utilities for registering panels and subpanels. It also adds the callbacks for expansion saving and drag and drop reordering described in D7490. These utilities, callbacks, and other common UI elements shared between modifiers live in MOD_ui_common.c. Because modifier buttons are now in panels, we can make use of subpanels for organization. The UI layouts also use the single column layout style consistently used elsewhere in Blender. Additionally, the mode-setting buttons are aligned and ordered consistently with the outliner. However, the large number of UI changes in this patch may mean that additional polishing is required in master. Thanks to William Reynish (@billreynish) who did a fair amount of the layout work and to Julian Eisel (@Severin) for consistent help. Differential Revision: https://developer.blender.org/D7498
461 lines
15 KiB
C
461 lines
15 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2005 by the Blender Foundation.
|
|
* All rights reserved.
|
|
*/
|
|
|
|
/** \file
|
|
* \ingroup modifiers
|
|
*/
|
|
|
|
#include <stddef.h>
|
|
#include <string.h>
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "BLT_translation.h"
|
|
|
|
#include "DNA_mesh_types.h"
|
|
#include "DNA_object_types.h"
|
|
#include "DNA_scene_types.h"
|
|
#include "DNA_screen_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_scene.h"
|
|
#include "BKE_screen.h"
|
|
#include "BKE_subdiv.h"
|
|
#include "BKE_subdiv_ccg.h"
|
|
#include "BKE_subdiv_deform.h"
|
|
#include "BKE_subdiv_mesh.h"
|
|
#include "BKE_subsurf.h"
|
|
|
|
#include "UI_interface.h"
|
|
#include "UI_resources.h"
|
|
|
|
#include "RE_engine.h"
|
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "DEG_depsgraph.h"
|
|
#include "DEG_depsgraph_query.h"
|
|
|
|
#include "MOD_modifiertypes.h"
|
|
#include "MOD_ui_common.h"
|
|
|
|
#include "intern/CCGSubSurf.h"
|
|
|
|
typedef struct SubsurfRuntimeData {
|
|
/* Cached subdivision surface descriptor, with topology and settings. */
|
|
struct Subdiv *subdiv;
|
|
} SubsurfRuntimeData;
|
|
|
|
static void initData(ModifierData *md)
|
|
{
|
|
SubsurfModifierData *smd = (SubsurfModifierData *)md;
|
|
|
|
smd->levels = 1;
|
|
smd->renderLevels = 2;
|
|
smd->uv_smooth = SUBSURF_UV_SMOOTH_PRESERVE_CORNERS;
|
|
smd->quality = 3;
|
|
smd->flags |= (eSubsurfModifierFlag_UseCrease | eSubsurfModifierFlag_ControlEdges);
|
|
}
|
|
|
|
static void copyData(const ModifierData *md, ModifierData *target, const int flag)
|
|
{
|
|
#if 0
|
|
const SubsurfModifierData *smd = (const SubsurfModifierData *)md;
|
|
#endif
|
|
SubsurfModifierData *tsmd = (SubsurfModifierData *)target;
|
|
|
|
BKE_modifier_copydata_generic(md, target, flag);
|
|
|
|
tsmd->emCache = tsmd->mCache = NULL;
|
|
}
|
|
|
|
static void freeRuntimeData(void *runtime_data_v)
|
|
{
|
|
if (runtime_data_v == NULL) {
|
|
return;
|
|
}
|
|
SubsurfRuntimeData *runtime_data = (SubsurfRuntimeData *)runtime_data_v;
|
|
if (runtime_data->subdiv != NULL) {
|
|
BKE_subdiv_free(runtime_data->subdiv);
|
|
}
|
|
MEM_freeN(runtime_data);
|
|
}
|
|
|
|
static void freeData(ModifierData *md)
|
|
{
|
|
SubsurfModifierData *smd = (SubsurfModifierData *)md;
|
|
|
|
if (smd->mCache) {
|
|
ccgSubSurf_free(smd->mCache);
|
|
smd->mCache = NULL;
|
|
}
|
|
if (smd->emCache) {
|
|
ccgSubSurf_free(smd->emCache);
|
|
smd->emCache = NULL;
|
|
}
|
|
freeRuntimeData(smd->modifier.runtime);
|
|
}
|
|
|
|
static bool isDisabled(const Scene *scene, ModifierData *md, bool useRenderParams)
|
|
{
|
|
SubsurfModifierData *smd = (SubsurfModifierData *)md;
|
|
int levels = (useRenderParams) ? smd->renderLevels : smd->levels;
|
|
|
|
return get_render_subsurf_level(&scene->r, levels, useRenderParams != 0) == 0;
|
|
}
|
|
|
|
static int subdiv_levels_for_modifier_get(const SubsurfModifierData *smd,
|
|
const ModifierEvalContext *ctx)
|
|
{
|
|
Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
|
|
const bool use_render_params = (ctx->flag & MOD_APPLY_RENDER);
|
|
const int requested_levels = (use_render_params) ? smd->renderLevels : smd->levels;
|
|
return get_render_subsurf_level(&scene->r, requested_levels, use_render_params);
|
|
}
|
|
|
|
static void subdiv_settings_init(SubdivSettings *settings, const SubsurfModifierData *smd)
|
|
{
|
|
settings->is_simple = (smd->subdivType == SUBSURF_TYPE_SIMPLE);
|
|
settings->is_adaptive = true;
|
|
settings->level = settings->is_simple ? 1 : smd->quality;
|
|
settings->use_creases = (smd->flags & eSubsurfModifierFlag_UseCrease);
|
|
settings->vtx_boundary_interpolation = SUBDIV_VTX_BOUNDARY_EDGE_ONLY;
|
|
settings->fvar_linear_interpolation = BKE_subdiv_fvar_interpolation_from_uv_smooth(
|
|
smd->uv_smooth);
|
|
}
|
|
|
|
/* Main goal of this function is to give usable subdivision surface descriptor
|
|
* which matches settings and topology. */
|
|
static Subdiv *subdiv_descriptor_ensure(SubsurfModifierData *smd,
|
|
const SubdivSettings *subdiv_settings,
|
|
const Mesh *mesh)
|
|
{
|
|
SubsurfRuntimeData *runtime_data = (SubsurfRuntimeData *)smd->modifier.runtime;
|
|
Subdiv *subdiv = BKE_subdiv_update_from_mesh(runtime_data->subdiv, subdiv_settings, mesh);
|
|
runtime_data->subdiv = subdiv;
|
|
return subdiv;
|
|
}
|
|
|
|
/* Subdivide into fully qualified mesh. */
|
|
|
|
static void subdiv_mesh_settings_init(SubdivToMeshSettings *settings,
|
|
const SubsurfModifierData *smd,
|
|
const ModifierEvalContext *ctx)
|
|
{
|
|
const int level = subdiv_levels_for_modifier_get(smd, ctx);
|
|
settings->resolution = (1 << level) + 1;
|
|
settings->use_optimal_display = (smd->flags & eSubsurfModifierFlag_ControlEdges) &&
|
|
!(ctx->flag & MOD_APPLY_TO_BASE_MESH);
|
|
}
|
|
|
|
static Mesh *subdiv_as_mesh(SubsurfModifierData *smd,
|
|
const ModifierEvalContext *ctx,
|
|
Mesh *mesh,
|
|
Subdiv *subdiv)
|
|
{
|
|
Mesh *result = mesh;
|
|
SubdivToMeshSettings mesh_settings;
|
|
subdiv_mesh_settings_init(&mesh_settings, smd, ctx);
|
|
if (mesh_settings.resolution < 3) {
|
|
return result;
|
|
}
|
|
result = BKE_subdiv_to_mesh(subdiv, &mesh_settings, mesh);
|
|
return result;
|
|
}
|
|
|
|
/* Subdivide into CCG. */
|
|
|
|
static void subdiv_ccg_settings_init(SubdivToCCGSettings *settings,
|
|
const SubsurfModifierData *smd,
|
|
const ModifierEvalContext *ctx)
|
|
{
|
|
const int level = subdiv_levels_for_modifier_get(smd, ctx);
|
|
settings->resolution = (1 << level) + 1;
|
|
settings->need_normal = true;
|
|
settings->need_mask = false;
|
|
}
|
|
|
|
static Mesh *subdiv_as_ccg(SubsurfModifierData *smd,
|
|
const ModifierEvalContext *ctx,
|
|
Mesh *mesh,
|
|
Subdiv *subdiv)
|
|
{
|
|
Mesh *result = mesh;
|
|
SubdivToCCGSettings ccg_settings;
|
|
subdiv_ccg_settings_init(&ccg_settings, smd, ctx);
|
|
if (ccg_settings.resolution < 3) {
|
|
return result;
|
|
}
|
|
result = BKE_subdiv_to_ccg_mesh(subdiv, &ccg_settings, mesh);
|
|
return result;
|
|
}
|
|
|
|
static SubsurfRuntimeData *subsurf_ensure_runtime(SubsurfModifierData *smd)
|
|
{
|
|
SubsurfRuntimeData *runtime_data = (SubsurfRuntimeData *)smd->modifier.runtime;
|
|
if (runtime_data == NULL) {
|
|
runtime_data = MEM_callocN(sizeof(*runtime_data), "subsurf runtime");
|
|
smd->modifier.runtime = runtime_data;
|
|
}
|
|
return runtime_data;
|
|
}
|
|
|
|
/* Modifier itself. */
|
|
|
|
static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
|
|
{
|
|
Mesh *result = mesh;
|
|
#if !defined(WITH_OPENSUBDIV)
|
|
BKE_modifier_set_error(md, "Disabled, built without OpenSubdiv");
|
|
return result;
|
|
#endif
|
|
SubsurfModifierData *smd = (SubsurfModifierData *)md;
|
|
SubdivSettings subdiv_settings;
|
|
subdiv_settings_init(&subdiv_settings, smd);
|
|
if (subdiv_settings.level == 0) {
|
|
return result;
|
|
}
|
|
BKE_subdiv_settings_validate_for_mesh(&subdiv_settings, mesh);
|
|
SubsurfRuntimeData *runtime_data = subsurf_ensure_runtime(smd);
|
|
Subdiv *subdiv = subdiv_descriptor_ensure(smd, &subdiv_settings, mesh);
|
|
if (subdiv == NULL) {
|
|
/* Happens on bad topology, but also on empty input mesh. */
|
|
return result;
|
|
}
|
|
/* TODO(sergey): Decide whether we ever want to use CCG for subsurf,
|
|
* maybe when it is a last modifier in the stack? */
|
|
if (true) {
|
|
result = subdiv_as_mesh(smd, ctx, mesh, subdiv);
|
|
}
|
|
else {
|
|
result = subdiv_as_ccg(smd, ctx, mesh, subdiv);
|
|
}
|
|
// BKE_subdiv_stats_print(&subdiv->stats);
|
|
if (subdiv != runtime_data->subdiv) {
|
|
BKE_subdiv_free(subdiv);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static void deformMatrices(ModifierData *md,
|
|
const ModifierEvalContext *UNUSED(ctx),
|
|
Mesh *mesh,
|
|
float (*vertex_cos)[3],
|
|
float (*deform_matrices)[3][3],
|
|
int num_verts)
|
|
{
|
|
#if !defined(WITH_OPENSUBDIV)
|
|
BKE_modifier_set_error(md, "Disabled, built without OpenSubdiv");
|
|
return;
|
|
#endif
|
|
|
|
/* Subsurf does not require extra space mapping, keep matrices as is. */
|
|
(void)deform_matrices;
|
|
|
|
SubsurfModifierData *smd = (SubsurfModifierData *)md;
|
|
SubdivSettings subdiv_settings;
|
|
subdiv_settings_init(&subdiv_settings, smd);
|
|
if (subdiv_settings.level == 0) {
|
|
return;
|
|
}
|
|
BKE_subdiv_settings_validate_for_mesh(&subdiv_settings, mesh);
|
|
SubsurfRuntimeData *runtime_data = subsurf_ensure_runtime(smd);
|
|
Subdiv *subdiv = subdiv_descriptor_ensure(smd, &subdiv_settings, mesh);
|
|
if (subdiv == NULL) {
|
|
/* Happens on bad topology, but also on empty input mesh. */
|
|
return;
|
|
}
|
|
BKE_subdiv_deform_coarse_vertices(subdiv, mesh, vertex_cos, num_verts);
|
|
if (subdiv != runtime_data->subdiv) {
|
|
BKE_subdiv_free(subdiv);
|
|
}
|
|
}
|
|
|
|
#ifdef WITH_CYCLES
|
|
static bool get_show_adaptive_options(const bContext *C, Panel *panel)
|
|
{
|
|
/* Don't show adaptive options if cycles isn't the active engine. */
|
|
const struct RenderEngineType *engine_type = CTX_data_engine_type(C);
|
|
if (!STREQ(engine_type->idname, "CYCLES")) {
|
|
return false;
|
|
}
|
|
|
|
/* Only show adaptive options if this is the last modifier. */
|
|
PointerRNA md_ptr;
|
|
modifier_panel_get_property_pointers(C, panel, NULL, &md_ptr);
|
|
ModifierData *md = md_ptr.data;
|
|
if (md->next != NULL) {
|
|
return false;
|
|
}
|
|
|
|
/* Don't show adaptive options if the cycles experimental feature set is disabled. */
|
|
Scene *scene = CTX_data_scene(C);
|
|
PointerRNA scene_ptr;
|
|
RNA_id_pointer_create(&scene->id, &scene_ptr);
|
|
if (BKE_scene_uses_cycles(scene)) {
|
|
PointerRNA cycles_ptr = RNA_pointer_get(&scene_ptr, "cycles");
|
|
if (RNA_enum_get(&cycles_ptr, "feature_set") != 1) { /* EXPERIMENTAL */
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
#endif
|
|
|
|
static void panel_draw(const bContext *C, Panel *panel)
|
|
{
|
|
uiLayout *layout = panel->layout;
|
|
|
|
PointerRNA ptr;
|
|
PointerRNA ob_ptr;
|
|
modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
|
|
|
|
/* Only test for adaptive subdivision if built with cycles. */
|
|
bool show_adaptive_options = false;
|
|
bool ob_use_adaptive_subdivision = false;
|
|
PointerRNA cycles_ptr = {NULL};
|
|
PointerRNA ob_cycles_ptr = {NULL};
|
|
#ifdef WITH_CYCLES
|
|
PointerRNA scene_ptr;
|
|
Scene *scene = CTX_data_scene(C);
|
|
RNA_id_pointer_create(&scene->id, &scene_ptr);
|
|
if (BKE_scene_uses_cycles(scene)) {
|
|
cycles_ptr = RNA_pointer_get(&scene_ptr, "cycles");
|
|
ob_cycles_ptr = RNA_pointer_get(&ob_ptr, "cycles");
|
|
if (!RNA_pointer_is_null(&ob_cycles_ptr)) {
|
|
ob_use_adaptive_subdivision = RNA_boolean_get(&ob_cycles_ptr, "use_adaptive_subdivision");
|
|
show_adaptive_options = get_show_adaptive_options(C, panel);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
uiItemR(layout, &ptr, "subdivision_type", 0, IFACE_("Type"), ICON_NONE);
|
|
|
|
if (show_adaptive_options) {
|
|
uiItemR(layout,
|
|
&ob_cycles_ptr,
|
|
"use_adaptive_subdivision",
|
|
0,
|
|
IFACE_("Adaptive Subdivision"),
|
|
ICON_NONE);
|
|
}
|
|
if (ob_use_adaptive_subdivision && show_adaptive_options) {
|
|
uiItemR(layout, &ob_cycles_ptr, "dicing_rate", 0, NULL, ICON_NONE);
|
|
float render = MAX2(RNA_float_get(&cycles_ptr, "dicing_rate") *
|
|
RNA_float_get(&ob_cycles_ptr, "dicing_rate"),
|
|
0.1f);
|
|
float preview = MAX2(RNA_float_get(&cycles_ptr, "preview_dicing_rate") *
|
|
RNA_float_get(&ob_cycles_ptr, "dicing_rate"),
|
|
0.1f);
|
|
char output[64];
|
|
snprintf(output, 64, "Final Scale: Render %.2f px, Viewport %.2f px", render, preview);
|
|
uiItemL(layout, output, ICON_NONE);
|
|
|
|
uiItemS(layout);
|
|
|
|
uiItemR(layout, &ptr, "levels", 0, IFACE_("Levels Viewport"), ICON_NONE);
|
|
}
|
|
else {
|
|
uiLayout *col = uiLayoutColumn(layout, true);
|
|
uiItemR(col, &ptr, "levels", 0, IFACE_("Levels Viewport"), ICON_NONE);
|
|
uiItemR(col, &ptr, "render_levels", 0, IFACE_("Render"), ICON_NONE);
|
|
}
|
|
|
|
uiItemR(layout, &ptr, "show_only_control_edges", 0, NULL, ICON_NONE);
|
|
|
|
modifier_panel_end(layout, &ptr);
|
|
}
|
|
|
|
static void advanced_panel_draw(const bContext *C, Panel *panel)
|
|
{
|
|
uiLayout *layout = panel->layout;
|
|
|
|
PointerRNA ptr;
|
|
PointerRNA ob_ptr;
|
|
modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
|
|
|
|
bool ob_use_adaptive_subdivision = false;
|
|
bool show_adaptive_options = false;
|
|
#ifdef WITH_CYCLES
|
|
Scene *scene = CTX_data_scene(C);
|
|
if (BKE_scene_uses_cycles(scene)) {
|
|
PointerRNA ob_cycles_ptr = RNA_pointer_get(&ob_ptr, "cycles");
|
|
if (!RNA_pointer_is_null(&ob_cycles_ptr)) {
|
|
ob_use_adaptive_subdivision = RNA_boolean_get(&ob_cycles_ptr, "use_adaptive_subdivision");
|
|
show_adaptive_options = get_show_adaptive_options(C, panel);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
uiLayoutSetActive(layout, !(show_adaptive_options && ob_use_adaptive_subdivision));
|
|
uiItemR(layout, &ptr, "quality", 0, NULL, ICON_NONE);
|
|
uiItemR(layout, &ptr, "uv_smooth", 0, NULL, ICON_NONE);
|
|
uiItemR(layout, &ptr, "use_creases", 0, NULL, ICON_NONE);
|
|
|
|
modifier_panel_end(layout, &ptr);
|
|
}
|
|
|
|
static void panelRegister(ARegionType *region_type)
|
|
{
|
|
PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Subsurf, panel_draw);
|
|
modifier_subpanel_register(
|
|
region_type, "advanced", "Advanced", NULL, advanced_panel_draw, panel_type);
|
|
}
|
|
|
|
ModifierTypeInfo modifierType_Subsurf = {
|
|
/* name */ "Subdivision",
|
|
/* structName */ "SubsurfModifierData",
|
|
/* structSize */ sizeof(SubsurfModifierData),
|
|
/* type */ eModifierTypeType_Constructive,
|
|
/* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping |
|
|
eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode |
|
|
eModifierTypeFlag_AcceptsCVs,
|
|
|
|
/* copyData */ copyData,
|
|
|
|
/* deformVerts */ NULL,
|
|
/* deformMatrices */ deformMatrices,
|
|
/* deformVertsEM */ NULL,
|
|
/* deformMatricesEM */ NULL,
|
|
/* modifyMesh */ modifyMesh,
|
|
/* modifyHair */ NULL,
|
|
/* modifyPointCloud */ NULL,
|
|
/* modifyVolume */ NULL,
|
|
|
|
/* initData */ initData,
|
|
/* requiredDataMask */ NULL,
|
|
/* freeData */ freeData,
|
|
/* isDisabled */ isDisabled,
|
|
/* updateDepsgraph */ NULL,
|
|
/* dependsOnTime */ NULL,
|
|
/* dependsOnNormals */ NULL,
|
|
/* foreachObjectLink */ NULL,
|
|
/* foreachIDLink */ NULL,
|
|
/* foreachTexLink */ NULL,
|
|
/* freeRuntimeData */ freeRuntimeData,
|
|
/* panelRegister */ panelRegister,
|
|
};
|