Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -15,4 +15,4 @@ quote = "1"
|
||||
syn = { version = "2", default-features = false, features = ["derive", "parsing", "proc-macro", "printing"] }
|
||||
proc-macro2 = "1"
|
||||
sha2.workspace = true
|
||||
warp_util.workspace = true
|
||||
galaxy_util.workspace = true
|
||||
|
||||
@@ -31,7 +31,7 @@ use std::{
|
||||
};
|
||||
use syn::{parse::Parse, Token};
|
||||
use syn::{parse_macro_input, LitStr};
|
||||
use warp_util::assets::{ASSETS_DIR, ASYNC_ASSETS_DIR, BUNDLED_ASSETS_DIR, REMOTE_ASSETS_DIR};
|
||||
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 +73,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! {
|
||||
::warpui::assets::asset_cache::AssetSource::Bundled {
|
||||
::galaxyui::assets::asset_cache::AssetSource::Bundled {
|
||||
path: #full_location .into(),
|
||||
}
|
||||
})
|
||||
@@ -102,13 +102,13 @@ fn construct_remote_asset(asset_name: &str, asset_dir: &str) -> Result<TokenStre
|
||||
let mut hasher = sha2::Sha256::new();
|
||||
hasher.update(&contents);
|
||||
let hash: [u8; 32] = hasher.finalize().into();
|
||||
let url = warp_util::assets::hashed_asset_url(&warp_util::assets::hashed_asset_path(
|
||||
let url = galaxy_util::assets::hashed_asset_url(&galaxy_util::assets::hashed_asset_path(
|
||||
Path::new(asset_name),
|
||||
&hash,
|
||||
));
|
||||
|
||||
Ok(quote! {
|
||||
::asset_cache::url_source(::warp_util::assets::make_absolute_url( #url ))
|
||||
::asset_cache::url_source(::galaxy_util::assets::make_absolute_url( #url ))
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user