Skip to content

Commit 6798baf

Browse files
amPerlamPerl
committed
fix json issues & clippy
1 parent bbf5b7c commit 6798baf

File tree

5 files changed

+46
-36
lines changed

5 files changed

+46
-36
lines changed

‎Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "nif"
3-
version = "0.4.2"
3+
version = "0.5.0"
44
edition = "2021"
55
authors = ["Romet Tagobert <[email protected]>"]
66
categories = []
@@ -27,7 +27,7 @@ gltf_export = ["gltf", "gltf-json"]
2727
[dependencies]
2828
anyhow = "1.0.72"
2929
thiserror = "1.0.43"
30-
glam = "0.24.1"
31-
gltf = { version = "1.2.0", optional = true }
32-
gltf-json = { version = "1.2.0", optional = true }
33-
binrw = "0.11.2"
30+
glam = "0.28.0"
31+
gltf = { version = "1.4.1", optional = true }
32+
gltf-json = { version = "1.4.1", optional = true }
33+
binrw = "0.14.0"

‎src/blocks/ni_particle/ni_psys_data.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub struct NiPSysData {
1010
pub base: NiParticlesData,
1111

1212
#[br(count = base.base.num_vertices)]
13-
pub particle_info: Vec<(Vector3, f32, f32, f32, u32)>,
13+
pub particle_info: Vec<NiParticleInfo>,
1414

1515
#[br(map = |x: u8| x > 0)]
1616
pub has_unknown_floats: bool,
@@ -21,6 +21,16 @@ pub struct NiPSysData {
2121
pub unknown_short_2: u16,
2222
}
2323

24+
#[derive(Debug, PartialEq, BinRead)]
25+
pub struct NiParticleInfo {
26+
pub velocity: Vector3,
27+
pub age: f32,
28+
pub life_span: f32,
29+
pub last_update: f32,
30+
pub spawn_generation: u16,
31+
pub code: u16,
32+
}
33+
2434
impl NiPSysData {
2535
pub fn parse<R: Read + Seek>(reader: &mut R) -> anyhow::Result<Self> {
2636
Ok(reader.read_le()?)

‎src/collectors/gltf.rs

+25-25
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl Gltf {
4242
let buffer_path = gltf_path.with_file_name(&relative_buffer_path);
4343

4444
gltf.buffers.push(json::Buffer {
45-
byte_length: buffer_vec.len() as u32,
45+
byte_length: buffer_vec.len().into(),
4646
name: Some(format!("{}_Buffer{}", gltf_filename, buffer_idx)),
4747
uri: Some(relative_buffer_path),
4848
extensions: Default::default(),
@@ -800,9 +800,9 @@ impl Gltf {
800800
Some(vertices) => {
801801
self.root.buffer_views.push(json::buffer::View {
802802
buffer: buffer_index,
803-
byte_length: expected_vertices_length as u32,
804-
byte_offset: Some(offset_so_far),
805-
byte_stride: Some(12),
803+
byte_length: expected_vertices_length.into(),
804+
byte_offset: Some(json::validation::USize64(offset_so_far as _)),
805+
byte_stride: Some(json::buffer::Stride(12)),
806806
name: Some(format!("{}_Buffer_Vertices", name)),
807807
target: Some(Valid(json::buffer::Target::ArrayBuffer)),
808808
extensions: Default::default(),
@@ -813,8 +813,8 @@ impl Gltf {
813813
json::Index::new(self.root.buffer_views.len() as u32 - 1);
814814
self.root.accessors.push(json::Accessor {
815815
buffer_view: Some(buffer_view_index),
816-
byte_offset: Some(0),
817-
count: vertices.len() as u32,
816+
byte_offset: Some(json::validation::USize64(0)),
817+
count: vertices.len().into(),
818818
component_type: Valid(json::accessor::GenericComponentType(
819819
json::accessor::ComponentType::F32,
820820
)),
@@ -844,9 +844,9 @@ impl Gltf {
844844
Some(normals) => {
845845
self.root.buffer_views.push(json::buffer::View {
846846
buffer: buffer_index,
847-
byte_length: expected_normals_length as u32,
848-
byte_offset: Some(offset_so_far),
849-
byte_stride: Some(12),
847+
byte_length: expected_normals_length.into(),
848+
byte_offset: Some(json::validation::USize64(offset_so_far as _)),
849+
byte_stride: Some(json::buffer::Stride(12)),
850850
name: Some(format!("{}_Buffer_Normals", name)),
851851
target: Some(Valid(json::buffer::Target::ArrayBuffer)),
852852
extensions: Default::default(),
@@ -857,8 +857,8 @@ impl Gltf {
857857
json::Index::new(self.root.buffer_views.len() as u32 - 1);
858858
self.root.accessors.push(json::Accessor {
859859
buffer_view: Some(buffer_view_index),
860-
byte_offset: Some(0),
861-
count: normals.len() as u32,
860+
byte_offset: Some(json::validation::USize64(0)),
861+
count: normals.len().into(),
862862
component_type: Valid(json::accessor::GenericComponentType(
863863
json::accessor::ComponentType::F32,
864864
)),
@@ -888,9 +888,9 @@ impl Gltf {
888888
Some(colors) => {
889889
self.root.buffer_views.push(json::buffer::View {
890890
buffer: buffer_index,
891-
byte_length: expected_colors_length as u32,
892-
byte_offset: Some(offset_so_far),
893-
byte_stride: Some(16),
891+
byte_length: expected_colors_length.into(),
892+
byte_offset: Some(json::validation::USize64(offset_so_far as _)),
893+
byte_stride: Some(json::buffer::Stride(16)),
894894
name: Some(format!("{}_Buffer_Colors", name)),
895895
target: Some(Valid(json::buffer::Target::ArrayBuffer)),
896896
extensions: Default::default(),
@@ -901,8 +901,8 @@ impl Gltf {
901901
json::Index::new(self.root.buffer_views.len() as u32 - 1);
902902
self.root.accessors.push(json::Accessor {
903903
buffer_view: Some(buffer_view_index),
904-
byte_offset: Some(0),
905-
count: colors.len() as u32,
904+
byte_offset: Some(json::validation::USize64(0)),
905+
count: colors.len().into(),
906906
component_type: Valid(json::accessor::GenericComponentType(
907907
json::accessor::ComponentType::F32,
908908
)),
@@ -936,9 +936,9 @@ impl Gltf {
936936
Some(uv_set) => {
937937
self.root.buffer_views.push(json::buffer::View {
938938
buffer: buffer_index,
939-
byte_length: expected_uvs_length as u32,
940-
byte_offset: Some(offset_so_far),
941-
byte_stride: Some(8),
939+
byte_length: expected_uvs_length.into(),
940+
byte_offset: Some(json::validation::USize64(offset_so_far as _)),
941+
byte_stride: Some(json::buffer::Stride(8)),
942942
name: Some(format!("{}_Buffer_UVs", name)),
943943
target: Some(Valid(json::buffer::Target::ArrayBuffer)),
944944
extensions: Default::default(),
@@ -949,8 +949,8 @@ impl Gltf {
949949
json::Index::new(self.root.buffer_views.len() as u32 - 1);
950950
self.root.accessors.push(json::Accessor {
951951
buffer_view: Some(buffer_view_index),
952-
byte_offset: Some(0),
953-
count: uv_set.uvs.len() as u32,
952+
byte_offset: Some(json::validation::USize64(0)),
953+
count: uv_set.uvs.len().into(),
954954
component_type: Valid(json::accessor::GenericComponentType(
955955
json::accessor::ComponentType::F32,
956956
)),
@@ -972,8 +972,8 @@ impl Gltf {
972972
Some(triangles) => {
973973
self.root.buffer_views.push(json::buffer::View {
974974
buffer: buffer_index,
975-
byte_length: expected_triangles_length as u32,
976-
byte_offset: Some(offset_so_far),
975+
byte_length: expected_triangles_length.into(),
976+
byte_offset: Some(json::validation::USize64(offset_so_far as _)),
977977
byte_stride: None, //Some(6),
978978
name: Some(format!("{}_Buffer_Triangles", name)),
979979
target: Some(Valid(json::buffer::Target::ElementArrayBuffer)),
@@ -984,8 +984,8 @@ impl Gltf {
984984
json::Index::new(self.root.buffer_views.len() as u32 - 1);
985985
self.root.accessors.push(json::Accessor {
986986
buffer_view: Some(buffer_view_index),
987-
byte_offset: Some(0),
988-
count: triangles.len() as u32 * 3,
987+
byte_offset: Some(json::validation::USize64(0)),
988+
count: (triangles.len() * 3).into(),
989989
component_type: Valid(json::accessor::GenericComponentType(
990990
json::accessor::ComponentType::U16,
991991
)),

‎src/collectors/single_mesh.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub struct Mesh {
1414

1515
impl Mesh {
1616
pub fn add_nif(&mut self, nif: &Nif, lod_distance: f32) -> anyhow::Result<()> {
17-
if let Some(Block::NiNode(ni_node)) = nif.blocks.get(0) {
17+
if let Some(Block::NiNode(ni_node)) = nif.blocks.first() {
1818
self.visit_ni_node(nif, ni_node, None, lod_distance)?;
1919
}
2020

‎src/parse_utils.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ use super::blocks::{Block, *};
22
use super::common;
33
use crate::error::NifError;
44
use binrw::{io::Read, BinRead, BinResult};
5-
use std::io::SeekFrom;
65

76
#[binrw::parser(reader, endian)]
8-
pub fn parse_keys<T: BinRead>(
7+
pub fn parse_keys<T>(
98
num_keys: u32,
109
key_type: Option<common::KeyType>,
1110
) -> BinResult<Vec<common::Key<T>>>
1211
where
12+
T: BinRead,
1313
T: for<'a> BinRead<Args<'a> = ()>,
1414
{
1515
if num_keys == 0 {
@@ -330,7 +330,7 @@ pub fn parse_blocks(strings: Vec<String>, block_type_indices: Vec<u16>) -> BinRe
330330
),
331331
_ => {
332332
return Err(binrw::Error::Custom {
333-
pos: reader.seek(SeekFrom::Current(0))?,
333+
pos: reader.stream_position()?,
334334
err: Box::new(NifError::UnknownBlock(blocks.len(), block_type.clone())),
335335
});
336336
}
@@ -339,7 +339,7 @@ pub fn parse_blocks(strings: Vec<String>, block_type_indices: Vec<u16>) -> BinRe
339339
}
340340
None => {
341341
return Err(binrw::Error::Custom {
342-
pos: reader.seek(SeekFrom::Current(0))?,
342+
pos: reader.stream_position()?,
343343
err: Box::new(NifError::InvalidBlockTypeIndex),
344344
});
345345
}

0 commit comments

Comments
 (0)