mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
f31a841789
* git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "6aa54a551" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "6aa54a551" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "88b012240" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "88b012240" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Update (its broken) * fix the enum * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "b7b6e1c82" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "b7b6e1c82" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * New names for LUS actions * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "c5cfebeee" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "c5cfebeee" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone (merge) --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "d5f4769b8" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "d5f4769b8" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Fix missing commands in the exporter. * Cleanups. * git subrepo pull --force --remote=https://github.com/harbourmasters/ZAPDTR --branch=master ZAPDTR subrepo: subdir: "ZAPDTR" merged: "d4c35b90a" upstream: origin: "https://github.com/harbourmasters/ZAPDTR" branch: "master" commit: "d4c35b90a" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Add unordered_map include to fix MacOS * fix string_view * Update Main.cpp * fix string view * So close I can almost taste it * So close * Fix missed git marker. * Fix surface types and * Update ZFile.cpp * Delete Jenkinsfile --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
91 lines
2.0 KiB
C++
91 lines
2.0 KiB
C++
#pragma once
|
|
|
|
#include "ZCollisionPoly.h"
|
|
#include "ZFile.h"
|
|
#include "ZResource.h"
|
|
#include "ZRoom/ZRoom.h"
|
|
#include "ZSurfaceType.h"
|
|
#include "ZVector.h"
|
|
|
|
class WaterBoxHeader
|
|
{
|
|
public:
|
|
int16_t xMin;
|
|
int16_t ySurface;
|
|
int16_t zMin;
|
|
int16_t xLength;
|
|
int16_t zLength;
|
|
int16_t pad;
|
|
int32_t properties;
|
|
|
|
WaterBoxHeader(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
|
|
|
|
std::string GetBodySourceCode() const;
|
|
};
|
|
|
|
class CameraPositionData
|
|
{
|
|
public:
|
|
int16_t x, y, z;
|
|
|
|
CameraPositionData(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
|
|
};
|
|
|
|
class CameraDataEntry
|
|
{
|
|
public:
|
|
uint16_t cameraSType;
|
|
int16_t numData;
|
|
int32_t cameraPosDataSeg;
|
|
};
|
|
|
|
class CameraDataList
|
|
{
|
|
public:
|
|
std::vector<CameraDataEntry*> entries;
|
|
std::vector<CameraPositionData*> cameraPositionData;
|
|
|
|
CameraDataList(ZFile* parent, const std::string& prefix, const std::vector<uint8_t>& rawData,
|
|
offset_t rawDataIndex, offset_t upperCameraBoundary);
|
|
~CameraDataList();
|
|
};
|
|
|
|
class ZCollisionHeader : public ZResource
|
|
{
|
|
public:
|
|
int16_t absMinX, absMinY, absMinZ;
|
|
int16_t absMaxX, absMaxY, absMaxZ;
|
|
uint16_t numVerts;
|
|
segptr_t vtxAddress;
|
|
uint16_t numPolygons;
|
|
segptr_t polyAddress;
|
|
segptr_t polyTypeDefAddress;
|
|
segptr_t camDataAddress;
|
|
|
|
int32_t numWaterBoxes;
|
|
segptr_t waterBoxAddress;
|
|
|
|
uint32_t vtxSegmentOffset, polySegmentOffset, polyTypeDefSegmentOffset, camDataSegmentOffset,
|
|
waterBoxSegmentOffset;
|
|
|
|
std::vector<ZVector> vertices;
|
|
std::vector<ZCollisionPoly> polygons;
|
|
std::vector<ZSurfaceType> PolygonTypes;
|
|
std::vector<WaterBoxHeader> waterBoxes;
|
|
CameraDataList* camData = nullptr;
|
|
|
|
ZCollisionHeader(ZFile* nParent);
|
|
~ZCollisionHeader();
|
|
|
|
void ParseRawData() override;
|
|
void DeclareReferences(const std::string& prefix) override;
|
|
|
|
std::string GetBodySourceCode() const override;
|
|
std::string GetDefaultName(const std::string& prefix) const override;
|
|
|
|
std::string GetSourceTypeName() const override;
|
|
ZResourceType GetResourceType() const override;
|
|
|
|
size_t GetRawDataSize() const override;
|
|
};
|