model

cppd · cppd · commit 966364b143a9 · 2026-03-22T12:16:56.000+03:00
diff --git a/src/model/mesh/file/mesh_facet.h b/src/model/mesh/file/mesh_facet.h
@@ -31,19 +31,18 @@ namespace ns::model::mesh::file
 namespace mesh_check_implementation
 {
 template <std::size_t N>
-void check_facet_indices(
-        const unsigned index,
-        const int vertex_count,
-        const int texcoord_count,
-        const int normal_count,
-        const typename Mesh<N>::Facet& facet)
+void check_vertex_indices(const unsigned index, const int vertex_count, const typename Mesh<N>::Facet& facet)
 {
         if (facet.vertices[index] < 0 || facet.vertices[index] >= vertex_count)
         {
                 error("Vertex index " + to_string(facet.vertices[index]) + " is out of bounds [0, "
                       + to_string(vertex_count) + ")");
         }
+}
 
+template <std::size_t N>
+void check_texcoord_indices(const unsigned index, const int texcoord_count, const typename Mesh<N>::Facet& facet)
+{
         if (facet.has_texcoord)
         {
                 if (facet.texcoords[index] < 0 || facet.texcoords[index] >= texcoord_count)
@@ -56,7 +55,11 @@ void check_facet_indices(
         {
                 error("No texture but texture coordinate index is not set to -1");
         }
+}
 
+template <std::size_t N>
+void check_normal_indices(const unsigned index, const int normal_count, const typename Mesh<N>::Facet& facet)
+{
         if (facet.has_normal)
         {
                 if (facet.normals[index] < 0 || facet.normals[index] >= normal_count)
@@ -82,7 +85,9 @@ void check_facet_indices(const Mesh<N>& mesh)
         {
                 for (std::size_t i = 0; i < N; ++i)
                 {
-                        check_facet_indices<N>(i, vertex_count, texcoord_count, normal_count, facet);
+                        check_vertex_indices<N>(i, vertex_count, facet);
+                        check_texcoord_indices<N>(i, texcoord_count, facet);
+                        check_normal_indices<N>(i, normal_count, facet);
                 }
         }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,19 +31,18 @@ namespace ns::model::mesh::file`
`31`	`31`	`namespace mesh_check_implementation`
`32`	`32`	`{`
`33`	`33`	`template <std::size_t N>`
`34`		`-void check_facet_indices(`
`35`		`- const unsigned index,`
`36`		`- const int vertex_count,`
`37`		`- const int texcoord_count,`
`38`		`- const int normal_count,`
`39`		`- const typename Mesh<N>::Facet& facet)`
	`34`	`+void check_vertex_indices(const unsigned index, const int vertex_count, const typename Mesh<N>::Facet& facet)`
`40`	`35`	`{`
`41`	`36`	`if (facet.vertices[index] < 0 \|\| facet.vertices[index] >= vertex_count)`
`42`	`37`	`{`
`43`	`38`	`error("Vertex index " + to_string(facet.vertices[index]) + " is out of bounds [0, "`
`44`	`39`	`+ to_string(vertex_count) + ")");`
`45`	`40`	`}`
	`41`	`+}`
`46`	`42`
	`43`	`+template <std::size_t N>`
	`44`	`+void check_texcoord_indices(const unsigned index, const int texcoord_count, const typename Mesh<N>::Facet& facet)`
	`45`	`+{`
`47`	`46`	`if (facet.has_texcoord)`
`48`	`47`	`{`
`49`	`48`	`if (facet.texcoords[index] < 0 \|\| facet.texcoords[index] >= texcoord_count)`
`@@ -56,7 +55,11 @@ void check_facet_indices(`
`56`	`55`	`{`
`57`	`56`	`error("No texture but texture coordinate index is not set to -1");`
`58`	`57`	`}`
	`58`	`+}`
`59`	`59`
	`60`	`+template <std::size_t N>`
	`61`	`+void check_normal_indices(const unsigned index, const int normal_count, const typename Mesh<N>::Facet& facet)`
	`62`	`+{`
`60`	`63`	`if (facet.has_normal)`
`61`	`64`	`{`
`62`	`65`	`if (facet.normals[index] < 0 \|\| facet.normals[index] >= normal_count)`
`@@ -82,7 +85,9 @@ void check_facet_indices(const Mesh<N>& mesh)`
`82`	`85`	`{`
`83`	`86`	`for (std::size_t i = 0; i < N; ++i)`
`84`	`87`	`{`
`85`		`- check_facet_indices<N>(i, vertex_count, texcoord_count, normal_count, facet);`
	`88`	`+ check_vertex_indices<N>(i, vertex_count, facet);`
	`89`	`+ check_texcoord_indices<N>(i, texcoord_count, facet);`
	`90`	`+ check_normal_indices<N>(i, normal_count, facet);`
`86`	`91`	`}`
`87`	`92`	`}`
`88`	`93`	`}`