diff --git a/benchmarks/benchmark_assimp/main.cpp b/benchmarks/benchmark_assimp/main.cpp index 2fe9038..38531b6 100644 --- a/benchmarks/benchmark_assimp/main.cpp +++ b/benchmarks/benchmark_assimp/main.cpp @@ -206,7 +206,7 @@ static void add_triangle( aiVector3D* vp = &pMesh->mVertices[tri_id * 3]; aiVector3D* vn = &pMesh->mNormals[tri_id * 3]; - copy_gmio_stl_coords(vn, triangle->normal); + copy_gmio_stl_coords(vn, triangle->n); *(vn+1) = *vn; *(vn+2) = *vn; @@ -273,9 +273,9 @@ static void get_triangle( } nor.Normalize(); } - copy_aiVector3D(&triangle->normal, nor); + copy_aiVector3D(&triangle->n, nor); #if 0 - copy_aiVector3D(&triangle->normal, mesh->mNormals[f.mIndices[0]]); + copy_aiVector3D(&triangle->n, mesh->mNormals[f.mIndices[0]]); #endif copy_aiVector3D(&triangle->v1, mesh->mVertices[f.mIndices[0]]); diff --git a/src/gmio_stl/internal/stla_write.c b/src/gmio_stl/internal/stla_write.c index 7dda27c..3deebff 100644 --- a/src/gmio_stl/internal/stla_write.c +++ b/src/gmio_stl/internal/stla_write.c @@ -207,7 +207,7 @@ int gmio_stla_write(struct gmio_stl_write_args* args) func_mesh_get_triangle(mesh_cookie, ibuffer_facet, &tri); buffpos = gmio_write_rawstr(buffpos, "facet normal "); - buffpos = gmio_write_coords(buffpos, coords_format_str, &tri.normal); + buffpos = gmio_write_coords(buffpos, coords_format_str, &tri.n); buffpos = gmio_write_rawstr(buffpos, "\nouter loop"); buffpos = gmio_write_rawstr(buffpos, "\n vertex "); diff --git a/src/gmio_stl/internal/stlb_byte_swap.c b/src/gmio_stl/internal/stlb_byte_swap.c index 9057b86..67b0008 100644 --- a/src/gmio_stl/internal/stlb_byte_swap.c +++ b/src/gmio_stl/internal/stlb_byte_swap.c @@ -19,7 +19,7 @@ void gmio_stl_triangle_bswap(struct gmio_stl_triangle* triangle) { - uint32_t* uintcoord_ptr = (uint32_t*)&(triangle->normal.x); + uint32_t* uintcoord_ptr = (uint32_t*)&(triangle->n.x); const uint16_t attr_byte_count = triangle->attribute_byte_count; int i; diff --git a/src/gmio_stl/stl_format.c b/src/gmio_stl/stl_format.c index f565a4e..abd1032 100644 --- a/src/gmio_stl/stl_format.c +++ b/src/gmio_stl/stl_format.c @@ -78,7 +78,7 @@ static enum gmio_stl_format gmio_stlb_format( memcpy(&tri, buff + GMIO_STLB_HEADER_SIZE + 4, GMIO_STLB_TRIANGLE_RAWSIZE); - if (gmio_float32_ulp_equals(gmio_sqrlen(&tri.normal), 1.f, 100)) { + if (gmio_float32_ulp_equals(gmio_sqrlen(&tri.n), 1.f, 100)) { #ifdef GMIO_HOST_IS_BIG_ENDIAN return GMIO_STL_FORMAT_BINARY_BE; #else @@ -86,7 +86,7 @@ static enum gmio_stl_format gmio_stlb_format( #endif } gmio_stl_triangle_bswap(&tri); - if (gmio_float32_ulp_equals(gmio_sqrlen(&tri.normal), 1.f, 100)) { + if (gmio_float32_ulp_equals(gmio_sqrlen(&tri.n), 1.f, 100)) { #ifdef GMIO_HOST_IS_BIG_ENDIAN return GMIO_STL_FORMAT_BINARY_LE; #else diff --git a/src/gmio_stl/stl_triangle.h b/src/gmio_stl/stl_triangle.h index 8468211..fdec865 100644 --- a/src/gmio_stl/stl_triangle.h +++ b/src/gmio_stl/stl_triangle.h @@ -38,7 +38,7 @@ struct gmio_stl_coords * orientation(normal) */ struct gmio_stl_triangle { - struct gmio_stl_coords normal; /*!< Normal vector */ + struct gmio_stl_coords n; /*!< Normal vector */ struct gmio_stl_coords v1; /*!< Vertex 1 */ struct gmio_stl_coords v2; /*!< Vertex 2 */ struct gmio_stl_coords v3; /*!< Vertex 3 */ diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index c338dd2..3a46cf4 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -663,7 +663,7 @@ int parse_facet( errc += stla_eat_next_token_inplace(data, FACET_token); errc += stla_eat_next_token_inplace(data, NORMAL_token); - parse_xyz_coords(data, &facet->normal); + parse_xyz_coords(data, &facet->n); errc += stla_eat_next_token_inplace(data, OUTER_token); errc += stla_eat_next_token_inplace(data, LOOP_token); diff --git a/src/gmio_support/stl_occ.cpp b/src/gmio_support/stl_occ.cpp index 5ad256d..8e6b0e6 100644 --- a/src/gmio_support/stl_occ.cpp +++ b/src/gmio_support/stl_occ.cpp @@ -39,7 +39,7 @@ static void occmesh_add_triangle( const gmio_stl_coords& v1 = tri->v1; const gmio_stl_coords& v2 = tri->v2; const gmio_stl_coords& v3 = tri->v3; - const gmio_stl_coords& n = tri->normal; + const gmio_stl_coords& n = tri->n; mesh->AddTriangle(mesh->AddOnlyNewVertex(v1.x, v1.y, v1.z), mesh->AddOnlyNewVertex(v2.x, v2.y, v2.z), mesh->AddOnlyNewVertex(v3.x, v3.y, v3.z), @@ -60,7 +60,7 @@ static void occmesh_get_triangle( double yN; double zN; occTri->GetVertexAndOrientation(idV1, idV2, idV3, xN, yN, zN); - gmio_stl_coords& n = tri->normal; + gmio_stl_coords& n = tri->n; n.x = static_cast(xN); n.y = static_cast(yN); n.z = static_cast(zN); diff --git a/tests/stl_utils.c b/tests/stl_utils.c index e99540b..2a8dd8e 100644 --- a/tests/stl_utils.c +++ b/tests/stl_utils.c @@ -130,7 +130,7 @@ gmio_bool_t gmio_stl_triangle_equal( const struct gmio_stl_triangle *rhs, uint32_t max_ulp_diff) { - return gmio_stl_coords_equal(&lhs->normal, &rhs->normal, max_ulp_diff) + return gmio_stl_coords_equal(&lhs->n, &rhs->n, max_ulp_diff) && gmio_stl_coords_equal(&lhs->v1, &rhs->v1, max_ulp_diff) && gmio_stl_coords_equal(&lhs->v2, &rhs->v2, max_ulp_diff) && gmio_stl_coords_equal(&lhs->v3, &rhs->v3, max_ulp_diff) diff --git a/tests/test_core_platform.c b/tests/test_core_platform.c index 6237163..d14995e 100644 --- a/tests/test_core_platform.c +++ b/tests/test_core_platform.c @@ -33,7 +33,7 @@ const char* test_platform__alignment() UTEST_ASSERT(offsetof(struct gmio_stl_coords, z) == 8); UTEST_ASSERT(sizeof(struct gmio_stl_coords) == GMIO_STL_COORDS_RAWSIZE); - UTEST_ASSERT(offsetof(struct gmio_stl_triangle, normal) == 0); + UTEST_ASSERT(offsetof(struct gmio_stl_triangle, n) == 0); UTEST_ASSERT(offsetof(struct gmio_stl_triangle, v1) == GMIO_STL_COORDS_RAWSIZE); UTEST_ASSERT(offsetof(struct gmio_stl_triangle, v2) == 2*GMIO_STL_COORDS_RAWSIZE); UTEST_ASSERT(offsetof(struct gmio_stl_triangle, v3) == 3*GMIO_STL_COORDS_RAWSIZE);