summaryrefslogtreecommitdiff
path: root/include/JSystem
diff options
context:
space:
mode:
authorCarco_21 <144170194+carter-ktb21@users.noreply.github.com>2025-07-10 19:16:30 -0400
committerGitHub <noreply@github.com>2025-07-11 02:16:30 +0300
commitb67414ef1a5f084b6d3fc08b066e5d1cabc3cb2a (patch)
tree80474d17ac06c8eb3884e60136d393d29a6ee334 /include/JSystem
parent3de6b37edf0ddf48eff336f66130f4379460e3d4 (diff)
d_a_demo00 work (#2525)
* Initial work * Got to ke_control * draw function * tiny execute work * all functions worked on * PR cleanup * Took out static keyword for dDemo_setDemoData
Diffstat (limited to 'include/JSystem')
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DJoint.h2
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DModel.h1
-rw-r--r--include/JSystem/J3DGraphBase/J3DMatBlock.h2
3 files changed, 5 insertions, 0 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h
index cd759add7f..d5854e996f 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJoint.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h
@@ -70,6 +70,8 @@ public:
static J3DMtxCalc* mCurrentMtxCalc;
+ inline u8 getKind() { return mKind & 15; }
+
private:
friend struct J3DJointFactory;
friend class J3DJointTree;
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index eca87c8127..9e412af352 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -100,6 +100,7 @@ public:
Vec* getBaseScale() { return &mBaseScale; }
void setAnmMtx(int jointNo, Mtx m) { mMtxBuffer->setAnmMtx(jointNo, m); }
MtxP getAnmMtx(int jointNo) { return mMtxBuffer->getAnmMtx(jointNo); }
+ J3DSkinDeform* getSkinDeform() { return mSkinDeform; }
/* 0x04 */ J3DModelData* mModelData;
/* 0x08 */ u32 mFlags;
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index 08ffccddb9..9d25587042 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -726,6 +726,8 @@ struct J3DBlend : public J3DBlendInfo {
void load(u8 ditherEnable) {
J3DGDSetBlendMode(getBlendMode(), getSrcFactor(), getDstFactor(), getLogicOp(), ditherEnable);
}
+
+ void setBlendInfo(const J3DBlendInfo& i_blendInfo) { *static_cast<J3DBlendInfo*>(this) = i_blendInfo; }
};
extern const J3DFogInfo j3dDefaultFogInfo;