diff --git a/port/PyAssimp/pyassimp/.structs.py.swp b/port/PyAssimp/pyassimp/.structs.py.swp deleted file mode 100644 index 1de72f0f8..000000000 Binary files a/port/PyAssimp/pyassimp/.structs.py.swp and /dev/null differ diff --git a/port/assimp_rs/src/structs/.mod.rs.swp b/port/assimp_rs/src/structs/.mod.rs.swp deleted file mode 100644 index a6b06ed63..000000000 Binary files a/port/assimp_rs/src/structs/.mod.rs.swp and /dev/null differ diff --git a/port/assimp_rs/src/structs/anim/mod.rs b/port/assimp_rs/src/structs/anim/mod.rs index 1a3167035..a0d4b7daf 100644 --- a/port/assimp_rs/src/structs/anim/mod.rs +++ b/port/assimp_rs/src/structs/anim/mod.rs @@ -1,2 +1,6 @@ mod anim; - +pub use self::anim::{ + Animation, + NodeAnim, + MeshAnim, + MeshMorphAnim}; diff --git a/port/assimp_rs/src/structs/color/mod.rs b/port/assimp_rs/src/structs/color/mod.rs index e60bae10a..d88527ed1 100644 --- a/port/assimp_rs/src/structs/color/mod.rs +++ b/port/assimp_rs/src/structs/color/mod.rs @@ -1,2 +1,5 @@ mod color; - +pub use self::color::{ + Color3D, + Color4D +}; diff --git a/port/assimp_rs/src/structs/matrix/mod.rs b/port/assimp_rs/src/structs/matrix/mod.rs index b277086fe..b0fb1e1f9 100644 --- a/port/assimp_rs/src/structs/matrix/mod.rs +++ b/port/assimp_rs/src/structs/matrix/mod.rs @@ -1,2 +1,4 @@ mod matrix; - +pub use self::matrix::{ + Matrix3x3, + Matrix4x4}; diff --git a/port/assimp_rs/src/structs/memory/mod.rs b/port/assimp_rs/src/structs/memory/mod.rs index 6e0c52781..8c8c31ce8 100644 --- a/port/assimp_rs/src/structs/memory/mod.rs +++ b/port/assimp_rs/src/structs/memory/mod.rs @@ -1,2 +1,2 @@ mod memory; - +pub use self::memory::MemoryInfo; diff --git a/port/assimp_rs/src/structs/mesh/mod.rs b/port/assimp_rs/src/structs/mesh/mod.rs index 670154f8d..1c3ef651d 100644 --- a/port/assimp_rs/src/structs/mesh/mod.rs +++ b/port/assimp_rs/src/structs/mesh/mod.rs @@ -1,2 +1,3 @@ mod mesh; + diff --git a/port/assimp_rs/src/structs/quaternion/mod.rs b/port/assimp_rs/src/structs/quaternion/mod.rs index 0239e8e02..bb2c0616c 100644 --- a/port/assimp_rs/src/structs/quaternion/mod.rs +++ b/port/assimp_rs/src/structs/quaternion/mod.rs @@ -1,2 +1,3 @@ mod quaternion; +pub use self::quaternion::Quaternion; diff --git a/port/assimp_rs/src/structs/string/mod.rs b/port/assimp_rs/src/structs/string/mod.rs index 846ccaefe..f599ba7cb 100644 --- a/port/assimp_rs/src/structs/string/mod.rs +++ b/port/assimp_rs/src/structs/string/mod.rs @@ -1,2 +1,3 @@ mod string; - +pub use self::string::MAXLEN; +pub use self::string::Str; diff --git a/port/assimp_rs/src/structs/texel/mod.rs b/port/assimp_rs/src/structs/texel/mod.rs deleted file mode 100644 index d8afdca52..000000000 --- a/port/assimp_rs/src/structs/texel/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod texel; - diff --git a/port/assimp_rs/src/structs/texel/texel.rs b/port/assimp_rs/src/structs/texel/texel.rs deleted file mode 100644 index b2c72f30e..000000000 --- a/port/assimp_rs/src/structs/texel/texel.rs +++ /dev/null @@ -1,19 +0,0 @@ -#[derive(Clone, Debug, Copy)] -struct Texel { - b: u32, - g: u32, - r: u32, - a: u32 -} - -impl Texel { - pub fn new(b_u32: u32, g_u32: u32, - r_u32: u32, a_u32: u32) -> Texel { - Texel { - b: b_u32, - g: g_u32, - r: r_u32, - a: a_u32 - } - } -} diff --git a/port/assimp_rs/src/structs/texture/mod.rs b/port/assimp_rs/src/structs/texture/mod.rs index a9d56e75b..1b5c9308d 100644 --- a/port/assimp_rs/src/structs/texture/mod.rs +++ b/port/assimp_rs/src/structs/texture/mod.rs @@ -1,2 +1,3 @@ mod texture; +pub use self::texture::Texel; diff --git a/port/assimp_rs/src/structs/texture/texture.rs b/port/assimp_rs/src/structs/texture/texture.rs index e69de29bb..b2c72f30e 100644 --- a/port/assimp_rs/src/structs/texture/texture.rs +++ b/port/assimp_rs/src/structs/texture/texture.rs @@ -0,0 +1,19 @@ +#[derive(Clone, Debug, Copy)] +struct Texel { + b: u32, + g: u32, + r: u32, + a: u32 +} + +impl Texel { + pub fn new(b_u32: u32, g_u32: u32, + r_u32: u32, a_u32: u32) -> Texel { + Texel { + b: b_u32, + g: g_u32, + r: r_u32, + a: a_u32 + } + } +} diff --git a/port/assimp_rs/src/structs/vertex/mod.rs b/port/assimp_rs/src/structs/vertex/mod.rs index d169246ce..97ae3eced 100644 --- a/port/assimp_rs/src/structs/vertex/mod.rs +++ b/port/assimp_rs/src/structs/vertex/mod.rs @@ -1,2 +1,2 @@ mod vertex; - +// pub use self::vertex::