jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +11 -1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28416fc624 - Show all commits

7
examples/PoolBox/iso/Config.xml
View File

@ -14,7 +14,7 @@
<Overlay name = "FCO.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.font_cycler</Overlay> <Overlay name = "FCO.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.font_cycler</Overlay>
<Overlay name = "SCO.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.screen_center</Overlay> <Overlay name = "SCO.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.screen_center</Overlay>
<Directory name="ASSETS" hidden = "true"> <Directory name = "ASSETS" hidden = "true">
<Directory name = "MAIN"> <Directory name = "MAIN">
<File name = "PACO.BIN" lz4 = "already">../assets/bin/Paco.bin</File> <File name = "PACO.BIN" lz4 = "already">../assets/bin/Paco.bin</File>
<File name = "DFISH.BIN" lz4 = "already">../assets/bin/doener_fish.bin</File> <File name = "DFISH.BIN" lz4 = "already">../assets/bin/doener_fish.bin</File>
@ -31,6 +31,11 @@
<File name = "TEX.BIN" lz4 = "already">../assets/bin/TexturePage.bin</File> <File name = "TEX.BIN" lz4 = "already">../assets/bin/TexturePage.bin</File>
<File name = "ICON.BIN" lz4 = "already">../assets/bin/IconTexture.bin</File> <File name = "ICON.BIN" lz4 = "already">../assets/bin/IconTexture.bin</File>
</Directory> </Directory>
<Directory name = "XAAUDIO" hidden = "true">
<XA-Audio name = "FOX.XA">
<Channel>../assets/bin/fox.xa</Channel>
</XA-Audio>
</Directory>
</Track> </Track>
<CD_Audio>../assets/audio/Evacuation_cdda.wav</CD_Audio> <CD_Audio>../assets/audio/Evacuation_cdda.wav</CD_Audio>
</ISO_Project> </ISO_Project>

5
src/Tools/psxcdgen_ex/src/config_reader/xml.rs
View File

@ -85,6 +85,10 @@ fn parse_track(track: roxmltree::Node, config: &mut Configuration) -> Result<(),
Ok(File{common, path, kind: FileKind::Overlay(PathBuf::from(file.attribute(attribute_names::LBA_SOURCE).unwrap_or_default()))}) Ok(File{common, path, kind: FileKind::Overlay(PathBuf::from(file.attribute(attribute_names::LBA_SOURCE).unwrap_or_default()))})
} }
fn parse_xa_audio(_file: roxmltree::Node, _is_hidden: bool) -> Result<File, Error> {
Err(Error::not_implemented("XA-Audio not supported yet"))
}
fn parse_file_system(cur_node: roxmltree::Node, root: &mut Directory, mut is_hidden: bool) -> Result<(), Error> { fn parse_file_system(cur_node: roxmltree::Node, root: &mut Directory, mut is_hidden: bool) -> Result<(), Error> {
for node in cur_node.children() { for node in cur_node.children() {
if node.is_element() { if node.is_element() {
@ -92,6 +96,7 @@ fn parse_track(track: roxmltree::Node, config: &mut Configuration) -> Result<(),
"File" => root.add_file(parse_regular_file(node, is_hidden)?), "File" => root.add_file(parse_regular_file(node, is_hidden)?),
"Main" => root.add_file(parse_main_file(node)?), "Main" => root.add_file(parse_main_file(node)?),
"Overlay" => root.add_file(parse_overlay_file(node, is_hidden)?), "Overlay" => root.add_file(parse_overlay_file(node, is_hidden)?),
"XA-Audio" => root.add_file(parse_xa_audio(node, is_hidden)?),
"Directory" => { "Directory" => {
is_hidden |= parse_boolean_attribute(&node, attribute_names::HIDDEN)?; is_hidden |= parse_boolean_attribute(&node, attribute_names::HIDDEN)?;
let mut new_dir = Directory::new(node.attribute(attribute_names::NAME).unwrap_or_default(), is_hidden); let mut new_dir = Directory::new(node.attribute(attribute_names::NAME).unwrap_or_default(), is_hidden);