mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Updated Texture Asset Handling (#478)

Browse source 
* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Fixed newline issue with ZAPD

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Fixed merge issues.

* Fixed makefile merge error

* Fixed additional merge error

* Fixed several more merge issues

* Commented out gameplay_keep and sk2 extraction, since currently unused.

* Reenabled gameplay_keep extraction since it's used in the spec

* Fixed build error

* Removed test struct

* Fixed makefile error that would happen on fresh builds

* Fixed merge issue

* Removed relative paths

* Multithreading on extraction, spec uses numbers, few changes to XMLs

* Removed redundant code from the extract_assets script

* object_sk2 and object_spot09_obj OK

* object_spot11_obj OK

* object_spot17_obj OK

* Test: One of the gameplay_keep dlists given a proper symbol

* Updated asset symbol names based on new naming scheme

* XMLs use "Offset" instead of "Address" now

* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file

* Updated to use latest build of ZAPD

* Updated ZAPD again

* Updated ZAP to remove assimp dependency

* Jenkins Test: Added .gitkeep file

* Updated ZAP once more

* Updated png file name to comply with new naming scheme.

* Fixed bad include

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
This commit is contained in:
Nicholas Estelami 2020-12-26 06:39:52 -05:00 • committed by GitHub
parent 8fa6cb6ff9
commit b95643b397
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
182 changed files with 2249 additions and 1472 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/ZAP2

@ -1 +1 @@
Subproject commit 15fcb21d2c4e2ef2f720d28a0f7dec259ddd06f5
Subproject commit 8033e46c02c70fcd48cbafc6256dd7f3f1bd11a4

55
tools/specprocess.py Normal file
View file

@ -0,0 +1,55 @@
import os
import sys
specFile = open("spec", "r");
specText = specFile.read();
specFile.close()
specLines = specText.split("\n");
# TODO: CLEAN THIS UP!
for i in range(0, len(specLines)):
line = specLines[i]
if (line.startswith("INCLUDE_SEG_SCENE")):
params = line.split("(")[1].split(")")[0].split(",")
for j in range(0, len(params)):
while (params[j].startswith(" ")):
params[j] = params[j][1 : len(params[j])]
line = "beginseg\r\n";
line += "\tname " + params[0] + "\r\n";
line += "\tromalign 0x1000\r\n";
line += "\tinclude " + params[1] + "\r\n";
line += "\taddress SEGMENT_SCENE\r\n";
line += "endseg\r\n";
elif (line.startswith("INCLUDE_SEG_ROOM")):
params = line.split("(")[1].split(")")[0].split(",")
for j in range(0, len(params)):
while (params[j].startswith(" ")):
params[j] = params[j][1 : len(params[j])]
line = "beginseg\r\n";
line += "\tname " + params[0] + "\r\n";
line += "\tromalign 0x1000\r\n";
line += "\tinclude " + params[1] + "\r\n";
line += "\taddress SEGMENT_ROOM\r\n";
line += "endseg\r\n";
elif (line.startswith("INCLUDE_SEG_OBJECT")):
params = line.split("(")[1].split(")")[0].split(",")
for j in range(0, len(params)):
while (params[j].startswith(" ")):
params[j] = params[j][1 : len(params[j])]
line = "beginseg\r\n";
line += "\tname " + params[0] + "\r\n";
line += "\tromalign 0x1000\r\n";
line += "\tinclude " + params[1] + "\r\n";
line += "\taddress SEGMENT_OBJECT\r\n";
line += "endseg\r\n";
line += "\r\n";
specLines[i] = line;
specOut = open("build/spec_preproc", "w");
specOut.writelines(specLines);
specOut.close();

13
tools/touchasset.py Normal file
View file

@ -0,0 +1,13 @@
#!/usr/bin/python3
import sys
import os
from os import path
if (path.exists(sys.argv[1])):
f = open(sys.argv[1], "r")
text = f.read()
f.close()
execStr = "touch " + text
print(execStr)
os.system(execStr)