mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hacks to align strings for clang... wow just wow

This commit is contained in:
Jeffrey Crowell 2022-07-04 03:46:32 -04:00
parent a9c3c7541e
commit cc56a5a94d
16 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ZAPDTR/ZAPD/ZFile.cpp
View File

@ -800,6 +800,7 @@ void ZFile::GenerateSourceHeaderFiles()
{
OutputFormatter formatter;
formatter.Write("#pragma once\n");
for (ZResource* res : resources)
{
std::string resSrc = res->GetSourceOutputHeader("");

11
ZAPDTR/ZAPD/ZResource.cpp
View File

@ -7,6 +7,7 @@
#include "WarningHandler.h"
#include "ZFile.h"
#include <Globals.h>
#include <set>
#include <ZDisplayList.h>
#include <ZArray.h>
@ -306,6 +307,7 @@ void ZResource::GetSourceOutputCode([[maybe_unused]] const std::string& prefix)
std::string ZResource::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix)
{
static std::set<std::string> myset;
if (Globals::Instance->otrMode && genOTRDef)
{
std::string str = "";;
@ -342,9 +344,14 @@ std::string ZResource::GetSourceOutputHeader([[maybe_unused]] const std::string&
prefix = "text";
if (prefix != "")
str += StringHelper::Sprintf("#define %s \"__OTR__%s/%s/%s\"", name.c_str(), prefix.c_str(), outName.c_str(), nameStr.c_str());
str += StringHelper::Sprintf("#define d%s \"__OTR__%s/%s/%s\"", name.c_str(), prefix.c_str(), outName.c_str(), nameStr.c_str());
else
str += StringHelper::Sprintf("#define %s \"__OTR__%s/%s\"", name.c_str(), outName.c_str(), nameStr.c_str());
str += StringHelper::Sprintf("#define d%s \"__OTR__%s/%s\"", name.c_str(), outName.c_str(), nameStr.c_str());
if (myset.find(name) == myset.end()) {
str += "\nstatic volatile const char " + name + "[]__attribute__ ((aligned (16))) = d" + name + ";";
myset.insert(name);
}
return str;
}

26
soh/soh/Enhancements/debugger/debugSaveEditor.cpp
View File

@ -185,17 +185,17 @@ typedef struct {
// Maps quest items ids to info for use in ImGui
std::map<uint32_t, QuestMapEntry> questMapping = {
QUEST_MAP_ENTRY(QUEST_MEDALLION_FOREST, gForestMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_FIRE, gFireMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_WATER, gWaterMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_SPIRIT, gSpiritMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_SHADOW, gShadowMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_LIGHT, gLightMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_KOKIRI_EMERALD, gKokiriEmeraldIconTex),
QUEST_MAP_ENTRY(QUEST_GORON_RUBY, gGoronRubyIconTex),
QUEST_MAP_ENTRY(QUEST_ZORA_SAPPHIRE, gZoraSapphireIconTex),
QUEST_MAP_ENTRY(QUEST_STONE_OF_AGONY, gStoneOfAgonyIconTex),
QUEST_MAP_ENTRY(QUEST_GERUDO_CARD, gGerudosCardIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_FOREST, dgForestMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_FIRE, dgFireMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_WATER, dgWaterMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_SPIRIT, dgSpiritMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_SHADOW, dgShadowMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_MEDALLION_LIGHT, dgLightMedallionIconTex),
QUEST_MAP_ENTRY(QUEST_KOKIRI_EMERALD, dgKokiriEmeraldIconTex),
QUEST_MAP_ENTRY(QUEST_GORON_RUBY, dgGoronRubyIconTex),
QUEST_MAP_ENTRY(QUEST_ZORA_SAPPHIRE, dgZoraSapphireIconTex),
QUEST_MAP_ENTRY(QUEST_STONE_OF_AGONY, dgStoneOfAgonyIconTex),
QUEST_MAP_ENTRY(QUEST_GERUDO_CARD, dgGerudosCardIconTex),
};
typedef struct {
@ -1605,9 +1605,9 @@ void InitSaveEditor() {
SohImGui::LoadResource(entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f));
}
for (const auto& entry : songMapping) {
SohImGui::LoadResource(entry.name, gSongNoteTex, entry.color);
SohImGui::LoadResource(entry.name, dgSongNoteTex, entry.color);
ImVec4 fadedCol = entry.color;
fadedCol.w = 0.3f;
SohImGui::LoadResource(entry.nameFaded, gSongNoteTex, fadedCol);
SohImGui::LoadResource(entry.nameFaded, dgSongNoteTex, fadedCol);
}
}

4
soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View File

@ -236,11 +236,11 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 666),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
gSPDisplayList(POLY_XLU_DISP++,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (stateFrames * 2) % 256, 0, 64, 32, 1,
255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
gSPDisplayList(POLY_XLU_DISP++, dsModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682);
}

4
soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View File

@ -235,11 +235,11 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 660),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
gSPDisplayList(POLY_XLU_DISP++,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 128, 32, 1,
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
gSPDisplayList(POLY_XLU_DISP++, dsModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676);
}

4
soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View File

@ -233,11 +233,11 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_light.c", 648),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
gSPDisplayList(POLY_XLU_DISP++,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 4, 32, 1,
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
gSPDisplayList(POLY_XLU_DISP++, dsModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_light.c", 664);
}

2
soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
View File

@ -600,7 +600,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD);
gSPDisplayList(POLY_XLU_DISP++, sShadowDL);
gSPDisplayList(POLY_XLU_DISP++, dsShadowDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 1006);
}

