Skip to content
Snippets Groups Projects
Verified Commit 4adf9163 authored by Louis's avatar Louis :fire:
Browse files

Fix web build, configure cabinet fullscreen

parent f9675401
No related branches found
No related tags found
No related merge requests found
Pipeline #128 failed with stages
in 7 minutes
...@@ -69,7 +69,7 @@ build-arm64: ...@@ -69,7 +69,7 @@ build-arm64:
- .cargo/bin/ - .cargo/bin/
- target/ - target/
script: script:
- cargo build --release -p ${BINARY_FOLDER} --target aarch64-unknown-linux-gnu - cargo build --release -p ${BINARY_FOLDER} --target aarch64-unknown-linux-gnu --features=cabinet
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
......
This diff is collapsed.
...@@ -8,6 +8,8 @@ edition = "2021" ...@@ -8,6 +8,8 @@ edition = "2021"
[features] [features]
default = [] default = []
no-aspect = [] no-aspect = []
# "cabinet" is used to enable extra systems for setting up an arcade cabinet
cabinet = []
[dependencies] [dependencies]
fastrand = "1.7" fastrand = "1.7"
...@@ -21,6 +23,9 @@ iyes_loopless = "0.7" ...@@ -21,6 +23,9 @@ iyes_loopless = "0.7"
musicbox = { git = "https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git", rev = "5ab4120a983e54ef0786ddca43b92a70605efd49"} musicbox = { git = "https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git", rev = "5ab4120a983e54ef0786ddca43b92a70605efd49"}
remote_events = { git = "https://lab.lcr.gr/microhacks/micro-bevy-remote-events.git", rev = "be0c6b43a73e4c5e7ece20797e3d6f59340147b4"} remote_events = { git = "https://lab.lcr.gr/microhacks/micro-bevy-remote-events.git", rev = "be0c6b43a73e4c5e7ece20797e3d6f59340147b4"}
[target.'cfg(target_arch = "wasm32")'.dependencies]
web-sys = { version = "0.3.58", features = ["Window"] }
[dependencies.bevy] [dependencies.bevy]
version = "0.8" version = "0.8"
default-features = false default-features = false
......
use bevy::prelude::*; use bevy::prelude::*;
use bevy::render::render_resource::FilterMode;
use bevy::render::texture::ImageSampler; use bevy::render::texture::ImageSampler;
use iyes_loopless::state::NextState; use iyes_loopless::state::NextState;
use musicbox::prelude::MusicBox; use musicbox::prelude::MusicBox;
......
use bevy::asset::AssetServerSettings; use bevy::asset::AssetServerSettings;
use bevy::prelude::*; use bevy::prelude::*;
use bevy::render::texture::ImageSettings; use bevy::render::texture::ImageSettings;
use bevy::window::PresentMode; use bevy::window::{PresentMode, WindowMode};
use crate::system::camera::spawn_orthographic_camera;
use crate::system::load_config::{get_asset_path_string, initial_size}; use crate::system::load_config::{get_asset_path_string, initial_size};
pub struct DefaultResourcesPlugin; pub struct DefaultResourcesPlugin;
...@@ -15,6 +14,11 @@ impl Plugin for DefaultResourcesPlugin { ...@@ -15,6 +14,11 @@ impl Plugin for DefaultResourcesPlugin {
width, width,
height, height,
resizable: true, resizable: true,
mode: if cfg!(feature = "cabinet") {
WindowMode::Fullscreen
} else {
WindowMode::Windowed
},
title: String::from("Bevy 2D Template"), title: String::from("Bevy 2D Template"),
present_mode: PresentMode::AutoNoVsync, present_mode: PresentMode::AutoNoVsync,
..Default::default() ..Default::default()
......
...@@ -19,9 +19,8 @@ impl<'w, 's> WindowManager<'w, 's> { ...@@ -19,9 +19,8 @@ impl<'w, 's> WindowManager<'w, 's> {
/// ## Arguments /// ## Arguments
/// - `func`: an `FnOnce` callback that is given a [`bevy::prelude::Window`] /// - `func`: an `FnOnce` callback that is given a [`bevy::prelude::Window`]
pub fn with_primary_window<Func: FnOnce(&Window)>(&self, func: Func) { pub fn with_primary_window<Func: FnOnce(&Window)>(&self, func: Func) {
match self.windows.get_primary() { if let Some(window) = self.windows.get_primary() {
Some(window) => func(window), func(window)
None => {}
} }
} }
pub fn get_primary_window(&self) -> Option<&Window> { pub fn get_primary_window(&self) -> Option<&Window> {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment