QuinnPainter/sandstone
1
Fork 0
mirror of https://github.com/QuinnPainter/sandstone.git synced 2025-06-18 19:15:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
quinnpainter 2023-04-17 23:26:53 +01:00
parent 0db0c9864b
commit ec00638669
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/Cargo.lock generated
View File

@ -430,7 +430,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.13",
"syn 2.0.15",
]
[[package]]
@ -1291,29 +1291,29 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.159"
version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.159"
version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.13",
"syn 2.0.15",
]
[[package]]
name = "serde_json"
version = "1.0.95"
version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"itoa",
"ryu",
@ -1413,9 +1413,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.13"
version = "2.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
dependencies = [
"proc-macro2",
"quote",
@ -1439,7 +1439,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.13",
"syn 2.0.15",
]
[[package]]

2
editor/src/hierarchy.rs
View File

@ -251,7 +251,7 @@ impl Hierarchy {
});
self.current_graph_idx = project_data.graphs.len();
// If this is the first graph created, make it the Main Graph
if project_data.graphs.len() == 0 {
if project_data.graphs.is_empty() {
project_data.main_graph = Some(self.current_graph_idx as u32);
}
*selected = Selected::Graph(self.current_graph_idx);

2
engine/arm9/src/hierarchy.rs
View File

@ -260,7 +260,7 @@ impl Hierarchy {
// this could return None if an object was immediately destroyed after creating it
let mut script_data = if let Some(item) = context.hierarchy.try_borrow_mut(handle) {
// return early - node is disabled
if item.global_enabled == false { continue; }
if !item.global_enabled { continue; }
if let Some(script_data) = item.script_data.take() {
script_data
} else {

2
engine/arm9/src/node/sprite.rs
View File

@ -108,7 +108,7 @@ impl SpriteExtensionHandler {
let mut cur_affine_index = 0;
for sprite in hierarchy.node_ext_pools.sprite_pool.iter() {
let node = hierarchy.object_pool.borrow(sprite.node_handle);
if node.global_enabled == false { continue; }
if !node.global_enabled { continue; }
let vram_mapping = self.sprite_vram_map[&sprite.graphic_asset];
let sprite_size = hierarchy.game_data.graphics[&sprite.graphic_asset].size;

2
shooter-demo/code/src/game_manager.rs
View File

@ -1,7 +1,5 @@
use alloc::format;
use sandstone::{Script, ScriptContext};
//use sandstone::fixed::types::*;
//use sandstone::hierarchy::HierarchyPoolTrait;
use sandstone::ironds::display::console;
use sandstone::ironds::input;