mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-13 02:10:57 +00:00
bdee3d33b4
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "b3bfa14cf"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "b3bfa14cf"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* use CS_FLOAT
* update csdis
* update committed csdata
* finish updating csdis.py
* add script to reextract committed csdata
* dont use asm-processor, use iconv for reencoding utf8 to eucjp
* remove asm-processor csdata usage remnants
* --cs-float hex
* delete tempfile at end of reencode.sh (may want to rm even if compilation fails though?)
* comment reencode.sh
* comment CMD_F
* do not break permuter guessing compile command, by not reencode.sh-wrapping compilation under PERMUTER (thanks anghelo)
* fix the permuter fix
* pad -> sBssDummyNeg1
* reencode.sh: rm tempfile on script exit (including on error)
* renumber sBssDummy vars in zcolchk from 0
* Revert "--cs-float hex"
This reverts commit 85267dc348.
* Revert BSS changes
* Add linemarker to reencoded files for better error message
* fix audio/general.c bss
* make reencode.sh work on macOS
* touch up csdis, csdis_re
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
52 lines
1.1 KiB
C++
52 lines
1.1 KiB
C++
#pragma once
|
|
#include <cstdint>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <memory>
|
|
|
|
#include "ZFile.h"
|
|
|
|
class ZKeyFrameSkel;
|
|
|
|
typedef struct
|
|
{
|
|
int16_t frame;
|
|
int16_t value;
|
|
int16_t velocity;
|
|
} KeyFrame;
|
|
|
|
class ZKeyFrameAnim : public ZResource
|
|
{
|
|
public:
|
|
ZKeyFrameSkel* skel;
|
|
std::vector<uint8_t> bitFlags; // Standard only
|
|
std::vector<uint16_t> bitFlagsFlex; // Flex only
|
|
|
|
std::vector<KeyFrame> keyFrames;
|
|
std::vector<int16_t> kfNums;
|
|
std::vector<int16_t> presetValues;
|
|
|
|
uint16_t unk_10;
|
|
int16_t duration;
|
|
|
|
ZKeyFrameAnim(ZFile* nParent);
|
|
~ZKeyFrameAnim();
|
|
void ParseXML(tinyxml2::XMLElement* reader) override;
|
|
void DeclareReferencesLate(const std::string& prefix) override;
|
|
void ParseRawDataLate() override;
|
|
std::string GetBodySourceCode() const override;
|
|
|
|
std::string GetSourceTypeName() const override;
|
|
ZResourceType GetResourceType() const override;
|
|
|
|
size_t GetRawDataSize() const override;
|
|
|
|
private:
|
|
offset_t skelOffset;
|
|
segptr_t bitFlagsAddr;
|
|
segptr_t keyFramesAddr;
|
|
segptr_t kfNumsAddr;
|
|
segptr_t presentValuesAddr;
|
|
template <typename T>
|
|
uint32_t GetSetBits(T data) const;
|
|
};
|