diff --git a/Makefile b/Makefile index 3957dd3..577a552 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,8 @@ clean.dist: run: release @cargo run --release +all: test release release.wasm + release: @cargo rustc --release -- -C prefer-dynamic release.wasm: diff --git a/src~/base_domik_view.rs b/src/base_domik_view.rs similarity index 97% rename from src~/base_domik_view.rs rename to src/base_domik_view.rs index a6aea6f..fcad8ac 100644 --- a/src~/base_domik_view.rs +++ b/src/base_domik_view.rs @@ -1,6 +1,5 @@ const VERS: &str = "v0.1.0"; -//use crate::raadbg::log; use crate::domik_ui_elements::*; diff --git a/src~/domik_ui_elements/mod.rs b/src/domik_ui_elements/mod.rs similarity index 100% rename from src~/domik_ui_elements/mod.rs rename to src/domik_ui_elements/mod.rs diff --git a/src~/log_view.rs b/src/log_view.rs similarity index 100% rename from src~/log_view.rs rename to src/log_view.rs diff --git a/src~/main.rs b/src/main.rs similarity index 88% rename from src~/main.rs rename to src/main.rs index df4eeab..5f8ab90 100644 --- a/src~/main.rs +++ b/src/main.rs @@ -11,12 +11,11 @@ mod domik_ui_elements; mod base_domik_view; mod test_view; -mod raadbg; -use raadbg::log; +use raalog::*; #[ cfg(not(target_arch = "wasm32")) ] fn main() -> Result<(), eframe::Error> { - log::simple("[BINARY]: MAIN has beed entered.."); + log::info("MAIN has beed entered.."); let options = eframe::NativeOptions { viewport: egui::ViewportBuilder::default() @@ -35,7 +34,7 @@ fn main() -> Result<(), eframe::Error> { #[ cfg(target_arch = "wasm32") ] fn main() { - log::simple("[WASM]: MAIN has beed entered.."); + log::info("MAIN has beed entered.."); console_error_panic_hook::set_once(); diff --git a/src~/player_to_audio/audio_core/audio_core_parameters.rs b/src/player_to_audio/audio_core/audio_core_parameters.rs similarity index 100% rename from src~/player_to_audio/audio_core/audio_core_parameters.rs rename to src/player_to_audio/audio_core/audio_core_parameters.rs diff --git a/src~/player_to_audio/audio_core/mod.rs b/src/player_to_audio/audio_core/mod.rs similarity index 100% rename from src~/player_to_audio/audio_core/mod.rs rename to src/player_to_audio/audio_core/mod.rs diff --git a/src~/player_to_audio/audio_core/render_holder.rs b/src/player_to_audio/audio_core/render_holder.rs similarity index 100% rename from src~/player_to_audio/audio_core/render_holder.rs rename to src/player_to_audio/audio_core/render_holder.rs diff --git a/src~/player_to_audio/midi_lib/midi_message.rs b/src/player_to_audio/midi_lib/midi_message.rs similarity index 100% rename from src~/player_to_audio/midi_lib/midi_message.rs rename to src/player_to_audio/midi_lib/midi_message.rs diff --git a/src~/player_to_audio/midi_lib/midi_receiver.rs b/src/player_to_audio/midi_lib/midi_receiver.rs similarity index 100% rename from src~/player_to_audio/midi_lib/midi_receiver.rs rename to src/player_to_audio/midi_lib/midi_receiver.rs diff --git a/src~/player_to_audio/midi_lib/midi_sequence.rs b/src/player_to_audio/midi_lib/midi_sequence.rs similarity index 100% rename from src~/player_to_audio/midi_lib/midi_sequence.rs rename to src/player_to_audio/midi_lib/midi_sequence.rs diff --git a/src~/player_to_audio/midi_lib/mod.rs b/src/player_to_audio/midi_lib/mod.rs similarity index 100% rename from src~/player_to_audio/midi_lib/mod.rs rename to src/player_to_audio/midi_lib/mod.rs diff --git a/src~/player_to_audio/midi_sequencer.rs b/src/player_to_audio/midi_sequencer.rs similarity index 100% rename from src~/player_to_audio/midi_sequencer.rs rename to src/player_to_audio/midi_sequencer.rs diff --git a/src~/player_to_audio/mod.rs b/src/player_to_audio/mod.rs similarity index 100% rename from src~/player_to_audio/mod.rs rename to src/player_to_audio/mod.rs diff --git a/src~/player_to_audio/synths/mod.rs b/src/player_to_audio/synths/mod.rs similarity index 100% rename from src~/player_to_audio/synths/mod.rs rename to src/player_to_audio/synths/mod.rs diff --git a/src~/player_to_audio/synths/rusty_synth_wrapper.rs b/src/player_to_audio/synths/rusty_synth_wrapper.rs similarity index 100% rename from src~/player_to_audio/synths/rusty_synth_wrapper.rs rename to src/player_to_audio/synths/rusty_synth_wrapper.rs diff --git a/src~/player_to_audio/synths/simple_synth.rs b/src/player_to_audio/synths/simple_synth.rs similarity index 100% rename from src~/player_to_audio/synths/simple_synth.rs rename to src/player_to_audio/synths/simple_synth.rs diff --git a/src~/player_to_audio/uni_source_variant.rs b/src/player_to_audio/uni_source_variant.rs similarity index 100% rename from src~/player_to_audio/uni_source_variant.rs rename to src/player_to_audio/uni_source_variant.rs diff --git a/src~/root_app.rs b/src/root_app.rs similarity index 94% rename from src~/root_app.rs rename to src/root_app.rs index 3480a0e..903d0de 100644 --- a/src~/root_app.rs +++ b/src/root_app.rs @@ -1,7 +1,7 @@ #![allow(non_snake_case)] +use raalog::*; use crate::log_view::LogView; -use crate::raadbg::log; use crate::base_domik_view::BaseDomikView; use crate::test_view::TestView; @@ -36,7 +36,7 @@ impl Default for RootApp { impl RootApp { pub fn new(cc: &eframe::CreationContext) -> Self { if let Some(storage) = cc.storage{ - log::simple("trying to load.."); + log::info("trying to load.."); return eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default(); } Default::default() @@ -46,9 +46,9 @@ impl RootApp { impl eframe::App for RootApp { fn save(&mut self, storage: &mut dyn eframe::Storage) { - log::simple("saving.."); + log::info("saving.."); eframe::set_value(storage, eframe::APP_KEY, self); - log::simple("..saved"); + log::info("..saved"); } fn update( &mut self, ctx: &egui::Context, _frame: &mut eframe::Frame ) { diff --git a/src~/test_view.rs b/src/test_view.rs similarity index 99% rename from src~/test_view.rs rename to src/test_view.rs index 3a54adc..8551d27 100644 --- a/src~/test_view.rs +++ b/src/test_view.rs @@ -1,5 +1,4 @@ -//use crate::raadbg::log; use egui::Color32;