diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-10-16 13:36:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 13:36:36 -0700 |
| commit | 20cc6db46bbf036ce447f9ee9d1ef2b93502e23d (patch) | |
| tree | 38f61f19dc3764ce694dcf2f7b3aefe4a14278c8 /include/JSystem | |
| parent | 8a37ec07d14b5691b222ebb749cf4df32b5a8d09 (diff) | |
| parent | 0413154d722d29df43887607c2dabbb6eb27cbf6 (diff) | |
Merge pull request #524 from Jcw87/J3DJoint
J3DJoint
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DNode.h | 4 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMaterial.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DNode.h b/include/JSystem/J3DGraphAnimator/J3DNode.h index ec8a783d..954fde89 100644 --- a/include/JSystem/J3DGraphAnimator/J3DNode.h +++ b/include/JSystem/J3DGraphAnimator/J3DNode.h @@ -10,10 +10,10 @@ typedef int (*J3DNodeCallBack)(J3DNode*, int); class J3DNode { public: virtual void init(J3DModelData*) {} - virtual void entryIn(); + virtual void entryIn() {} virtual void calcIn() {} virtual void calcOut() {} - virtual u32 getType() const; + virtual u32 getType() const { return 'NNON'; } virtual ~J3DNode(); J3DNode(); diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 7bc64fce..7ecda53c 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -42,6 +42,7 @@ public: virtual void change(); J3DMaterial* getNext() const { return mNext; } + void setNext(J3DMaterial* material) {mNext = material; } J3DShape* getShape() const { return mShape; } u32 getMaterialMode() { return mMaterialMode; } void setMaterialMode(u32 mode) { mMaterialMode = mode; } |
