diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-05-26 11:01:46 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-05-27 13:07:16 +0300 |
commit | 38b50fe3933d99daba6e4cee93b5317cf3220a2f (patch) | |
tree | e7c47c851d425863a80d5793f684a80c15738614 /intern/opensubdiv/internal/topology/topology_refiner_factory.cc | |
parent | 15bcfc5b1993a38ce75d568aae434391680e6efe (diff) |
OpenSubdiv: Hide individual topology elements
Move all API to happen via MeshTopology.
This is a preparation for an upcoming memory optimization.
Diffstat (limited to 'intern/opensubdiv/internal/topology/topology_refiner_factory.cc')
-rw-r--r-- | intern/opensubdiv/internal/topology/topology_refiner_factory.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/opensubdiv/internal/topology/topology_refiner_factory.cc b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc index c01cf158668..5a84c45101b 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_factory.cc +++ b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc @@ -52,7 +52,6 @@ template<> inline bool TopologyRefinerFactory<TopologyRefinerData>::resizeComponentTopology( TopologyRefiner &refiner, const TopologyRefinerData &cb_data) { - using blender::opensubdiv::FaceTopology; using blender::opensubdiv::MeshTopology; const OpenSubdiv_Converter *converter = cb_data.converter; @@ -121,7 +120,6 @@ template<> inline bool TopologyRefinerFactory<TopologyRefinerData>::assignComponentTopology( TopologyRefiner &refiner, const TopologyRefinerData &cb_data) { - using blender::opensubdiv::EdgeTopology; using blender::opensubdiv::MeshTopology; using Far::IndexArray; @@ -141,7 +139,7 @@ inline bool TopologyRefinerFactory<TopologyRefinerData>::assignComponentTopology int edge_vertices[2]; converter->getEdgeVertices(converter, edge_index, edge_vertices); - base_mesh_topology->setEdgevertexIndices(edge_index, edge_vertices[0], edge_vertices[1]); + base_mesh_topology->setEdgeVertexIndices(edge_index, edge_vertices[0], edge_vertices[1]); } } @@ -185,10 +183,12 @@ inline bool TopologyRefinerFactory<TopologyRefinerData>::assignComponentTopology const int num_edges = converter->getNumEdges(converter); for (int edge_index = 0; edge_index < num_edges; ++edge_index) { // Vertices this edge connects. - const EdgeTopology &edge = base_mesh_topology->getEdge(edge_index); + int v1, v2; + base_mesh_topology->getEdgeVertexIndices(edge_index, &v1, &v2); + IndexArray dst_edge_vertices = getBaseEdgeVertices(refiner, edge_index); - dst_edge_vertices[0] = edge.v1; - dst_edge_vertices[1] = edge.v2; + dst_edge_vertices[0] = v1; + dst_edge_vertices[1] = v2; // Faces adjacent to this edge. IndexArray dst_edge_faces = getBaseEdgeFaces(refiner, edge_index); |