mirror of
https://github.com/zeldaret/oot.git
synced 2025-01-14 12:17:08 +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>
41 lines
986 B
C++
41 lines
986 B
C++
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <string>
|
|
#include <vector>
|
|
#include "tinyxml2.h"
|
|
|
|
#include "OtherStructs/CutsceneOoT_Commands.h"
|
|
#include "OtherStructs/CutsceneMM_Commands.h"
|
|
#include "ZFile.h"
|
|
#include "ZResource.h"
|
|
|
|
enum class CsFloatType;
|
|
|
|
class ZCutscene : public ZResource
|
|
{
|
|
public:
|
|
ZCutscene(ZFile* nParent);
|
|
~ZCutscene();
|
|
|
|
void ParseRawData() override;
|
|
|
|
Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override;
|
|
|
|
std::string GetBodySourceCode() const override;
|
|
|
|
size_t GetRawDataSize() const override;
|
|
|
|
std::string GetSourceTypeName() const override;
|
|
ZResourceType GetResourceType() const override;
|
|
|
|
static std::string GetCsEncodedFloat(float f, CsFloatType type, bool useSciNotation);
|
|
|
|
int32_t numCommands;
|
|
int32_t endFrame;
|
|
std::vector<CutsceneCommand*> commands;
|
|
|
|
protected:
|
|
CutsceneCommand* GetCommandOoT(uint32_t id, offset_t currentPtr) const;
|
|
CutsceneCommand* GetCommandMM(uint32_t id, offset_t currentPtr) const;
|
|
};
|