Merge tag 'tags/7.0.1' into new_item_menu

Spock Bravo
lilDavid · May 11, 2023 · 71568e4 · 71568e4
2 parents 1ce7ae5 + d8891f1
commit 71568e4
Show file tree

Hide file tree

Showing 361 changed files with 7,086 additions and 9,558 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@ __pycache__/
 .vscode/
 .vs/
 .idea/
-cmake-build-debug
+cmake-build-**
 venv/
 .cache/
 
@@ -444,6 +444,7 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
+_packages
 */extract_assets_cmake*
 /build*
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(Ship VERSION 7.0.0 LANGUAGES C CXX)
-set(PROJECT_BUILD_NAME "Spock Alfa" CACHE STRING "")
+project(Ship VERSION 7.0.1 LANGUAGES C CXX)
+set(PROJECT_BUILD_NAME "Spock Bravo" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

diff --git a/OTRExporter/OTRExporter/AnimationExporter.cpp b/OTRExporter/OTRExporter/AnimationExporter.cpp
@@ -5,20 +5,20 @@ void OTRExporter_Animation::Save(ZResource* res, const fs::path& outPath, Binary
 {
 	ZAnimation* anim = (ZAnimation*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_Animation);
+	WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Animation);
 
 	ZNormalAnimation* normalAnim = dynamic_cast<ZNormalAnimation*>(anim);
 	ZCurveAnimation* curveAnim = dynamic_cast<ZCurveAnimation*>(anim);
 	ZLinkAnimation* linkAnim = dynamic_cast<ZLinkAnimation*>(anim);
 	if (linkAnim != nullptr)
 	{
-		writer->Write((uint32_t)Ship::AnimationType::Link);
+		writer->Write((uint32_t)LUS::AnimationType::Link);
 		writer->Write((uint16_t)linkAnim->frameCount);
 		writer->Write((uint32_t)linkAnim->segmentAddress);
 	}
 	else if (curveAnim != nullptr)
 	{
-		writer->Write((uint32_t)Ship::AnimationType::Curve);
+		writer->Write((uint32_t)LUS::AnimationType::Curve);
 		writer->Write((uint16_t)curveAnim->frameCount);
 
 		writer->Write((uint32_t)curveAnim->refIndexArr.size());
@@ -44,7 +44,7 @@ void OTRExporter_Animation::Save(ZResource* res, const fs::path& outPath, Binary
 	}
 	else if (normalAnim != nullptr)
 	{
-		writer->Write((uint32_t)Ship::AnimationType::Normal);
+		writer->Write((uint32_t)LUS::AnimationType::Normal);
 		writer->Write((uint16_t)normalAnim->frameCount);
 
 		writer->Write((uint32_t)normalAnim->rotationValues.size());
@@ -65,6 +65,6 @@ void OTRExporter_Animation::Save(ZResource* res, const fs::path& outPath, Binary
 	}
 	else
 	{
-		writer->Write((uint32_t)Ship::AnimationType::Legacy);
+		writer->Write((uint32_t)LUS::AnimationType::Legacy);
 	}
 }
diff --git a/OTRExporter/OTRExporter/ArrayExporter.cpp b/OTRExporter/OTRExporter/ArrayExporter.cpp
@@ -5,7 +5,7 @@ void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 {
 	ZArray* arr = (ZArray*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::Array);
+	WriteHeader(res, outPath, writer, LUS::ResourceType::Array);
 
 	writer->Write((uint32_t)arr->resList[0]->GetResourceType());
 	writer->Write((uint32_t)arr->arrayCnt);

diff --git a/OTRExporter/OTRExporter/AudioExporter.cpp b/OTRExporter/OTRExporter/AudioExporter.cpp
@@ -2,7 +2,7 @@
 #include "Main.h"
 #include <Utils/MemoryStream.h>
 #include <Globals.h>
-#include <Utils/File.h>
+#include <Utils/DiskFile.h>
 #include "DisplayListExporter.h"
 
 void OTRExporter_Audio::WriteSampleEntryReference(ZAudio* audio, SampleEntry* entry, std::map<uint32_t, SampleEntry*> samples, BinaryWriter* writer)
@@ -29,7 +29,7 @@ void OTRExporter_Audio::WriteSampleEntryReference(ZAudio* audio, SampleEntry* en
 
 void OTRExporter_Audio::WriteSampleEntry(SampleEntry* entry, BinaryWriter* writer)
 {
-	WriteHeader(nullptr, "", writer, Ship::ResourceType::SOH_AudioSample, Ship::Version::Rachael);
+	WriteHeader(nullptr, "", writer, LUS::ResourceType::SOH_AudioSample, 2);
 
 	writer->Write(entry->codec);
 	writer->Write(entry->medium);
@@ -81,7 +81,7 @@ void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 {
 	ZAudio* audio = (ZAudio*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_Audio, Ship::Version::Rachael);
+	WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Audio, 2);
 
 	// Write Samples as individual files
 	for (auto pair : audio->samples)
@@ -114,7 +114,7 @@ void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 		MemoryStream* fntStream = new MemoryStream();
 		BinaryWriter fntWriter = BinaryWriter(fntStream);
 
-		WriteHeader(nullptr, "", &fntWriter, Ship::ResourceType::SOH_AudioSoundFont, Ship::Version::Rachael);
+		WriteHeader(nullptr, "", &fntWriter, LUS::ResourceType::SOH_AudioSoundFont, 2);
 
 		fntWriter.Write((uint32_t)i);
 		fntWriter.Write(audio->soundFontTable[i].medium);
@@ -173,7 +173,7 @@ void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 		MemoryStream* seqStream = new MemoryStream();
 		BinaryWriter seqWriter = BinaryWriter(seqStream);
 
-		WriteHeader(nullptr, "", &seqWriter, Ship::ResourceType::SOH_AudioSequence, Ship::Version::Rachael);
+		WriteHeader(nullptr, "", &seqWriter, LUS::ResourceType::SOH_AudioSequence, 2);
 
 		seqWriter.Write((uint32_t)seq.size());
 		seqWriter.Write(seq.data(), seq.size());

diff --git a/OTRExporter/OTRExporter/BackgroundExporter.cpp b/OTRExporter/OTRExporter/BackgroundExporter.cpp
@@ -5,7 +5,7 @@ void OTRExporter_Background::Save(ZResource* res, const fs::path& outPath, Binar
 {
 	ZBackground* bg = (ZBackground*)res;
 
-	WriteHeader(bg, outPath, writer, Ship::ResourceType::SOH_Background);
+	WriteHeader(bg, outPath, writer, LUS::ResourceType::SOH_Background);
 
 	writer->Write((uint32_t)bg->GetRawDataSize());
 

diff --git a/OTRExporter/OTRExporter/BlobExporter.cpp b/OTRExporter/OTRExporter/BlobExporter.cpp
@@ -5,7 +5,7 @@ void OTRExporter_Blob::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 {
 	ZBlob* blob = (ZBlob*)res;
 
-	WriteHeader(blob, outPath, writer, Ship::ResourceType::Blob);
+	WriteHeader(blob, outPath, writer, LUS::ResourceType::Blob);
 
 	auto start = std::chrono::steady_clock::now();
 

diff --git a/OTRExporter/OTRExporter/CollisionExporter.cpp b/OTRExporter/OTRExporter/CollisionExporter.cpp
@@ -5,7 +5,7 @@ void OTRExporter_Collision::Save(ZResource* res, const fs::path& outPath, Binary
 {
 	ZCollisionHeader* col = (ZCollisionHeader*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_CollisionHeader);
+	WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_CollisionHeader);
 
 	writer->Write(col->absMinX);
 	writer->Write(col->absMinY);
@@ -32,16 +32,18 @@ void OTRExporter_Collision::Save(ZResource* res, const fs::path& outPath, Binary
 		writer->Write(col->polygons[i].vtxA);
 		writer->Write(col->polygons[i].vtxB);
 		writer->Write(col->polygons[i].vtxC);
-		writer->Write(col->polygons[i].a);
-		writer->Write(col->polygons[i].b);
-		writer->Write(col->polygons[i].c);
-		writer->Write(col->polygons[i].d);
+		writer->Write(col->polygons[i].normX);
+		writer->Write(col->polygons[i].normY);
+		writer->Write(col->polygons[i].normZ);
+		writer->Write(col->polygons[i].dist);
 	}
 
-	writer->Write((uint32_t)col->polygonTypes.size());
+	writer->Write((uint32_t)col->PolygonTypes.size());
 
-	for (uint16_t i = 0; i < col->polygonTypes.size(); i++)
-		writer->Write(col->polygonTypes[i]);
+	for (uint16_t i = 0; i < col->PolygonTypes.size(); i++) {
+		writer->Write(col->PolygonTypes[i].data[1]);
+		writer->Write(col->PolygonTypes[i].data[0]);
+	}
 
 	writer->Write((uint32_t)col->camData->entries.size());