mirror of
https://github.com/pmret/papermario.git
synced 2024-09-19 16:01:48 +02:00
Merge pull request #97 from nanaian/rip-star-rod
Remove Star Rod submodule
This commit is contained in:
Ethan Roseman
GitHub
commit
fc6e7ba903
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,6 +1,3 @@
|
||||
[submodule "tools/star-rod"]
|
||||
path = tools/star-rod
|
||||
url = https://github.com/nanaian/star-rod.git
|
||||
[submodule "tools/n64splat"]
|
||||
path = tools/n64splat
|
||||
url = https://github.com/ethteck/n64splat.git
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 9df51d29626ffae94ff7ed03c252c24e71430105
|
||||
@ -1,87 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import os
|
||||
import re
|
||||
from glob import glob
|
||||
from stringcase import constcase, pascalcase # pip install stringcase
|
||||
|
||||
DIR = os.path.dirname(__file__)
|
||||
SR_DATABASE = os.path.join(DIR, "star-rod/database")
|
||||
FILES = (
|
||||
glob(os.path.join(SR_DATABASE, "types/*.enum")) +
|
||||
glob(os.path.join(SR_DATABASE, "types/**/*.enum")) +
|
||||
glob(os.path.join(SR_DATABASE, "types/*.flags")) +
|
||||
glob(os.path.join(SR_DATABASE, "types/**/*.flags"))
|
||||
)
|
||||
|
||||
with open(os.path.join(DIR, "../include/enums.h"), "w") as h:
|
||||
h.write("""#ifndef _ENUMS_H_
|
||||
#define _ENUMS_H_
|
||||
|
||||
#include "ultra64.h"
|
||||
#include "types.h"
|
||||
|
||||
""")
|
||||
|
||||
for filename in FILES:
|
||||
with open(filename, "r") as file:
|
||||
lines = file.readlines()
|
||||
|
||||
# Get enum attributes
|
||||
namespace = pascalcase(re.match(r"[^ \t]*", lines[0]).group(0))
|
||||
library_name = re.match(r"[^ \t]*", lines[1]).group(0)
|
||||
reverse = True if re.match(r"[^ \t]*", lines[2]).group(0) == "true" else False
|
||||
|
||||
# Renamed namespaces
|
||||
if namespace == "Item": namespace = "ItemId"
|
||||
if namespace == "Sound": namespace = "SoundId"
|
||||
if namespace == "Partner": namespace = "PartnerId"
|
||||
if namespace == "Sprite": namespace = "SpriteId"
|
||||
if namespace == "Outcome": namespace = "EncounterOutcome"
|
||||
#if namespace == "Phase": namespace = "BattlePhase"
|
||||
if namespace == "Actor": namespace = "ActorId"
|
||||
#if namespace == "Status": namespace = "ActorStatus"
|
||||
#if namespace == "StatusFlags": namespace = "ActorStatusFlags"
|
||||
#if namespace == "Event": namespace = "BattleEvent"
|
||||
if namespace == "Decoration": namespace = "DecorationId"
|
||||
if namespace == "Npc": namespace = "NpcId"
|
||||
if namespace == "Trigger": namespace = "TriggerFlags"
|
||||
if namespace == "Anim": continue
|
||||
if namespace == "Entity": continue # just ram addresses
|
||||
|
||||
# Get a list of tuples containing (name, value)
|
||||
items = []
|
||||
name_max_len = 0
|
||||
comment = False
|
||||
for line in lines[4:]:
|
||||
line = line.rstrip("\n")
|
||||
if not comment and not line.startswith("%") and "=" in line:
|
||||
m = re.match(r"[ \t]*?([^ \t]*)[ \t]*=[ \t]*([^ \t]*)", line)
|
||||
if m:
|
||||
if reverse:
|
||||
name = m.group(1)
|
||||
value = int(m.group(2), 16)
|
||||
else:
|
||||
name = m.group(2)
|
||||
value = int(m.group(1), 16)
|
||||
if value < 0:
|
||||
str_value = f"{value}"
|
||||
else:
|
||||
str_value = "0x" + f"{value:08x}".upper()
|
||||
|
||||
if name.upper() != name:
|
||||
name = constcase(name)
|
||||
items.append((name, str_value))
|
||||
name_max_len = max(len(name), name_max_len)
|
||||
elif "/%" in line:
|
||||
comment = True
|
||||
elif "%/" in line:
|
||||
comment = False
|
||||
|
||||
# Write a section to the header file for this enum
|
||||
h.write(f"typedef UNK_TYPE {namespace};\n")
|
||||
for (name, value) in items:
|
||||
h.write(f"#define {namespace}_{name.ljust(name_max_len)} {value}\n")
|
||||
h.write("\n")
|
||||
|
||||
h.write("#endif\n")
|
||||
@ -1,198 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
from os import path
|
||||
from glob import glob
|
||||
import re
|
||||
|
||||
DIR = path.dirname(__file__)
|
||||
SR_DATABASE = path.join(DIR, "star-rod/database")
|
||||
|
||||
# SR currently defines a struct with the "name" struct. This causes
|
||||
# problems, so we'll call it the following instead.
|
||||
STRUCT_STRUCT_ALIAS = "texture_header"
|
||||
|
||||
STRUCT_FILES = (
|
||||
# structs which need to be forward declared (because they're used
|
||||
# without indirection in other structs)
|
||||
glob(path.join(SR_DATABASE, f"structs/**/matrix4f.struct")) +
|
||||
glob(path.join(SR_DATABASE, f"structs/**/matrix4s.struct")) +
|
||||
glob(path.join(SR_DATABASE, f"structs/**/cam_pos_settings.struct")) +
|
||||
glob(path.join(SR_DATABASE, f"structs/**/partner_data.struct")) +
|
||||
glob(path.join(SR_DATABASE, f"structs/**/npc_blur_data.struct")) +
|
||||
|
||||
# other structs
|
||||
glob(path.join(SR_DATABASE, f"structs/**/*.struct"))
|
||||
)
|
||||
|
||||
def convert_type(type, structs):
|
||||
size = 1
|
||||
suffix = ""
|
||||
|
||||
# replace basic types
|
||||
basic_types = [
|
||||
("ubyte", "u8", 1),
|
||||
("byte", "s8", 1),
|
||||
("uchar", "u8", 1),
|
||||
("char", "s8", 1),
|
||||
|
||||
("ushort", "u16", 2),
|
||||
("short", "s16", 2),
|
||||
|
||||
("uint", "u32", 4),
|
||||
("int", "s32", 4),
|
||||
|
||||
("ulong", "u64", 8),
|
||||
("long", "s64", 8),
|
||||
|
||||
("float", "f32", 4),
|
||||
("double", "f64", 8),
|
||||
|
||||
("ptr", "UNK_PTR", 4),
|
||||
|
||||
("struct", f"struct {STRUCT_STRUCT_ALIAS}", 0x30),
|
||||
]
|
||||
for name, size in structs:
|
||||
basic_types.append((name, f"struct {name}", size))
|
||||
for sr_name, decomp_name, basic_size in basic_types:
|
||||
match = re.search(f"(\\b|^)({sr_name})(\\b|$)", type)
|
||||
if match:
|
||||
size = basic_size
|
||||
start, end = match.span(2)
|
||||
type = type[:start] + decomp_name + type[end:]
|
||||
break
|
||||
|
||||
# array
|
||||
while array_match := re.search(r"\[(([0-9]+)`|([a-fA-F0-9]+))\]", type):
|
||||
bin_len_str = array_match.group(2)
|
||||
hex_len_str = array_match.group(3)
|
||||
|
||||
array_len = int(bin_len_str) if bin_len_str else int(hex_len_str, 16)
|
||||
size *= array_len
|
||||
suffix += f"[{array_len}]"
|
||||
|
||||
# strip match from type
|
||||
start, end = array_match.span()
|
||||
type = type[:start] + type[end:]
|
||||
|
||||
# pointer
|
||||
if "*" in type:
|
||||
size = 4
|
||||
|
||||
return type, size, suffix
|
||||
|
||||
# read struct names and their sizes in advance
|
||||
structs = []
|
||||
for filename in STRUCT_FILES:
|
||||
struct_name = path.splitext(path.basename(filename))[0]
|
||||
if struct_name == "struct":
|
||||
struct_name = STRUCT_STRUCT_ALIAS
|
||||
|
||||
with open(filename) as file:
|
||||
for line in file.readlines():
|
||||
if line.startswith("%"):
|
||||
continue
|
||||
|
||||
parts = [x.strip() for x in line.split(":")]
|
||||
if len(parts) == 0:
|
||||
continue
|
||||
|
||||
if parts[0] == "size":
|
||||
struct_size = int(parts[1], 16)
|
||||
structs.append((struct_name, struct_size))
|
||||
continue
|
||||
|
||||
with open(path.join(DIR, f"../include/common_structs.h"), "w") as h:
|
||||
h.write(f"""#ifndef _COMMON_STRUCTS_H_
|
||||
#define _COMMON_STRUCTS_H_
|
||||
|
||||
#include "ultra64.h"
|
||||
#include "types.h"
|
||||
|
||||
""")
|
||||
# write all structs out to common_structs.h
|
||||
struct_names_seen = []
|
||||
for filename in STRUCT_FILES:
|
||||
struct_name = path.splitext(path.basename(filename))[0]
|
||||
struct_size = None
|
||||
offset_len = 2 # string length for hex offsets
|
||||
|
||||
if struct_name == "struct":
|
||||
struct_name = STRUCT_STRUCT_ALIAS
|
||||
|
||||
# avoid repeat declarations
|
||||
if struct_name.startswith("_") or struct_name.startswith("OS") or "." in struct_name or struct_name == "sprite":
|
||||
continue
|
||||
if struct_name in struct_names_seen:
|
||||
continue
|
||||
struct_names_seen.append(struct_name)
|
||||
|
||||
h.write(f"typedef struct {struct_name} {{\n")
|
||||
|
||||
with open(filename) as file:
|
||||
in_fields = False
|
||||
|
||||
cur_offset = 0
|
||||
def update_offset(offset):
|
||||
global cur_offset
|
||||
delta = offset - cur_offset
|
||||
|
||||
ofs_str = ("%X" % cur_offset).zfill(2)
|
||||
ofs_str_z = ofs_str.zfill(offset_len)
|
||||
|
||||
# insert unknown char array
|
||||
if delta == 1:
|
||||
h.write(f" /* 0x{ofs_str_z} */ char unk_{ofs_str};\n")
|
||||
elif delta > 0:
|
||||
h.write(f" /* 0x{ofs_str_z} */ char unk_{ofs_str}[{delta}];\n")
|
||||
|
||||
cur_offset += delta
|
||||
|
||||
for line in file.readlines():
|
||||
# read and strip line comment
|
||||
comment = re.search(r"%(.*)$", line)
|
||||
if comment:
|
||||
pos = comment.span()[0]
|
||||
line = line[0:pos]
|
||||
comment = comment.group(1).strip()
|
||||
|
||||
parts = [x.strip() for x in line.split(":")]
|
||||
if len(parts) == 0:
|
||||
continue
|
||||
|
||||
if in_fields:
|
||||
if parts[0] == "}":
|
||||
in_fields = False
|
||||
else:
|
||||
offset, name, type = parts
|
||||
|
||||
# clean name
|
||||
name = re.sub(r"[^a-zA-Z0-9_]", "", name)
|
||||
|
||||
offset = int(offset, 16)
|
||||
ofs_str = ("%X" % offset).zfill(offset_len)
|
||||
update_offset(offset)
|
||||
|
||||
if type == "code":
|
||||
h.write(f" /* 0x{ofs_str} */ UNK_FUN_PTR({name});")
|
||||
cur_offset += 4
|
||||
else:
|
||||
type, size, suffix = convert_type(type, structs)
|
||||
|
||||
h.write(f" /* 0x{ofs_str} */ {type} {name}{suffix};")
|
||||
cur_offset += size
|
||||
|
||||
if comment:
|
||||
h.write(f" /* {comment} */")
|
||||
h.write("\n")
|
||||
else:
|
||||
if parts[0] == "size":
|
||||
struct_size = int(parts[1], 16)
|
||||
structs.append((struct_name, struct_size))
|
||||
offset_len = max(2, len(parts[1]))
|
||||
elif parts[0] == "{":
|
||||
in_fields = True
|
||||
|
||||
update_offset(struct_size)
|
||||
h.write(f"}} {struct_name}; // size = 0x{('%X' % struct_size).zfill(offset_len)}\n\n")
|
||||
|
||||
h.write("#endif\n")
|
||||
Loading…
Reference in New Issue
Block a user