mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some matches in JPADrawVisitor

Browse Source
This commit is contained in:
LagoLunatic
2024-04-15 19:56:16 -04:00
parent 19325b3c0b
commit a88c87bf63
2 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JGeometry.h
+1
View File
@@ -77,6 +77,7 @@ struct TVec3<f32> : public Vec {
TVec3() {}
TVec3(f32 x, f32 y, f32 z) { set(x, y, z); }
TVec3(const Vec& b) { set(b); }
TVec3(const TVec3<f32>& b) { set(b); }
operator Vec*() { return (Vec*)&x; }
operator const Vec*() const { return (Vec*)&x; }
src/JSystem/JParticle/JPADrawVisitor.cpp
+22 -30
View File
@@ -278,7 +278,6 @@ void JPADrawExecLoadTexture::exec(const JPADrawContext* pDC, JPABaseParticle* pt
/* 80260BAC-80260D24 .text exec__20JPADrawExecBillBoardFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecBillBoard::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
/* Nonmatching */
if (ptcl->isInvisibleParticle())
return;
@@ -287,25 +286,21 @@ void JPADrawExecBillBoard::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl
f32 x0 = scaleX * (JPADrawContext::pcb->mGlobalScaleX - JPADrawContext::pcb->mPivotX);
f32 y0 = scaleY * (JPADrawContext::pcb->mGlobalScaleY - JPADrawContext::pcb->mPivotY);
f32 x1 = scaleX * (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX);
f32 y1 = scaleY * (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY);
scaleX *= (JPADrawContext::pcb->mGlobalScaleX + JPADrawContext::pcb->mPivotX);
scaleY *= (JPADrawContext::pcb->mGlobalScaleY + JPADrawContext::pcb->mPivotY);
JGeometry::TVec3<f32> pt(ptcl->mPosition);
MTXMultVec(JPADrawContext::pcb->mDrawMtxPtr, pt, &pt);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
f32 px = pt.x;
f32 py = pt.y;
f32 pz = pt.z;
JGeometry::TVec2<f32>* texCoord = JPADrawContext::pcb->mTexCoordPt;
GXPosition3f32(-x0 + px, +y0 + py, pz);
GXTexCoord2f32(texCoord[0].x, texCoord[0].y);
GXPosition3f32(+x1 + px, +y0 + py, pz);
GXTexCoord2f32(texCoord[1].x, texCoord[1].y);
GXPosition3f32(+x1 + px, -y1 + py, pz);
GXTexCoord2f32(texCoord[2].x, texCoord[2].y);
GXPosition3f32(-x0 + px, -y1 + py, pz);
GXTexCoord2f32(texCoord[3].x, texCoord[3].y);
GXPosition3f32(-scaleX + pt.x, +scaleY + pt.y, pt.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[0].x, JPADrawContext::pcb->mTexCoordPt[0].y);
GXPosition3f32(+x0 + pt.x, +scaleY + pt.y, pt.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[1].x, JPADrawContext::pcb->mTexCoordPt[1].y);
GXPosition3f32(+x0 + pt.x, -y0 + pt.y, pt.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[2].x, JPADrawContext::pcb->mTexCoordPt[2].y);
GXPosition3f32(-scaleX + pt.x, -y0 + pt.y, pt.z);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[3].x, JPADrawContext::pcb->mTexCoordPt[3].y);
GXEnd();
}
@@ -499,7 +494,6 @@ void JPADrawExecDirBillBoard::exec(const JPADrawContext* pDC, JPABaseParticle* p
/* 80262DC0-80262FBC .text exec__19JPADrawExecRotationFPC14JPADrawContextP15JPABaseParticle */
void JPADrawExecRotation::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl) {
/* Nonmatching */
if (ptcl->isInvisibleParticle())
return;
@@ -523,15 +517,14 @@ void JPADrawExecRotation::exec(const JPADrawContext* pDC, JPABaseParticle* ptcl)
f32 z = ptcl->mPosition.z;
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
JGeometry::TVec2<f32>* texCoord = JPADrawContext::pcb->mTexCoordPt;
GXPosition3f32(pt[0].x + x, pt[0].y + y, pt[0].z + z);
GXTexCoord2f32(texCoord[0].x, texCoord[0].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[0].x, JPADrawContext::pcb->mTexCoordPt[0].y);
GXPosition3f32(pt[1].x + x, pt[1].y + y, pt[1].z + z);
GXTexCoord2f32(texCoord[1].x, texCoord[1].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[1].x, JPADrawContext::pcb->mTexCoordPt[1].y);
GXPosition3f32(pt[2].x + x, pt[2].y + y, pt[2].z + z);
GXTexCoord2f32(texCoord[2].x, texCoord[2].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[2].x, JPADrawContext::pcb->mTexCoordPt[2].y);
GXPosition3f32(pt[3].x + x, pt[3].y + y, pt[3].z + z);
GXTexCoord2f32(texCoord[3].x, texCoord[3].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[3].x, JPADrawContext::pcb->mTexCoordPt[3].y);
GXEnd();
}
@@ -572,23 +565,22 @@ void JPADrawExecRotationCross::exec(const JPADrawContext* pDC, JPABaseParticle*
f32 z = ptcl->mPosition.z;
GXBegin(GX_QUADS, GX_VTXFMT0, 8);
JGeometry::TVec2<f32>* texCoord = JPADrawContext::pcb->mTexCoordPt;
GXPosition3f32(pt[0].x + x, pt[0].y + y, pt[0].z + z);
GXTexCoord2f32(texCoord[0].x, texCoord[0].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[0].x, JPADrawContext::pcb->mTexCoordPt[0].y);
GXPosition3f32(pt[1].x + x, pt[1].y + y, pt[1].z + z);
GXTexCoord2f32(texCoord[1].x, texCoord[1].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[1].x, JPADrawContext::pcb->mTexCoordPt[1].y);
GXPosition3f32(pt[2].x + x, pt[2].y + y, pt[2].z + z);
GXTexCoord2f32(texCoord[2].x, texCoord[2].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[2].x, JPADrawContext::pcb->mTexCoordPt[2].y);
GXPosition3f32(pt[3].x + x, pt[3].y + y, pt[3].z + z);
GXTexCoord2f32(texCoord[3].x, texCoord[3].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[3].x, JPADrawContext::pcb->mTexCoordPt[3].y);
GXPosition3f32(pt[4].x + x, pt[4].y + y, pt[4].z + z);
GXTexCoord2f32(texCoord[0].x, texCoord[0].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[0].x, JPADrawContext::pcb->mTexCoordPt[0].y);
GXPosition3f32(pt[5].x + x, pt[5].y + y, pt[5].z + z);
GXTexCoord2f32(texCoord[1].x, texCoord[1].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[1].x, JPADrawContext::pcb->mTexCoordPt[1].y);
GXPosition3f32(pt[6].x + x, pt[6].y + y, pt[6].z + z);
GXTexCoord2f32(texCoord[2].x, texCoord[2].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[2].x, JPADrawContext::pcb->mTexCoordPt[2].y);
GXPosition3f32(pt[7].x + x, pt[7].y + y, pt[7].z + z);
GXTexCoord2f32(texCoord[3].x, texCoord[3].y);
GXTexCoord2f32(JPADrawContext::pcb->mTexCoordPt[3].x, JPADrawContext::pcb->mTexCoordPt[3].y);
GXEnd();
}