etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 21:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change how DynOS generates actors - generate any geolayout that isn't referenced by another

Browse source
This commit is contained in:
MysterD 2022-04-13 18:27:21 -07:00
parent 4008d99c75
commit 8e20697f4f
4 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/dynos.cpp.h
View file

@ -450,9 +450,8 @@ struct GfxData : NoCopy {
DataNodes<AnimData> mAnimations; DataNodes<AnimData> mAnimations;
Array<Pair<String, void *>> mAnimationTable; Array<Pair<String, void *>> mAnimationTable;
// Generate // Skip bin output of children
Array<DataNode<GeoLayout> *> mGenerateGeoLayouts; Array<DataNode<GeoLayout> *> mChildGeoLayouts;
Array<DataNode<LevelScript> *> mGenerateLevelScripts;
// Current // Current
u64 mLoadIndex = 0; u64 mLoadIndex = 0;

32
data/dynos_bin_actor.cpp
View file

@ -146,7 +146,15 @@ static String GetActorFolder(const Array<Pair<u64, String>> &aActorsFolders, u64
} }
static void DynOS_Actor_Generate(const SysPath &aPackFolder, Array<Pair<u64, String>> _ActorsFolders, GfxData *_GfxData) { static void DynOS_Actor_Generate(const SysPath &aPackFolder, Array<Pair<u64, String>> _ActorsFolders, GfxData *_GfxData) {
for (auto &_GeoNode : _GfxData->mGenerateGeoLayouts) { // generate in reverse order to detect children
for (s32 geoIndex = _GfxData->mGeoLayouts.Count() - 1; geoIndex >= 0; geoIndex--) {
auto &_GeoNode = _GfxData->mGeoLayouts[geoIndex];
// if this is a child geo layout, don't save it as a bin
if (_GfxData->mChildGeoLayouts.Find(_GeoNode) != -1) {
continue;
}
String _GeoRootName = _GeoNode->mName; String _GeoRootName = _GeoNode->mName;
// If there is an existing binary file for this layout, skip and go to the next actor // If there is an existing binary file for this layout, skip and go to the next actor
@ -220,6 +228,8 @@ static void DynOS_Actor_Generate(const SysPath &aPackFolder, Array<Pair<u64, Str
_GfxData->mLuaPointerList.Clear(); _GfxData->mLuaPointerList.Clear();
_GfxData->mLuaTokenList.Clear(); _GfxData->mLuaTokenList.Clear();
} }
_GfxData->mChildGeoLayouts.Clear();
} }
void DynOS_Actor_GeneratePack(const SysPath &aPackFolder) { void DynOS_Actor_GeneratePack(const SysPath &aPackFolder) {
@ -250,26 +260,6 @@ void DynOS_Actor_GeneratePack(const SysPath &aPackFolder) {
DynOS_Read_Source(_GfxData, fstring("%s/geo.inc.c", _Folder.c_str())); DynOS_Read_Source(_GfxData, fstring("%s/geo.inc.c", _Folder.c_str()));
DynOS_Read_Source(_GfxData, fstring("%s/collision.inc.c", _Folder.c_str())); DynOS_Read_Source(_GfxData, fstring("%s/collision.inc.c", _Folder.c_str()));
// Figure out which geo layouts to generate
s32 geoLayoutCount = _GfxData->mGeoLayouts.Count();
if (geoLayoutCount > prevGeoLayoutCount) {
// find actors to generate
bool foundActor = false;
for (s32 i = prevGeoLayoutCount; i < geoLayoutCount; i++) {
String _GeoRootName = _GfxData->mGeoLayouts[i]->mName;
const void* actor = DynOS_Actor_GetLayoutFromName(_GeoRootName.begin());
if (actor != NULL) {
foundActor = true;
_GfxData->mGenerateGeoLayouts.Add(_GfxData->mGeoLayouts[i]);
}
}
// if we haven't found an actor, just add the last geo layout found
if (!foundActor) {
_GfxData->mGenerateGeoLayouts.Add(_GfxData->mGeoLayouts[geoLayoutCount - 1]);
}
}
if (_GfxData->mModelIdentifier != 0) { if (_GfxData->mModelIdentifier != 0) {
_ActorsFolders.Add({ _GfxData->mModelIdentifier, String(_PackEnt->d_name) }); _ActorsFolders.Add({ _GfxData->mModelIdentifier, String(_PackEnt->d_name) });
} }

4
data/dynos_bin_geo.cpp
View file

@ -111,7 +111,9 @@ static s64 ParseGeoSymbolArg(GfxData* aGfxData, DataNode<GeoLayout>* aNode, u64&
// Geo layouts // Geo layouts
for (auto& _Node : aGfxData->mGeoLayouts) { for (auto& _Node : aGfxData->mGeoLayouts) {
if (_Arg == _Node->mName) { if (_Arg == _Node->mName) {
return (s64) DynOS_Geo_Parse(aGfxData, _Node, false)->mData; auto geoNode = DynOS_Geo_Parse(aGfxData, _Node, false);
aGfxData->mChildGeoLayouts.Add(geoNode);
return (s64) geoNode->mData;
} }
} }

5
data/dynos_bin_lvl.cpp
View file

@ -2086,14 +2086,15 @@ static bool DynOS_Lvl_GeneratePack_Internal(const SysPath &aPackFolder, Array<Pa
ClearLvlDataNodes(_GfxData->mMovtexs); ClearLvlDataNodes(_GfxData->mMovtexs);
ClearLvlDataNodes(_GfxData->mMovtexQCs); ClearLvlDataNodes(_GfxData->mMovtexQCs);
ClearLvlDataNodes(_GfxData->mRooms); ClearLvlDataNodes(_GfxData->mRooms);
ClearLvlDataNodes(_GfxData->mGenerateGeoLayouts);
ClearLvlDataNodes(_GfxData->mGenerateLevelScripts);
_GfxData->mPointerList.Clear(); _GfxData->mPointerList.Clear();
_GfxData->mPointerOffsetList.Clear(); _GfxData->mPointerOffsetList.Clear();
_GfxData->mLuaPointerList.Clear(); _GfxData->mLuaPointerList.Clear();
_GfxData->mLuaTokenList.Clear(); _GfxData->mLuaTokenList.Clear();
generated = true; generated = true;
} }
_GfxData->mChildGeoLayouts.Clear();
return generated; return generated;
} }