mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-09 19:51:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

demo matches for some grid funcs

Browse Source
This commit is contained in:
LagoLunatic
2026-09-09 13:35:22 -04:00
parent 01edd8c27a
commit 99662e663f
5 changed files with 171 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+15 -16
View File
@@ -48,32 +48,31 @@ public:
void drawTail() const;
void setCallBackPacket(J3DCallBackPacket* pPacket);
J3DPacket* getEntryPacket(u16 i) { return mpBuf[i]; }
u32 getEntryTableSize() { return mBufSize; } // Unused in TWW, but exists in TP
void setNonSort() { mSortType = (u32)SORT_NON; }
void setZSort() { mSortType = (u32)SORT_Z; }
void setInvalidSort() { mSortType = (u32)SORT_INVALID; }
J3DPacket* getEntryPacket(u16 i) { return mpBuffer[i]; }
u32 getEntryTableSize() { return mEntryTableSize; } // Unused in TWW, but exists in TP
int getSortMode() { return mSortMode; }
void setNonSort() { mSortMode = SORT_NON; }
void setZSort() { mSortMode = SORT_Z; }
void setInvalidSort() { mSortMode = SORT_INVALID; }
void setZMtx(MtxP mtx) { mpZMtx = mtx; }
void calcZRatio() {
mZRatio = (mZFar - mZNear) / (f32)mBufSize;
mZRatio = (mZFar - mZNear) / (f32)mEntryTableSize;
}
void getSortMode() {}
static sortFunc sortFuncTable[6];
static drawFunc drawFuncTable[2];
static int entryNum;
public:
/* 0x00 */ J3DPacket** mpBuf;
/* 0x04 */ u32 mBufSize;
/* 0x08 */ u32 mDrawType;
/* 0x0C */ u32 mSortType;
private:
/* 0x00 */ J3DPacket** mpBuffer;
/* 0x04 */ u32 mEntryTableSize;
/* 0x08 */ u32 mDrawMode;
/* 0x0C */ u32 mSortMode;
/* 0x10 */ f32 mZNear;
/* 0x14 */ f32 mZFar;
/* 0x18 */ f32 mZRatio;
/* 0x1C */ MtxP mpZMtx;
/* 0x20 */ J3DPacket* mpCallBackPacket;
static sortFunc sortFuncTable[6];
static drawFunc drawFuncTable[2];
static int entryNum;
};
#endif /* J3DDRAWBUFFER_H */
include/JSystem/J3DGraphBase/J3DPacket.h
+3 -3
View File
@@ -214,9 +214,9 @@ public:
J3DTexture* getTexture() { return mpTexture; }
virtual ~J3DMatPacket();
virtual int entry(J3DDrawBuffer* param_1) {
J3DDrawBuffer::sortFunc func = J3DDrawBuffer::sortFuncTable[param_1->mSortType];
return (param_1->*func)(this);
virtual int entry(J3DDrawBuffer* pBuffer) {
J3DDrawBuffer::sortFunc func = J3DDrawBuffer::sortFuncTable[pBuffer->getSortMode()];
return (pBuffer->*func)(this);
}
virtual void draw();
virtual bool isSame(J3DMatPacket*) const;
include/d/actor/d_a_grid.h
+1 -79
View File
@@ -26,15 +26,13 @@ public:
cXyz* getPos() { return mPos[field_0x18a2]; }
cXyz* getNrm() { return mNrm[field_0x18a2]; }
cXyz* getBackNrm() { return mBackNrm[field_0x18a2]; } // not in debug map due to not being used in that version
void changeCurrentPos() { field_0x18a2 ^= 1; }
void setAlpha(u8 i_alpha) { mAlpha = i_alpha; }
u8 getAlpha() { return mAlpha; }
void setTevStr(dKy_tevstr_c* i_tevstr) { mpTevStr = i_tevstr; }
MtxP getMtx() { return mMtx; }
// fake? doesn't appear in debug map, but fixes some issues and exists in other similar classes
cXyz* getBackNrm() { return mBackNrm[field_0x18a2]; }
public:
/* 0x003C */ J3DShapePacket mShapePacket;
/* 0x0080 */ Mtx mMtx;
@@ -88,80 +86,4 @@ public:
/* 0x2218 */ u8 mIsForceWindRelAngle;
};
class daHo_HIO_c : public JORReflexible {
public:
daHo_HIO_c() {
mNo = -1;
field_0x5 = 1;
field_0x7 = 0;
field_0x14 = 40.0f;
field_0x6 = 0;
field_0x8 = 0;
field_0x18 = 0.5f;
field_0x1c = 0.1f;
field_0xc = 0.1f;
field_0x20 = 0.4f;
field_0x24 = 1.0f;
field_0x28 = 1.0f;
field_0x2c = 1.0f;
field_0x30 = 0xFF;
field_0x31 = 50;
field_0x34 = 900.0f;
field_0x38 = 0;
field_0x39 = 0;
field_0x70[0] = 1.0f;
field_0x70[1] = 0.425f;
field_0x70[2] = 0.45f;
field_0x70[3] = 0.4f;
field_0x70[4] = 0.2f;
field_0x70[5] = 0.4f;
field_0x70[6] = 0.45f;
field_0x70[7] = 0.4f;
field_0x70[8] = 0.2f;
field_0x70[9] = 0.5f;
field_0x70[10] = 0.75f;
field_0x70[11] = 1.0f;
field_0x70[12] = 1.0f;
field_0x3c[0] = 0.05f;
field_0x3c[1] = 0.125f;
field_0x3c[2] = 0.175f;
field_0x3c[3] = 0.15f;
field_0x3c[4] = 0.0625f;
field_0x3c[5] = 0.15f;
field_0x3c[6] = 0.2f;
field_0x3c[7] = 0.15f;
field_0x3c[8] = 0.075f;
field_0x3c[9] = 0.175f;
field_0x3c[10] = 0.175f;
field_0x3c[11] = 0.1f;
field_0x3c[12] = 0.0f;
}
virtual ~daHo_HIO_c() { mNo = -1; }
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ u8 field_0x7;
/* 0x08 */ u8 field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ u8 field_0x30;
/* 0x31 */ u8 field_0x31;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ u8 field_0x38;
/* 0x39 */ u8 field_0x39;
/* 0x3C */ f32 field_0x3c[13];
/* 0x70 */ f32 field_0x70[13];
};
#endif /* D_A_GRID_H */
src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+39 -39
View File
@@ -16,23 +16,23 @@
/* 802EC74C-802EC7B4 .text initialize__13J3DDrawBufferFv */
void J3DDrawBuffer::initialize() {
mDrawType = DRAW_HEAD;
mSortType = SORT_MAT;
mDrawMode = DRAW_HEAD;
mSortMode = SORT_MAT;
mZNear = 1.0f;
mZFar = 10000.0f;
mpZMtx = NULL;
mpCallBackPacket = NULL;
mBufSize = 0x20;
mEntryTableSize = 0x20;
calcZRatio();
}
/* 802EC7B4-802EC84C .text allocBuffer__13J3DDrawBufferFUl */
J3DError J3DDrawBuffer::allocBuffer(u32 bufSize) {
mpBuf = new (0x20) J3DPacket*[bufSize];
if (mpBuf == NULL)
mpBuffer = new (0x20) J3DPacket*[bufSize];
if (mpBuffer == NULL)
return J3DErrType_OutOfMemory;
mBufSize = bufSize;
mEntryTableSize = bufSize;
frameInit();
calcZRatio();
return J3DErrType_Success;
@@ -42,14 +42,14 @@ J3DError J3DDrawBuffer::allocBuffer(u32 bufSize) {
J3DDrawBuffer::~J3DDrawBuffer() {
frameInit();
delete[] mpBuf;
mpBuf = NULL;
delete[] mpBuffer;
mpBuffer = NULL;
}
/* 802EC8AC-802EC8E4 .text frameInit__13J3DDrawBufferFv */
void J3DDrawBuffer::frameInit() {
for (u32 i = 0; i < mBufSize; i++)
mpBuf[i] = NULL;
for (u32 i = 0; i < mEntryTableSize; i++)
mpBuffer[i] = NULL;
mpCallBackPacket = NULL;
}
@@ -60,8 +60,8 @@ int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
pMatPacket->getShapePacket()->drawClear();
if (pMatPacket->isChanged()) {
pMatPacket->setNextPacket(mpBuf[0]);
mpBuf[0] = pMatPacket;
pMatPacket->setNextPacket(mpBuffer[0]);
mpBuffer[0] = pMatPacket;
return 1;
}
@@ -73,21 +73,21 @@ int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
} else {
hash = ((u32)texture->getResTIMG(texNo) + texture->getResTIMG(texNo)->imageOffset) >> 5;
}
u32 slot = hash & (mBufSize - 1);
u32 slot = hash & (mEntryTableSize - 1);
if (mpBuf[slot] == NULL) {
mpBuf[slot] = pMatPacket;
if (mpBuffer[slot] == NULL) {
mpBuffer[slot] = pMatPacket;
return 1;
} else {
for (J3DMatPacket* pkt = (J3DMatPacket*)mpBuf[slot]; pkt != NULL; pkt = (J3DMatPacket*)pkt->getNextPacket()) {
for (J3DMatPacket* pkt = (J3DMatPacket*)mpBuffer[slot]; pkt != NULL; pkt = (J3DMatPacket*)pkt->getNextPacket()) {
if (pkt->isSame(pMatPacket)) {
pkt->addShapePacket(pMatPacket->getShapePacket());
return 0;
}
}
pMatPacket->setNextPacket(mpBuf[slot]);
mpBuf[slot] = pMatPacket;
pMatPacket->setNextPacket(mpBuffer[slot]);
mpBuffer[slot] = pMatPacket;
return 1;
}
}
@@ -95,18 +95,18 @@ int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
/* 802ECA38-802ECAF0 .text entryMatAnmSort__13J3DDrawBufferFP12J3DMatPacket */
int J3DDrawBuffer::entryMatAnmSort(J3DMatPacket* pMatPacket) {
J3DMaterialAnm* pMaterialAnm = pMatPacket->mpMaterialAnm;
u32 slot = (u32)pMaterialAnm & (mBufSize - 1);
u32 slot = (u32)pMaterialAnm & (mEntryTableSize - 1);
if (pMaterialAnm == NULL) {
return entryMatSort(pMatPacket);
} else {
pMatPacket->drawClear();
pMatPacket->getShapePacket()->drawClear();
if (mpBuf[slot] == NULL) {
mpBuf[slot] = pMatPacket;
if (mpBuffer[slot] == NULL) {
mpBuffer[slot] = pMatPacket;
return 1;
} else {
for (J3DMatPacket* pkt = (J3DMatPacket*)mpBuf[slot]; pkt != NULL;
for (J3DMatPacket* pkt = (J3DMatPacket*)mpBuffer[slot]; pkt != NULL;
pkt = (J3DMatPacket*)pkt->getNextPacket())
{
if (pkt->mpMaterialAnm == pMaterialAnm) {
@@ -115,8 +115,8 @@ int J3DDrawBuffer::entryMatAnmSort(J3DMatPacket* pMatPacket) {
}
}
pMatPacket->setNextPacket(mpBuf[slot]);
mpBuf[slot] = pMatPacket;
pMatPacket->setNextPacket(mpBuffer[slot]);
mpBuffer[slot] = pMatPacket;
return 1;
}
}
@@ -139,15 +139,15 @@ int J3DDrawBuffer::entryZSort(J3DMatPacket* i_packet) {
if (mZFar - mZRatio > value) {
uvar4 = value / mZRatio;
} else {
uvar4 = mBufSize - 1;
uvar4 = mEntryTableSize - 1;
}
} else {
uvar4 = 0;
}
u32 idx = (mBufSize - 1) - uvar4;
i_packet->setNextPacket(mpBuf[idx]);
mpBuf[idx] = i_packet;
u32 idx = (mEntryTableSize - 1) - uvar4;
i_packet->setNextPacket(mpBuffer[idx]);
mpBuffer[idx] = i_packet;
return 1;
}
@@ -183,16 +183,16 @@ int J3DDrawBuffer::entryNonSort(J3DMatPacket* i_packet) {
i_packet->drawClear();
i_packet->mpShapePacket->drawClear();
i_packet->setNextPacket(mpBuf[0]);
mpBuf[0] = i_packet;
i_packet->setNextPacket(mpBuffer[0]);
mpBuffer[0] = i_packet;
return 1;
}
/* 802ECCC4-802ECCE4 .text entryImm__13J3DDrawBufferFP9J3DPacketUs */
int J3DDrawBuffer::entryImm(J3DPacket* i_packet, u16 index) {
i_packet->setNextPacket(mpBuf[index]);
mpBuf[index] = i_packet;
i_packet->setNextPacket(mpBuffer[index]);
mpBuffer[index] = i_packet;
return 1;
}
@@ -213,14 +213,14 @@ J3DDrawBuffer::drawFunc J3DDrawBuffer::drawFuncTable[] = {
/* 802ECCE4-802ECD38 .text draw__13J3DDrawBufferCFv */
void J3DDrawBuffer::draw() const {
drawFunc func = drawFuncTable[mDrawType];
drawFunc func = drawFuncTable[mDrawMode];
(this->*func)();
}
/* 802ECD38-802ECDB0 .text drawHead__13J3DDrawBufferCFv */
void J3DDrawBuffer::drawHead() const {
u32 size = mBufSize;
J3DPacket** buf = mpBuf;
u32 size = mEntryTableSize;
J3DPacket** buf = mpBuffer;
for (u32 i = 0; i < size; i++) {
for (J3DPacket* packet = buf[i]; packet != NULL; packet = packet->getNextPacket()) {
@@ -231,10 +231,10 @@ void J3DDrawBuffer::drawHead() const {
/* 802ECDB0-802ECE2C .text drawTail__13J3DDrawBufferCFv */
void J3DDrawBuffer::drawTail() const {
int num = mBufSize - 1;
int num = mEntryTableSize - 1;
for (int i = num; i >= 0; i--) {
for (J3DPacket* packet = mpBuf[i]; packet != NULL; packet = packet->getNextPacket()) {
for (J3DPacket* packet = mpBuffer[i]; packet != NULL; packet = packet->getNextPacket()) {
packet->draw();
}
}
@@ -245,8 +245,8 @@ void J3DDrawBuffer::setCallBackPacket(J3DCallBackPacket* pPacket) {
mpCallBackPacket = pPacket;
if (pPacket != NULL) {
pPacket->drawClear();
pPacket->setNextPacket(mpBuf[0]);
mpBuf[0] = pPacket;
pPacket->setNextPacket(mpBuffer[0]);
mpBuffer[0] = pPacket;
}
}
src/d/actor/d_a_grid.cpp
+113 -30
View File
@@ -8,6 +8,84 @@
#include "res/Object/Cloth.h"
#include "res/Object/Ship.h"
class daHo_HIO_c : public JORReflexible {
public:
daHo_HIO_c() {
mNo = -1;
field_0x5 = 1;
field_0x7 = 0;
field_0x14 = 40.0f;
field_0x6 = 0;
field_0x8 = 0;
field_0x18 = 0.5f;
field_0x1c = 0.1f;
field_0xc = 0.1f;
field_0x20 = 0.4f;
field_0x24 = 1.0f;
field_0x28 = 1.0f;
field_0x2c = 1.0f;
field_0x30 = 0xFF;
field_0x31 = 50;
field_0x34 = 900.0f;
field_0x38 = 0;
field_0x39 = 0;
field_0x70[0] = 1.0f;
field_0x70[1] = 0.425f;
field_0x70[2] = 0.45f;
field_0x70[3] = 0.4f;
field_0x70[4] = 0.2f;
field_0x70[5] = 0.4f;
field_0x70[6] = 0.45f;
field_0x70[7] = 0.4f;
field_0x70[8] = 0.2f;
field_0x70[9] = 0.5f;
field_0x70[10] = 0.75f;
field_0x70[11] = 1.0f;
field_0x70[12] = 1.0f;
field_0x3c[0] = 0.05f;
field_0x3c[1] = 0.125f;
field_0x3c[2] = 0.175f;
field_0x3c[3] = 0.15f;
field_0x3c[4] = 0.0625f;
field_0x3c[5] = 0.15f;
field_0x3c[6] = 0.2f;
field_0x3c[7] = 0.15f;
field_0x3c[8] = 0.075f;
field_0x3c[9] = 0.175f;
field_0x3c[10] = 0.175f;
field_0x3c[11] = 0.1f;
field_0x3c[12] = 0.0f;
}
virtual ~daHo_HIO_c() { mNo = -1; }
void genMessage(JORMContext* ctx) { UNUSED(ctx); }
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ u8 field_0x7;
/* 0x08 */ u8 field_0x8;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ u8 field_0x30;
/* 0x31 */ u8 field_0x31;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ u8 field_0x38;
/* 0x39 */ u8 field_0x39;
/* 0x3C */ f32 field_0x3c[13];
/* 0x70 */ f32 field_0x70[13];
};
static daHo_HIO_c l_HIO;
static daShip_c* l_ship;
@@ -156,8 +234,8 @@ void daHo_packet_c::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
GXSetArray(GX_VA_POS, getPos(), sizeof(cXyz));
GXSetArray(GX_VA_NRM, getNrm(), sizeof(cXyz));
GXSetArray(GX_VA_POS, mPos[field_0x18a2], sizeof(cXyz));
GXSetArray(GX_VA_NRM, mNrm[field_0x18a2], sizeof(cXyz));
GXSetArray(GX_VA_TEX0, l_texCoord, sizeof(cXy));
GXTexObj texObj;
@@ -342,7 +420,7 @@ void ho_move(daGrid_c* i_this) {
cXyz sp28;
MtxPosition(&sp34, &sp28);
f32 temp_f1 = std::fabsf(sp28.z) + 0.02f;
f32 temp_f29 = std::fabsf(sp28.z) + 0.02f;
sp34.x = 1.0f;
sp34.z = 0.0f;
MtxPosition(&sp34, &sp28);
@@ -350,8 +428,8 @@ void ho_move(daGrid_c* i_this) {
f32 temp_f28 = std::fabsf(sp28.z);
temp_f28 *= 1.0f - i_this->field_0x2200;
f32 temp_f = 1.0f + (0.01f + REG6_F(15)) * (temp_f28 * cM_ssin(i_this->field_0x1b44));
s32 temp_r0_2 = 2500.0f + (9000.0f * (DEMO_SELECT(temp_f15, 0.8f) * windPow)) * DEMO_SELECT((1.0f + REG10_F(3)), 1);
i_this->field_0x1b44 += cLib_maxLimit(temp_r0_2, (s32)10000);
int temp_r0_2 = 2500.0f + (9000.0f * (DEMO_SELECT(temp_f15, 0.8f) * windPow)) * DEMO_SELECT((1.0f + REG10_F(3)), 1);
i_this->field_0x1b44 += cLib_maxLimit(temp_r0_2, 10000);
i_this->field_0x2212 += (s16)(3000.0f * cM_scos(var_r28));
s16 temp_r3_2;
@@ -397,11 +475,11 @@ void ho_move(daGrid_c* i_this) {
for (int i = 0; i < 85; i++, pos++) {
f32 temp_f25 = 1.0f - i_this->field_0x2200;
f32 temp_f24 = 3 - var_r24;
f32 temp_f23 = var_r23 - 2 + DEMO_SELECT(REG0_F(5), 0);
f32 temp_f23 = var_r23 - 2 + DEMO_SELECT(REG10_S(5), 0);
s16 sp50 = 10922.0f * x_rate_tbl[var_r23];
temp_f31 = temp_f1 * cM_ssin(i_this->field_0x1b44 + i * i_this->field_0x1b4c);
temp_f30 = 0.5f * (temp_f1 * cM_scos(i_this->field_0x1b44 + i * i_this->field_0x1b4e));
temp_f31 = temp_f29 * cM_ssin(i_this->field_0x1b44 + i * i_this->field_0x1b4c);
temp_f30 = 0.5f * (temp_f29 * cM_scos(i_this->field_0x1b44 + i * i_this->field_0x1b4e));
MtxPosition(&sp34, &sp28);
f32 x_value = 0.25f + 0.75f * windPow;
@@ -422,7 +500,8 @@ void ho_move(daGrid_c* i_this) {
temp_f30 *= temp_f0_2;
f32 temp_f0_3 = temp_f23 < 0.0f ? temp_f23 : 0.0f;
f32 temp_f1_2 = 0.67f + 0.3f * (SQUARE(temp_f0_3) / DEMO_SELECT(SQUARE(2 - REG10_S(5)), 4));
f32 temp_f1_4 = (SQUARE(temp_f0_3) / DEMO_SELECT(SQUARE(2 - REG10_S(5)), 4));
f32 temp_f1_2 = 0.67f + 0.3f * temp_f1_4;
f32 temp_f3 = 1.0f - temp_f1_2 * i_this->field_0x2200;
f32 z_rate;
f32 temp_f4 = 120.0f;
@@ -452,7 +531,11 @@ void ho_move(daGrid_c* i_this) {
f32 cos_ = cM_scos(i_this->field_0x2212 + sp50 * var_r24);
temp_f5 *= (i_this->field_0x2200 * cos_ * var_r24) / 6.0f;
f32 temp = 1.0f - 0.5f * (SQUARE(temp_f0_3) / 4);
#if VERSION == VERSION_DEMO
f32 temp = 1.0f - 0.5f * SQUARE(temp_f0_3);
#else
f32 temp = 1.0f - 0.5f * (SQUARE(temp_f0_3) / 4.0f);
#endif
temp_f5 *= temp;
temp_f4 *= temp;
@@ -460,7 +543,8 @@ void ho_move(daGrid_c* i_this) {
f32 temp_f1_3 = 0.25f * -temp_f0_5;
if (var_r24 > 4) {
f32 temp = std::fabsf(cM_ssin(i_this->field_0x2212 + (sp50 * 2) * var_r24));
temp_f1_3 += 4.25f * ((var_r24 - 4) * temp);
f32 temp2 = ((var_r24 - 4) * temp);
temp_f1_3 += 4.25f * temp2;
}
if (l_HIO.field_0x39) {
@@ -586,15 +670,13 @@ cPhs_State daGrid_c::_create() {
}
int var_r29;
int i = 0;
Vec* pos_p = l_pos;
for (; i < 85; i++) {
for (int i = 0; i < 85; i++) {
f32 var_f27;
if (i >= 0 && i <= 6) {
var_f27 = 10.0f * (4.0f + DEMO_SELECT(REG0_F(18), 0));
} else if (i >= 7 && i <= 13) {
var_f27 = 10.0f * (7.0f + DEMO_SELECT(REG0_F(4), 0));
var_f27 = 10.0f * (7.0f + DEMO_SELECT(REG0_F(3), 0));
} else if ((i >= 49 && i <= 55) || (i >= 42 && i <= 48)) {
var_f27 = 10.0f * (8.5f + DEMO_SELECT(REG0_F(19), 0));
} else {
@@ -603,9 +685,9 @@ cPhs_State daGrid_c::_create() {
var_r29 = 6;
f32 temp_f4 = std::fabsf(pos_p[0].z - pos_p[i].z);
f32 temp_f2 = std::fabsf(pos_p[var_r29].z - pos_p[i].z);
f32 temp_f0 = std::fabsf(pos_p[0].z - pos_p[var_r29].z);
f32 temp_f4 = std::fabsf(l_pos[0].z - l_pos[i].z);
f32 temp_f2 = std::fabsf(l_pos[var_r29].z - l_pos[i].z);
f32 temp_f0 = std::fabsf(l_pos[0].z - l_pos[var_r29].z);
temp_f0 *= 0.5f;
f32 temp_f1 = 1.05f * ((M_PI / 2) / temp_f0);
@@ -634,18 +716,18 @@ cPhs_State daGrid_c::_create() {
}
}
f32 pos_y = pos_p[i].y;
Vec* temp_r0 = &pos_p[var_r29];
f32 pos_y = l_pos[i].y;
f32 temp_f26;
f32 temp_f1_3;
f32 temp_f1_4;
f32 temp_f0_2;
if (pos_y < temp_r0->y) {
temp_f0_2 = std::fabsf(pos_p[0].y - pos_y);
temp_f1_3 = std::fabsf(temp_r0->y - pos_y);
f32 temp_f0_2; // TODO: needs to be moved up to match demo, but this breaks retail?
f32 temp_f2_2;
if (pos_y < l_pos[var_r29].y) {
temp_f0_2 = std::fabsf(l_pos[0].y - pos_y);
temp_f1_3 = std::fabsf(l_pos[var_r29].y - pos_y);
f32 temp_f2_2 = std::fabsf(temp_r0->y - pos_p[0].y);
temp_f2_2 = std::fabsf(l_pos[var_r29].y - l_pos[0].y);
temp_f2_2 *= 0.5f;
temp_f1_4 = 1.05f * ((M_PI / 2) / temp_f2_2);
@@ -657,12 +739,13 @@ cPhs_State daGrid_c::_create() {
temp_f26 = 10.0f * (8.0f + DEMO_SELECT(REG0_F(15), 0));
}
} else {
temp_f0_2 = std::fabsf(temp_r0->y - pos_y);
temp_f1_3 = std::fabsf(pos_p[84].y - pos_y);
temp_f0_2 = std::fabsf(l_pos[var_r29].y - pos_y);
temp_f1_3 = std::fabsf(l_pos[84].y - pos_y);
f32 temp_f2_2 = std::fabsf(temp_r0->y - pos_p[84].y);
temp_f2_2 = std::fabsf(l_pos[var_r29].y - l_pos[84].y);
temp_f2_2 *= 0.5f;
temp_f1_4 = 1.15f * ((M_PI / 2) / temp_f2_2);
temp_f26 = 10.0f * (2.0f + DEMO_SELECT(REG0_F(17), 0));
}
@@ -687,8 +770,8 @@ cPhs_State daGrid_c::_create() {
/* 800EAEAC-800EAF28 .text _delete__8daGrid_cFv */
bool daGrid_c::_delete() {
dComIfG_resDelete(&mClothPhase, "Cloth");
dComIfG_resDelete(&mShipPhase, "Ship");
dComIfG_resDeleteDemo(&mClothPhase, "Cloth");
dComIfG_resDeleteDemo(&mShipPhase, "Ship");
if (l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);