Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/alembic/intern/abc_mesh.cc
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/alembic/intern/abc_mesh.cc')
-rw-r--r--source/blender/alembic/intern/abc_mesh.cc50
1 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 8728303923a..92de3547fd2 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -116,7 +116,7 @@ static void get_vertices(struct Mesh *mesh, std::vector<Imath::V3f> &points)
MVert *verts = mesh->mvert;
- for (int i = 0, e = mesh->totvert; i < e; ++i) {
+ for (int i = 0, e = mesh->totvert; i < e; i++) {
copy_yup_from_zup(points[i].getValue(), verts[i].co);
}
}
@@ -137,7 +137,7 @@ static void get_topology(struct Mesh *mesh,
loop_counts.reserve(num_poly);
/* NOTE: data needs to be written in the reverse order. */
- for (int i = 0; i < num_poly; ++i) {
+ for (int i = 0; i < num_poly; i++) {
MPoly &poly = mpoly[i];
loop_counts.push_back(poly.totloop);
@@ -145,7 +145,7 @@ static void get_topology(struct Mesh *mesh,
MLoop *loop = mloop + poly.loopstart + (poly.totloop - 1);
- for (int j = 0; j < poly.totloop; ++j, --loop) {
+ for (int j = 0; j < poly.totloop; j++, loop--) {
poly_verts.push_back(loop->v);
}
}
@@ -164,7 +164,7 @@ static void get_creases(struct Mesh *mesh,
MEdge *edge = mesh->medge;
- for (int i = 0, e = mesh->totedge; i < e; ++i) {
+ for (int i = 0, e = mesh->totedge; i < e; i++) {
const float sharpness = static_cast<float>(edge[i].crease) * factor;
if (sharpness != 0.0f) {
@@ -185,7 +185,7 @@ static void get_vertex_normals(struct Mesh *mesh, std::vector<Imath::V3f> &norma
MVert *verts = mesh->mvert;
float no[3];
- for (int i = 0, e = mesh->totvert; i < e; ++i) {
+ for (int i = 0, e = mesh->totvert; i < e; i++) {
normal_short_to_float_v3(no, verts[i].no);
copy_yup_from_zup(normals[i].getValue(), no);
}
@@ -209,8 +209,8 @@ static void get_loop_normals(struct Mesh *mesh, std::vector<Imath::V3f> &normals
int abc_index = 0;
if (lnors) {
- for (int i = 0, e = mesh->totpoly; i < e; ++i, ++mp) {
- for (int j = mp->totloop - 1; j >= 0; --j, ++abc_index) {
+ for (int i = 0, e = mesh->totpoly; i < e; i++, mp++) {
+ for (int j = mp->totloop - 1; j >= 0; j--, abc_index++) {
int blender_index = mp->loopstart + j;
copy_yup_from_zup(normals[abc_index].getValue(), lnors[blender_index]);
}
@@ -219,20 +219,20 @@ static void get_loop_normals(struct Mesh *mesh, std::vector<Imath::V3f> &normals
else {
float no[3];
- for (int i = 0, e = mesh->totpoly; i < e; ++i, ++mp) {
+ for (int i = 0, e = mesh->totpoly; i < e; i++, mp++) {
ml = mloop + mp->loopstart + (mp->totloop - 1);
/* Flat shaded, use common normal for all verts. */
if ((mp->flag & ME_SMOOTH) == 0) {
BKE_mesh_calc_poly_normal(mp, ml - (mp->totloop - 1), verts, no);
- for (int j = 0; j < mp->totloop; --ml, ++j, ++abc_index) {
+ for (int j = 0; j < mp->totloop; ml--, j++, abc_index++) {
copy_yup_from_zup(normals[abc_index].getValue(), no);
}
}
else {
/* Smooth shaded, use individual vert normals. */
- for (int j = 0; j < mp->totloop; --ml, ++j, ++abc_index) {
+ for (int j = 0; j < mp->totloop; ml--, j++, abc_index++) {
normal_short_to_float_v3(no, verts[ml->v].no);
copy_yup_from_zup(normals[abc_index].getValue(), no);
}
@@ -525,7 +525,7 @@ template<typename Schema> void AbcGenericMeshWriter::writeFaceSets(struct Mesh *
getGeoGroups(me, geo_groups);
std::map<std::string, std::vector<int32_t>>::iterator it;
- for (it = geo_groups.begin(); it != geo_groups.end(); ++it) {
+ for (it = geo_groups.begin(); it != geo_groups.end(); it++) {
OFaceSet face_set = schema.createFaceSet(it->first);
OFaceSetSchema::Sample samp;
samp.setFaces(Int32ArraySample(it->second));
@@ -615,7 +615,7 @@ void AbcGenericMeshWriter::getVelocities(struct Mesh *mesh, std::vector<Imath::V
if (fss->meshVelocities) {
float *mesh_vels = reinterpret_cast<float *>(fss->meshVelocities);
- for (int i = 0; i < totverts; ++i) {
+ for (int i = 0; i < totverts; i++) {
copy_yup_from_zup(vels[i].getValue(), mesh_vels);
mesh_vels += 3;
}
@@ -631,7 +631,7 @@ void AbcGenericMeshWriter::getGeoGroups(struct Mesh *mesh,
const int num_poly = mesh->totpoly;
MPoly *polygons = mesh->mpoly;
- for (int i = 0; i < num_poly; ++i) {
+ for (int i = 0; i < num_poly; i++) {
MPoly &current_poly = polygons[i];
short mnr = current_poly.mat_nr;
@@ -658,7 +658,7 @@ void AbcGenericMeshWriter::getGeoGroups(struct Mesh *mesh,
std::vector<int32_t> faceArray;
- for (int i = 0, e = mesh->totface; i < e; ++i) {
+ for (int i = 0, e = mesh->totface; i < e; i++) {
faceArray.push_back(i);
}
@@ -707,7 +707,7 @@ static void assign_materials(Main *bmain,
std::map<std::string, int>::const_iterator it = mat_index_map.begin();
int matcount = 0;
- for (; it != mat_index_map.end(); ++it, ++matcount) {
+ for (; it != mat_index_map.end(); it++, matcount++) {
if (!BKE_object_material_slot_add(bmain, ob)) {
can_assign = false;
break;
@@ -723,7 +723,7 @@ static void assign_materials(Main *bmain,
if (can_assign) {
it = mat_index_map.begin();
- for (; it != mat_index_map.end(); ++it) {
+ for (; it != mat_index_map.end(); it++) {
std::string mat_name = it->first;
mat_iter = mat_map.find(mat_name.c_str());
@@ -770,7 +770,7 @@ static void read_mverts_interp(MVert *mverts,
const float weight)
{
float tmp[3];
- for (int i = 0; i < positions->size(); ++i) {
+ for (int i = 0; i < positions->size(); i++) {
MVert &mvert = mverts[i];
const Imath::V3f &floor_pos = (*positions)[i];
const Imath::V3f &ceil_pos = (*ceil_positions)[i];
@@ -801,7 +801,7 @@ void read_mverts(MVert *mverts,
const P3fArraySamplePtr &positions,
const N3fArraySamplePtr &normals)
{
- for (int i = 0; i < positions->size(); ++i) {
+ for (int i = 0; i < positions->size(); i++) {
MVert &mvert = mverts[i];
Imath::V3f pos_in = (*positions)[i];
@@ -839,7 +839,7 @@ static void read_mpolys(CDStreamConfig &config, const AbcMeshData &mesh_data)
unsigned int rev_loop_index = 0;
unsigned int uv_index = 0;
- for (int i = 0; i < face_counts->size(); ++i) {
+ for (int i = 0; i < face_counts->size(); i++) {
const int face_size = (*face_counts)[i];
MPoly &poly = mpolys[i];
@@ -856,7 +856,7 @@ static void read_mpolys(CDStreamConfig &config, const AbcMeshData &mesh_data)
/* NOTE: Alembic data is stored in the reverse order. */
rev_loop_index = loop_index + (face_size - 1);
- for (int f = 0; f < face_size; ++f, ++loop_index, --rev_loop_index) {
+ for (int f = 0; f < face_size; f++, loop_index++, rev_loop_index--) {
MLoop &loop = mloops[rev_loop_index];
loop.v = (*face_indices)[loop_index];
@@ -899,9 +899,9 @@ static void process_normals(CDStreamConfig &config, const AbcMeshData &mesh_data
MPoly *mpoly = mesh->mpoly;
int abc_index = 0;
- for (int i = 0, e = mesh->totpoly; i < e; ++i, ++mpoly) {
+ for (int i = 0, e = mesh->totpoly; i < e; i++, mpoly++) {
/* As usual, ABC orders the loops in reverse. */
- for (int j = mpoly->totloop - 1; j >= 0; --j, ++abc_index) {
+ for (int j = mpoly->totloop - 1; j >= 0; j--, abc_index++) {
int blender_index = mpoly->loopstart + j;
copy_zup_from_yup(lnors[blender_index], loop_normals[abc_index].getValue());
}
@@ -1246,7 +1246,7 @@ void AbcMeshReader::assign_facesets_to_mpoly(const ISampleSelector &sample_sel,
int current_mat = 0;
- for (int i = 0; i < face_sets.size(); ++i) {
+ for (int i = 0; i < face_sets.size(); i++) {
const std::string &grp_name = face_sets[i];
if (r_mat_map.find(grp_name) == r_mat_map.end()) {
@@ -1292,7 +1292,7 @@ void AbcMeshReader::readFaceSetsSample(Main *bmain, Mesh *mesh, const ISampleSel
ABC_INLINE MEdge *find_edge(MEdge *edges, int totedge, int v1, int v2)
{
- for (int i = 0, e = totedge; i < e; ++i) {
+ for (int i = 0, e = totedge; i < e; i++) {
MEdge &edge = edges[i];
if (edge.v1 == v1 && edge.v2 == v2) {
@@ -1419,7 +1419,7 @@ void AbcSubDReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelec
MEdge *edges = mesh->medge;
if (indices && sharpnesses) {
- for (int i = 0, s = 0, e = indices->size(); i < e; i += 2, ++s) {
+ for (int i = 0, s = 0, e = indices->size(); i < e; i += 2, s++) {
MEdge *edge = find_edge(edges, mesh->totedge, (*indices)[i], (*indices)[i + 1]);
if (edge) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 03:33:00 +0300