Merge pull request #1606 from hannobraun/install
Make `fj-viewer` assets available in its crate package
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
@ -12,21 +12,21 @@ pub struct Assets<'a> {
|
|||||||
impl<'a> Assets<'a> {
|
impl<'a> Assets<'a> {
|
||||||
pub fn get_instance() -> Self {
|
pub fn get_instance() -> Self {
|
||||||
let cube_obj: &[u8] =
|
let cube_obj: &[u8] =
|
||||||
include_bytes!("../../../assets/navigation_cube/cube.obj");
|
include_bytes!("../assets/navigation_cube/cube.obj");
|
||||||
let cube_mtl: &[u8] =
|
let cube_mtl: &[u8] =
|
||||||
include_bytes!("../../../assets/navigation_cube/cube.mtl");
|
include_bytes!("../assets/navigation_cube/cube.mtl");
|
||||||
let front_texture: &[u8] =
|
let front_texture: &[u8] =
|
||||||
include_bytes!("../../../assets/navigation_cube/front.png");
|
include_bytes!("../assets/navigation_cube/front.png");
|
||||||
let right_texture: &[u8] =
|
let right_texture: &[u8] =
|
||||||
include_bytes!("../../../assets/navigation_cube/right.png");
|
include_bytes!("../assets/navigation_cube/right.png");
|
||||||
let rear_texture: &[u8] =
|
let rear_texture: &[u8] =
|
||||||
include_bytes!("../../../assets/navigation_cube/rear.png");
|
include_bytes!("../assets/navigation_cube/rear.png");
|
||||||
let left_texture: &[u8] =
|
let left_texture: &[u8] =
|
||||||
include_bytes!("../../../assets/navigation_cube/left.png");
|
include_bytes!("../assets/navigation_cube/left.png");
|
||||||
let top_texture: &[u8] =
|
let top_texture: &[u8] =
|
||||||
include_bytes!("../../../assets/navigation_cube/top.png");
|
include_bytes!("../assets/navigation_cube/top.png");
|
||||||
let bottom_texture: &[u8] =
|
let bottom_texture: &[u8] =
|
||||||
include_bytes!("../../../assets/navigation_cube/bottom.png");
|
include_bytes!("../assets/navigation_cube/bottom.png");
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
cube_obj,
|
cube_obj,
|
||||||
|
@ -189,10 +189,6 @@ impl Crate {
|
|||||||
command
|
command
|
||||||
.arg("publish")
|
.arg("publish")
|
||||||
.args(["--token", token.unsecure()])
|
.args(["--token", token.unsecure()])
|
||||||
// By this point in the process, the crates have been built
|
|
||||||
// successfully multiple times. No reason to slow down the
|
|
||||||
// release by building them again.
|
|
||||||
.arg("--no-verify")
|
|
||||||
.current_dir(&self.path);
|
.current_dir(&self.path);
|
||||||
|
|
||||||
if dry_run {
|
if dry_run {
|
||||||
|