From eb3c3b3e083eda725069f5c37c170644bc272c5f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 9 Mar 2022 08:32:21 -0500 Subject: [PATCH] improve handling of assets --- .gitignore | 2 +- pack_assets.sh | 3 ++- src/egui_app.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a1ca3c6..7c6d80e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ Cargo.lock /pkg /tmp -/assets/data.tar \ No newline at end of file +/data.tar \ No newline at end of file diff --git a/pack_assets.sh b/pack_assets.sh index 4832d02..d2f151f 100755 --- a/pack_assets.sh +++ b/pack_assets.sh @@ -1,4 +1,5 @@ #!/bin/bash cd assets rm -fr data.tar | true -tar -cvf data.tar *.* \ No newline at end of file +tar -cvf data.tar *.* +mv data.tar ../ \ No newline at end of file diff --git a/src/egui_app.rs b/src/egui_app.rs index 7c2538a..d63154f 100644 --- a/src/egui_app.rs +++ b/src/egui_app.rs @@ -44,7 +44,7 @@ const DEFAULT_MAX_X: f64 = 10.0; const DEFAULT_INTEGRAL_NUM: usize = 100; // Font Data -flate!(static DATA_FILE: [u8] from "assets/data.tar"); +flate!(static DATA_FILE: [u8] from "data.tar"); struct FileData { pub font_ubuntu_light: FontData,