mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Add actorfixer.py ~~and graphovl.py~~; and a few improvements to extract_assets.py (#783)

Browse source 
* Only process touched files and abort the extraction if one file wasn't extracted properly

Signed-off-by: angie <angheloalf95@gmail.com>

* add actorfixer and graphovl

Signed-off-by: angie <angheloalf95@gmail.com>

* Re set execution permisions to diff.py

Signed-off-by: angie <angheloalf95@gmail.com>

* Add graphs/ to gitignore

Signed-off-by: angie <angheloalf95@gmail.com>

* Add looners flag to graphovl

Signed-off-by: angie <angheloalf95@gmail.com>

* Parse macros

Signed-off-by: angie <angheloalf95@gmail.com>

* cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* Add enum parser to graphovl

Signed-off-by: angie <angheloalf95@gmail.com>

* Remove redundant code

Signed-off-by: angie <angheloalf95@gmail.com>

* cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* Custom colors to graphovl!

* Select multiples styles for graphovl

* Add solarized light style

* Add renames of #796

* Add unaccounted warning flag

* remove graphovl

* git subrepo clone https://github.com/AngheloAlf/graphovl.git tools/graphovl

subrepo:
  subdir:   "tools/graphovl"
  merged:   "577e71592"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "577e71592"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove graphovl

* Add `graphovl/` to gitignore
This commit is contained in:
Anghelo Carvajal 2021-05-22 20:00:10 -04:00 • committed by GitHub
parent 5c4fdb706b
commit 5062f785fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 210 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

95
extract_assets.py
View file

@ -1,55 +1,100 @@
#!/usr/bin/env python3
import argparse
from multiprocessing import Pool, cpu_count, Event
import os
from shutil import copyfile
from multiprocessing import Pool
from multiprocessing import cpu_count
# Returns True if outFile doesn't exists
# or if inFile has been modified after the last modification of outFile
def checkTouchedFile(inFile: str, outFile: str) -> bool:
if not os.path.exists(outFile):
return True
return os.path.getmtime(inFile) > os.path.getmtime(outFile)
def Extract(xmlPath, outputPath, outputSourcePath):
ExtractFile(xmlPath, outputPath, outputSourcePath, 1, 0)
ExtractFile(xmlPath, outputPath, outputSourcePath, 1, 0)
def ExtractScene(xmlPath, outputPath, outputSourcePath):
ExtractFile(xmlPath, outputPath, outputSourcePath, 1, 1)
ExtractFile(xmlPath, outputPath, outputSourcePath, 1, 1)
def ExtractFile(xmlPath, outputPath, outputSourcePath, genSrcFile, incFilePrefix):
execStr = "tools/ZAPD/ZAPD.out e -eh -i %s -b baserom/ -o %s -osf %s -gsf %i -ifp %i -rconf tools/ZAPDConfigs/MqDbg/Config.xml" % (xmlPath, outputPath, outputSourcePath, genSrcFile, incFilePrefix)
if globalAbort.is_set():
# Don't extract if another file wasn't extracted properly.
return
print(execStr)
os.system(execStr)
execStr = "tools/ZAPD/ZAPD.out e -eh -i %s -b baserom/ -o %s -osf %s -gsf %i -ifp %i -rconf tools/ZAPDConfigs/MqDbg/Config.xml" % (xmlPath, outputPath, outputSourcePath, genSrcFile, incFilePrefix)
if globalUnaccounted:
execStr += " -wu"
print(execStr)
exitValue = os.system(execStr)
if exitValue != 0:
globalAbort.set()
print("\n")
print("Error when extracting from file " + xmlPath, file=os.sys.stderr)
print("Aborting...", file=os.sys.stderr)
print("\n")
def ExtractFunc(fullPath):
outPath = ("assets/" + fullPath.split("assets/xml/")[1]).split(".xml")[0]
outSourcePath = ("assets/" + fullPath.split("assets/xml/")[1]).split(".xml")[0]
*pathList, xmlName = fullPath.split(os.sep)
objectName = os.path.splitext(xmlName)[0]
if (fullPath.startswith("assets/xml/scenes/")):
ExtractScene(fullPath, outPath, outSourcePath)
else:
Extract(fullPath, outPath, outSourcePath)
outPath = os.path.join("assets", *pathList[2:], objectName)
outSourcePath = outPath
isScene = fullPath.startswith("assets/xml/scenes/")
if isScene:
objectName += "_scene"
if not globalForce:
cFile = os.path.join(outPath, objectName + ".c")
hFile = os.path.join(outPath, objectName + ".h")
if not checkTouchedFile(fullPath, cFile) and not checkTouchedFile(fullPath, hFile):
return
if isScene:
ExtractScene(fullPath, outPath, outSourcePath)
else:
Extract(fullPath, outPath, outSourcePath)
def initializeWorker(force: bool, abort, unaccounted: bool):
global globalForce
global globalAbort
global globalUnaccounted
globalForce = force
globalAbort = abort
globalUnaccounted = unaccounted
def main():
parser = argparse.ArgumentParser(description="baserom asset extractor")
parser.add_argument("-s", "--single", help="asset path relative to assets/, e.g. objects/gameplay_keep")
parser.add_argument("-f", "--force", help="Force the extraction of every xml instead of checking the touched ones.", action="store_true")
parser.add_argument("-u", "--unaccounted", help="Enables ZAPD unaccounted detector warning system.", action="store_true")
args = parser.parse_args()
abort = Event()
asset_path = args.single
if asset_path is not None:
if asset_path.endswith("/"):
asset_path = asset_path[0:-1]
Extract(f"assets/xml/{asset_path}.xml", f"assets/{asset_path}/", f"assets/{asset_path}/")
# Always force if -s is used.
initializeWorker(True, abort, args.unaccounted)
fullPath = os.path.join("assets", "xml", asset_path + ".xml")
ExtractFunc(fullPath)
else:
xmlFiles = []
for currentPath, folders, files in os.walk("assets"):
for file in files:
fullPath = os.path.join(currentPath, file)
if file.endswith(".xml") and currentPath.startswith("assets/xml/"):
outPath = ("assets/" + fullPath.split("assets/xml/")[1]).split(".xml")[0]
xmlFiles.append(fullPath)
for currentPath, folders, files in os.walk(os.path.join("assets", "xml")):
for file in files:
fullPath = os.path.join(currentPath, file)
if file.endswith(".xml"):
xmlFiles.append(fullPath)
numCores = cpu_count()
print("Extracting assets with " + str(numCores) + " CPU cores.")
p = Pool(numCores)
p.map(ExtractFunc, xmlFiles)
with Pool(numCores, initializer=initializeWorker, initargs=(args.force, abort, args.unaccounted)) as p:
p.map(ExtractFunc, xmlFiles)
if abort.is_set():
exit(1)
if __name__ == "__main__":
main()