diff --git a/Cargo.lock b/Cargo.lock index 2750d753..ae297b32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -248,7 +248,7 @@ dependencies = [ ] [[package]] -name = "cart_demo" +name = "cart-demo" version = "0.1.0" [[package]] @@ -717,7 +717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] -name = "host_desktop" +name = "host-desktop" version = "0.1.0" dependencies = [ "cpal", diff --git a/Cargo.toml b/Cargo.toml index f273094a..f77766cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ - "crates/core", - "crates/host_desktop", - "crates/cart_demo", + "crates/prometeu-core", + "crates/host-desktop", + "crates/cart-demo", ] resolver = "2" diff --git a/README.md b/README.md index 68c833be..2f550d10 100644 --- a/README.md +++ b/README.md @@ -46,25 +46,25 @@ runtime/ Cargo.toml # Workspace root rust-toolchain.toml # Versão do Rust (fixa) crates/ - core/ # PROMETEU Core (hardware lógico) - host_desktop/ # Host desktop (janela, input real, present) - cart_demo/ # Cartucho/demo hardcoded (temporário) + prometeu-core/ # PROMETEU Core (hardware lógico) + host-desktop/ # Host desktop (janela, input real, present) + cart-demo/ # Cartucho/demo hardcoded (temporário) ``` -### crates/core +### crates/prometeu-core Contém o **núcleo do PROMETEU**: - loop lógico - periféricos - framebuffer - nenhuma dependência de sistema operacional -### crates/host_desktop +### crates/host-desktop Implementação de host para desktop: - cria janela - traduz teclado/mouse/touch do SO para o core - apresenta o framebuffer na tela -### crates/cart_demo +### crates/cart-demo Código de demonstração hardcoded. Será substituído futuramente por: - cartuchos @@ -104,7 +104,7 @@ Na raiz do repositório: ```bash cargo build -cargo run -p host_desktop +cargo run -p host-desktop ``` No início, o host apenas valida: diff --git a/crates/cart_demo/Cargo.toml b/crates/cart-demo/Cargo.toml similarity index 76% rename from crates/cart_demo/Cargo.toml rename to crates/cart-demo/Cargo.toml index 7337faaf..546f75d1 100644 --- a/crates/cart_demo/Cargo.toml +++ b/crates/cart-demo/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cart_demo" +name = "cart-demo" version = "0.1.0" edition = "2024" diff --git a/crates/cart_demo/src/lib.rs b/crates/cart-demo/src/lib.rs similarity index 100% rename from crates/cart_demo/src/lib.rs rename to crates/cart-demo/src/lib.rs diff --git a/crates/host_desktop/Cargo.toml b/crates/host-desktop/Cargo.toml similarity index 57% rename from crates/host_desktop/Cargo.toml rename to crates/host-desktop/Cargo.toml index 04eaa922..edeb0800 100644 --- a/crates/host_desktop/Cargo.toml +++ b/crates/host-desktop/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "host_desktop" +name = "host-desktop" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] -prometeu-core = { path = "../core" } +prometeu-core = { path = "../prometeu-core" } winit = "0.30.12" pixels = "0.15.0" cpal = "0.15.3" diff --git a/crates/host_desktop/src/audio_mixer.rs b/crates/host-desktop/src/audio_mixer.rs similarity index 100% rename from crates/host_desktop/src/audio_mixer.rs rename to crates/host-desktop/src/audio_mixer.rs diff --git a/crates/host_desktop/src/main.rs b/crates/host-desktop/src/main.rs similarity index 100% rename from crates/host_desktop/src/main.rs rename to crates/host-desktop/src/main.rs diff --git a/crates/host_desktop/src/prometeu_runner.rs b/crates/host-desktop/src/prometeu_runner.rs similarity index 99% rename from crates/host_desktop/src/prometeu_runner.rs rename to crates/host-desktop/src/prometeu_runner.rs index 563d4106..ec215002 100644 --- a/crates/host_desktop/src/prometeu_runner.rs +++ b/crates/host-desktop/src/prometeu_runner.rs @@ -182,7 +182,7 @@ impl ApplicationHandler for PrometeuRunner { // Borrow mutável do frame (dura só dentro deste bloco) let frame = pixels.frame_mut(); - // Borrow imutável do core (campo diferente, ok) + // Borrow imutável do prometeu-core (campo diferente, ok) let src = self.hardware.gfx.front_buffer(); draw_rgb565_to_rgba8(src, frame); diff --git a/crates/core/Cargo.toml b/crates/prometeu-core/Cargo.toml similarity index 79% rename from crates/core/Cargo.toml rename to crates/prometeu-core/Cargo.toml index a28c407d..cb7a9eb4 100644 --- a/crates/core/Cargo.toml +++ b/crates/prometeu-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "prometeu-core" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] \ No newline at end of file diff --git a/crates/core/src/firmware/firmware.rs b/crates/prometeu-core/src/firmware/firmware.rs similarity index 100% rename from crates/core/src/firmware/firmware.rs rename to crates/prometeu-core/src/firmware/firmware.rs diff --git a/crates/core/src/firmware/firmware_state.rs b/crates/prometeu-core/src/firmware/firmware_state.rs similarity index 100% rename from crates/core/src/firmware/firmware_state.rs rename to crates/prometeu-core/src/firmware/firmware_state.rs diff --git a/crates/core/src/firmware/mod.rs b/crates/prometeu-core/src/firmware/mod.rs similarity index 100% rename from crates/core/src/firmware/mod.rs rename to crates/prometeu-core/src/firmware/mod.rs diff --git a/crates/core/src/hardware/audio.rs b/crates/prometeu-core/src/hardware/audio.rs similarity index 100% rename from crates/core/src/hardware/audio.rs rename to crates/prometeu-core/src/hardware/audio.rs diff --git a/crates/core/src/hardware/gfx.rs b/crates/prometeu-core/src/hardware/gfx.rs similarity index 100% rename from crates/core/src/hardware/gfx.rs rename to crates/prometeu-core/src/hardware/gfx.rs diff --git a/crates/core/src/hardware/hardware.rs b/crates/prometeu-core/src/hardware/hardware.rs similarity index 100% rename from crates/core/src/hardware/hardware.rs rename to crates/prometeu-core/src/hardware/hardware.rs diff --git a/crates/core/src/hardware/input_signal.rs b/crates/prometeu-core/src/hardware/input_signal.rs similarity index 100% rename from crates/core/src/hardware/input_signal.rs rename to crates/prometeu-core/src/hardware/input_signal.rs diff --git a/crates/core/src/hardware/mod.rs b/crates/prometeu-core/src/hardware/mod.rs similarity index 100% rename from crates/core/src/hardware/mod.rs rename to crates/prometeu-core/src/hardware/mod.rs diff --git a/crates/core/src/hardware/pad.rs b/crates/prometeu-core/src/hardware/pad.rs similarity index 100% rename from crates/core/src/hardware/pad.rs rename to crates/prometeu-core/src/hardware/pad.rs diff --git a/crates/core/src/hardware/touch.rs b/crates/prometeu-core/src/hardware/touch.rs similarity index 100% rename from crates/core/src/hardware/touch.rs rename to crates/prometeu-core/src/hardware/touch.rs diff --git a/crates/core/src/lib.rs b/crates/prometeu-core/src/lib.rs similarity index 100% rename from crates/core/src/lib.rs rename to crates/prometeu-core/src/lib.rs diff --git a/crates/core/src/model/button.rs b/crates/prometeu-core/src/model/button.rs similarity index 100% rename from crates/core/src/model/button.rs rename to crates/prometeu-core/src/model/button.rs diff --git a/crates/core/src/model/cartridge.rs b/crates/prometeu-core/src/model/cartridge.rs similarity index 100% rename from crates/core/src/model/cartridge.rs rename to crates/prometeu-core/src/model/cartridge.rs diff --git a/crates/core/src/model/color.rs b/crates/prometeu-core/src/model/color.rs similarity index 100% rename from crates/core/src/model/color.rs rename to crates/prometeu-core/src/model/color.rs diff --git a/crates/core/src/model/mod.rs b/crates/prometeu-core/src/model/mod.rs similarity index 100% rename from crates/core/src/model/mod.rs rename to crates/prometeu-core/src/model/mod.rs diff --git a/crates/core/src/model/sample.rs b/crates/prometeu-core/src/model/sample.rs similarity index 100% rename from crates/core/src/model/sample.rs rename to crates/prometeu-core/src/model/sample.rs diff --git a/crates/core/src/model/sprite.rs b/crates/prometeu-core/src/model/sprite.rs similarity index 100% rename from crates/core/src/model/sprite.rs rename to crates/prometeu-core/src/model/sprite.rs diff --git a/crates/core/src/model/tile.rs b/crates/prometeu-core/src/model/tile.rs similarity index 100% rename from crates/core/src/model/tile.rs rename to crates/prometeu-core/src/model/tile.rs diff --git a/crates/core/src/model/tile_bank.rs b/crates/prometeu-core/src/model/tile_bank.rs similarity index 100% rename from crates/core/src/model/tile_bank.rs rename to crates/prometeu-core/src/model/tile_bank.rs diff --git a/crates/core/src/model/tile_layer.rs b/crates/prometeu-core/src/model/tile_layer.rs similarity index 100% rename from crates/core/src/model/tile_layer.rs rename to crates/prometeu-core/src/model/tile_layer.rs diff --git a/crates/core/src/prometeu_hub/mod.rs b/crates/prometeu-core/src/prometeu_hub/mod.rs similarity index 100% rename from crates/core/src/prometeu_hub/mod.rs rename to crates/prometeu-core/src/prometeu_hub/mod.rs diff --git a/crates/core/src/prometeu_hub/prometeu_hub.rs b/crates/prometeu-core/src/prometeu_hub/prometeu_hub.rs similarity index 100% rename from crates/core/src/prometeu_hub/prometeu_hub.rs rename to crates/prometeu-core/src/prometeu_hub/prometeu_hub.rs diff --git a/crates/core/src/prometeu_os/mod.rs b/crates/prometeu-core/src/prometeu_os/mod.rs similarity index 100% rename from crates/core/src/prometeu_os/mod.rs rename to crates/prometeu-core/src/prometeu_os/mod.rs diff --git a/crates/core/src/prometeu_os/prometeu_os.rs b/crates/prometeu-core/src/prometeu_os/prometeu_os.rs similarity index 100% rename from crates/core/src/prometeu_os/prometeu_os.rs rename to crates/prometeu-core/src/prometeu_os/prometeu_os.rs diff --git a/crates/core/src/vm/call_frame.rs b/crates/prometeu-core/src/vm/call_frame.rs similarity index 100% rename from crates/core/src/vm/call_frame.rs rename to crates/prometeu-core/src/vm/call_frame.rs diff --git a/crates/core/src/vm/mod.rs b/crates/prometeu-core/src/vm/mod.rs similarity index 100% rename from crates/core/src/vm/mod.rs rename to crates/prometeu-core/src/vm/mod.rs diff --git a/crates/core/src/vm/native_interface.rs b/crates/prometeu-core/src/vm/native_interface.rs similarity index 100% rename from crates/core/src/vm/native_interface.rs rename to crates/prometeu-core/src/vm/native_interface.rs diff --git a/crates/core/src/vm/opcode.rs b/crates/prometeu-core/src/vm/opcode.rs similarity index 100% rename from crates/core/src/vm/opcode.rs rename to crates/prometeu-core/src/vm/opcode.rs diff --git a/crates/core/src/vm/program.rs b/crates/prometeu-core/src/vm/program.rs similarity index 100% rename from crates/core/src/vm/program.rs rename to crates/prometeu-core/src/vm/program.rs diff --git a/crates/core/src/vm/value.rs b/crates/prometeu-core/src/vm/value.rs similarity index 100% rename from crates/core/src/vm/value.rs rename to crates/prometeu-core/src/vm/value.rs diff --git a/crates/core/src/vm/virtual_machine.rs b/crates/prometeu-core/src/vm/virtual_machine.rs similarity index 100% rename from crates/core/src/vm/virtual_machine.rs rename to crates/prometeu-core/src/vm/virtual_machine.rs