diff --git a/src/match_loading.rs b/src/match_loading.rs index 1a6ed08..d60f6eb 100644 --- a/src/match_loading.rs +++ b/src/match_loading.rs @@ -16,7 +16,7 @@ use crate::{ manifest::{FighterManifest, FighterManifestRegistry}, spawn_fighter, visual::FighterAnimations, - }, input::{LocalInputAssignments, LocalInputSource, MatchInputAssignments}, match_runtime::MatchState, materials::fighter_material::FighterMaterial, netcode::{ + }, input::{LocalInputAssignments, LocalInputSource, MatchInputAssignments}, match_runtime::MatchState, netcode::{ GGRSCfg, session::{ConnectionStatus, SessionConfig, create_session}, }, scripting::FighterAttackScript, stage::{ diff --git a/src/materials/fighter_material.rs b/src/materials/fighter_material.rs index 2b6497a..e81ac3e 100644 --- a/src/materials/fighter_material.rs +++ b/src/materials/fighter_material.rs @@ -13,17 +13,6 @@ pub struct FighterMaterialExtension { status_color: LinearRgba, #[uniform(100)] status_color_intensity: f32, - - // Web examples WebGL2 support: structs must be 16 byte aligned. - #[cfg(feature = "webgl2")] - #[uniform(100)] - _webgl2_padding_8b: u32, - #[cfg(feature = "webgl2")] - #[uniform(100)] - _webgl2_padding_12b: u32, - #[cfg(feature = "webgl2")] - #[uniform(100)] - _webgl2_padding_16b: u32, } const SHADER_ASSET_PATH: &str = "embedded://shinespark/shaders/fighter.wgsl"; diff --git a/src/materials/mod.rs b/src/materials/mod.rs index 1415824..a4d1f33 100644 --- a/src/materials/mod.rs +++ b/src/materials/mod.rs @@ -1,16 +1,8 @@ use bevy::{ - asset::embedded_asset, gltf::GltfMaterialName, material::OpaqueRendererMethod, pbr::ExtendedMaterial, prelude::*, world_serialization::WorldInstanceReady, + asset::embedded_asset, prelude::*, }; -use bevy::{ - color::palettes::basic::RED, - pbr::{MaterialExtension}, - prelude::*, - render::render_resource::*, - shader::ShaderRef, -}; -use crate::materials::fighter_material::{FighterMaterial, FighterMaterialExtension}; pub mod fighter_material;