5e46e3d28a
Remove the indirection previously used for the topology refiner to separate C and C++ code. Instead retrieve the base level in calling code and call opensubdiv API functions directly. This avoids copying arrays of mesh indices and should reduce function call overhead since index retrieval can now be inlined. It also lets us remove a lot of boilerplate shim code. The downside is increased need for WITH_OPENSUBDIV defines in various parts of blenkernel, but I think that is required to avoid the previous indirection and have the kernel deal with OpenSubdiv more directly. Pull Request: https://projects.blender.org/blender/blender/pulls/120825
105 lines
3.0 KiB
C++
105 lines
3.0 KiB
C++
/* SPDX-FileCopyrightText: 2020 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup bke
|
|
*/
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "DNA_mesh_types.h"
|
|
#include "DNA_modifier_types.h"
|
|
#include "DNA_object_types.h"
|
|
|
|
#include "BKE_subdiv.hh"
|
|
#include "BKE_subdiv_eval.hh"
|
|
|
|
#include "multires_reshape.hh"
|
|
#include "opensubdiv_converter_capi.hh"
|
|
#include "subdiv_converter.hh"
|
|
|
|
#ifdef WITH_OPENSUBDIV
|
|
|
|
static float simple_to_catmull_clark_get_edge_sharpness(const OpenSubdiv_Converter * /*converter*/,
|
|
int /*manifold_edge_index*/)
|
|
{
|
|
return 10.0f;
|
|
}
|
|
|
|
static bool simple_to_catmull_clark_is_infinite_sharp_vertex(
|
|
const OpenSubdiv_Converter * /*converter*/, int /*manifold_vertex_index*/)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static blender::bke::subdiv::Subdiv *subdiv_for_simple_to_catmull_clark(Object *object,
|
|
MultiresModifierData *mmd)
|
|
{
|
|
using namespace blender::bke;
|
|
subdiv::Settings subdiv_settings;
|
|
BKE_multires_subdiv_settings_init(&subdiv_settings, mmd);
|
|
|
|
const Mesh *base_mesh = static_cast<const Mesh *>(object->data);
|
|
|
|
OpenSubdiv_Converter converter;
|
|
subdiv::converter_init_for_mesh(&converter, &subdiv_settings, base_mesh);
|
|
converter.getEdgeSharpness = simple_to_catmull_clark_get_edge_sharpness;
|
|
converter.isInfiniteSharpVertex = simple_to_catmull_clark_is_infinite_sharp_vertex;
|
|
|
|
subdiv::Subdiv *subdiv = subdiv::new_from_converter(&subdiv_settings, &converter);
|
|
subdiv::converter_free(&converter);
|
|
|
|
if (!subdiv::eval_begin_from_mesh(
|
|
subdiv, base_mesh, {}, subdiv::SUBDIV_EVALUATOR_TYPE_CPU, nullptr))
|
|
{
|
|
subdiv::free(subdiv);
|
|
return nullptr;
|
|
}
|
|
|
|
return subdiv;
|
|
}
|
|
|
|
#endif
|
|
|
|
void multires_do_versions_simple_to_catmull_clark(Object *object, MultiresModifierData *mmd)
|
|
{
|
|
#ifdef WITH_OPENSUBDIV
|
|
const Mesh *base_mesh = static_cast<const Mesh *>(object->data);
|
|
if (base_mesh->corners_num == 0) {
|
|
return;
|
|
}
|
|
|
|
/* Store the grids displacement in object space against the simple limit surface. */
|
|
{
|
|
blender::bke::subdiv::Subdiv *subdiv = subdiv_for_simple_to_catmull_clark(object, mmd);
|
|
MultiresReshapeContext reshape_context;
|
|
if (!multires_reshape_context_create_from_subdiv(
|
|
&reshape_context, object, mmd, subdiv, mmd->totlvl))
|
|
{
|
|
blender::bke::subdiv::free(subdiv);
|
|
return;
|
|
}
|
|
|
|
multires_reshape_store_original_grids(&reshape_context);
|
|
multires_reshape_assign_final_coords_from_mdisps(&reshape_context);
|
|
multires_reshape_context_free(&reshape_context);
|
|
|
|
blender::bke::subdiv::free(subdiv);
|
|
}
|
|
|
|
/* Calculate the new tangent displacement against the new Catmull-Clark limit surface. */
|
|
{
|
|
MultiresReshapeContext reshape_context;
|
|
if (!multires_reshape_context_create_from_modifier(&reshape_context, object, mmd, mmd->totlvl))
|
|
{
|
|
return;
|
|
}
|
|
multires_reshape_object_grids_to_tangent_displacement(&reshape_context);
|
|
multires_reshape_context_free(&reshape_context);
|
|
}
|
|
#else
|
|
UNUSED_VARS(object, mmd);
|
|
#endif
|
|
}
|