{"header":{"message":"fix: just use bevy_asset_loader","description":null,"timestamp":"2024-03-04T04:54:02.730328Z","authors":[{}]},"hash":"JNVXXPEIDBTMUTQT5T5WWJXPZCDBEEBG5QXA3JKXYP5SORBVUMMQC","authors":[{"login":"Jengamon","key":"AFEuLzv5ecUJzaewFwoWh4jeCDqWZztr7dswYwyG9vfU"}],"deps":{"hashes":[["JNVXXPEIDBTMUTQT5T5WWJXPZCDBEEBG5QXA3JKXYP5SORBVUMMQC","fix: just use bevy_asset_loader"],["AA",null],["EK273J7XN5BRDC6T24XLZ2LZP2SLDT2Y4AVPIGCQTY2IMEKHDZBAC","fix(sfxr): organization"],["MKB2A5XCWBZO2E6QFE6PD36LF3IGMJCGJB5TGMRAPSKCKHS75ISAC","fix: more modular"],["JV22QZEHUOIQD6B3P5F3CT5H3FFR4VH5Q64XG2TQKSTSXEVBH6MAC","fix(fundsp): move public endpoint to Track"],["X6Q2DCTTZVQ2HCA4BFLKONTXJ2AYHTBBZCARASBEKEDCDZ2YSPUQC","fix: use rig logic, and find good clamp"],["FIO72ZSANLC3OS5IKSZ4PUAIBFAAHZA6EFGHMHP6YVFGTOJ7PPKQC","fix(fundsp): the flow is real"],["CHX7R6AMVYVLZJ7DSE6E3B4TCJPRWS2V7ZEJIU2UQ3SSLRKYMJWQC","feat(fundsp): create sfxr, goal to have sfxr on a stick"],["DHVMRJ4SO4DGM64HCY5K6AFO6O3VIFYJ7GTFUSXH433JYT3VNZDQC","fix(debug): simplify oscilloscope logic"]],"deps":["EK273J7XN5BRDC6T24XLZ2LZP2SLDT2Y4AVPIGCQTY2IMEKHDZBAC"],"known":["MKB2A5XCWBZO2E6QFE6PD36LF3IGMJCGJB5TGMRAPSKCKHS75ISAC","X6Q2DCTTZVQ2HCA4BFLKONTXJ2AYHTBBZCARASBEKEDCDZ2YSPUQC","DHVMRJ4SO4DGM64HCY5K6AFO6O3VIFYJ7GTFUSXH433JYT3VNZDQC","JV22QZEHUOIQD6B3P5F3CT5H3FFR4VH5Q64XG2TQKSTSXEVBH6MAC","FIO72ZSANLC3OS5IKSZ4PUAIBFAAHZA6EFGHMHP6YVFGTOJ7PPKQC","CHX7R6AMVYVLZJ7DSE6E3B4TCJPRWS2V7ZEJIU2UQ3SSLRKYMJWQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/sfxr.rs","line":14,"ins":{"up_context":[{"change":3,"pos":337}],"down_context":[{"change":3,"pos":384}],"flag":"BLOCK","start":0,"end":133,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":337},"to":{"change":3,"start":337,"end":384},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":" app.init_asset_loader::()"},{"Add":" .init_asset_loader::()"},{"Add":" .init_asset::();"}],"del_contents":[{"Del":" app.init_asset_loader::();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/sfxr.rs","line":20,"ins":{"up_context":[{"change":3,"pos":393}],"down_context":[{"change":2,"pos":0}],"flag":"BLOCK","start":134,"end":264,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":393},"to":{"change":3,"start":393,"end":471},"introduced_by":3}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":"#[derive(serde::Deserialize, serde::Serialize, Asset, TypePath, Debug)]"},{"Add":"pub enum Sfxr {"},{"Add":" PinkExp { amp: Option, f: f32 },"}],"del_contents":[{"Del":"#[derive(serde::Deserialize)]\nstruct Sfxr {\n amp: Option,\n f: f32,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":32},"path":"src/sfxr.rs","line":27,"ins":{"up_context":[{"change":2,"pos":67}],"down_context":[{"change":2,"pos":160}],"flag":"BLOCK","start":265,"end":1106,"inode":{"change":3,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":67},"to":{"change":2,"start":67,"end":160},"introduced_by":2}],"inode":{"change":3,"pos":32}},"ins_contents":[{"Add":" match sfxr {"},{"Add":" Sfxr::PinkExp { amp, f } => {"},{"Add":" Machine::new(pink() * amp.unwrap_or(1.0) * envelope(move |t| exp(-f * t)))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"// Also let's us load in the Sfxr itself, for debugging purposes"},{"Add":"#[derive(Default)]"},{"Add":"struct DebugSfxrLoader;"},{"Add":""},{"Add":"impl AssetLoader for DebugSfxrLoader {"},{"Add":" type Asset = Sfxr;"},{"Add":" type Settings = ();"},{"Add":" type Error = SfxrLoaderError;"},{"Add":" fn load<'a>("},{"Add":" &'a self,"},{"Add":" reader: &'a mut Reader,"},{"Add":" _settings: &'a Self::Settings,"},{"Add":" _load_context: &'a mut LoadContext,"},{"Add":" ) -> BoxedFuture<'a, Result> {"},{"Add":" Box::pin(async move {"},{"Add":" let mut bytes = Vec::new();"},{"Add":" reader.read_to_end(&mut bytes).await?;"},{"Add":" let sfxr = ron::de::from_bytes::(&bytes)?;"},{"Add":" Ok(sfxr)"},{"Add":" })"}],"del_contents":[{"Del":" Machine::new(pink() * sfxr.amp.unwrap_or(1.0) * envelope(move |t| exp(-sfxr.f * t)))\n"}]}},{"Edit":{"inode":{"change":3,"pos":32},"path":"src/sfxr.rs","line":56,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":166}],"down_context":[{"change":3,"pos":471}],"flag":"BLOCK","start":1107,"end":1174,"inode":{"change":3,"pos":32}}},"contents":[{"Add":""},{"Add":" fn extensions(&self) -> &[&str] {"},{"Add":" &[\"sfxr.ron\"]"},{"Add":" }"}]}},{"Edit":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":8,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":254}],"down_context":[{"change":3,"pos":254}],"flag":"BLOCK","start":1175,"end":1210,"inode":{"change":3,"pos":120}}},"contents":[{"Add":"use bevy_asset_loader::prelude::*;"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":16,"ins":{"up_context":[{"change":3,"pos":589}],"down_context":[{"change":3,"pos":734}],"flag":"BLOCK","start":1211,"end":1481,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":589},"to":{"change":3,"start":589,"end":734},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":" app.add_systems(Update, debug_view_window.run_if(in_state(GameState::InRun)));"},{"Add":" }"},{"Add":""},{"Add":" fn finish(&self, app: &mut App) {"},{"Add":" app.configure_loading_state("},{"Add":" LoadingStateConfig::new(GameState::Booting).load_collection::(),"},{"Add":" );"}],"del_contents":[{"Del":" app.add_systems(Update, debug_view_window.run_if(in_state(GameState::InRun)))\n .add_systems(Startup, setup_debug_collection);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":26,"ins":{"up_context":[{"change":3,"pos":743}],"down_context":[{"change":3,"pos":763}],"flag":"BLOCK","start":1482,"end":1519,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":743},"to":{"change":3,"start":743,"end":763},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":"#[derive(Resource, AssetCollection)]"}],"del_contents":[{"Del":"#[derive(Resource)]\n"}]}},{"Edit":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":28,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":784}],"down_context":[{"change":3,"pos":784}],"flag":"BLOCK","start":1520,"end":1558,"inode":{"change":3,"pos":120}}},"contents":[{"Add":" #[asset(path = \"debug.sfxr.ron\")]"}]}},{"Edit":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":30,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":832}],"down_context":[{"change":3,"pos":832}],"flag":"BLOCK","start":1559,"end":1647,"inode":{"change":3,"pos":120}}},"contents":[{"Add":" #[asset(path = \"debug.sfxr.ron\")]"},{"Add":" noisy_handle_sfxr: Handle,"}]}},{"Edit":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":34,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":332},"to":{"change":3,"start":835,"end":862},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":862},"to":{"change":3,"start":1670,"end":1765},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1765},"to":{"change":3,"start":918,"end":950},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":918},"to":{"change":3,"start":918,"end":950},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":950},"to":{"change":3,"start":1766,"end":2012},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2012},"to":{"change":3,"start":1121,"end":1184},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1121},"to":{"change":3,"start":1121,"end":1184},"introduced_by":3}],"inode":{"change":3,"pos":120}}},"contents":[{"Del":"fn setup_debug_collection(\n"},{"Del":" // mut machines: ResMut>,\n asset_server: Res,\n"},{"Del":" mut commands: Commands,\n) {\n"},{"Del":" // use fundsp::hacker32::*;\n // let noisy_handle = machines.add(fundsp_kira::Machine::new(\n // pink() * envelope(|t| exp(-5.0 * t)),\n // // pink() * 0.2,\n // ));\n let noisy_handle = asset_server.load(\"debug.sfxr.ron\");\n"},{"Del":"\n commands.insert_resource(DebugAssets { noisy_handle })\n}\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":41,"ins":{"up_context":[{"change":3,"pos":60}],"down_context":[{"change":3,"pos":642}],"flag":"BLOCK","start":1648,"end":1722,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60},"to":{"change":3,"start":1208,"end":1246},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":" assets: Res,"},{"Add":""},{"Add":" sfxrs: Res>,"}],"del_contents":[{"Del":" assets: Option>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":58,"ins":{"up_context":[{"change":3,"pos":1108}],"down_context":[{"change":3,"pos":1433}],"flag":"BLOCK","start":1723,"end":1989,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1108},"to":{"change":3,"start":1247,"end":1433},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":" track.play(assets.noisy_handle.clone());"},{"Add":" }"},{"Add":""},{"Add":" ui.collapsing(\"Debug Sfxr\", |ui| {"},{"Add":" // Show our homework"},{"Add":" if let Some(sfxr) = sfxrs.get(assets.noisy_handle_sfxr.clone()) {"},{"Add":" ui.label(format!(\"{sfxr:#?}\"));"}],"del_contents":[{"Del":" if let Some(assets) = assets {\n track.play(assets.noisy_handle.clone());\n } else {\n warn!(\"Debug asset noisy_handle not loaded...\");\n"}]}},{"Replacement":{"inode":{"change":3,"pos":120},"path":"src/debug.rs","line":66,"ins":{"up_context":[{"change":3,"pos":1447}],"down_context":[{"change":3,"pos":61}],"flag":"BLOCK","start":1990,"end":2002,"inode":{"change":3,"pos":120}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1447},"to":{"change":3,"start":1378,"end":1388},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1963},"to":{"change":3,"start":1378,"end":1388},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1378},"to":{"change":3,"start":1378,"end":1388},"introduced_by":3}],"inode":{"change":3,"pos":120}},"ins_contents":[{"Add":" });"}],"del_contents":[{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":2052},"path":"assets/debug.sfxr.ron","line":1,"ins":{"up_context":[{"change":3,"pos":2052}],"down_context":[{"change":2,"pos":320}],"flag":"BLOCK","start":2003,"end":2012,"inode":{"change":3,"pos":2052}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2052},"to":{"change":3,"start":2053,"end":2055},"introduced_by":3}],"inode":{"change":3,"pos":2052}},"ins_contents":[{"Add":"PinkExp("}],"del_contents":[{"Del":"(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":2052},"path":"assets/debug.sfxr.ron","line":3,"ins":{"up_context":[{"change":2,"pos":343}],"down_context":[{"change":3,"pos":2087}],"flag":"BLOCK","start":2013,"end":2026,"inode":{"change":3,"pos":2052}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":343},"to":{"change":2,"start":343,"end":355},"introduced_by":2}],"inode":{"change":3,"pos":2052}},"ins_contents":[{"Add":" f: 20.0,"}],"del_contents":[{"Del":" f: 1.0,\n"}]}}],"owner":"Jengamon","repo":"acerola_jam0_gam","token":"Jsr9ykylutlDfrjWfTABFCokF+vJ1ctV49z4w4zOcrw=","login":null}

…

Dependencies

Change contents