{"header":{"message":"so many changes","description":null,"timestamp":"2024-04-21T12:38:16.705013Z","authors":[{}]},"hash":"OFSXWOK6YNCYCKXRPOLAQQOYANOMDOL3ZDUXMDM65UTKVOA4LAXAC","authors":[{"login":"Jengamon","key":"AFEuLzv5ecUJzaewFwoWh4jeCDqWZztr7dswYwyG9vfU"}],"deps":{"hashes":[["OFSXWOK6YNCYCKXRPOLAQQOYANOMDOL3ZDUXMDM65UTKVOA4LAXAC","so many changes"],["AA",null],["ZTXU3KDWJAP47BPTRDJGQSR3C2YNKJE5NKFBYZKXR7N6LWGJWC7QC","changem bangem"],["6YIJ6ZQ6EOSZCK4K422ZUDXSMXKBEAWNA2MKCDS6B7NR2BGB3M2AC","make a test of things working together"],["57S64Z47SHSHO23K7VPUFBJETNVYBPK47BSIHJCW572KIUVF52HQC","first"]],"deps":["ZTXU3KDWJAP47BPTRDJGQSR3C2YNKJE5NKFBYZKXR7N6LWGJWC7QC"],"known":["57S64Z47SHSHO23K7VPUFBJETNVYBPK47BSIHJCW572KIUVF52HQC","6YIJ6ZQ6EOSZCK4K422ZUDXSMXKBEAWNA2MKCDS6B7NR2BGB3M2AC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":41,"ins":{"up_context":[{"change":2,"pos":717}],"down_context":[{"change":3,"pos":644}],"flag":"BLOCK","start":0,"end":61,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":717},"to":{"change":2,"start":717,"end":776},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":" InputManagerPlugin::::default(),"}],"del_contents":[{"Del":" InputManagerPlugin::::default(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":45,"ins":{"up_context":[{"change":3,"pos":704}],"down_context":[{"change":3,"pos":704}],"flag":"BLOCK","start":62,"end":148,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":704},"to":{"change":2,"start":834,"end":882},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":" .add_systems(Update, update_tnua)"},{"Add":" .add_systems(Update, input_behaved)"}],"del_contents":[{"Del":" .add_systems(Update, update_test_stuff)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":51,"ins":{"up_context":[{"change":2,"pos":958}],"down_context":[{"change":2,"pos":978}],"flag":"BLOCK","start":149,"end":171,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":958},"to":{"change":2,"start":958,"end":978},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":"enum PlayerMovement {"}],"del_contents":[{"Del":"enum PlayerAction {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":59,"ins":{"up_context":[{"change":2,"pos":1038}],"down_context":[{"change":2,"pos":1242}],"flag":"BLOCK","start":172,"end":473,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1038},"to":{"change":2,"start":1038,"end":1242},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":"fn default_player_map() -> InputMap {"},{"Add":" InputMap::new(["},{"Add":" ("},{"Add":" PlayerMovement::Jump,"},{"Add":" Into::::into(KeyCode::Space),"},{"Add":" ),"},{"Add":" ("},{"Add":" PlayerMovement::Walk,"},{"Add":" VirtualAxis::horizontal_arrow_keys().into(),"},{"Add":" ),"},{"Add":" ])"}],"del_contents":[{"Del":"fn default_player_map() -> InputMap {\n InputMap::new([(PlayerAction::Jump, KeyCode::Space)])\n .insert(PlayerAction::Walk, VirtualAxis::horizontal_arrow_keys())\n .to_owned()\n"}]}},{"Edit":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":115,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2381},"to":{"change":2,"start":2381,"end":2400},"introduced_by":2}],"inode":{"change":3,"pos":15482}}},"contents":[{"Del":" Mass(1.0),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":116,"ins":{"up_context":[{"change":2,"pos":2441}],"down_context":[{"change":2,"pos":2496}],"flag":"BLOCK","start":474,"end":532,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2441},"to":{"change":2,"start":2441,"end":2496},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":" // TnuaXpbd2dSensorShape(Collider::circle(32.0)),"}],"del_contents":[{"Del":" TnuaXpbd2dSensorShape(Collider::circle(32.0)),\n"}]}},{"Edit":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":131,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2814}],"down_context":[{"change":2,"pos":2814}],"flag":"BLOCK","start":533,"end":1498,"inode":{"change":3,"pos":15482}}},"contents":[{"Add":" TnuaConfig {"},{"Add":" max_speed: 5000.,"},{"Add":" air_actions: 2,"},{"Add":" walk: TnuaBuiltinWalk {"},{"Add":" acceleration: 2000.,"},{"Add":" air_acceleration: 1500.,"},{"Add":" float_height: 64.0,"},{"Add":" ..default()"},{"Add":" },"},{"Add":" jump: TnuaBuiltinJump {"},{"Add":" height: 128.,"},{"Add":" reschedule_cooldown: Some(0.1),"},{"Add":" // Defaults x 10"},{"Add":" upslope_extra_gravity: 300.0,"},{"Add":" // takeoff_extra_gravity: 300.0,"},{"Add":" // takeoff_above_velocity: 64.0,"},{"Add":" fall_extra_gravity: 200.0,"},{"Add":" shorten_extra_gravity: 600.0,"},{"Add":" peak_prevention_at_upward_velocity: 10.0,"},{"Add":" peak_prevention_extra_gravity: 200.0,"},{"Add":" ..default()"},{"Add":" },"},{"Add":" },"},{"Add":" TnuaControllerBundle::default(),"},{"Add":" // TnuaXpbd2dSensorShape(Collider::circle(32.0)),"},{"Add":" TnuaSimpleAirActionsCounter::default(),"}]}},{"Edit":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":181,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1187}],"down_context":[{"change":2,"pos":3579}],"flag":"BLOCK","start":1499,"end":1549,"inode":{"change":3,"pos":15482}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"struct AiContext {"},{"Add":" desired_movement: Vec2,"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":187,"ins":{"up_context":[{"change":2,"pos":3582}],"down_context":[{"change":2,"pos":3915}],"flag":"BLOCK","start":1550,"end":1640,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3582},"to":{"change":2,"start":3582,"end":3915},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":"#[derive(Component)]"},{"Add":"struct Behaved {"},{"Add":" runner: simple_bt::BehaviorRunner,"},{"Add":"}"}],"del_contents":[{"Del":"fn update_test_stuff(\n mut query: Query<\n (\n &ActionState,\n &mut TnuaController,\n &TnuaConfig,\n &mut TnuaSimpleAirActionsCounter,\n ),\n With,\n >,\n) {\n let (action_state, mut tnua_controller, config, mut air_counter) = query.single_mut();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":192,"ins":{"up_context":[{"change":2,"pos":3916}],"down_context":[{"change":2,"pos":4022}],"flag":"BLOCK","start":1641,"end":2055,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3916},"to":{"change":2,"start":3916,"end":4022},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":"fn input_behaved(mut query: Query<(&mut Behaved,), Without>) {"},{"Add":" for (mut behaved,) in query.iter_mut() {"},{"Add":" let mut context = AiContext {"},{"Add":" desired_movement: Vec2::ZERO,"},{"Add":" };"},{"Add":" behaved.runner.proceed(&mut context);"},{"Add":" let x_movement = context.desired_movement.x;"},{"Add":" if x_movement > 0.001 {"},{"Add":" // action_state.press(&PlayerMovement::Walk);"},{"Add":" }"},{"Add":" }"},{"Add":"}"}],"del_contents":[{"Del":" let mov_dir = action_state.clamped_value(&PlayerAction::Walk);\n let direction = mov_dir * Vec3::X;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":205,"ins":{"up_context":[{"change":2,"pos":4023}],"down_context":[{"change":2,"pos":4073}],"flag":"BLOCK","start":2056,"end":2444,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4023},"to":{"change":2,"start":4023,"end":4073},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":"fn update_tnua("},{"Add":" mut query: Query<("},{"Add":" &ActionState,"},{"Add":" &mut TnuaController,"},{"Add":" &TnuaConfig,"},{"Add":" &mut TnuaSimpleAirActionsCounter,"},{"Add":" )>,"},{"Add":") {"},{"Add":" for (action_state, mut tnua_controller, config, mut air_counter) in query.iter_mut() {"},{"Add":" let mov_dir = action_state.clamped_value(&PlayerMovement::Walk);"},{"Add":" let direction = mov_dir * Vec3::X;"}],"del_contents":[{"Del":" air_counter.update(tnua_controller.as_mut());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":217,"ins":{"up_context":[{"change":2,"pos":4074}],"down_context":[{"change":2,"pos":4102}],"flag":"BLOCK","start":2445,"end":2499,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4074},"to":{"change":2,"start":4074,"end":4102},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":" air_counter.update(tnua_controller.as_mut());"}],"del_contents":[{"Del":" let speed_factor = 1.0;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":219,"ins":{"up_context":[{"change":2,"pos":4103}],"down_context":[{"change":2,"pos":4342}],"flag":"BLOCK","start":2500,"end":2532,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4103},"to":{"change":2,"start":4103,"end":4342},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":" let speed_factor = 1.0;"}],"del_contents":[{"Del":" tnua_controller.basis(TnuaBuiltinWalk {\n desired_velocity: direction * speed_factor * config.max_speed,\n // TODO Hanel shooting maybe?\n desired_forward: direction.normalize_or_zero(),\n ..config.walk\n });\n"}]}},{"Replacement":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":221,"ins":{"up_context":[{"change":2,"pos":4343}],"down_context":[{"change":2,"pos":4572}],"flag":"BLOCK","start":2533,"end":2785,"inode":{"change":3,"pos":15482}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4343},"to":{"change":2,"start":4343,"end":4572},"introduced_by":2}],"inode":{"change":3,"pos":15482}},"ins_contents":[{"Add":" tnua_controller.basis(TnuaBuiltinWalk {"},{"Add":" desired_velocity: direction * speed_factor * config.max_speed,"},{"Add":" // TODO Handle shooting maybe?"},{"Add":" desired_forward: direction.normalize_or_zero(),"},{"Add":" ..config.walk"}],"del_contents":[{"Del":" if action_state.just_pressed(&PlayerAction::Jump) {\n tnua_controller.action(TnuaBuiltinJump {\n allow_in_air: air_counter.air_count_for(TnuaBuiltinJump::NAME) <= config.air_actions,\n ..config.jump\n"}]}},{"Edit":{"inode":{"change":3,"pos":15482},"path":"bullet_hell/src/main.rs","line":227,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4584}],"down_context":[{"change":2,"pos":4584}],"flag":"BLOCK","start":2786,"end":3080,"inode":{"change":3,"pos":15482}}},"contents":[{"Add":""},{"Add":" if action_state.just_pressed(&PlayerMovement::Jump) {"},{"Add":" tnua_controller.action(TnuaBuiltinJump {"},{"Add":" allow_in_air: air_counter.air_count_for(TnuaBuiltinJump::NAME)"},{"Add":" <= config.air_actions,"},{"Add":" ..config.jump"},{"Add":" });"},{"Add":" }"}]}},{"FileAdd":{"meta":{"basename":"camera.rs","metadata":0},"context":[{"change":3,"pos":754}],"contents":[{"Add":"use std::time::Duration;"},{"Add":""},{"Add":"use crate::{LOGICAL_HEIGHT, LOGICAL_WIDTH};"},{"Add":""},{"Add":"use bevy::prelude::*;"},{"Add":"use bevy_egui::{egui, EguiContexts};"},{"Add":"use bevy_smooth_pixel_camera::components::PixelCamera;"},{"Add":"use bevy_smooth_pixel_camera::viewport::ViewportSize;"},{"Add":""},{"Add":"pub struct CameraPlugin;"},{"Add":""},{"Add":"impl Plugin for CameraPlugin {"},{"Add":" fn build(&self, app: &mut App) {"},{"Add":" app.add_plugins(bevy_smooth_pixel_camera::PixelCameraPlugin)"},{"Add":" .init_resource::()"},{"Add":" .add_systems(Startup, setup_camera)"},{"Add":" .add_systems(Update, (update_camera, camera_rig_debug));"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Resource)]"},{"Add":"pub struct CameraRig {"},{"Add":" /// Which [`CameraTarget`](s) does the camera target?"},{"Add":" pub targetting: usize,"},{"Add":" precision: f32,"},{"Add":" /// how long should the lerp take?"},{"Add":" pub snap_duration: Duration,"},{"Add":"}"},{"Add":""},{"Add":"impl CameraRig {"},{"Add":" /// Camera lag - [0.0, 1.0]"},{"Add":" ///"},{"Add":" /// The camera will nominally be within this percentage of the"},{"Add":" /// target within [`self::snap_duration`]"},{"Add":" pub fn lag(&self) -> f32 {"},{"Add":" self.precision"},{"Add":" }"},{"Add":""},{"Add":" pub fn set_lag(&mut self, lag: f32) {"},{"Add":" self.precision = lag.clamp(0.0, 1.0);"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Default for CameraRig {"},{"Add":" fn default() -> Self {"},{"Add":" Self {"},{"Add":" targetting: 0,"},{"Add":" precision: 0.7,"},{"Add":" snap_duration: Duration::from_secs_f32(10f32.recip()),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// The maximum value used for [`CameraRig::targetting`]"},{"Add":"pub const MAX_TARGET: usize = 3;"},{"Add":""},{"Add":"fn camera_rig_debug(mut rig: ResMut, mut contexts: EguiContexts) {"},{"Add":" egui::Window::new(\"Camera Rig\").show(contexts.ctx_mut(), |ui| {"},{"Add":" ui.horizontal(|ui| {"},{"Add":" ui.label(\"Targetting\");"},{"Add":" ui.add(egui::Slider::new(&mut rig.targetting, 0..=MAX_TARGET));"},{"Add":" });"},{"Add":" ui.horizontal(|ui| {"},{"Add":" ui.label(\"Precision\");"},{"Add":" ui.add(egui::Slider::new(&mut rig.precision, 0.0..=1.0));"},{"Add":" });"},{"Add":" ui.horizontal(|ui| {"},{"Add":" ui.label(\"Snap Inverse Halflife\");"},{"Add":" let mut recip_halflife = rig.snap_duration.as_secs_f32().recip();"},{"Add":" if ui"},{"Add":" .add(egui::Slider::new(&mut recip_halflife, 1.0..=100.0))"},{"Add":" .changed()"},{"Add":" {"},{"Add":" rig.snap_duration = Duration::from_secs_f32(recip_halflife.recip());"},{"Add":" }"},{"Add":" });"},{"Add":" });"},{"Add":"}"},{"Add":""},{"Add":"/// Attach this to something to make it the target of the camera"},{"Add":"#[derive(Component, Default)]"},{"Add":"pub struct CameraTarget(pub usize);"},{"Add":""},{"Add":"#[derive(Component, Default)]"},{"Add":"struct Camera;"},{"Add":""},{"Add":"#[derive(Bundle)]"},{"Add":"struct CameraBundle {"},{"Add":" camera: Camera,"},{"Add":" camera_2d: Camera2dBundle,"},{"Add":" pixel_camera: PixelCamera,"},{"Add":" // chroma_aberration: post_process::ChromaticAberattionSettings,"},{"Add":"}"},{"Add":""},{"Add":"fn setup_camera(mut commands: Commands) {"},{"Add":" commands.insert_resource(ClearColor(Color::rgb(0.07, 0.05, 0.05)));"},{"Add":" commands.spawn(CameraBundle {"},{"Add":" camera: Camera,"},{"Add":" camera_2d: Camera2dBundle::default(),"},{"Add":" pixel_camera: PixelCamera::from_size(ViewportSize::AutoMax {"},{"Add":" max_width: LOGICAL_WIDTH,"},{"Add":" max_height: LOGICAL_HEIGHT,"},{"Add":" }),"},{"Add":" // chroma_aberration: post_process::ChromaticAberattionSettings {"},{"Add":" // // intensity: 0.02,"},{"Add":" // ..default()"},{"Add":" // },"},{"Add":" });"},{"Add":"}"},{"Add":""},{"Add":"fn update_camera("},{"Add":" mut camera: Query<(&mut PixelCamera, &GlobalTransform), With>,"},{"Add":" targets: Query<(&GlobalTransform, &CameraTarget)>,"},{"Add":" rig: Res,"},{"Add":" time: Res,"},{"Add":") {"},{"Add":" // This is only 1 camera..."},{"Add":" let (mut camera, cam_transform) = camera.single_mut();"},{"Add":" // ...but soooo many targets"},{"Add":" let targeted = targets"},{"Add":" .iter()"},{"Add":" .filter(|(_, t)| t.0 == rig.targetting)"},{"Add":" .collect::>();"},{"Add":" // Get the midpoint of all targeted items"},{"Add":" let goal = targeted"},{"Add":" .iter()"},{"Add":" .map(|(transform, _)| transform.translation())"},{"Add":" .reduce(|total, e| total + e)"},{"Add":" .map(|total| total / targeted.len() as f32);"},{"Add":" if let Some(goal) = goal {"},{"Add":" // Lerp the camera to player's global translation point"},{"Add":" let source = cam_transform.translation();"},{"Add":" // Taken from https://mastodon.social/@acegikmo/111931613710775864"},{"Add":" let lambda = -rig.snap_duration.as_secs_f32() / rig.precision.log2();"},{"Add":" let alpha = 2.0f32.powf(-time.delta_seconds() / lambda);"},{"Add":" let lerped = source * alpha + goal * (1.0 - alpha);"},{"Add":" camera.subpixel_pos = lerped.xy();"},{"Add":" }"},{"Add":"}"}]}}],"owner":"Jengamon","repo":"bevy_games","token":"zBNoCwOE2C3QsBOt2A0H47f+YGLQ9kpGyhE1PFTDq/g=","login":null}

…

Dependencies

Change contents