Chaoscaot/schemsearch
1
0
Fork 0
mirror of https://github.com/Chaoscaot/schemsearch.git synced 2026-01-03 10:37:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated crates and introduce OpenCL matcher integration

Browse Source
This commit is contained in:
Chaoscaot
2025-04-09 13:41:50 +02:00
parent 2a584e878f
commit 47bbf25ac7
17 changed files with 202 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,26 +19,7 @@ pub mod pattern_mapper;
pub mod search;
pub mod nbt_search;
use serde::{Serialize, Deserialize};
#[derive(Debug, Clone, Copy, Deserialize, Serialize)]
pub struct SearchBehavior {
pub ignore_block_data: bool,
pub ignore_block_entities: bool,
pub ignore_air: bool,
pub air_as_any: bool,
pub ignore_entities: bool,
pub threshold: f32,
pub invalid_nbt: bool,
}
#[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
pub struct Match {
pub x: u16,
pub y: u16,
pub z: u16,
pub percent: f32,
}
use schemsearch_common::SearchBehavior;
#[inline]
pub fn normalize_data(data: &str, ignore_data: bool) -> &str {

16
schemsearch-lib/src/search.rs
View File

@@ -1,6 +1,8 @@
use math::round::ceil;
use schemsearch_common::Match;
use schemsearch_files::SpongeSchematic;
use crate::{Match, SearchBehavior};
use schemsearch_ocl_matcher::{ocl_available, ocl_search};
use crate::{SearchBehavior};
use crate::pattern_mapper::{match_palette, match_palette_adapt};
pub fn search(
@@ -20,16 +22,12 @@ pub fn search(
let mut matches: Vec<Match> = Vec::with_capacity(4);
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
};
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_schem.block_data.len() as f32;
@@ -42,6 +40,14 @@ pub fn search(
let schem_width = schem.width as usize;
let schem_height = schem.height as usize;
let schem_length = schem.length as usize;
if ocl_available() {
return ocl_search(schem_data.as_slice(), [schem_width, schem_height, schem_length], pattern_schem.block_data.as_slice(), [pattern_width, pattern_height, pattern_length], *air_id, search_behavior).unwrap()
}
let schem_data = schem_data.as_ptr();
let pattern_data = pattern_schem.block_data.as_ptr();
let skip_amount = ceil((pattern_blocks * (1.0 - search_behavior.threshold)) as f64, 0) as i32;