mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-17 12:33:38 +00:00
Code Issues Projects Releases Wiki Activity

Remove submodule and use subrepo for ZAPD (#591)

Browse source 
* remove zap

* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "cd4a8760b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "cd4a8760b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* remove thanks.md

* zap2 -> zapd and spec changes

* remove submodule init
This commit is contained in:
fig02 2021-01-01 23:24:29 -05:00 • committed by GitHub
parent ae5a8f2700
commit ba0c6965ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
220 changed files with 85641 additions and 554 deletions
Download patch file Download diff file Expand all files Collapse all files

90
tools/ZAPD/ZAPD/ZCollision.h Normal file
View file

@ -0,0 +1,90 @@
#pragma once
#include "ZResource.h"
#include "ZFile.h"
#include "ZRoom/ZRoom.h"
class PolygonEntry
{
public:
int16_t type;
int16_t vtxA, vtxB, vtxC;
int16_t a, b, c, d;
PolygonEntry(std::vector<uint8_t> rawData, int rawDataIndex);
};
class VertexEntry
{
public:
int16_t x, y, z;
VertexEntry(std::vector<uint8_t> rawData, int rawDataIndex);
};
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(std::vector<uint8_t> rawData, int rawDataIndex);
};
class CameraPositionData
{
public:
int16_t x, y, z;
CameraPositionData(std::vector<uint8_t> rawData, int rawDataIndex);
};
class CameraDataEntry
{
public:
int16_t cameraSType;
int16_t numData;
int32_t cameraPosDataSeg;
};
class CameraDataList
{
public:
std::vector<CameraDataEntry*> entries;
std::vector<CameraPositionData*> cameraPositionData;
CameraDataList(ZFile* parent, std::string prefix, std::vector<uint8_t> rawData, int rawDataIndex, int polyTypeDefSegmentOffset, int polygonTypesCnt);
};
class ZCollisionHeader : public ZResource
{
public:
int16_t absMinX, absMinY, absMinZ;
int16_t absMaxX, absMaxY, absMaxZ;
int16_t numVerts;
int32_t vtxSegmentOffset;
int16_t numPolygons;
int32_t polySegmentOffset;
int32_t polyTypeDefSegmentOffset;
int32_t camDataSegmentOffset;
int32_t numWaterBoxes;
int32_t waterBoxSegmentOffset;
std::vector<VertexEntry*> vertices;
std::vector<PolygonEntry*> polygons;
std::vector<uint64_t> polygonTypes;
std::vector<WaterBoxHeader*> waterBoxes;
CameraDataList* camData;
ZCollisionHeader();
//ZCollisionHeader(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex);
ZCollisionHeader(ZFile* parent, std::string prefix, std::vector<uint8_t> rawData, int rawDataIndex);
static ZCollisionHeader* ExtractFromXML(tinyxml2::XMLElement* reader, std::vector<uint8_t> nRawData, int rawDataIndex);
};