update ssbh_data and ssbh_wgpu

ScanMountGoat · Feb 26, 2024 · b1c136f · b1c136f
1 parent 8eb44e6
commit b1c136f
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 81 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ glam = { version = "0.25.0", features = ["mint", "bytemuck", "serde"] }
 rfd = "0.10.0"
 ssbh_wgpu = { git = "https://github.com/ScanMountGoat/ssbh_wgpu" }
 nutexb_wgpu = { git = "https://github.com/ScanMountGoat/ssbh_wgpu" }
-ssbh_data = { git = "https://github.com/ultimate-research/ssbh_lib", rev = "1a014fa", features = ["strum", "serde"] }
+ssbh_data = { version = "0.18.0", features = ["strum", "serde"] }
 strum = "0.24.1"
 nutexb = "0.7.0"
 octocrab = "0.19.0"

diff --git a/src/app/rendering.rs b/src/app/rendering.rs
@@ -1,5 +1,5 @@
 use log::error;
-use ssbh_data::{anim_data::AnimData, SsbhData};
+use ssbh_data::anim_data::AnimData;
 use ssbh_wgpu::{animation::camera::animate_camera, CameraTransforms, SsbhRenderer};
 
 use crate::{CameraState, CameraValues, LightingData, RenderState};

diff --git a/src/validation.rs b/src/validation.rs
@@ -852,7 +852,7 @@ mod tests {
             data: Vec::new(),
             layer_mipmaps: Vec::new(),
             footer: NutexbFooter {
-                string: Vec::new().into(),
+                string: Default::default(),
                 width: 1,
                 height: 1,
                 depth: 1,
@@ -872,7 +872,7 @@ mod tests {
             data: Vec::new(),
             layer_mipmaps: Vec::new(),
             footer: NutexbFooter {
-                string: Vec::new().into(),
+                string: Default::default(),
                 width: 64,
                 height: 64,
                 depth: 1,