Separate android resources and assets

NiklasEi · Jul 16, 2023 · 827e991 · 827e991
1 parent 3551668
commit 827e991
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/assets/res/mipmap-mdpi/bevy.png → assets/textures/bevy.png b/assets/res/mipmap-mdpi/bevy.png → assets/textures/bevy.png
diff --git a/build/android/res/mipmap-mdpi/bevy.png b/build/android/res/mipmap-mdpi/bevy.png
diff --git a/build/macos/icon_1024x1024.png → build/icon_1024x1024.png b/build/macos/icon_1024x1024.png → build/icon_1024x1024.png
diff --git a/build/macos/create_icns.sh b/build/macos/create_icns.sh
@@ -2,16 +2,16 @@
 
 rm -rf AppIcon.iconset/*
 mkdir -p AppIcon.iconset
-sips -z 16 16 icon_1024x1024.png --out AppIcon.iconset/icon_16x16.png
-sips -z 32 32 icon_1024x1024.png --out AppIcon.iconset/[email protected]
-sips -z 32 32 icon_1024x1024.png --out AppIcon.iconset/icon_32x32.png
-sips -z 64 64 icon_1024x1024.png --out AppIcon.iconset/[email protected]
-sips -z 128 128 icon_1024x1024.png --out AppIcon.iconset/icon_128x128.png
-sips -z 256 256 icon_1024x1024.png --out AppIcon.iconset/[email protected]
-sips -z 256 256 icon_1024x1024.png --out AppIcon.iconset/icon_256x256.png
-sips -z 512 512 icon_1024x1024.png --out AppIcon.iconset/[email protected]
-sips -z 512 512 icon_1024x1024.png --out AppIcon.iconset/icon_512x512.png
-cp icon_1024x1024.png AppIcon.iconset/[email protected]
+sips -z 16 16 ../icon_1024x1024.png --out AppIcon.iconset/icon_16x16.png
+sips -z 32 32 ../icon_1024x1024.png --out AppIcon.iconset/[email protected]
+sips -z 32 32 ../icon_1024x1024.png --out AppIcon.iconset/icon_32x32.png
+sips -z 64 64 ../icon_1024x1024.png --out AppIcon.iconset/[email protected]
+sips -z 128 128 ../icon_1024x1024.png --out AppIcon.iconset/icon_128x128.png
+sips -z 256 256 ../icon_1024x1024.png --out AppIcon.iconset/[email protected]
+sips -z 256 256 ../icon_1024x1024.png --out AppIcon.iconset/icon_256x256.png
+sips -z 512 512 ../icon_1024x1024.png --out AppIcon.iconset/[email protected]
+sips -z 512 512 ../icon_1024x1024.png --out AppIcon.iconset/icon_512x512.png
+cp ../icon_1024x1024.png AppIcon.iconset/[email protected]
 iconutil -c icns AppIcon.iconset
 mkdir -p src/Game.app/Contents/Resources
 mv AppIcon.icns src/Game.app/Contents/Resources/
diff --git a/src/loading.rs b/src/loading.rs
@@ -36,6 +36,6 @@ pub struct AudioAssets {
 
 #[derive(AssetCollection, Resource)]
 pub struct TextureAssets {
- #[asset(path = "res/mipmap-mdpi/bevy.png")]
+ #[asset(path = "textures/bevy.png")]
  pub texture_bevy: Handle<Image>,
 }