{"header":{"message":"fix(camera): to 11","description":null,"timestamp":"2024-03-04T18:54:59.917246Z","authors":[{}]},"hash":"NWMRJJ6FF223Z37T5JL56ETC24NYVYXATI7EZCFQKH52NBWSQENAC","authors":[{"login":"Jengamon","key":"AFEuLzv5ecUJzaewFwoWh4jeCDqWZztr7dswYwyG9vfU"}],"deps":{"hashes":[["NWMRJJ6FF223Z37T5JL56ETC24NYVYXATI7EZCFQKH52NBWSQENAC","fix(camera): to 11"],["AA",null],["OKP45LHMU44KSJO64P2I7JAMEH6K77VAPBS4TA6MGGYEHEL76A2QC","fix: allow Machines to have userdata"],["HBV2UM3PW4OM7OMHCNSEFOGLL62DKTAYFMATZ6CCAXWRQZKS766AC","feat: playing around with sfxr"],["X6Q2DCTTZVQ2HCA4BFLKONTXJ2AYHTBBZCARASBEKEDCDZ2YSPUQC","fix: use rig logic, and find good clamp"],["JV22QZEHUOIQD6B3P5F3CT5H3FFR4VH5Q64XG2TQKSTSXEVBH6MAC","fix(fundsp): move public endpoint to Track"],["VICUJP7SGKKCO2ZWO5ACSO3OS4HV4JTXTHQHYSFOADANGUJ5ZDDAC","fix: fix camera and stuff"],["GVXGUTXFNHGTF6ZYK5OEWKJ4N3IXZTRBK65D6KXB4JQG5GFLKWAQC","fix: handle latency elsewhere"],["FIO72ZSANLC3OS5IKSZ4PUAIBFAAHZA6EFGHMHP6YVFGTOJ7PPKQC","fix(fundsp): the flow is real"],["WQS2WD437EWG2CKPOY5TDWPEBE3US7LGHVAH2HVYQ7RW2L6FHJ5AC","fix: more modulear"],["MKB2A5XCWBZO2E6QFE6PD36LF3IGMJCGJB5TGMRAPSKCKHS75ISAC","fix: more modular"]],"deps":["OKP45LHMU44KSJO64P2I7JAMEH6K77VAPBS4TA6MGGYEHEL76A2QC"],"known":["MKB2A5XCWBZO2E6QFE6PD36LF3IGMJCGJB5TGMRAPSKCKHS75ISAC","WQS2WD437EWG2CKPOY5TDWPEBE3US7LGHVAH2HVYQ7RW2L6FHJ5AC","VICUJP7SGKKCO2ZWO5ACSO3OS4HV4JTXTHQHYSFOADANGUJ5ZDDAC","X6Q2DCTTZVQ2HCA4BFLKONTXJ2AYHTBBZCARASBEKEDCDZ2YSPUQC","GVXGUTXFNHGTF6ZYK5OEWKJ4N3IXZTRBK65D6KXB4JQG5GFLKWAQC","JV22QZEHUOIQD6B3P5F3CT5H3FFR4VH5Q64XG2TQKSTSXEVBH6MAC","FIO72ZSANLC3OS5IKSZ4PUAIBFAAHZA6EFGHMHP6YVFGTOJ7PPKQC","HBV2UM3PW4OM7OMHCNSEFOGLL62DKTAYFMATZ6CCAXWRQZKS766AC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":1,"ins":{"up_context":[{"change":3,"pos":34}],"down_context":[{"change":3,"pos":21}],"flag":"BLOCK","start":0,"end":31,"inode":{"change":3,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":34},"to":{"change":3,"start":0,"end":21},"introduced_by":3}],"inode":{"change":3,"pos":34}},"ins_contents":[{"Add":"use crate::{camera, movement};"}],"del_contents":[{"Del":"use crate::movement;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":101,"ins":{"up_context":[{"change":3,"pos":3358}],"down_context":[{"change":3,"pos":3429}],"flag":"BLOCK","start":32,"end":130,"inode":{"change":3,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3358},"to":{"change":3,"start":3358,"end":3429},"introduced_by":3}],"inode":{"change":3,"pos":34}},"ins_contents":[{"Add":" cam_target: camera::CameraTarget,"},{"Add":" input_manager_bundle: InputManagerBundle,"}],"del_contents":[{"Del":" pub(crate) input_manager_bundle: InputManagerBundle,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":105,"ins":{"up_context":[{"change":3,"pos":3506}],"down_context":[{"change":3,"pos":3554}],"flag":"BLOCK","start":131,"end":168,"inode":{"change":3,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3506},"to":{"change":3,"start":3506,"end":3554},"introduced_by":3}],"inode":{"change":3,"pos":34}},"ins_contents":[{"Add":" sprite_sheet: SpriteSheetBundle,"}],"del_contents":[{"Del":" pub(crate) sprite_sheet: SpriteSheetBundle,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":107,"ins":{"up_context":[{"change":3,"pos":3592}],"down_context":[{"change":3,"pos":3690}],"flag":"BLOCK","start":169,"end":279,"inode":{"change":3,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3592},"to":{"change":3,"start":3592,"end":3690},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3690},"to":{"change":3,"start":250,"end":295},"introduced_by":3}],"inode":{"change":3,"pos":34}},"ins_contents":[{"Add":" movement_dir: movement_pointer::MovementDirection,"},{"Add":" dash: DashState,"},{"Add":" moveable: movement::Moveable,"}],"del_contents":[{"Del":" pub(crate) movement_dir: movement_pointer::MovementDirection,\n pub(crate) dash: DashState,\n"},{"Del":" pub(crate) moveable: movement::Moveable,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":111,"ins":{"up_context":[{"change":3,"pos":3716}],"down_context":[{"change":3,"pos":3756}],"flag":"BLOCK","start":280,"end":309,"inode":{"change":3,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3716},"to":{"change":3,"start":3716,"end":3756},"introduced_by":3}],"inode":{"change":3,"pos":34}},"ins_contents":[{"Add":" children: SpawnChildren,"}],"del_contents":[{"Del":" pub(crate) children: SpawnChildren,\n"}]}},{"Edit":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":123,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":4141}],"down_context":[{"change":3,"pos":4141}],"flag":"BLOCK","start":310,"end":418,"inode":{"change":3,"pos":34}}},"contents":[{"Add":" // Make ourself the default cam target"},{"Add":" cam_target: camera::CameraTarget::default(),"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":34,"ins":{"up_context":[{"change":3,"pos":1207}],"down_context":[{"change":3,"pos":469}],"flag":"BLOCK","start":419,"end":614,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1207},"to":{"change":3,"start":395,"end":469},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":395},"to":{"change":3,"start":395,"end":469},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":" query: Query<"},{"Add":" ("},{"Add":" Entity,"},{"Add":" &ActionState,"},{"Add":" &DashState,"},{"Add":" Option<&camera::CameraTarget>,"},{"Add":" ),"},{"Add":" With,"},{"Add":" >,"}],"del_contents":[{"Del":" query: Query<(&ActionState, &DashState), With>,\n"}]}},{"Edit":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":695}],"down_context":[{"change":3,"pos":642}],"flag":"BLOCK","start":615,"end":643,"inode":{"change":3,"pos":120}}},"contents":[{"Add":" mut commands: Commands,"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":136,"ins":{"up_context":[{"change":3,"pos":3098}],"down_context":[{"change":3,"pos":3169}],"flag":"BLOCK","start":644,"end":756,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3098},"to":{"change":3,"start":3098,"end":3169},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":" let Ok((player_entity, action_state, dash_state, maybe_cam_target)) = query.get_single()"},{"Add":" else {"}],"del_contents":[{"Del":" let Ok((action_state, dash_state)) = query.get_single() else {\n"}]}},{"Edit":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":141,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3201}],"down_context":[{"change":3,"pos":3201}],"flag":"BLOCK","start":757,"end":1174,"inode":{"change":3,"pos":120}}},"contents":[{"Add":" if maybe_cam_target.is_some() {"},{"Add":" if ui.button(\"Detach Camera\").clicked() {"},{"Add":" commands"},{"Add":" .entity(player_entity)"},{"Add":" .remove::();"},{"Add":" }"},{"Add":" } else if ui.button(\"Attach Camera\").clicked() {"},{"Add":" commands"},{"Add":" .entity(player_entity)"},{"Add":" .insert(camera::CameraTarget::default());"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":3,"ins":{"up_context":[{"change":3,"pos":1662}],"down_context":[{"change":3,"pos":7694}],"flag":"BLOCK","start":1175,"end":1233,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1662},"to":{"change":3,"start":7620,"end":7694},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7619},"to":{"change":3,"start":7620,"end":7694},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":"use super::{post_process, LOGICAL_HEIGHT, LOGICAL_WIDTH};"}],"del_contents":[{"Del":"use super::{player::Player, post_process, LOGICAL_HEIGHT, LOGICAL_WIDTH};\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":25,"ins":{"up_context":[{"change":3,"pos":2062}],"down_context":[{"change":3,"pos":2076}],"flag":"BLOCK","start":1234,"end":1254,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2062},"to":{"change":3,"start":2062,"end":2076},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":" precision: f32,"}],"del_contents":[{"Del":" lag: f32,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":31,"ins":{"up_context":[{"change":3,"pos":2168}],"down_context":[{"change":3,"pos":2238}],"flag":"BLOCK","start":1255,"end":1408,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2168},"to":{"change":3,"start":2168,"end":2238},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"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`]"}],"del_contents":[{"Del":" /// Camera lag - [0.0, 1.0) lower is snappier, higher is smoother\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":36,"ins":{"up_context":[{"change":3,"pos":2269}],"down_context":[{"change":3,"pos":2286}],"flag":"BLOCK","start":1409,"end":1432,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2269},"to":{"change":3,"start":2269,"end":2286},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":" self.precision"}],"del_contents":[{"Del":" self.lag\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":40,"ins":{"up_context":[{"change":3,"pos":2335}],"down_context":[{"change":3,"pos":2390}],"flag":"BLOCK","start":1433,"end":1480,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2335},"to":{"change":3,"start":334,"end":375},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":" self.precision = lag.clamp(0.0, 0.99);"}],"del_contents":[{"Del":" self.lag = lag.clamp(0.0, 0.99);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":47,"ins":{"up_context":[{"change":3,"pos":2470}],"down_context":[{"change":3,"pos":2492}],"flag":"BLOCK","start":1481,"end":1509,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2470},"to":{"change":3,"start":2470,"end":2492},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":" precision: 0.7,"}],"del_contents":[{"Del":" lag: 0.7,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":53,"ins":{"up_context":[{"change":3,"pos":2578}],"down_context":[{"change":3,"pos":7874}],"flag":"BLOCK","start":1510,"end":1719,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":2578},"to":{"change":3,"start":7827,"end":7848},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7827},"to":{"change":3,"start":7827,"end":7848},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7848},"to":{"change":3,"start":2579,"end":2594},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":"/// Attach this to something to make it the target of the camera"},{"Add":"// TODO Maybe allow indexing, to switch targets? Might be cool for cutscenes."},{"Add":"#[derive(Component, Default)]"},{"Add":"pub struct CameraTarget(pub usize);"}],"del_contents":[{"Del":"#[derive(Component)]\n"},{"Del":"struct Camera;\n"}]}},{"Edit":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":58,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":7875}],"down_context":[{"change":3,"pos":7875}],"flag":"BLOCK","start":1720,"end":1792,"inode":{"change":3,"pos":7619}}},"contents":[{"Add":"#[derive(Component, Default)]"},{"Add":"struct Camera {"},{"Add":" targetting: usize,"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":74,"ins":{"up_context":[{"change":3,"pos":8209}],"down_context":[{"change":3,"pos":8233}],"flag":"BLOCK","start":1793,"end":1828,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8209},"to":{"change":3,"start":8209,"end":8233},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":" camera: Camera::default(),"}],"del_contents":[{"Del":" camera: Camera,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":88,"ins":{"up_context":[{"change":3,"pos":2828}],"down_context":[{"change":3,"pos":2829}],"flag":"BLOCK","start":1829,"end":1954,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":2828},"to":{"change":3,"start":8616,"end":8742},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8616},"to":{"change":3,"start":8616,"end":8742},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":" mut camera: Query<(&mut PixelCamera, &Camera, &GlobalTransform)>,"},{"Add":" targets: Query<(&GlobalTransform, &CameraTarget)>,"}],"del_contents":[{"Del":" mut camera: Query<(&mut PixelCamera, &GlobalTransform), With>,\n player: Query<&GlobalTransform, With>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7619},"path":"src/camera.rs","line":93,"ins":{"up_context":[{"change":3,"pos":8746}],"down_context":[{"change":3,"pos":9289}],"flag":"BLOCK","start":1955,"end":2903,"inode":{"change":3,"pos":7619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8746},"to":{"change":3,"start":8746,"end":9037},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9037},"to":{"change":3,"start":2876,"end":3165},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3165},"to":{"change":3,"start":9194,"end":9289},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9194},"to":{"change":3,"start":9194,"end":9289},"introduced_by":3}],"inode":{"change":3,"pos":7619}},"ins_contents":[{"Add":" // This is only 1 camera..."},{"Add":" let (mut camera, cam, cam_transform) = camera.single_mut();"},{"Add":" // ...but soooo many targets"},{"Add":" let targeted = targets"},{"Add":" .iter()"},{"Add":" .filter(|(_, t)| t.0 == cam.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();"}],"del_contents":[{"Del":" match (player.get_single(), camera.get_single_mut()) {\n (Ok(transform), Ok((mut camera, cam_transform))) => {\n // Lerp the camera to player's global translation point\n let source = cam_transform.translation();\n let goal = transform.translation();\n"},{"Del":" let adjusted_lag = rig.lag;\n let lerped = source * adjusted_lag + goal * (1.0 - adjusted_lag);\n let lerp_delta = lerped - source;\n camera.subpixel_pos +=\n lerp_delta.xy() * time.delta_seconds() / rig.snap_duration.as_secs_f32();\n"},{"Del":" }\n _ => {\n // Either the camera or the player doesnt exist\n }\n"}]}}],"owner":"Jengamon","repo":"acerola_jam0_gam","token":"GyZPHTHzo6EoYtMbMvi0VCuX79nXFaxmNLAXPMvJt3Y=","login":null}

…

Dependencies

Change contents