[Bf-blender-cvs] [4be8061baf0] geometry-nodes-mesh-primitives: Rename and reorder variables for consistency
Hans Goudey
noreply at git.blender.org
Sat Mar 13 23:31:49 CET 2021
Commit: 4be8061baf03fc28d5df73fe1942bd818cfe4f9d
Author: Hans Goudey
Date: Sat Mar 13 17:27:57 2021 -0500
Branches: geometry-nodes-mesh-primitives
https://developer.blender.org/rB4be8061baf03fc28d5df73fe1942bd818cfe4f9d
Rename and reorder variables for consistency
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
index ebafb0c6aeb..78549abcc46 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
@@ -174,31 +174,32 @@ static Mesh *create_circle_mesh(const float radius,
case GEO_NODE_MESH_CIRCLE_FILL_NONE:
break;
case GEO_NODE_MESH_CIRCLE_FILL_NGON: {
+ MPoly &poly = polys[0];
+ poly.loopstart = 0;
+ poly.totloop = loops.size();
+
for (const int i : IndexRange(verts_num)) {
MLoop &loop = loops[i];
loop.e = i;
loop.v = i;
}
- MPoly &poly = polys[0];
- poly.loopstart = 0;
- poly.totloop = loops.size();
break;
}
case GEO_NODE_MESH_CIRCLE_FILL_TRIANGLE_FAN: {
for (const int i : IndexRange(verts_num)) {
- MLoop &loop = loops[3 * i];
- loop.e = i;
- loop.v = i;
- MLoop &loop2 = loops[3 * i + 1];
- loop2.e = verts_num + ((i + 1) % verts_num);
- loop2.v = (i + 1) % verts_num;
- MLoop &loop3 = loops[3 * i + 2];
- loop3.e = verts_num + i;
- loop3.v = verts_num;
-
MPoly &poly = polys[i];
poly.loopstart = 3 * i;
poly.totloop = 3;
+
+ MLoop &loop_a = loops[3 * i];
+ loop_a.e = i;
+ loop_a.v = i;
+ MLoop &loop_b = loops[3 * i + 1];
+ loop_b.e = verts_num + ((i + 1) % verts_num);
+ loop_b.v = (i + 1) % verts_num;
+ MLoop &loop_c = loops[3 * i + 2];
+ loop_c.e = verts_num + i;
+ loop_c.v = verts_num;
}
break;
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
index 5b66d027b5c..a47b54fac38 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
@@ -335,15 +335,15 @@ Mesh *create_cylinder_or_cone_mesh(const float radius_top,
poly.loopstart = loop_index;
poly.totloop = 3;
- MLoop &loop1 = loops[loop_index++];
- loop1.v = top_verts_start + i;
- loop1.e = top_edges_start + i;
- MLoop &loop2 = loops[loop_index++];
- loop2.v = top_verts_start + (i + 1) % verts_num;
- loop2.e = top_fan_edges_start + (i + 1) % verts_num;
- MLoop &loop3 = loops[loop_index++];
- loop3.v = top_center_vert_index;
- loop3.e = top_fan_edges_start + i;
+ MLoop &loop_a = loops[loop_index++];
+ loop_a.v = top_verts_start + i;
+ loop_a.e = top_edges_start + i;
+ MLoop &loop_b = loops[loop_index++];
+ loop_b.v = top_verts_start + (i + 1) % verts_num;
+ loop_b.e = top_fan_edges_start + (i + 1) % verts_num;
+ MLoop &loop_c = loops[loop_index++];
+ loop_c.v = top_center_vert_index;
+ loop_c.e = top_fan_edges_start + i;
}
}
}
@@ -356,18 +356,18 @@ Mesh *create_cylinder_or_cone_mesh(const float radius_top,
poly.loopstart = loop_index;
poly.totloop = 4;
- MLoop &loop1 = loops[loop_index++];
- loop1.v = top_verts_start + i;
- loop1.e = connecting_edges_start + i;
- MLoop &loop2 = loops[loop_index++];
- loop2.v = bottom_verts_start + i;
- loop2.e = bottom_edges_start + i;
- MLoop &loop3 = loops[loop_index++];
- loop3.v = bottom_verts_start + (i + 1) % verts_num;
- loop3.e = connecting_edges_start + (i + 1) % verts_num;
- MLoop &loop4 = loops[loop_index++];
- loop4.v = top_verts_start + (i + 1) % verts_num;
- loop4.e = top_edges_start + i;
+ MLoop &loop_a = loops[loop_index++];
+ loop_a.v = top_verts_start + i;
+ loop_a.e = connecting_edges_start + i;
+ MLoop &loop_b = loops[loop_index++];
+ loop_b.v = bottom_verts_start + i;
+ loop_b.e = bottom_edges_start + i;
+ MLoop &loop_c = loops[loop_index++];
+ loop_c.v = bottom_verts_start + (i + 1) % verts_num;
+ loop_c.e = connecting_edges_start + (i + 1) % verts_num;
+ MLoop &loop_d = loops[loop_index++];
+ loop_d.v = top_verts_start + (i + 1) % verts_num;
+ loop_d.e = top_edges_start + i;
}
}
else {
@@ -378,15 +378,15 @@ Mesh *create_cylinder_or_cone_mesh(const float radius_top,
poly.loopstart = loop_index;
poly.totloop = 3;
- MLoop &loop1 = loops[loop_index++];
- loop1.v = top_verts_start + i;
- loop1.e = connecting_edges_start + i;
- MLoop &loop2 = loops[loop_index++];
- loop2.v = bottom_verts_start;
- loop2.e = connecting_edges_start + (i + 1) % verts_num;
- MLoop &loop3 = loops[loop_index++];
- loop3.v = top_verts_start + (i + 1) % verts_num;
- loop3.e = top_edges_start + i;
+ MLoop &loop_a = loops[loop_index++];
+ loop_a.v = top_verts_start + i;
+ loop_a.e = connecting_edges_start + i;
+ MLoop &loop_b = loops[loop_index++];
+ loop_b.v = bottom_verts_start;
+ loop_b.e = connecting_edges_start + (i + 1) % verts_num;
+ MLoop &loop_c = loops[loop_index++];
+ loop_c.v = top_verts_start + (i + 1) % verts_num;
+ loop_c.e = top_edges_start + i;
}
}
else {
@@ -396,15 +396,15 @@ Mesh *create_cylinder_or_cone_mesh(const float radius_top,
poly.loopstart = loop_index;
poly.totloop = 3;
- MLoop &loop1 = loops[loop_index++];
- loop1.v = bottom_verts_start + i;
- loop1.e = bottom_edges_start + i;
- MLoop &loop2 = loops[loop_index++];
- loop2.v = bottom_verts_start + (i + 1) % verts_num;
- loop2.e = connecting_edges_start + (i + 1) % verts_num;
- MLoop &loop3 = loops[loop_index++];
- loop3.v = top_verts_start;
- loop3.e = connecting_edges_start + i;
+ MLoop &loop_a = loops[loop_index++];
+ loop_a.v = bottom_verts_start + i;
+ loop_a.e = bottom_edges_start + i;
+ MLoop &loop_b = loops[loop_index++];
+ loop_b.v = bottom_verts_start + (i + 1) % verts_num;
+ loop_b.e = connecting_edges_start + (i + 1) % verts_num;
+ MLoop &loop_c = loops[loop_index++];
+ loop_c.v = top_verts_start;
+ loop_c.e = connecting_edges_start + i;
}
}
}
@@ -429,15 +429,15 @@ Mesh *create_cylinder_or_cone_mesh(const float radius_top,
poly.loopstart = loop_index;
poly.totloop = 3;
- MLoop &loop1 = loops[loop_index++];
- loop1.v = bottom_verts_start + i;
- loop1.e = bottom_fan_edges_start + i;
- MLoop &loop2 = loops[loop_index++];
- loop2.v = bottom_center_vert_index;
- loop2.e = bottom_fan_edges_start + (i + 1) % verts_num;
- MLoop &loop3 = loops[loop_index++];
- loop3.v = bottom_verts_start + (i + 1) % verts_num;
- loop3.e = bottom_edges_start + i;
+ MLoop &loop_a = loops[loop_index++];
+ loop_a.v = bottom_verts_start + i;
+ loop_a.e = bottom_fan_edges_start + i;
+ MLoop &loop_b = loops[loop_index++];
+ loop_b.v = bottom_center_vert_index;
+ loop_b.e = bottom_fan_edges_start + (i + 1) % verts_num;
+ MLoop &loop_c = loops[loop_index++];
+ loop_c.v = bottom_verts_start + (i + 1) % verts_num;
+ loop_c.e = bottom_edges_start + i;
}
}
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
index 6486e310008..6e0f90792e8 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
@@ -158,15 +158,12 @@ static void calculate_sphere_faces(MutableSpan<MLoop> loops,
MPoly &poly = polys[poly_index++];
poly.loopstart = loop_index;
poly.totloop = 3;
-
MLoop &loop_a = loops[loop_index++];
loop_a.v = 0;
loop_a.e = segment;
-
MLoop &loop_b = loops[loop_index++];
loop_b.v = first_vert_ring_index_start + segment;
loop_b.e = segments + segment;
-
MLoop &loop_c = loops[loop_index++];
loop_c.v = first_vert_ring_index_start + (segment + 1) % segments;
loop_c.e = (segment + 1) % segments;
@@ -187,15 +184,12 @@ static void calculate_sphere_faces(MutableSpan<MLoop> loops,
MLoop &loop_a = loops[loop_index++];
loop_a.v = ring_vert_index_start + segment;
loop_a.e = ring_vertical_edge_index_start + segment;
-
MLoop &loop_b = loops[loop_index++];
loop_b.v = next_ring_vert_index_start + segment;
loop_b.e = next_ring_edge_index_start + segment;
-
MLoop &loop_c = loops[loop_index++];
loop_c.v = next_ring_vert_index_start + ((segment + 1) % segments);
loop_c.e = ring_vertical_edge_index_start + ((segment + 1) % segments);
-
MLoop &loop_d = loops[loop_index++];
loop_d.v = ring_vert_index_start + ((segment + 1) % segments);
loop_d.e = ring_edge_index_start + segment;
@@ -217,11 +211,9 @@ static void calculate_sphere_faces(MutableSpan<MLoop> loops,
MLoop &loop_a = loops[loop_index++];
loop_a.v = last_vert_index;
loop_a.e = bottom_edge_fan_start + ((segment + 1) % segments);
-
MLoop &loop_b = loops[loop_index++];
loop_b.v = last_vert_ring_start + (segment + 1) % segments;
loop_b.e = last_edge_ring_start + segment;
-
MLoop &loop_c = loops[loop_index++];
loop_c.v = last_vert_ring_start + segment;
loop_c.e = bottom_edge_fan_start + segment;
More information about the Bf-blender-cvs
mailing list