6
soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
View File

@ -43,7 +43,7 @@ void EnJsjutan_Init(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.actor.flags &= ~ACTOR_FLAG_0;
DynaPolyActor_Init(&this->dyna, DPM_UNK);
CollisionHeader_GetVirtual(&sCol, &header);
CollisionHeader_GetVirtual(&dsCol, &header);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, header);
Actor_SetScale(thisx, 0.02f);
this->unk_164 = true;
@ -430,7 +430,7 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) {
} else {
gSPSegment(POLY_OPA_DISP++, 0x0C, sShadowEvenVtx);
}
gSPDisplayList(POLY_OPA_DISP++, sModelDL);
gSPDisplayList(POLY_OPA_DISP++, dsModelDL);
func_80093D18(globalCtx->state.gfxCtx);
Matrix_Translate(thisx->world.pos.x, this->unk_168 + 3.0f, thisx->world.pos.z, MTXMODE_NEW);
@ -449,7 +449,7 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) {
} else {
gSPSegment(POLY_OPA_DISP++, 0x0C, sCarpetEvenVtx);
}
gSPDisplayList(POLY_OPA_DISP++, sModelDL);
gSPDisplayList(POLY_OPA_DISP++, dsModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_jsjutan.c", 823);
}

4
soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
View File

@ -236,12 +236,12 @@ void MagicFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE);
gDPLoadTextureBlock(POLY_XLU_DISP++, sTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
gDPLoadTextureBlock(POLY_XLU_DISP++, dsTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 15, G_TX_NOLOD);
gDPSetTile(POLY_XLU_DISP++, G_IM_FMT_I, G_IM_SIZ_8b, 8, 0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, 14,
G_TX_NOMIRROR | G_TX_WRAP, 6, 14);
gDPSetTileSize(POLY_XLU_DISP++, 1, 0, 0, 252, 252);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
gSPDisplayList(POLY_XLU_DISP++,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512,
511 - ((gameplayFrames * 5) % 512), 64, 64, 1, (gameplayFrames * 2) % 256,

2
soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
View File

@ -78,7 +78,7 @@ void MagicWind_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void MagicWind_UpdateAlpha(f32 alpha) {
s32 i;
Vtx* vtx = ResourceMgr_LoadVtxByName(sCylinderVtx);
Vtx* vtx = ResourceMgr_LoadVtxByName(dsCylinderVtx);
for (i = 0; i < ARRAY_COUNT(sAlphaUpdVals); i++) {
vtx[sAlphaUpdVals[i]].n.a = alpha * 255.0f;

4
soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
View File

@ -156,10 +156,10 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 469),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sCylinderMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsCylinderMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 32, 1,
0, scroll * (-8), 32, 32));
gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL);
gSPDisplayList(POLY_XLU_DISP++, dsCylinderModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 485);
}

2
soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
View File

@ -137,7 +137,7 @@ void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) {
gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE);
gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 150, this->primColorAlpha);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 8, scroll * 4, 64, 64, 1,
scroll * 4, scroll * 4, 64, 64));
gSPWideTextureRectangle(POLY_XLU_DISP++, OTRGetRectDimensionFromLeftEdge(0) << 2, 0,

6
soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
View File

@ -97,7 +97,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
for (i = 0; i < 20; i++) {
vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx);
vtxPtr = ResourceMgr_LoadVtxByName(dsFrustumVtx);
vtxPtr[i * 2 + 0].v.cn[3] = alphaTable[(sAlphaIndices[i] & 0xF0) >> 4];
vtxPtr[i * 2 + 1].v.cn[3] = alphaTable[sAlphaIndices[i] & 0xF];
}
@ -120,10 +120,10 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, 100, 0, 255, 128);
}
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 - scroll, scroll * (-2), 32, 32, 1,
0 - scroll, scroll * (-2), 32, 32));
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);
gSPDisplayList(POLY_XLU_DISP++, dsFrustumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 398);
}

4
soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
View File

@ -77,7 +77,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) {
z = 1330;
}
vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx);
vtxPtr = ResourceMgr_LoadVtxByName(dsFrustumVtx);
if (this->timer >= 80) {
alpha = 12 * (100 - this->timer);
} else {
@ -102,7 +102,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 100, 0, 128);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 6, scroll * (-6), 64, 64, 1,
scroll * (-6), 0, 64, 64));
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);

6
soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
View File

@ -78,7 +78,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
z = 1330;
}
vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx);
vtxPtr = ResourceMgr_LoadVtxByName(dsFrustumVtx);
if (this->counter >= 80) {
alpha = 12 * (100 - this->counter);
} else {
@ -103,10 +103,10 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 128);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 12, scroll * (-12), 64, 64, 1,
scroll * 8, scroll * (-8), 64, 64));
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);
gSPDisplayList(POLY_XLU_DISP++, dsFrustumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 370);
}

4
soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
View File

@ -73,7 +73,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
z = 1330.0f;
}
vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx);
vtxPtr = ResourceMgr_LoadVtxByName(dsFrustumVtx);
if (this->timer >= 30) {
alpha = 12 * (50 - this->timer);
} else {
@ -99,7 +99,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->actor.params == OCEFF_WIPE4_UNUSED) {
gSPDisplayList(POLY_XLU_DISP++, sUnusedMaterialDL);
} else {
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL);
}
gSPDisplayList(POLY_XLU_DISP++, sMaterial2DL);