sync: main

nenikitov · Feb 17, 2024 · 401d419 · 401d419
2 parents 5ff29bb + 8e25299
commit 401d419
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/engine/src/asset/model/mod.rs b/engine/src/asset/model/mod.rs
@@ -9,7 +9,7 @@ use 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/sound/mod.rs b/engine/src/asset/sound/mod.rs
@@ -20,8 +20,7 @@ impl Sound {
         match self {
             Sound::Song(sound) => sound.mix(false),
             Sound::Effect(effect) => effect.mix(),
-        }
-    }
+        } }
 }
 
 pub struct SoundCollection;

diff --git a/engine/src/asset/texture/mod.rs b/engine/src/asset/texture/mod.rs
@@ -1,10 +1,8 @@
-// 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 dat::{offset::TextureOffset, size::TextureSize, texture::MippedTexture};
+use dat::{offset::TextureOffset, texture::MippedTexture};
+pub use dat::{size::TextureSize, texture::Texture};
 
-use self::dat::texture::Texture;
 use super::{extension::*, AssetParser};
 use crate::utils::{compression::decompress, nom::*};