Set up build commands for windows, linux & web

.dockerignore

+dist/
+/target/
+/.idea/
\ No newline at end of file

Makefile

+PROJECT_NAME=game_core
+CURRENT_DIRECTORY=$(shell pwd)
+
 linux-deps:
 	sudo apt-get install -yyq clang pkg-config libx11-dev libasound-dev libudev-dev lld
 
@@ -19,4 +22,32 @@ run-web:
 	cd game_core && trunk serve --release
 
 check:
-	cargo check --release --features "bevy/dynamic" -p game_core
\ No newline at end of file
+	cargo check --release --features "bevy/dynamic" -p game_core
+
+build-windows: clean_dist top_tail
+	docker run --rm --name "${PROJECT_NAME}-build-windows" -v "$(CURRENT_DIRECTORY):/app" -w /app --user $(shell id -u):$(shell id -g) r.lcr.gr/microhacks/bevy-builder \
+		cargo build --release -p game_core --target x86_64-pc-windows-gnu
+	mkdir -p dist
+	cp -r assets dist/assets
+	cp target/x86_64-pc-windows-gnu/release/game_core.exe "dist/${PROJECT_NAME}.exe"
+	cd dist && zip -r "${PROJECT_NAME}-windows.zip" "./${PROJECT_NAME}.exe" ./assets
+
+build-linux: clean_dist top_tail
+	docker run --rm --name "${PROJECT_NAME}-build-linux" -v "$(CURRENT_DIRECTORY):/app" -w /app --user $(shell id -u):$(shell id -g) r.lcr.gr/microhacks/bevy-builder \
+		cargo build --release -p game_core --target x86_64-unknown-linux-gnu
+	mkdir -p dist
+	cp -r assets dist/assets
+	cp target/x86_64-unknown-linux-gnu/release/game_core "dist/${PROJECT_NAME}"
+	cd dist && zip -r "${PROJECT_NAME}-linux.zip" "./${PROJECT_NAME}" ./assets
+
+build-web: top_tail
+	cd game_core && trunk build --release
+	cd game_core/dist && zip -r "${PROJECT_NAME}-web.zip" ./*
+
+clean_dist:
+	rm -rf ./dist
+
+top_tail:
+	@echo "================================================"
+	@echo "               Building ${PROJECT_NAME}"
+	@echo "================================================"
\ No newline at end of file

game_core/Cargo.toml

@@ -6,18 +6,20 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-iyes_loopless = "0.6.1"
-fastrand = "1.7.0"
-anyhow = "1.0.58"
-log = "0.4.17"
-thiserror = "1.0.31"
-serde = "1.0.139"
-serde_json = "1.0.82"
+#iyes_loopless = "0.6.1"
+fastrand = "1.7"
+anyhow = "1"
+log = "0.4"
+thiserror = "1"
+serde = "1"
+serde_json = "1"
+iyes_loopless = { git = "https://lab.lcr.gr/microhacks/iyes-loopless.git", rev = "289746aceb673d0863d5c846d4d4511e6f15c224" }
 
-micro_bevy_musicbox = { git = "https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git", rev="a6c8ae0127de2a0f2fd20ce7189625471663cd4a"}
+musicbox = { git = "https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git", rev = "fc8da57c9cc174d174dd3200d2880096a39c733f"}
+remote_events = { git = "https://lab.lcr.gr/microhacks/micro-bevy-remote-events.git", rev = "be0c6b43a73e4c5e7ece20797e3d6f59340147b4"}
 
 [dependencies.bevy]
-version = "0.7"
+version = "0.8"
 default-features = false
 features = [
     "render",

game_core/src/assets/loader.rs

@@ -4,7 +4,7 @@ use bevy::asset::LoadState;
 use bevy::ecs::system::SystemParam;
 use bevy::prelude::*;
 use bevy::reflect::TypeUuid;
-use micro_bevy_musicbox::prelude::AudioSource;
+use musicbox::prelude::AudioSource;
 
 use crate::assets::{AssetHandles, FixedAssetNameMapping, SpriteSheetConfig};
 

game_core/src/assets/mod.rs

@@ -2,14 +2,13 @@ mod loader;
 mod resources;
 mod startup;
 
-use bevy::app::Plugin;
+use bevy::app::{App, Plugin};
 use iyes_loopless::condition::ConditionSet;
 use iyes_loopless::prelude::AppLooplessStateExt;
 pub use loader::AssetTypeLoader;
 pub use resources::{AssetHandles, AssetNameMapping, FixedAssetNameMapping, SpriteSheetConfig};
 
 use crate::system::flow::AppState;
-use crate::App;
 
 pub struct AssetsPlugin;
 impl Plugin for AssetsPlugin {

game_core/src/assets/resources.rs

 use bevy::prelude::*;
 use bevy::utils::HashMap;
-use micro_bevy_musicbox::prelude::AudioSource;
-use micro_bevy_musicbox::utilities::SuppliesAudio;
+use musicbox::prelude::AudioSource;
+use musicbox::utilities::SuppliesAudio;
 
 #[derive(Copy, Clone, Debug)]
 pub struct SpriteSheetConfig {

game_core/src/lib.rs

-use bevy::asset::AssetServerSettings;
-use bevy::prelude::*;
-use bevy::window::PresentMode;
-
-use crate::system::camera::{spawn_orthographic_camera, spawn_ui_camera};
-
 pub mod assets;
+pub mod multiplayer;
 pub mod splash_screen;
 pub mod system;
-
-#[cfg(target_arch = "wasm32")]
-pub fn get_asset_path_string() -> String {
-	String::from("assets")
-}
-#[cfg(not(target_arch = "wasm32"))]
-pub fn get_asset_path_string() -> String {
-	std::env::current_dir()
-		.unwrap()
-		.join("assets")
-		.to_str()
-		.unwrap()
-		.to_string()
-}
-
-pub struct DefaultResourcesPlugin;
-impl Plugin for DefaultResourcesPlugin {
-	fn build(&self, app: &mut App) {
-		app.insert_resource(WindowDescriptor {
-			width: 1280.0,
-			height: 720.0,
-			resizable: true,
-			title: String::from("Bevy 2D Template"),
-			present_mode: PresentMode::Mailbox,
-			..Default::default()
-		})
-		.insert_resource(Msaa { samples: 1 })
-		.insert_resource(ClearColor(Color::hex("040720").unwrap()))
-		.insert_resource(AssetServerSettings {
-			asset_folder: get_asset_path_string(),
-			watch_for_changes: false,
-		})
-		.add_startup_system(spawn_orthographic_camera)
-		.add_startup_system(spawn_ui_camera);
-	}
-}

game_core/src/main.rs

 use bevy::prelude::*;
 use game_core::system::flow::AppState;
-use game_core::DefaultResourcesPlugin;
+use game_core::system::resources::DefaultResourcesPlugin;
 use iyes_loopless::prelude::AppLooplessStateExt;
-use micro_bevy_musicbox::CombinedAudioPlugins;
+use musicbox::CombinedAudioPlugins;
+use remote_events::RemoteEventPlugin;
 
 fn main() {
 	App::new()
@@ -12,5 +13,10 @@ fn main() {
 		.add_plugin(game_core::assets::AssetsPlugin)
 		.add_plugins(CombinedAudioPlugins)
 		.add_plugin(game_core::splash_screen::SplashScreenPlugin)
+		.add_plugin(game_core::system::camera::CameraManagementPlugin)
+		.add_plugin(RemoteEventPlugin::<
+			game_core::multiplayer::OutgoingEvent,
+			game_core::multiplayer::IncomingEvent,
+		>::new())
 		.run();
 }

game_core/src/multiplayer/mod.rs

+use remote_events::events::{FromSocketMessage, ToSocketMessage};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum IncomingEvent {
+	#[default]
+	Void,
+}
+
+impl FromSocketMessage for IncomingEvent {
+	fn from_text(value: String) -> Self {
+		serde_json::from_str(value.as_str()).unwrap_or_default()
+	}
+
+	fn from_binary(value: Vec<u8>) -> Self {
+		serde_json::from_slice(value.as_slice()).unwrap_or_default()
+	}
+}
+
+#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)]
+pub enum OutgoingEvent {
+	#[default]
+	Void,
+}
+
+impl ToSocketMessage for OutgoingEvent {
+	fn to_text(&self) -> String {
+		serde_json::to_string(&self).unwrap_or(String::from("{}"))
+	}
+}

game_core/src/splash_screen/systems.rs

 use bevy::prelude::*;
 use bevy::render::render_resource::FilterMode;
+use bevy::render::texture::ImageSampler;
 use iyes_loopless::state::NextState;
-use micro_bevy_musicbox::prelude::MusicBox;
+use musicbox::prelude::MusicBox;
 
 use crate::assets::AssetHandles;
 use crate::splash_screen::components::{
@@ -63,10 +64,7 @@ pub fn setup_splash_screen(
 		false => window_size.width() / image_data.texture_descriptor.size.width as f32,
 	};
 
-	image_data.sampler_descriptor.min_filter = FilterMode::Linear;
-	image_data.sampler_descriptor.mag_filter = FilterMode::Linear;
-	image_data.sampler_descriptor.mipmap_filter = FilterMode::Linear;
-
+	image_data.sampler_descriptor = ImageSampler::linear();
 	music_box.play_effect_once("splash_sting");
 
 	commands

game_core/src/system/camera.rs

 use bevy::app::App;
 use bevy::math::{Vec2, Vec3Swizzles};
 use bevy::prelude::{
-	Commands, Component, CoreStage, Entity, OrthographicCameraBundle, Plugin, Query, Transform,
-	UiCameraBundle, With,
+	Camera2dBundle, Commands, Component, CoreStage, Entity, Plugin, Query, Transform, With,
 };
 use iyes_loopless::prelude::AppLooplessStateExt;
 
@@ -11,9 +10,6 @@ use crate::system::flow::AppState;
 /// A flag component to indicate which entity should be followed by the camera
 #[derive(Component)]
 pub struct ChaseCam;
-/// A flag component to indicate a camera that should be used for Bevy UI
-#[derive(Component)]
-pub struct BevyUICamera;
 /// A flag component to indicate a camera that should be used for rendering world entities and sprites
 #[derive(Component)]
 pub struct GameCamera;
@@ -21,17 +17,10 @@ pub struct GameCamera;
 /// System that creates a default orthographic camera, with correct tags for querying
 pub fn spawn_orthographic_camera(mut commands: Commands) {
 	commands
-		.spawn_bundle(OrthographicCameraBundle::new_2d())
+		.spawn_bundle(Camera2dBundle::default())
 		.insert(GameCamera);
 }
 
-/// System that creates a default UI camera, with the correct tags for querying
-pub fn spawn_ui_camera(mut commands: Commands) {
-	commands
-		.spawn_bundle(UiCameraBundle::default())
-		.insert(BevyUICamera);
-}
-
 /// System that takes the average location of all chase camera entities, and updates the location
 /// of all world cameras to track the average location.
 ///
@@ -68,7 +57,6 @@ pub struct CameraManagementPlugin;
 impl Plugin for CameraManagementPlugin {
 	fn build(&self, app: &mut App) {
 		app.add_enter_system(AppState::Preload, spawn_orthographic_camera)
-			.add_enter_system(AppState::Preload, spawn_ui_camera)
 			.add_system_to_stage(CoreStage::PreUpdate, sync_chase_camera_location);
 	}
 }

game_core/src/system/mod.rs

 pub mod camera;
 pub mod flow;
+pub mod resources;
 pub mod utilities;
 pub mod window;

game_core/src/system/resources.rs

+use bevy::asset::AssetServerSettings;
+use bevy::prelude::*;
+use bevy::render::texture::ImageSettings;
+use bevy::window::PresentMode;
+
+use crate::system::camera::spawn_orthographic_camera;
+
+#[cfg(target_arch = "wasm32")]
+pub fn get_asset_path_string() -> String {
+	String::from("assets")
+}
+#[cfg(not(target_arch = "wasm32"))]
+pub fn get_asset_path_string() -> String {
+	std::env::current_dir()
+		.unwrap()
+		.join("assets")
+		.to_str()
+		.unwrap()
+		.to_string()
+}
+
+pub struct DefaultResourcesPlugin;
+impl Plugin for DefaultResourcesPlugin {
+	fn build(&self, app: &mut App) {
+		app.insert_resource(WindowDescriptor {
+			width: 1280.0,
+			height: 720.0,
+			resizable: true,
+			title: String::from("Bevy 2D Template"),
+			present_mode: PresentMode::AutoNoVsync,
+			..Default::default()
+		})
+		.insert_resource(ImageSettings::default_nearest())
+		.insert_resource(Msaa { samples: 1 })
+		.insert_resource(ClearColor(Color::hex("040720").unwrap()))
+		.insert_resource(AssetServerSettings {
+			asset_folder: get_asset_path_string(),
+			watch_for_changes: false,
+		});
+	}
+}