diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-05-16 15:21:03 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-05-16 15:21:03 +0400 |
commit | 2c051903746735de7e94e7fd2784ffc58a92a203 (patch) | |
tree | 0c0c41480e85935ba6a2370390d7762bbef529ed /source/blender/collada/MeshImporter.h | |
parent | b68673f37cbe3732f895d05391a91bea498b8286 (diff) |
fix [#31320] Collada now supports import/export of loose edges (edges not attached to faces)
Diffstat (limited to 'source/blender/collada/MeshImporter.h')
-rw-r--r-- | source/blender/collada/MeshImporter.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source/blender/collada/MeshImporter.h b/source/blender/collada/MeshImporter.h index 97ae4d99ad7..e4c1aca395a 100644 --- a/source/blender/collada/MeshImporter.h +++ b/source/blender/collada/MeshImporter.h @@ -50,6 +50,10 @@ #include "ArmatureImporter.h" #include "collada_utils.h" +extern "C" { +#include "BLI_edgehash.h" +} + // only for ArmatureImporter to "see" MeshImporter::get_object_by_geom_uid class MeshImporterBase { @@ -118,8 +122,20 @@ private: int count_new_tris(COLLADAFW::Mesh *mesh, Mesh *me); + bool primitive_has_useable_normals(COLLADAFW::MeshPrimitive *mp); + bool primitive_has_faces(COLLADAFW::MeshPrimitive *mp); + + static void mesh_add_edges(Mesh *mesh, int len); + + unsigned int get_loose_edge_count(COLLADAFW::Mesh *mesh); + + CustomData create_edge_custom_data(EdgeHash *eh); + + void allocate_face_data(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris); + // TODO: import uv set names void read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris); + void read_lines(COLLADAFW::Mesh *mesh, Mesh *me); void get_vector(float v[3], COLLADAFW::MeshVertexData& arr, int i, int stride); |