[Bf-blender-cvs] [809a2d02647] cycles_procedural_api: cleanup, rename num_subd_faces get_num_subd_faces
Kévin Dietrich
noreply at git.blender.org
Sat Oct 3 04:18:23 CEST 2020
Commit: 809a2d02647d7583231cdf818b182ac172724e7d
Author: Kévin Dietrich
Date: Fri Oct 2 23:33:08 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB809a2d02647d7583231cdf818b182ac172724e7d
cleanup, rename num_subd_faces get_num_subd_faces
===================================================================
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/render/attribute.cpp
M intern/cycles/render/geometry.cpp
M intern/cycles/render/mesh.cpp
M intern/cycles/render/mesh.h
M intern/cycles/render/mesh_subdivision.cpp
M intern/cycles/subd/subd_split.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 7ba6d07002e..f4d814c68db 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -48,7 +48,7 @@ struct MikkUserData {
float *tangent_sign)
: mesh(mesh), texface(NULL), orco(NULL), tangent(tangent), tangent_sign(tangent_sign)
{
- const AttributeSet &attributes = (mesh->num_subd_faces()) ? mesh->subd_attributes :
+ const AttributeSet &attributes = (mesh->get_num_subd_faces()) ? mesh->subd_attributes :
mesh->attributes;
Attribute *attr_vN = attributes.find(ATTR_STD_VERTEX_NORMAL);
@@ -85,8 +85,8 @@ struct MikkUserData {
static int mikk_get_num_faces(const SMikkTSpaceContext *context)
{
const MikkUserData *userdata = (const MikkUserData *)context->m_pUserData;
- if (userdata->mesh->num_subd_faces()) {
- return userdata->mesh->num_subd_faces();
+ if (userdata->mesh->get_num_subd_faces()) {
+ return userdata->mesh->get_num_subd_faces();
}
else {
return userdata->mesh->num_triangles();
@@ -96,7 +96,7 @@ static int mikk_get_num_faces(const SMikkTSpaceContext *context)
static int mikk_get_num_verts_of_face(const SMikkTSpaceContext *context, const int face_num)
{
const MikkUserData *userdata = (const MikkUserData *)context->m_pUserData;
- if (userdata->mesh->num_subd_faces()) {
+ if (userdata->mesh->get_num_subd_faces()) {
const Mesh *mesh = userdata->mesh;
return mesh->get_subd_num_corners()[face_num];
}
@@ -107,7 +107,7 @@ static int mikk_get_num_verts_of_face(const SMikkTSpaceContext *context, const i
static int mikk_vertex_index(const Mesh *mesh, const int face_num, const int vert_num)
{
- if (mesh->num_subd_faces()) {
+ if (mesh->get_num_subd_faces()) {
const Mesh::SubdFace &face = mesh->get_subd_face(face_num);
return mesh->get_subd_face_corners()[face.start_corner + vert_num];
}
@@ -118,7 +118,7 @@ static int mikk_vertex_index(const Mesh *mesh, const int face_num, const int ver
static int mikk_corner_index(const Mesh *mesh, const int face_num, const int vert_num)
{
- if (mesh->num_subd_faces()) {
+ if (mesh->get_num_subd_faces()) {
const Mesh::SubdFace &face = mesh->get_subd_face(face_num);
return face.start_corner + vert_num;
}
@@ -178,7 +178,7 @@ static void mikk_get_normal(const SMikkTSpaceContext *context,
const MikkUserData *userdata = (const MikkUserData *)context->m_pUserData;
const Mesh *mesh = userdata->mesh;
float3 vN;
- if (mesh->num_subd_faces()) {
+ if (mesh->get_num_subd_faces()) {
const Mesh::SubdFace &face = mesh->get_subd_face(face_num);
if (face.smooth) {
const int vertex_index = mikk_vertex_index(mesh, face_num, vert_num);
@@ -222,7 +222,7 @@ static void mikk_compute_tangents(
const BL::Mesh &b_mesh, const char *layer_name, Mesh *mesh, bool need_sign, bool active_render)
{
/* Create tangent attributes. */
- AttributeSet &attributes = (mesh->num_subd_faces()) ? mesh->subd_attributes : mesh->attributes;
+ AttributeSet &attributes = (mesh->get_num_subd_faces()) ? mesh->subd_attributes : mesh->attributes;
Attribute *attr;
ustring name;
if (layer_name != NULL) {
diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index c723c29b3d6..37b98909d78 100644
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -191,7 +191,7 @@ size_t Attribute::element_size(Geometry *geom, AttributePrimitive prim) const
size = mesh->num_triangles();
}
else {
- size = mesh->num_subd_faces() + mesh->get_num_ngons();
+ size = mesh->get_num_subd_faces() + mesh->get_num_ngons();
}
}
break;
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index 6a4bf0e7d6b..5c519da856e 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -442,7 +442,7 @@ void GeometryManager::update_svm_attributes(Device *,
if (geom->is_mesh()) {
Mesh *mesh = static_cast<Mesh *>(geom);
- if (mesh->num_subd_faces()) {
+ if (mesh->get_num_subd_faces()) {
attr_map[index].x = id;
attr_map[index].y = req.subd_desc.element;
attr_map[index].z = as_uint(req.subd_desc.offset);
@@ -818,8 +818,8 @@ void GeometryManager::mesh_calc_offset(Scene *scene)
vert_size += mesh->verts.size();
tri_size += mesh->num_triangles();
- if (mesh->num_subd_faces()) {
- Mesh::SubdFace last = mesh->get_subd_face(mesh->num_subd_faces() - 1);
+ if (mesh->get_num_subd_faces()) {
+ Mesh::SubdFace last = mesh->get_subd_face(mesh->get_num_subd_faces() - 1);
patch_size += (last.ptex_offset + last.num_ptex_faces()) * 8;
/* patch tables are stored in same array so include them in patch_size */
@@ -829,7 +829,7 @@ void GeometryManager::mesh_calc_offset(Scene *scene)
}
}
- face_size += mesh->num_subd_faces();
+ face_size += mesh->get_num_subd_faces();
corner_size += mesh->subd_face_corners.size();
mesh->optix_prim_offset = optix_prim_size;
@@ -869,8 +869,8 @@ void GeometryManager::device_update_mesh(
vert_size += mesh->verts.size();
tri_size += mesh->num_triangles();
- if (mesh->num_subd_faces()) {
- Mesh::SubdFace last = mesh->get_subd_face(mesh->num_subd_faces() - 1);
+ if (mesh->get_num_subd_faces()) {
+ Mesh::SubdFace last = mesh->get_subd_face(mesh->get_num_subd_faces() - 1);
patch_size += (last.ptex_offset + last.num_ptex_faces()) * 8;
/* patch tables are stored in same array so include them in patch_size */
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index a6f3d3abcb5..a7f88be4bd7 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -212,7 +212,7 @@ void Mesh::resize_mesh(int numverts, int numtris)
shader.resize(numtris);
smooth.resize(numtris);
- if (num_subd_faces()) {
+ if (get_num_subd_faces()) {
triangle_patch.resize(numtris);
vert_patch_uv.resize(numverts);
}
@@ -228,7 +228,7 @@ void Mesh::reserve_mesh(int numverts, int numtris)
shader.reserve(numtris);
smooth.reserve(numtris);
- if (num_subd_faces()) {
+ if (get_num_subd_faces()) {
triangle_patch.reserve(numtris);
vert_patch_uv.reserve(numverts);
}
@@ -314,7 +314,7 @@ void Mesh::add_vertex(float3 P)
{
verts.push_back_reserved(P);
- if (num_subd_faces()) {
+ if (get_num_subd_faces()) {
vert_patch_uv.push_back_reserved(make_float2(0.0f, 0.0f));
}
}
@@ -325,7 +325,7 @@ void Mesh::add_vertex_slow(float3 P)
socket_modified |= get_triangles_socket()->modified_flag_bit;
- if (num_subd_faces()) {
+ if (get_num_subd_faces()) {
vert_patch_uv.push_back_slow(make_float2(0.0f, 0.0f));
socket_modified |= get_vert_patch_uv_socket()->modified_flag_bit;
}
@@ -343,7 +343,7 @@ void Mesh::add_triangle(int v0, int v1, int v2, int shader_, bool smooth_)
socket_modified |= get_shader_socket()->modified_flag_bit;
socket_modified |= get_smooth_socket()->modified_flag_bit;
- if (num_subd_faces()) {
+ if (get_num_subd_faces()) {
triangle_patch.push_back_reserved(-1);
socket_modified |= get_triangle_patch_socket()->modified_flag_bit;
}
@@ -359,8 +359,8 @@ void Mesh::add_subd_face(int *corners, int num_corners, int shader_, bool smooth
int ptex_offset = 0;
- if (num_subd_faces()) {
- SubdFace s = get_subd_face(num_subd_faces() - 1);
+ if (get_num_subd_faces()) {
+ SubdFace s = get_subd_face(get_num_subd_faces() - 1);
ptex_offset = s.ptex_offset + s.num_ptex_faces();
}
@@ -596,7 +596,7 @@ void Mesh::add_vertex_normals()
}
/* subd vertex normals */
- if (!subd_attributes.find(ATTR_STD_VERTEX_NORMAL) && num_subd_faces()) {
+ if (!subd_attributes.find(ATTR_STD_VERTEX_NORMAL) && get_num_subd_faces()) {
/* get attributes */
Attribute *attr_vN = subd_attributes.add(ATTR_STD_VERTEX_NORMAL);
float3 *vN = attr_vN->data_float3();
@@ -604,7 +604,7 @@ void Mesh::add_vertex_normals()
/* compute vertex normals */
memset(vN, 0, verts.size() * sizeof(float3));
- for (size_t i = 0; i < num_subd_faces(); i++) {
+ for (size_t i = 0; i < get_num_subd_faces(); i++) {
SubdFace face = get_subd_face(i);
float3 fN = face.normal(this);
@@ -708,7 +708,7 @@ void Mesh::pack_verts(const vector<uint> &tri_prim_index,
{
size_t verts_size = verts.size();
- if (verts_size && num_subd_faces()) {
+ if (verts_size && get_num_subd_faces()) {
float2 *vert_patch_uv_ptr = vert_patch_uv.data();
for (size_t i = 0; i < verts_size; i++) {
@@ -725,13 +725,13 @@ void Mesh::pack_verts(const vector<uint> &tri_prim_index,
t.v[2] + vert_offset,
tri_prim_index[i + tri_offset]);
- tri_patch[i] = (!num_subd_faces()) ? -1 : (triangle_patch[i] * 8 + patch_offset);
+ tri_patch[i] = (!get_num_subd_faces()) ? -1 : (triangle_patch[i] * 8 + patch_offset);
}
}
void Mesh::pack_patches(uint *patch_data, uint vert_offset, uint face_offset, uint corner_offset)
{
- size_t num_faces = num_subd_faces();
+ size_t num_faces = get_num_subd_faces();
int ngons = 0;
for (size_t f = 0; f < num_faces; f++) {
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index 0a5cb6522e0..f00be5466f9 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -237,7 +237,7 @@ class Mesh : public Geometry {
SubdParams *get_subd_params();
- size_t num_subd_faces() const
+ size_t get_num_subd_faces() const
{
return subd_shader.size();
}
diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp
index d4fc3c1a070..7b93bbffbe1 100644
--- a/intern/cycles/render/mesh_subdivision.cpp
+++ b/intern/cycles/render/mesh_subdivision.cpp
@@ -47,9 +47,9 @@ bool TopologyRefinerFactory<ccl::Mesh>::resizeComponentTopology(TopologyRefiner
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list