OpenSubdiv: Cleanup, move utility function to base type conversion
This commit is contained in:
parent
0ff665e4ce
commit
be03a756e5
@ -86,5 +86,22 @@ OpenSubdiv_FVarLinearInterpolation getCAPIFVarLinearInterpolationFromOSD(
|
||||
return OSD_FVAR_LINEAR_INTERPOLATION_NONE;
|
||||
}
|
||||
|
||||
OpenSubdiv::Sdc::Options::VtxBoundaryInterpolation getVtxBoundaryInterpolationFromCAPI(
|
||||
OpenSubdiv_VtxBoundaryInterpolation boundary_interpolation)
|
||||
{
|
||||
using OpenSubdiv::Sdc::Options;
|
||||
|
||||
switch (boundary_interpolation) {
|
||||
case OSD_VTX_BOUNDARY_NONE:
|
||||
return Options::VTX_BOUNDARY_NONE;
|
||||
case OSD_VTX_BOUNDARY_EDGE_ONLY:
|
||||
return Options::VTX_BOUNDARY_EDGE_ONLY;
|
||||
case OSD_VTX_BOUNDARY_EDGE_AND_CORNER:
|
||||
return Options::VTX_BOUNDARY_EDGE_AND_CORNER;
|
||||
}
|
||||
assert(!"Unknown veretx boundary interpolation.");
|
||||
return Options::VTX_BOUNDARY_EDGE_ONLY;
|
||||
}
|
||||
|
||||
} // namespace opensubdiv
|
||||
} // namespace blender
|
||||
|
@ -26,7 +26,7 @@
|
||||
#include <opensubdiv/sdc/options.h>
|
||||
#include <opensubdiv/sdc/types.h>
|
||||
|
||||
#include "opensubdiv_converter_capi.h"
|
||||
#include "opensubdiv_capi_type.h"
|
||||
|
||||
struct OpenSubdiv_Converter;
|
||||
|
||||
@ -45,6 +45,9 @@ OpenSubdiv::Sdc::Options::FVarLinearInterpolation getFVarLinearInterpolationFrom
|
||||
OpenSubdiv_FVarLinearInterpolation getCAPIFVarLinearInterpolationFromOSD(
|
||||
OpenSubdiv::Sdc::Options::FVarLinearInterpolation linear_interpolation);
|
||||
|
||||
OpenSubdiv::Sdc::Options::VtxBoundaryInterpolation getVtxBoundaryInterpolationFromCAPI(
|
||||
OpenSubdiv_VtxBoundaryInterpolation boundary_interpolation);
|
||||
|
||||
} // namespace opensubdiv
|
||||
} // namespace blender
|
||||
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "internal/base/type_convert.h"
|
||||
#include "internal/opensubdiv_util.h"
|
||||
#include "internal/topology/topology_refiner_impl.h"
|
||||
#include "opensubdiv_converter_capi.h"
|
||||
|
||||
using blender::opensubdiv::vector;
|
||||
|
||||
|
@ -251,23 +251,6 @@ namespace opensubdiv {
|
||||
|
||||
namespace {
|
||||
|
||||
OpenSubdiv::Sdc::Options::VtxBoundaryInterpolation getVtxBoundaryInterpolationFromCAPI(
|
||||
OpenSubdiv_VtxBoundaryInterpolation boundary_interpolation)
|
||||
{
|
||||
using OpenSubdiv::Sdc::Options;
|
||||
|
||||
switch (boundary_interpolation) {
|
||||
case OSD_VTX_BOUNDARY_NONE:
|
||||
return Options::VTX_BOUNDARY_NONE;
|
||||
case OSD_VTX_BOUNDARY_EDGE_ONLY:
|
||||
return Options::VTX_BOUNDARY_EDGE_ONLY;
|
||||
case OSD_VTX_BOUNDARY_EDGE_AND_CORNER:
|
||||
return Options::VTX_BOUNDARY_EDGE_AND_CORNER;
|
||||
}
|
||||
assert(!"Unknown veretx boundary interpolation.");
|
||||
return Options::VTX_BOUNDARY_EDGE_ONLY;
|
||||
}
|
||||
|
||||
OpenSubdiv::Sdc::Options getSDCOptions(OpenSubdiv_Converter *converter)
|
||||
{
|
||||
using OpenSubdiv::Sdc::Options;
|
||||
|
Loading…
Reference in New Issue
Block a user