Chaoscaot/schemsearch
1
0
Fork 0
mirror of https://github.com/Chaoscaot/schemsearch.git synced 2025-12-05 08:47:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve Performance

Browse Source
This commit is contained in:
Chaoscaot
2023-08-20 15:37:23 +02:00
parent e3e6e9f759
commit d20940f89b
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
schemsearch-lib/src/lib.rs
View File

@@ -39,30 +39,30 @@ pub fn search(
search_behavior: SearchBehavior,
) -> Vec<Match> {
if schem.width < pattern_schem.width || schem.height < pattern_schem.height || schem.length < pattern_schem.length {
return vec![];
return Vec::new();
}
if pattern_schem.palette.len() > schem.palette.len() {
return vec![];
return Vec::new();
}
let pattern_schem = match_palette(&schem, &pattern_schem, search_behavior.ignore_block_data);
let mut matches: Vec<Match> = Vec::new();
let mut matches: Vec<Match> = Vec::with_capacity(4);
let pattern_data = pattern_schem.block_data.as_slice();
let pattern_data = pattern_schem.block_data.as_ptr();
let schem_data = if search_behavior.ignore_block_data {
match_palette_adapt(&schem, &pattern_schem.palette, search_behavior.ignore_block_data)
} else {
schem.block_data.clone()
schem.block_data
};
let schem_data = schem_data.as_slice();
let schem_data = schem_data.as_ptr();
let air_id = if search_behavior.ignore_air || search_behavior.air_as_any { pattern_schem.palette.get("minecraft:air").unwrap_or(&-1) } else { &-1};
let pattern_blocks = pattern_data.len() as f32;
let pattern_blocks = pattern_schem.block_data.len() as f32;
let i_pattern_blocks = pattern_blocks as i32;
let pattern_width = pattern_schem.width as usize;
@@ -86,16 +86,16 @@ pub fn search(
for i in 0..pattern_width {
let index = (x + i) + schem_width * ((z + k) + (y + j) * schem_length);
let pattern_index = i + pattern_width * (k + j * pattern_length);
let data = unsafe {schem_data.get_unchecked(index) };
let pattern_data = unsafe { pattern_data.get_unchecked(pattern_index) };
if (search_behavior.ignore_air && *data != *air_id) || (search_behavior.air_as_any && *pattern_data != *air_id) {
let data = unsafe { *schem_data.add(index) };
let pattern_data = unsafe { *pattern_data.add(pattern_index) };
if (search_behavior.ignore_air && data != *air_id) || (search_behavior.air_as_any && pattern_data != *air_id) {
continue 'inner;
}
if *data != *pattern_data {
if data != pattern_data {
not_matching += 1;
}
if not_matching >= skip_amount {
break 'outer;
if not_matching >= skip_amount {
break 'outer;
}
}
}
}
@@ -109,7 +109,6 @@ pub fn search(
percent: (i_pattern_blocks - not_matching) as f32 / pattern_blocks,
});
}
}
}
}