From 25907c830822c4878943c088639322a44253573e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 14 Apr 2024 14:00:45 -0700 Subject: [PATCH] small JPA fixes --- include/JSystem/JGeometry.h | 1 - src/JSystem/JParticle/JPADraw.cpp | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 56f590ad0..60dcb12b8 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -77,7 +77,6 @@ struct TVec3 : public Vec { TVec3() {} TVec3(f32 x, f32 y, f32 z) { set(x, y, z); } TVec3(const Vec& b) { set(b); } - TVec3(const TVec3& b) { set(b); } operator Vec*() { return (Vec*)&x; } operator const Vec*() const { return (Vec*)&x; } diff --git a/src/JSystem/JParticle/JPADraw.cpp b/src/JSystem/JParticle/JPADraw.cpp index 044cfa9e4..03d300f06 100644 --- a/src/JSystem/JParticle/JPADraw.cpp +++ b/src/JSystem/JParticle/JPADraw.cpp @@ -766,14 +766,14 @@ void JPADraw::setChildClipBoard() { cb.mPivotX = cb.mPivotY = 0.0f; - cb.field_0x14[1].y = 0.0f; - cb.field_0x14[0].y = 0.0f; - cb.field_0x14[3].x = 0.0f; - cb.field_0x14[0].x = 0.0f; - cb.field_0x14[3].y = 1.0f; - cb.field_0x14[2].y = 1.0f; - cb.field_0x14[2].x = 1.0f; - cb.field_0x14[1].x = 1.0f; + cb.mTexCoordPt[1].y = 0.0f; + cb.mTexCoordPt[0].y = 0.0f; + cb.mTexCoordPt[3].x = 0.0f; + cb.mTexCoordPt[0].x = 0.0f; + cb.mTexCoordPt[3].y = 1.0f; + cb.mTexCoordPt[2].y = 1.0f; + cb.mTexCoordPt[2].x = 1.0f; + cb.mTexCoordPt[1].x = 1.0f; cb.mDirTypeFunc = NULL; cb.mRotTypeFunc = NULL;