alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Expand $OUT_DIR in background and sprite include macros

Browse source
This commit is contained in:
Constantin 2024-01-24 19:19:30 +01:00
parent 356adb60e9
commit 3fcab53f52
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
agb-image-converter/src/lib.rs
View file

@ -42,7 +42,9 @@ struct BackgroundGfxOption {
impl config::Image for BackgroundGfxOption { impl config::Image for BackgroundGfxOption {
fn filename(&self) -> String { fn filename(&self) -> String {
self.file_name.clone() self.file_name
.clone()
.replace(OUT_DIR, &get_out_dir(&self.file_name))
} }
fn colours(&self) -> Colours { fn colours(&self) -> Colours {
@ -293,6 +295,8 @@ pub fn include_colours_inner(input: TokenStream) -> TokenStream {
#[proc_macro] #[proc_macro]
pub fn include_aseprite_inner(input: TokenStream) -> TokenStream { pub fn include_aseprite_inner(input: TokenStream) -> TokenStream {
let out_dir = get_out_dir(&input.to_string());
let parser = Punctuated::<LitStr, syn::Token![,]>::parse_terminated; let parser = Punctuated::<LitStr, syn::Token![,]>::parse_terminated;
let parsed = match parser.parse(input) { let parsed = match parser.parse(input) {
Ok(e) => e, Ok(e) => e,
@ -310,6 +314,7 @@ pub fn include_aseprite_inner(input: TokenStream) -> TokenStream {
let filenames: Vec<PathBuf> = parsed let filenames: Vec<PathBuf> = parsed
.iter() .iter()
.map(|s| s.value()) .map(|s| s.value())
.map(|s| s.replace(OUT_DIR, &out_dir))
.map(|s| Path::new(&root).join(&*s)) .map(|s| Path::new(&root).join(&*s))
.collect(); .collect();
@ -663,6 +668,16 @@ fn valid_sprite_size(width: u32, height: u32) -> bool {
} }
} }
const OUT_DIR: &str = "$OUT_DIR";
fn get_out_dir(raw_input: &str) -> String {
if raw_input.contains(OUT_DIR) {
std::env::var("OUT_DIR").expect("Failed to get OUT_DIR")
} else {
String::new()
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use asefile::AnimationDirection; use asefile::AnimationDirection;