diff options
| author | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2023-10-17 05:56:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 23:56:49 -0400 |
| commit | 094e797349c86d0baef4a624962f4287aefdfef2 (patch) | |
| tree | ee08bc4d0cba7fe53732d056627532bb2ffd605d /ZAPD/ZRoom/Commands/SetMesh.h | |
| parent | 338e35f89afc905399ad90c952d154ae7b20bf75 (diff) | |
Update old names to newer ones (#305)JackMaster
* JointKey -> LegacyJointKey
* CamData -> BgCamInfo
* TransformData -> CurveInterpKnot
* TransformUpdateIndex -> CurveAnimationHeader
* SkelCurveLimbList -> CurveSkeletonHeader
* LightSettings -> EnvLightSettings
* EntranceEntry -> Spawn
* PolygonDlist -> RoomShapeDListsEntry
* PolygonType0 -> RoomShapeNormal,
MeshHeader1Single -> RoomShapeImageSingle
* BgImage -> RoomShapeImageMultiBgEntry
* MeshHeader1Multi -> RoomShapeImageMulti
PolygonDlist2 -> RoomShapeCullableEntry
* PolygonType2 -> RoomShapeCullable
* SCENE_CMD_MESH -> SCENE_CMD_ROOM_SHAPE
* implement enum parsing + use NaviQuestHintFileId
* Struct_800A57C0 -> SkinVertex
* Struct_800A598C_2 -> SkinTransformation
* Struct_800A5E28 -> SkinAnimatedLimbData
* Struct_800A598C -> SkinLimbModif
* fix MM issues
* LinkAnimationHeader -> PlayerAnimationHeader (MM)
* CsCameraEntry -> ActorCsCamInfo (MM)
* remaining scene commands (MM)
* format
* removed useless comment
* name skinlimb members
* format
* fixed indentation
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetMesh.h')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetMesh.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/ZAPD/ZRoom/Commands/SetMesh.h b/ZAPD/ZRoom/Commands/SetMesh.h index 9d90374..c0f15da 100644 --- a/ZAPD/ZRoom/Commands/SetMesh.h +++ b/ZAPD/ZRoom/Commands/SetMesh.h @@ -5,7 +5,7 @@ #include "ZDisplayList.h" #include "ZRoom/ZRoomCommand.h" -class PolygonDlist : public ZResource +class RoomShapeDListsEntry : public ZResource { public: ZRoom* zRoom; @@ -21,7 +21,7 @@ public: ZDisplayList* opaDList = nullptr; // Gfx* ZDisplayList* xluDList = nullptr; // Gfx* - PolygonDlist(ZFile* nParent); + RoomShapeDListsEntry(ZFile* nParent); void ParseRawData() override; void DeclareReferences(const std::string& prefix) override; @@ -41,7 +41,7 @@ protected: ZDisplayList* MakeDlist(segptr_t ptr, const std::string& prefix); }; -class BgImage : public ZResource +class RoomShapeImageMultiBgEntry : public ZResource { public: uint16_t unk_00; @@ -60,8 +60,9 @@ public: bool isSubStruct; - BgImage(ZFile* nParent); - BgImage(bool nIsSubStruct, const std::string& prefix, uint32_t nRawDataIndex, ZFile* nParent); + RoomShapeImageMultiBgEntry(ZFile* nParent); + RoomShapeImageMultiBgEntry(bool nIsSubStruct, const std::string& prefix, uint32_t nRawDataIndex, + ZFile* nParent); void ParseRawData() override; @@ -80,7 +81,7 @@ class PolygonTypeBase : public ZResource { public: uint8_t type; - std::vector<PolygonDlist> polyDLists; + std::vector<RoomShapeDListsEntry> polyDLists; PolygonTypeBase(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); @@ -100,12 +101,12 @@ public: segptr_t dlist; // single - BgImage single; + RoomShapeImageMultiBgEntry single; // multi uint8_t count; - segptr_t list; // BgImage* - std::vector<BgImage> multiList; + segptr_t list; // RoomShapeImageMultiBgEntry* + std::vector<RoomShapeImageMultiBgEntry> multiList; PolygonType1(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); @@ -119,14 +120,14 @@ public: size_t GetRawDataSize() const override; }; -class PolygonType2 : public PolygonTypeBase +class RoomShapeCullable : public PolygonTypeBase { public: uint8_t num; segptr_t start; segptr_t end; - PolygonType2(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); + RoomShapeCullable(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); void ParseRawData() override; void DeclareReferences(const std::string& prefix) override; |