{"header":{"message":"feat: add fullish physical model","description":null,"timestamp":"2024-03-06T05:14:20.067802Z","authors":[{}]},"hash":"ELGDDPUWFOH6ELJVCFVNUQJQRB44G66BJXVQWQGQHNUWYA3XQJVQC","authors":[{"login":"Jengamon","key":"AFEuLzv5ecUJzaewFwoWh4jeCDqWZztr7dswYwyG9vfU"}],"deps":{"hashes":[["ELGDDPUWFOH6ELJVCFVNUQJQRB44G66BJXVQWQGQHNUWYA3XQJVQC","feat: add fullish physical model"],["AA",null],["KYEVTQT5IWDHVCMV2TORNQPODLJBKD3HLS4EIXR5HOL5DZI3UVKQC","fix: modularize movement pointers"],["NWMRJJ6FF223Z37T5JL56ETC24NYVYXATI7EZCFQKH52NBWSQENAC","fix(camera): to 11"],["R5KHFY6NVDHJJC5WNM4H5MXTVXRRZ2SLGL3LOWHGCEEF66KVBE7AC","fix(camera,debug): polly and cameras"],["JNVXXPEIDBTMUTQT5T5WWJXPZCDBEEBG5QXA3JKXYP5SORBVUMMQC","fix: just use bevy_asset_loader"],["YDD3LID47IBIIXCMSWAZ3I4H3Q3Y32WXNQBZXVJB6QRFZANVIROQC","fix(debug): polly goes nowhere"],["QX5SFVRZ6YZLBMRMRGGNQJ6U73ES5EYWC4SDAR3XCL563NHZU64AC","fix: more and modular movement"],["WFOUXIQIR2QYO3IJ5UW2YHQM5F5HKH7ZXI27JEUXA5E6G5OO5EJAC","feat(fundsp): move buffer to audio-side"],["KM5JASJ5IRMB5WINXIC4CQBLUUYZWA5MYTLQ77M4U33B7ZQ2EYBAC","fix: move stuff around?"],["WQS2WD437EWG2CKPOY5TDWPEBE3US7LGHVAH2HVYQ7RW2L6FHJ5AC","fix: more modulear"],["FIO72ZSANLC3OS5IKSZ4PUAIBFAAHZA6EFGHMHP6YVFGTOJ7PPKQC","fix(fundsp): the flow is real"],["EQ6ZV6AZEAW6XVZFIZCMKFFE6EAL2I2XTLDTN7BUC53T5H7FS5FQC","fix: woops"],["VICUJP7SGKKCO2ZWO5ACSO3OS4HV4JTXTHQHYSFOADANGUJ5ZDDAC","fix: fix camera and stuff"],["EV477LPQ57FEHMFO6E3LL5MFWZC6NTGER42SKP5CJN73SWXGB5AQC","fix: split and put in modules"],["MKB2A5XCWBZO2E6QFE6PD36LF3IGMJCGJB5TGMRAPSKCKHS75ISAC","fix: more modular"],["WZNCJURAC7FVWQLHFLXE26CAZVCY4OMCD5U52VEW75LBEVXHHRYQC","fix: the true unit"],["J32UZAU7V6XDZUSDHMLVA474JC4S4AHMLZZN55XC74YMXW4ZMFKQC","feat: do collision"]],"deps":["KYEVTQT5IWDHVCMV2TORNQPODLJBKD3HLS4EIXR5HOL5DZI3UVKQC"],"known":["EV477LPQ57FEHMFO6E3LL5MFWZC6NTGER42SKP5CJN73SWXGB5AQC","MKB2A5XCWBZO2E6QFE6PD36LF3IGMJCGJB5TGMRAPSKCKHS75ISAC","WQS2WD437EWG2CKPOY5TDWPEBE3US7LGHVAH2HVYQ7RW2L6FHJ5AC","VICUJP7SGKKCO2ZWO5ACSO3OS4HV4JTXTHQHYSFOADANGUJ5ZDDAC","FIO72ZSANLC3OS5IKSZ4PUAIBFAAHZA6EFGHMHP6YVFGTOJ7PPKQC","JNVXXPEIDBTMUTQT5T5WWJXPZCDBEEBG5QXA3JKXYP5SORBVUMMQC","WFOUXIQIR2QYO3IJ5UW2YHQM5F5HKH7ZXI27JEUXA5E6G5OO5EJAC","NWMRJJ6FF223Z37T5JL56ETC24NYVYXATI7EZCFQKH52NBWSQENAC","R5KHFY6NVDHJJC5WNM4H5MXTVXRRZ2SLGL3LOWHGCEEF66KVBE7AC","YDD3LID47IBIIXCMSWAZ3I4H3Q3Y32WXNQBZXVJB6QRFZANVIROQC","QX5SFVRZ6YZLBMRMRGGNQJ6U73ES5EYWC4SDAR3XCL563NHZU64AC","WZNCJURAC7FVWQLHFLXE26CAZVCY4OMCD5U52VEW75LBEVXHHRYQC","KM5JASJ5IRMB5WINXIC4CQBLUUYZWA5MYTLQ77M4U33B7ZQ2EYBAC","EQ6ZV6AZEAW6XVZFIZCMKFFE6EAL2I2XTLDTN7BUC53T5H7FS5FQC","J32UZAU7V6XDZUSDHMLVA474JC4S4AHMLZZN55XC74YMXW4ZMFKQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":32,"ins":{"up_context":[{"change":3,"pos":1026}],"down_context":[{"change":3,"pos":1054}],"flag":"BLOCK","start":0,"end":36,"inode":{"change":3,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1026},"to":{"change":3,"start":23,"end":60},"introduced_by":3}],"inode":{"change":3,"pos":34}},"ins_contents":[{"Add":" &mut movement::Movable,"}],"del_contents":[{"Del":" &mut movement::Moveable,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":108,"ins":{"up_context":[{"change":3,"pos":245}],"down_context":[{"change":3,"pos":43}],"flag":"BLOCK","start":37,"end":70,"inode":{"change":3,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":245},"to":{"change":3,"start":245,"end":279},"introduced_by":3}],"inode":{"change":3,"pos":34}},"ins_contents":[{"Add":" moveable: movement::Movable,"}],"del_contents":[{"Del":" moveable: movement::Moveable,\n"}]}},{"Edit":{"inode":{"change":3,"pos":34},"path":"src/player.rs","line":141,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":214},"to":{"change":3,"start":214,"end":242},"introduced_by":3}],"inode":{"change":3,"pos":34}}},"contents":[{"Del":" ..default()\n"}]}},{"Edit":{"inode":{"change":3,"pos":44},"path":"src/movement_pointer.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":229}],"down_context":[{"change":2,"pos":229}],"flag":"BLOCK","start":71,"end":93,"inode":{"change":3,"pos":44}}},"contents":[{"Add":""},{"Add":"use crate::movement;"}]}},{"Edit":{"inode":{"change":3,"pos":44},"path":"src/movement_pointer.rs","line":88,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1699},"to":{"change":3,"start":1699,"end":1801},"introduced_by":3}],"inode":{"change":3,"pos":44}}},"contents":[{"Del":" // highest speed we expect movement-pointered stuff to move at\n const MAX_SPEED: f32 = 1000.0;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":44},"path":"src/movement_pointer.rs","line":98,"ins":{"up_context":[{"change":3,"pos":2219}],"down_context":[{"change":3,"pos":2297}],"flag":"BLOCK","start":94,"end":182,"inode":{"change":3,"pos":44}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2219},"to":{"change":3,"start":2219,"end":2297},"introduced_by":3}],"inode":{"change":3,"pos":44}},"ins_contents":[{"Add":" let mixed = lerp_mix(MIN_COLOR, MAX_COLOR, md.1 / movement::MAX_SPEED);"}],"del_contents":[{"Del":" let mixed = lerp_mix(MIN_COLOR, MAX_COLOR, md.1 / MAX_SPEED);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":44},"path":"src/movement_pointer.rs","line":113,"ins":{"up_context":[{"change":3,"pos":2939}],"down_context":[{"change":3,"pos":3038}],"flag":"BLOCK","start":183,"end":369,"inode":{"change":3,"pos":44}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2939},"to":{"change":3,"start":2939,"end":3038},"introduced_by":3}],"inode":{"change":3,"pos":44}},"ins_contents":[{"Add":" *vis = if md.1 > movement::MIN_SPEED * 10. {"},{"Add":" Visibility::Inherited"},{"Add":" } else {"},{"Add":" Visibility::Hidden"},{"Add":" };"}],"del_contents":[{"Del":" // In case we hid the element before\n *vis = Visibility::Inherited;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":44},"path":"src/movement_pointer.rs","line":120,"ins":{"up_context":[{"change":3,"pos":3134}],"down_context":[{"change":3,"pos":3217}],"flag":"BLOCK","start":370,"end":463,"inode":{"change":3,"pos":44}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3134},"to":{"change":3,"start":3134,"end":3217},"introduced_by":3}],"inode":{"change":3,"pos":44}},"ins_contents":[{"Add":" + MAX_POINTER_DELTA * (md.1 / movement::MAX_SPEED).clamp(0.0, 1.0)))"}],"del_contents":[{"Del":" + MAX_POINTER_DELTA * (md.1 / MAX_SPEED).clamp(0.0, 1.0)))\n"}]}},{"Replacement":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":10,"ins":{"up_context":[{"change":3,"pos":99}],"down_context":[{"change":3,"pos":310}],"flag":"BLOCK","start":464,"end":648,"inode":{"change":3,"pos":368}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":99},"to":{"change":3,"start":258,"end":331},"introduced_by":3}],"inode":{"change":3,"pos":368}},"ins_contents":[{"Add":" app.add_systems("},{"Add":" FixedUpdate,"},{"Add":" (fake_friction, update_velocity, update_transform)"},{"Add":" .chain()"},{"Add":" .in_set(Movement),"},{"Add":" );"}],"del_contents":[{"Del":" app.add_systems(FixedUpdate, update_transform.in_set(Movement));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":23,"ins":{"up_context":[{"change":3,"pos":490}],"down_context":[{"change":3,"pos":512}],"flag":"BLOCK","start":649,"end":670,"inode":{"change":3,"pos":368}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":490},"to":{"change":3,"start":490,"end":512},"introduced_by":3}],"inode":{"change":3,"pos":368}},"ins_contents":[{"Add":"pub struct Movable {"}],"del_contents":[{"Del":"pub struct Moveable {\n"}]}},{"Edit":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":25,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":536}],"down_context":[{"change":3,"pos":536}],"flag":"BLOCK","start":671,"end":718,"inode":{"change":3,"pos":368}}},"contents":[{"Add":" pub acceleration: Vec2,"},{"Add":" pub mass: f32,"}]}},{"Replacement":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":29,"ins":{"up_context":[{"change":3,"pos":539}],"down_context":[{"change":3,"pos":567}],"flag":"BLOCK","start":719,"end":746,"inode":{"change":3,"pos":368}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":539},"to":{"change":3,"start":539,"end":567},"introduced_by":3}],"inode":{"change":3,"pos":368}},"ins_contents":[{"Add":"impl Default for Movable {"}],"del_contents":[{"Del":"impl Default for Moveable {\n"}]}},{"Edit":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":33,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":642}],"down_context":[{"change":3,"pos":642}],"flag":"BLOCK","start":747,"end":807,"inode":{"change":3,"pos":368}}},"contents":[{"Add":" acceleration: default(),"},{"Add":" mass: 1.0,"}]}},{"Replacement":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":39,"ins":{"up_context":[{"change":3,"pos":661}],"down_context":[{"change":3,"pos":686}],"flag":"BLOCK","start":808,"end":1875,"inode":{"change":3,"pos":368}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":661},"to":{"change":3,"start":319,"end":340},"introduced_by":3}],"inode":{"change":3,"pos":368}},"ins_contents":[{"Add":"/// Speeds below this should be considered 0."},{"Add":"pub const MIN_SPEED: f32 = 1.0;"},{"Add":"// highest speed we expect movement-pointered stuff to move at"},{"Add":"pub const MAX_SPEED: f32 = 1000.0;"},{"Add":""},{"Add":"fn fake_friction(mut query: Query<&mut Movable>) {"},{"Add":" // TODO Allow this to be determined by tiles!"},{"Add":" // This should range from 0.0 to 1.0"},{"Add":" const MU: f32 = 0.7;"},{"Add":" const MU_STATIC: f32 = 0.9;"},{"Add":" const GRAVITY: f32 = 9.8; // m/s^2 on Earth, TODO adjust for feel"},{"Add":" for mut movable in query.iter_mut() {"},{"Add":" let speed = movable.velocity.length();"},{"Add":" if let Some(vnorm) = movable.velocity.try_normalize() {"},{"Add":" // Friction = mu * N where N is the normal force"},{"Add":" // we assume the only normal force is gravity."},{"Add":" // so friction in our system is"},{"Add":" // mu * mass * gravity"},{"Add":" let mass = movable.mass;"},{"Add":" let friction_magnitude ="},{"Add":" if speed <= MIN_SPEED { MU_STATIC } else { MU } * mass.max(1.0) * GRAVITY;"},{"Add":" movable.acceleration += -vnorm * friction_magnitude;"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn update_velocity("}],"del_contents":[{"Del":"fn update_transform(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":67,"ins":{"up_context":[{"change":3,"pos":709}],"down_context":[{"change":3,"pos":752}],"flag":"BLOCK","start":1876,"end":1898,"inode":{"change":3,"pos":368}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":709},"to":{"change":3,"start":709,"end":752},"introduced_by":3}],"inode":{"change":3,"pos":368}},"ins_contents":[{"Add":" &mut Movable,"}],"del_contents":[{"Del":" &mut Transform,\n &Moveable,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":72,"ins":{"up_context":[{"change":3,"pos":843}],"down_context":[{"change":3,"pos":914}],"flag":"BLOCK","start":1899,"end":2139,"inode":{"change":3,"pos":368}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":843},"to":{"change":3,"start":843,"end":914},"introduced_by":3}],"inode":{"change":3,"pos":368}},"ins_contents":[{"Add":" for (mut movable, maybe_pointer) in query.iter_mut() {"},{"Add":" let acceleration = movable.acceleration;"},{"Add":" movable.velocity += acceleration * time.delta_seconds();"},{"Add":" // Reset accel"},{"Add":" movable.acceleration = Vec2::ZERO;"},{"Add":""}],"del_contents":[{"Del":" for (mut transform, moveable, maybe_pointer) in query.iter_mut() {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":80,"ins":{"up_context":[{"change":3,"pos":1017}],"down_context":[{"change":3,"pos":1132}],"flag":"BLOCK","start":2140,"end":2253,"inode":{"change":3,"pos":368}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1017},"to":{"change":3,"start":1017,"end":1132},"introduced_by":3}],"inode":{"change":3,"pos":368}},"ins_contents":[{"Add":" pointer.0 = movable.velocity.normalize_or_zero();"},{"Add":" pointer.1 = movable.velocity.length();"}],"del_contents":[{"Del":" pointer.0 = moveable.velocity.normalize_or_zero();\n pointer.1 = moveable.velocity.length();\n"}]}},{"Edit":{"inode":{"change":3,"pos":368},"path":"src/movement.rs","line":83,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1142}],"down_context":[{"change":3,"pos":1142}],"flag":"BLOCK","start":2254,"end":2404,"inode":{"change":3,"pos":368}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn update_transform(mut query: Query<(&mut Transform, &Movable)>, time: Res) {"},{"Add":" for (mut transform, moveable) in query.iter_mut() {"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":1,"ins":{"up_context":[{"change":3,"pos":120}],"down_context":[{"change":3,"pos":7483}],"flag":"BLOCK","start":2405,"end":2476,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":120},"to":{"change":3,"start":452,"end":513},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":"use crate::{camera, collision, movement, movement_pointer, GameState};"}],"del_contents":[{"Del":"use crate::{camera, collision, movement_pointer, GameState};\n"}]}},{"Edit":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":58,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":656},"to":{"change":3,"start":656,"end":688},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":69},"to":{"change":3,"start":1053,"end":1077},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":509},"to":{"change":3,"start":1053,"end":1077},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":688},"to":{"change":3,"start":1053,"end":1077},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1053},"to":{"change":3,"start":1053,"end":1077},"introduced_by":3}],"inode":{"change":3,"pos":120}}},"contents":[{"Del":" // is_static: true,\n"},{"Del":" ..default()\n"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":84,"ins":{"up_context":[{"change":3,"pos":614}],"down_context":[{"change":3,"pos":469}],"flag":"BLOCK","start":2477,"end":2655,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":614},"to":{"change":3,"start":1881,"end":1953},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":" mut polly: Query<"},{"Add":" ("},{"Add":" Entity,"},{"Add":" Option<&camera::CameraTarget>,"},{"Add":" Option<&mut movement::Movable>,"},{"Add":" ),"},{"Add":" With,"},{"Add":" >,"}],"del_contents":[{"Del":" polly: Query<(Entity, Option<&camera::CameraTarget>), With>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":120,"ins":{"up_context":[{"change":3,"pos":2001}],"down_context":[{"change":3,"pos":2062}],"flag":"BLOCK","start":2656,"end":2730,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2001},"to":{"change":3,"start":2001,"end":2062},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":" let (polly_entity, cam_target, movable) = polly.single_mut();"}],"del_contents":[{"Del":" let (polly_entity, cam_target) = polly.single();\n"}]}},{"Edit":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":135,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2668}],"down_context":[{"change":3,"pos":2668}],"flag":"BLOCK","start":2731,"end":3246,"inode":{"change":3,"pos":120}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" if let Some(mut movable) = movable {"},{"Add":" if ui.button(\"Static\").clicked() {"},{"Add":" commands.entity(polly_entity).remove::();"},{"Add":" }"},{"Add":""},{"Add":" ui.add(egui::Slider::new(&mut movable.mass, 5.0..=100.0).text(\"Mass\"));"},{"Add":" } else if ui.button(\"Dynamic\").clicked() {"},{"Add":" commands.entity(polly_entity).insert(movement::Movable {"},{"Add":" mass: 20.0,"},{"Add":" ..default()"},{"Add":" });"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":15,"ins":{"up_context":[{"change":3,"pos":865}],"down_context":[{"change":3,"pos":950}],"flag":"BLOCK","start":3247,"end":3333,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865},"to":{"change":3,"start":865,"end":950},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" .add_systems(FixedUpdate, resolve_collisions.before(movement::Movement));"}],"del_contents":[{"Del":" .add_systems(FixedUpdate, resolve_collisions.after(movement::Movement));\n"}]}},{"Edit":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":29,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1165},"to":{"change":3,"start":1165,"end":1249},"introduced_by":3}],"inode":{"change":3,"pos":37}}},"contents":[{"Del":" /// Can this object be moved by collision? true if not\n pub is_static: bool,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":38,"ins":{"up_context":[{"change":3,"pos":1427}],"down_context":[{"change":3,"pos":1510}],"flag":"BLOCK","start":3334,"end":3472,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1427},"to":{"change":3,"start":1427,"end":1510},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" mut query: Query<("},{"Add":" Entity,"},{"Add":" &GlobalTransform,"},{"Add":" &mut Collidable,"},{"Add":" Option<&mut movement::Movable>,"},{"Add":" )>,"}],"del_contents":[{"Del":" mut query: Query<(Entity, &GlobalTransform, &mut Transform, &mut Collidable)>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":48,"ins":{"up_context":[{"change":3,"pos":1629}],"down_context":[{"change":3,"pos":1741}],"flag":"BLOCK","start":3473,"end":3573,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1629},"to":{"change":3,"start":1629,"end":1741},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" [(entity, gtransform, collidable, movable), (oentity, ogtransform, ocollidable, omovable)],"}],"del_contents":[{"Del":" [(entity, gtransform, mut transform, collidable), (oentity, ogtransform, mut otransform, ocollidable)],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":63,"ins":{"up_context":[{"change":3,"pos":2351}],"down_context":[{"change":3,"pos":2515}],"flag":"BLOCK","start":3574,"end":3823,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2351},"to":{"change":3,"start":2351,"end":2515},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" let mtv = axis * magnitude * (oaabb_min_proj - aabb_min_proj).signum();"},{"Add":" const IMPULSE: f32 = 5_000.0;"},{"Add":" // TODO This does not handle rotation, cuz we assume we can't do that."},{"Add":" match (movable, omovable) {"}],"del_contents":[{"Del":" let mtv = (axis * magnitude * (oaabb_min_proj - aabb_min_proj).signum()).extend(0.0);\n match (collidable.is_static, ocollidable.is_static) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":68,"ins":{"up_context":[{"change":3,"pos":2585}],"down_context":[{"change":3,"pos":2662}],"flag":"BLOCK","start":3824,"end":3914,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2585},"to":{"change":3,"start":2585,"end":2662},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" (None, None) => continue,"},{"Add":" (None, Some(mut omovable)) => {"}],"del_contents":[{"Del":" (true, true) => continue,\n (true, false) => {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":71,"ins":{"up_context":[{"change":3,"pos":2708}],"down_context":[{"change":3,"pos":2759}],"flag":"BLOCK","start":3915,"end":4099,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2708},"to":{"change":3,"start":2708,"end":2759},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" // otransform.translation += mtv;"},{"Add":" let mass = omovable.mass.max(1.0);"},{"Add":" omovable.acceleration += mtv * mass.recip() * IMPULSE;"}],"del_contents":[{"Del":" otransform.translation += mtv;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":75,"ins":{"up_context":[{"change":3,"pos":2777}],"down_context":[{"change":3,"pos":2812}],"flag":"BLOCK","start":4100,"end":4147,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2777},"to":{"change":3,"start":2777,"end":2812},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" (Some(mut movable), None) => {"}],"del_contents":[{"Del":" (false, true) => {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":77,"ins":{"up_context":[{"change":3,"pos":2857}],"down_context":[{"change":3,"pos":2907}],"flag":"BLOCK","start":4148,"end":4276,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2857},"to":{"change":3,"start":2857,"end":2907},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" let mass = movable.mass.max(1.0);"},{"Add":" movable.acceleration += mtv * mass.recip() * IMPULSE;"}],"del_contents":[{"Del":" transform.translation += mtv;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":80,"ins":{"up_context":[{"change":3,"pos":2925}],"down_context":[{"change":3,"pos":2961}],"flag":"BLOCK","start":4277,"end":4338,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2925},"to":{"change":3,"start":2925,"end":2961},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" (Some(mut movable), Some(mut omovable)) => {"}],"del_contents":[{"Del":" (false, false) => {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37},"path":"src/collision.rs","line":83,"ins":{"up_context":[{"change":3,"pos":3075}],"down_context":[{"change":3,"pos":3186}],"flag":"BLOCK","start":4339,"end":4600,"inode":{"change":3,"pos":37}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3075},"to":{"change":3,"start":3075,"end":3186},"introduced_by":3}],"inode":{"change":3,"pos":37}},"ins_contents":[{"Add":" let mass = movable.mass.max(1.0);"},{"Add":" let omass = omovable.mass.max(1.0);"},{"Add":" movable.acceleration += mtv * -IMPULSE * mass.recip();"},{"Add":" omovable.acceleration += mtv * IMPULSE * omass.recip();"}],"del_contents":[{"Del":" transform.translation -= mtv / 2.;\n otransform.translation += mtv / 2.;\n"}]}}],"owner":"Jengamon","repo":"acerola_jam0_gam","token":"Lz4AUypoOjoQYgZt0F0acqR6V8zqtae+p4U/1VFpNzw=","login":null}

…

Dependencies

Change contents