Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 0 additions & 112 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ ris_gpu_renderers = { path = "crates/ris_gpu_renderers" }
# external
ash = "0.37.3"
cfg-if = "1"
chrono = "0.4"
imgui = { version = "0.11.0", features = ["docking"] }
libc = "^0.2.30" # required for linux
miniz_oxide = "=0.8.2"
Expand Down
Binary file modified assets/in_use/scenes/new(1).ris_scene
Binary file not shown.
2 changes: 1 addition & 1 deletion crates/ris_asset/src/asset_importer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub fn import_all(
let mut target_path = PathBuf::new();
target_path.push(target_directory.clone());
target_path.push(&target_path_part);
let target_path = PathBuf::from(target_path.parent().unwrap());
let target_path = PathBuf::from(target_path.parent().into_ris_error()?);

ris_log::debug!(
"import \"{}\" to \"{}\"",
Expand Down
94 changes: 56 additions & 38 deletions crates/ris_asset/src/codecs/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,55 +200,63 @@ impl TryFrom<&JsonValue> for i32 {
type Error = JsonError;

fn try_from(value: &JsonValue) -> Result<Self, Self::Error> {
match value {
JsonValue::Number(JsonNumber { inner }) => {
// safety: construction of invalid number should be impossible
Ok(inner.parse().unwrap())
}
_ => Err(JsonError::InvalidCast),
}
let JsonValue::Number(JsonNumber { inner }) = value else {
return Err(JsonError::InvalidCast);
};

let Ok(number) = inner.parse() else {
return Err(JsonError::InvalidCast);
};

Ok(number)
}
}

impl TryFrom<&JsonValue> for usize {
type Error = JsonError;

fn try_from(value: &JsonValue) -> Result<Self, Self::Error> {
match value {
JsonValue::Number(JsonNumber { inner }) => {
// safety: construction of invalid number should be impossible
Ok(inner.parse().unwrap())
}
_ => Err(JsonError::InvalidCast),
}
let JsonValue::Number(JsonNumber { inner }) = value else {
return Err(JsonError::InvalidCast);
};

let Ok(number) = inner.parse() else {
return Err(JsonError::InvalidCast);
};

Ok(number)
}
}

impl TryFrom<&JsonValue> for isize {
type Error = JsonError;

fn try_from(value: &JsonValue) -> Result<Self, Self::Error> {
match value {
JsonValue::Number(JsonNumber { inner }) => {
// safety: construction of invalid number should be impossible
Ok(inner.parse().unwrap())
}
_ => Err(JsonError::InvalidCast),
}
let JsonValue::Number(JsonNumber { inner }) = value else {
return Err(JsonError::InvalidCast);
};

let Ok(number) = inner.parse() else {
return Err(JsonError::InvalidCast);
};

Ok(number)
}
}

impl TryFrom<&JsonValue> for f32 {
type Error = JsonError;

fn try_from(value: &JsonValue) -> Result<Self, Self::Error> {
match value {
JsonValue::Number(JsonNumber { inner }) => {
// safety: construction of number that cannot be parsed should be impossible
Ok(inner.parse().unwrap())
}
_ => Err(JsonError::InvalidCast),
}
let JsonValue::Number(JsonNumber { inner }) = value else {
return Err(JsonError::InvalidCast);
};

let Ok(number) = inner.parse() else {
return Err(JsonError::InvalidCast);
};

Ok(number)
}
}

Expand Down Expand Up @@ -463,8 +471,14 @@ impl JsonValue {
return Err(JsonError::SyntaxError);
}

let first = first_token.chars().next().unwrap();
let last = last_token.chars().next().unwrap();
// these two should never be None, because of the asserts above. but we do error handling
// anyway, just in case
let Some(first) = first_token.chars().next() else {
return Err(JsonError::SyntaxError);
};
let Some(last) = last_token.chars().next() else {
return Err(JsonError::SyntaxError);
};

let is_object = first == BEGIN_OBJECT && last == END_OBJECT;
let is_array = first == BEGIN_ARRAY && last == END_ARRAY;
Expand All @@ -483,18 +497,19 @@ impl JsonValue {
for token in &tokens[start..end] {
match token.len() {
0 => return Err(JsonError::SyntaxError),
1 => match token.chars().next().unwrap() {
BEGIN_OBJECT => object_generation += 1,
BEGIN_ARRAY => array_generation += 1,
END_OBJECT => object_generation -= 1,
END_ARRAY => array_generation -= 1,
VALUE_SEPARATOR => {
1 => match token.chars().next() {
Some(BEGIN_OBJECT) => object_generation += 1,
Some(BEGIN_ARRAY) => array_generation += 1,
Some(END_OBJECT) => object_generation -= 1,
Some(END_ARRAY) => array_generation -= 1,
Some(VALUE_SEPARATOR) => {
if object_generation == 0 && array_generation == 0 {
elements.push(Vec::new());
continue;
}
}
_ => {}
Some(_) => {}
None => return Err(JsonError::SyntaxError),
},
_ => {}
}
Expand Down Expand Up @@ -638,7 +653,10 @@ impl JsonMember {
return Err(JsonError::SyntaxError);
}

let separator = separator_token.chars().next().unwrap();
let Some(separator) = separator_token.chars().next() else {
return Err(JsonError::SyntaxError);
};

if separator != NAME_SEPARATOR {
return Err(JsonError::SyntaxError);
}
Expand Down
5 changes: 4 additions & 1 deletion crates/ris_asset/src/lookup/ris_mesh_lookup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ impl MeshLookup {
value: None,
};
self.entries.push(entry);
let entry = self.entries.last_mut().unwrap();
let entry = ris_error::unwrap!(
self.entries.last_mut().into_ris_error(),
"we just added the entry, thus this should never be None",
);
entry
}
}
Expand Down
1 change: 0 additions & 1 deletion crates/ris_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ edition = "2021"

[dependencies]
ash = "0.37.3"
chrono = "0.4"
imgui = "0.11.0"
sdl2 = "0.38.0"
sdl2-sys = "0.38.0"
Expand Down
Loading