hut/outfly
hut/outfly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
yuni 2024-09-17 16:41:08 +02:00
parent 3e8d4bf6d7
commit 2876266008
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game.rs
View file

@ -481,7 +481,7 @@ fn debug(
keyboard_input: Res<ButtonInput<KeyCode>>, keyboard_input: Res<ButtonInput<KeyCode>>,
// mut commands: Commands, // mut commands: Commands,
// mut extended_materials: ResMut< // mut extended_materials: ResMut<
// Assets<bevy::pbr::ExtendedMaterial<StandardMaterial, load::AsteroidSurface>>, // Assets<bevy::pbr::ExtendedMaterial<StandardMaterial, load::AsteroidSurface>>,
// >, // >,
mut achievement_tracker: ResMut<var::AchievementTracker>, mut achievement_tracker: ResMut<var::AchievementTracker>,
vars: Res<var::GameVars>, vars: Res<var::GameVars>,
@ -490,11 +490,11 @@ fn debug(
if settings.dev_mode && keyboard_input.just_pressed(KeyCode::KeyP) { if settings.dev_mode && keyboard_input.just_pressed(KeyCode::KeyP) {
// for (entity, _name, mesh) in &materials { // for (entity, _name, mesh) in &materials {
// dbg!(mesh); // dbg!(mesh);
// let mut entity = commands.entity(entity); // let mut entity = commands.entity(entity);
// entity.remove::<Handle<StandardMaterial>>(); // entity.remove::<Handle<StandardMaterial>>();
// let material = extended_materials.add(load::AsteroidSurface::material()); // let material = extended_materials.add(load::AsteroidSurface::material());
// entity.insert(material); // entity.insert(material);
// } // }
} }
if settings.dev_mode && keyboard_input.just_pressed(KeyCode::KeyN) { if settings.dev_mode && keyboard_input.just_pressed(KeyCode::KeyN) {

12
src/visual.rs
View file

@ -265,11 +265,9 @@ pub fn update_fade_material(
if now > end_time { if now > end_time {
material.base_color.set_alpha(data.value_end); material.base_color.set_alpha(data.value_end);
commands.entity(entity).remove::<FadeMaterial>(); commands.entity(entity).remove::<FadeMaterial>();
} } else if now < data.start_time {
else if now < data.start_time {
material.base_color.set_alpha(data.value_start); material.base_color.set_alpha(data.value_start);
} } else {
else {
let progress = ((now - data.start_time) / data.duration) as f32; let progress = ((now - data.start_time) / data.duration) as f32;
let value = data.value_start + progress * (data.value_end - data.value_start); let value = data.value_start + progress * (data.value_end - data.value_start);
material.base_color.set_alpha(value); material.base_color.set_alpha(value);
@ -288,11 +286,9 @@ pub fn update_grow(
if now > end_time { if now > end_time {
trans.scale = Vec3::splat(data.scale_end); trans.scale = Vec3::splat(data.scale_end);
commands.entity(entity).remove::<Grow3DObject>(); commands.entity(entity).remove::<Grow3DObject>();
} } else if now < data.start_time {
else if now < data.start_time {
trans.scale = Vec3::splat(data.scale_start); trans.scale = Vec3::splat(data.scale_start);
} } else {
else {
let progress = ((now - data.start_time) / data.duration) as f32; let progress = ((now - data.start_time) / data.duration) as f32;
let scale = data.scale_start + progress * (data.scale_end - data.scale_start); let scale = data.scale_start + progress * (data.scale_end - data.scale_start);
trans.scale = Vec3::splat(scale); trans.scale = Vec3::splat(scale);

5
src/world.rs
View file

@ -38,7 +38,10 @@ impl Plugin for WorldPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_systems(Startup, setup); app.add_systems(Startup, setup);
app.add_systems(Update, handle_respawn.run_if(on_event::<RespawnEvent>())); app.add_systems(Update, handle_respawn.run_if(on_event::<RespawnEvent>()));
app.add_systems(Update, handle_despawn_at.run_if(any_with_component::<DespawnAt>)); app.add_systems(
Update,
handle_despawn_at.run_if(any_with_component::<DespawnAt>),
);
app.add_plugins(PhysicsPlugins::default()); app.add_plugins(PhysicsPlugins::default());
//app.add_plugins(PhysicsDebugPlugin::default()); //app.add_plugins(PhysicsDebugPlugin::default());
app.insert_resource(Gravity(DVec3::splat(0.0))); app.insert_resource(Gravity(DVec3::splat(0.0)));