public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first pass of merging in warp (doesn't build)

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/asset_macro/src/lib.rs
+7 -8
View File
@@ -22,16 +22,15 @@
extern crate quote;
extern crate proc_macro;
use galaxy_util::assets::{ASSETS_DIR, ASYNC_ASSETS_DIR, BUNDLED_ASSETS_DIR, REMOTE_ASSETS_DIR};
use std::env;
use std::path::{Path, PathBuf};
use proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2;
use sha2::Digest;
use std::{
env,
path::{Path, PathBuf},
};
use syn::{parse::Parse, Token};
use syn::{parse_macro_input, LitStr};
use syn::parse::Parse;
use syn::{parse_macro_input, LitStr, Token};
use galaxy_util::assets::{ASSETS_DIR, ASYNC_ASSETS_DIR, BUNDLED_ASSETS_DIR, REMOTE_ASSETS_DIR};
struct MacroArgs {
/// The name of the asset. E.g. `jpg/jellyfish_bg.jpg`
@@ -73,7 +72,7 @@ fn construct_bundled_asset(asset_name: &str, asset_dir: &str) -> Result<TokenStr
if full_asset_path(asset_name, asset_dir).exists() {
let full_location = format!("{asset_dir}/{asset_name}");
Ok(quote! {
::galaxyui::assets::asset_cache::AssetSource::Bundled {
::galaxyui_core::assets::asset_cache::AssetSource::Bundled {
path: #full_location .into(),
}
})