refactor: re-export TextureSize and Texture from texture/mod.rs.

nenikitov · Jan 27, 2024 · 5d47b87 · 5d47b87
1 parent df7235c
commit 5d47b87
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/engine/src/asset/model/mod.rs b/engine/src/asset/model/mod.rs
@@ -2,7 +2,7 @@ mod dat;
 
 use super::{
     extension::*,
-    texture::dat::{size::TextureSize, texture::Texture},
+    texture::{Texture, TextureSize},
     AssetParser,
 };
 use crate::utils::nom::*;

diff --git a/engine/src/asset/skybox.rs b/engine/src/asset/skybox.rs
@@ -1,6 +1,6 @@
 use super::{
     extension::*,
-    texture::dat::{size::TextureSize, texture::Texture},
+    texture::{Texture, TextureSize},
     AssetParser,
 };
 use crate::{asset::color_map::Color, utils::nom::*};

diff --git a/engine/src/asset/texture/mod.rs b/engine/src/asset/texture/mod.rs
@@ -1,11 +1,9 @@
-// TODO(nenikitov): When textures are moved to a separate public module later,
-// this `pub(crate)` could be deleted
-pub(crate) mod dat;
+mod dat;
 
-use self::dat::texture::Texture;
 use super::{extension::*, AssetParser};
 use crate::utils::{compression::decompress, nom::*};
-use dat::{offset::TextureOffset, size::TextureSize, texture::MippedTexture};
+use dat::{offset::TextureOffset, texture::MippedTexture};
+pub use dat::{size::TextureSize, texture::Texture};
 
 pub enum TextureMipKind {
     NonMipped(Texture),