From 5de22b50369ed8671d423509b72815894e81522a Mon Sep 17 00:00:00 2001 From: angie Date: Mon, 10 May 2021 21:32:09 -0400 Subject: [PATCH] git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "769f5702a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "769f5702a" git-subrepo: version: "0.4.3" origin: "???" commit: "???" --- tools/ZAPD/.gitrepo | 4 +- tools/ZAPD/Makefile | 38 +- tools/ZAPD/README.md | 39 + tools/ZAPD/ZAPD/Declaration.cpp | 79 + tools/ZAPD/ZAPD/Declaration.h | 65 + tools/ZAPD/ZAPD/File.h | 1 - tools/ZAPD/ZAPD/Globals.cpp | 53 +- tools/ZAPD/ZAPD/Globals.h | 10 +- .../HighLevel/HLAnimationIntermediette.cpp | 15 +- .../ZAPD/HighLevel/HLAnimationIntermediette.h | 2 +- .../ZAPD/HighLevel/HLModelIntermediette.cpp | 142 +- .../ZAPD/HighLevel/HLModelIntermediette.h | 6 +- tools/ZAPD/ZAPD/HighLevel/HLTexture.cpp | 9 +- tools/ZAPD/ZAPD/ImageBackend.cpp | 473 ++ tools/ZAPD/ZAPD/ImageBackend.h | 71 + tools/ZAPD/ZAPD/Main.cpp | 172 +- tools/ZAPD/ZAPD/Overlays/ZOverlay.cpp | 36 +- tools/ZAPD/ZAPD/Overlays/ZOverlay.h | 2 +- tools/ZAPD/ZAPD/Path.h | 4 +- tools/ZAPD/ZAPD/StringHelper.h | 11 +- tools/ZAPD/ZAPD/ZAnimation.cpp | 95 +- tools/ZAPD/ZAPD/ZAnimation.h | 26 +- tools/ZAPD/ZAPD/ZArray.cpp | 4 +- tools/ZAPD/ZAPD/ZArray.h | 6 +- tools/ZAPD/ZAPD/ZBackground.cpp | 28 +- tools/ZAPD/ZAPD/ZBackground.h | 17 +- tools/ZAPD/ZAPD/ZBlob.cpp | 24 +- tools/ZAPD/ZAPD/ZBlob.h | 13 +- tools/ZAPD/ZAPD/ZCollision.cpp | 14 +- tools/ZAPD/ZAPD/ZCollision.h | 4 +- tools/ZAPD/ZAPD/ZCutscene.cpp | 169 +- tools/ZAPD/ZAPD/ZCutscene.h | 14 +- tools/ZAPD/ZAPD/ZCutsceneMM.cpp | 21 +- tools/ZAPD/ZAPD/ZCutsceneMM.h | 10 +- tools/ZAPD/ZAPD/ZDisplayList.cpp | 691 +- tools/ZAPD/ZAPD/ZDisplayList.h | 49 +- tools/ZAPD/ZAPD/ZFile.cpp | 506 +- tools/ZAPD/ZAPD/ZFile.h | 32 +- tools/ZAPD/ZAPD/ZLimb.cpp | 64 +- tools/ZAPD/ZAPD/ZLimb.h | 8 +- tools/ZAPD/ZAPD/ZMtx.cpp | 14 +- tools/ZAPD/ZAPD/ZMtx.h | 10 +- tools/ZAPD/ZAPD/ZPath.cpp | 201 + tools/ZAPD/ZAPD/ZPath.h | 51 + tools/ZAPD/ZAPD/ZResource.cpp | 62 +- tools/ZAPD/ZAPD/ZResource.h | 130 +- tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.cpp | 17 +- tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.h | 12 +- .../ZRoom/Commands/SetActorCutsceneList.cpp | 106 +- .../ZRoom/Commands/SetActorCutsceneList.h | 30 +- .../ZAPD/ZAPD/ZRoom/Commands/SetActorList.cpp | 200 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.h | 46 +- .../ZRoom/Commands/SetAlternateHeaders.cpp | 92 +- .../ZAPD/ZRoom/Commands/SetAlternateHeaders.h | 23 +- .../Commands/SetAnimatedMaterialList.cpp | 402 + ...extureList.h => SetAnimatedMaterialList.h} | 53 +- .../ZRoom/Commands/SetAnimatedTextureList.cpp | 432 - .../ZAPD/ZRoom/Commands/SetCameraSettings.cpp | 30 +- .../ZAPD/ZRoom/Commands/SetCameraSettings.h | 15 +- .../ZRoom/Commands/SetCollisionHeader.cpp | 48 +- .../ZAPD/ZRoom/Commands/SetCollisionHeader.h | 21 +- .../ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.cpp | 171 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.h | 45 +- .../ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.cpp | 110 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.h | 32 +- .../ZAPD/ZRoom/Commands/SetEchoSettings.cpp | 26 +- .../ZAPD/ZRoom/Commands/SetEchoSettings.h | 15 +- .../ZAPD/ZRoom/Commands/SetEntranceList.cpp | 103 +- .../ZAPD/ZRoom/Commands/SetEntranceList.h | 31 +- .../ZAPD/ZAPD/ZRoom/Commands/SetExitList.cpp | 82 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.h | 21 +- .../ZAPD/ZAPD/ZRoom/Commands/SetLightList.cpp | 125 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.h | 41 +- .../ZRoom/Commands/SetLightingSettings.cpp | 150 +- .../ZAPD/ZRoom/Commands/SetLightingSettings.h | 31 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.cpp | 722 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.h | 173 +- .../ZAPD/ZRoom/Commands/SetMinimapChests.cpp | 96 +- .../ZAPD/ZRoom/Commands/SetMinimapChests.h | 31 +- .../ZAPD/ZRoom/Commands/SetMinimapList.cpp | 108 +- .../ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.h | 31 +- .../ZAPD/ZRoom/Commands/SetObjectList.cpp | 88 +- .../ZAPD/ZAPD/ZRoom/Commands/SetObjectList.h | 20 +- .../ZAPD/ZAPD/ZRoom/Commands/SetPathways.cpp | 243 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.h | 64 +- .../ZAPD/ZRoom/Commands/SetRoomBehavior.cpp | 51 +- .../ZAPD/ZRoom/Commands/SetRoomBehavior.h | 27 +- .../ZAPD/ZAPD/ZRoom/Commands/SetRoomList.cpp | 81 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.h | 32 +- .../ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp | 32 +- .../ZAPD/ZRoom/Commands/SetSkyboxModifier.h | 15 +- .../ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp | 40 +- .../ZAPD/ZRoom/Commands/SetSkyboxSettings.h | 17 +- .../ZAPD/ZRoom/Commands/SetSoundSettings.cpp | 32 +- .../ZAPD/ZRoom/Commands/SetSoundSettings.h | 15 +- .../ZAPD/ZRoom/Commands/SetSpecialObjects.cpp | 31 +- .../ZAPD/ZRoom/Commands/SetSpecialObjects.h | 15 +- .../ZRoom/Commands/SetStartPositionList.cpp | 93 +- .../ZRoom/Commands/SetStartPositionList.h | 21 +- .../ZAPD/ZRoom/Commands/SetTimeSettings.cpp | 32 +- .../ZAPD/ZRoom/Commands/SetTimeSettings.h | 18 +- .../ZRoom/Commands/SetTransitionActorList.cpp | 99 +- .../ZRoom/Commands/SetTransitionActorList.h | 32 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.cpp | 35 +- tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.h | 15 +- .../ZRoom/Commands/SetWorldMapVisited.cpp | 18 +- .../ZAPD/ZRoom/Commands/SetWorldMapVisited.h | 13 +- tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.cpp | 18 +- tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.h | 13 +- tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.cpp | 18 +- tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.h | 13 +- .../ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp | 50 +- .../ZAPD/ZRoom/Commands/ZRoomCommandUnk.h | 25 +- tools/ZAPD/ZAPD/ZRoom/ZNames.h | 6 +- tools/ZAPD/ZAPD/ZRoom/ZRoom.cpp | 424 +- tools/ZAPD/ZAPD/ZRoom/ZRoom.h | 38 +- tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.cpp | 73 +- tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.h | 48 +- tools/ZAPD/ZAPD/ZScalar.cpp | 122 +- tools/ZAPD/ZAPD/ZScalar.h | 16 +- tools/ZAPD/ZAPD/ZSkeleton.cpp | 36 +- tools/ZAPD/ZAPD/ZSkeleton.h | 9 +- tools/ZAPD/ZAPD/ZString.cpp | 62 + tools/ZAPD/ZAPD/ZString.h | 23 + tools/ZAPD/ZAPD/ZSymbol.cpp | 10 +- tools/ZAPD/ZAPD/ZSymbol.h | 8 +- tools/ZAPD/ZAPD/ZTexture.cpp | 825 +- tools/ZAPD/ZAPD/ZTexture.h | 107 +- tools/ZAPD/ZAPD/ZVector.cpp | 84 +- tools/ZAPD/ZAPD/ZVector.h | 28 +- tools/ZAPD/ZAPD/ZVtx.cpp | 53 +- tools/ZAPD/ZAPD/ZVtx.h | 24 +- .../docs/zapd_extraction_xml_reference.md | 19 + tools/ZAPD/lib/stb/stb_image.h | 7547 ----------------- tools/ZAPD/lib/stb/stb_image_write.h | 1622 ---- 135 files changed, 5362 insertions(+), 14304 deletions(-) create mode 100644 tools/ZAPD/README.md create mode 100644 tools/ZAPD/ZAPD/Declaration.cpp create mode 100644 tools/ZAPD/ZAPD/Declaration.h create mode 100644 tools/ZAPD/ZAPD/ImageBackend.cpp create mode 100644 tools/ZAPD/ZAPD/ImageBackend.h create mode 100644 tools/ZAPD/ZAPD/ZPath.cpp create mode 100644 tools/ZAPD/ZAPD/ZPath.h create mode 100644 tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp rename tools/ZAPD/ZAPD/ZRoom/Commands/{SetAnimatedTextureList.h => SetAnimatedMaterialList.h} (51%) delete mode 100644 tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedTextureList.cpp create mode 100644 tools/ZAPD/ZAPD/ZString.cpp create mode 100644 tools/ZAPD/ZAPD/ZString.h delete mode 100644 tools/ZAPD/lib/stb/stb_image.h delete mode 100644 tools/ZAPD/lib/stb/stb_image_write.h diff --git a/tools/ZAPD/.gitrepo b/tools/ZAPD/.gitrepo index 73304fd8d3..3957fa685a 100644 --- a/tools/ZAPD/.gitrepo +++ b/tools/ZAPD/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/zeldaret/ZAPD.git branch = master - commit = b9120803e6094a54192ed67d9585ab046101c816 - parent = 81b43ba32e564a00c976dec7d520e6bcb0b122f8 + commit = 769f5702a422d14bfb0a60a39319da4b4bf9ec1f + parent = 58813216fc7397a0b7356c2236269c783cf83fce method = merge cmdver = 0.4.3 diff --git a/tools/ZAPD/Makefile b/tools/ZAPD/Makefile index f2e9d64741..074e6a9736 100644 --- a/tools/ZAPD/Makefile +++ b/tools/ZAPD/Makefile @@ -1,27 +1,40 @@ OPTIMIZATION_ON ?= 1 +ASAN ?= 0 +DEPRECATION_OFF ?= 0 +CFLAGS ?= CC := g++ INC := -I ZAPD -I lib/assimp/include -I lib/elfio -I lib/json/include -I lib/stb -I lib/tinygltf -I lib/libgfxd -I lib/tinyxml2 +CFLAGS += -g3 -ggdb -fpic -std=c++17 -rdynamic -Wall -fno-omit-frame-pointer -CFLAGS := -g3 -fpic -Wl,-export-dynamic -std=c++17 -rdynamic -Wall -ifeq ($(OPTIMIZATION_ON),1) - CFLAGS += -O2 -else +ifeq ($(OPTIMIZATION_ON),0) CFLAGS += -O0 +else + CFLAGS += -O2 endif +ifneq ($(ASAN),0) + CFLAGS += -fsanitize=address +endif +ifneq ($(DEPRECATION_OFF),0) + CFLAGS += -DDEPRECATION_OFF +endif +# CFLAGS += -DTEXTURE_DEBUG -LDFLAGS := -ldl +LDFLAGS := -ldl -lpng UNAME := $(shell uname) -FS_INC = +FS_INC ?= ifneq ($(UNAME), Darwin) FS_INC += -lstdc++fs + CFLAGS += -Wl,-export-dynamic endif -SRC_DIRS := ZAPD ZAPD/ZRoom ZAPD/ZRoom/Commands ZAPD/Overlays ZAPD/HighLevel ZAPD/OpenFBX +SRC_DIRS := ZAPD ZAPD/ZRoom ZAPD/ZRoom/Commands ZAPD/Overlays ZAPD/HighLevel -CPP_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp)) -CPP_FILES += lib/tinyxml2/tinyxml2.cpp +ZAPD_CPP_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp)) +ZAPD_H_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.h)) + +CPP_FILES += $(ZAPD_CPP_FILES) lib/tinyxml2/tinyxml2.cpp O_FILES := $(CPP_FILES:.cpp=.o) all: ZAPD.out copycheck @@ -38,6 +51,11 @@ clean: rebuild: clean all +format: + clang-format-11 -i $(ZAPD_CPP_FILES) $(ZAPD_H_FILES) + +.PHONY: all genbuildinfo copycheck clean rebuild format + %.o: %.cpp $(CC) $(CFLAGS) $(INC) -c $< -o $@ $(LDFLAGS) @@ -45,7 +63,7 @@ ZAPD/Main.o: genbuildinfo ZAPD/Main.cpp $(CC) $(CFLAGS) $(INC) -c ZAPD/Main.cpp -o $@ $(LDFLAGS) lib/libgfxd/libgfxd.a: - $(MAKE) -C lib/libgfxd -j + $(MAKE) -C lib/libgfxd ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a $(CC) $(CFLAGS) $(INC) $(O_FILES) lib/libgfxd/libgfxd.a -o $@ $(FS_INC) $(LDFLAGS) diff --git a/tools/ZAPD/README.md b/tools/ZAPD/README.md new file mode 100644 index 0000000000..909ba87c3d --- /dev/null +++ b/tools/ZAPD/README.md @@ -0,0 +1,39 @@ +# ZAPD: Zelda Asset Processor for Decomp + +## Compiling + +### Dependencies + +ZAPD needs a compiler with C++17 support. + +ZAPD has the following library dependencies: + +- `libpng` + +In a Debian/Ubuntu based environment, those could be installed with the following command: + +```bash +sudo apt install libpng-dev +``` + +### Building + +#### Linux / *nix + +ZAPD uses the clasic `Makefile` approach. To build just run `make` (or even better `make -j` for faster compilations). + +You can configure a bit your ZAPD build with the following options: + +- `OPTIMIZATION_ON`: If set to `0`, then optimizations will be disabled (compile with `-O0`). Any other value compiles with `-O2`. Defaults to `1`. +- `ASAN`: If it is set to a non-zero then ZAPD will be compiled with Address Sanitizer enabled (`-fsanitize=address`). Defaults to `0`. +- `DEPRECATION_OFF`: If it is set to a non-zero then deprecation warnings will be disabled. Defaults to `0`. + +As an example, if you want to build ZAPD with optimizations disabled and use the address sanitizer, you could use the following command: + +```bash +make -j OPTIMIZATION_ON=0 ASAN=1 +``` + +#### Windows + +This repository contains `vcxproj` files for compiling under Visual Studio environments. See `ZAPD/ZAPD.vcxproj`. diff --git a/tools/ZAPD/ZAPD/Declaration.cpp b/tools/ZAPD/ZAPD/Declaration.cpp new file mode 100644 index 0000000000..63a3918050 --- /dev/null +++ b/tools/ZAPD/ZAPD/Declaration.cpp @@ -0,0 +1,79 @@ +#include "Declaration.h" + +Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, + std::string nText) +{ + alignment = nAlignment; + padding = nPadding; + size = nSize; + text = nText; +} + +Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, + std::string nVarName, bool nIsArray, std::string nText) + : Declaration(nAlignment, DeclarationPadding::None, nSize, nText) +{ + varType = nVarType; + varName = nVarName; + isArray = nIsArray; +} + +Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, + std::string nVarType, std::string nVarName, bool nIsArray, + std::string nText) + : Declaration(nAlignment, nPadding, nSize, nText) +{ + varType = nVarType; + varName = nVarName; + isArray = nIsArray; +} + +Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, + std::string nVarName, bool nIsArray, size_t nArrayItemCnt, + std::string nText) + : Declaration(nAlignment, DeclarationPadding::None, nSize, nText) +{ + varType = nVarType; + varName = nVarName; + isArray = nIsArray; + arrayItemCnt = nArrayItemCnt; +} + +Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, + std::string nVarName, bool nIsArray, std::string nArrayItemCntStr, + std::string nText) + : Declaration(nAlignment, DeclarationPadding::None, nSize, nText) +{ + varType = nVarType; + varName = nVarName; + isArray = nIsArray; + arrayItemCntStr = nArrayItemCntStr; +} + +Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, + std::string nVarName, bool nIsArray, size_t nArrayItemCnt, + std::string nText, bool nIsExternal) + : Declaration(nAlignment, nSize, nVarType, nVarName, nIsArray, nArrayItemCnt, nText) +{ + isExternal = nIsExternal; +} + +Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, + std::string nVarType, std::string nVarName, bool nIsArray, + size_t nArrayItemCnt, std::string nText) + : Declaration(nAlignment, nPadding, nSize, nText) +{ + varType = nVarType; + varName = nVarName; + isArray = nIsArray; + arrayItemCnt = nArrayItemCnt; +} + +Declaration::Declaration(std::string nIncludePath, size_t nSize, std::string nVarType, + std::string nVarName) + : Declaration(DeclarationAlignment::None, DeclarationPadding::None, nSize, "") +{ + includePath = nIncludePath; + varType = nVarType; + varName = nVarName; +} diff --git a/tools/ZAPD/ZAPD/Declaration.h b/tools/ZAPD/ZAPD/Declaration.h new file mode 100644 index 0000000000..fa8653b858 --- /dev/null +++ b/tools/ZAPD/ZAPD/Declaration.h @@ -0,0 +1,65 @@ +#pragma once + +#include +#include + +enum class DeclarationAlignment +{ + None, + Align4, + Align8, + Align16 +}; + +enum class DeclarationPadding +{ + None, + Pad4, + Pad8, + Pad16 +}; + +class Declaration +{ +public: + DeclarationAlignment alignment; + DeclarationPadding padding; + size_t size = 0; + std::string preText; + std::string text; + std::string rightText; + std::string postText; + std::string preComment; + std::string postComment; + std::string varType; + std::string varName; + std::string includePath; + bool isExternal = false; + bool isArray = false; + size_t arrayItemCnt = 0; + std::string arrayItemCntStr; + std::vector references; + bool isUnaccounted = false; + bool isPlaceholder = false; + + Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, + std::string nVarName, bool nIsArray, std::string nText); + Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, + std::string nVarType, std::string nVarName, bool nIsArray, std::string nText); + Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, + std::string nVarName, bool nIsArray, size_t nArrayItemCnt, std::string nText); + Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, + std::string nVarName, bool nIsArray, std::string nArrayItemCntStr, + std::string nText); + Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, + std::string nVarName, bool nIsArray, size_t nArrayItemCnt, std::string nText, + bool nIsExternal); + Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, + std::string nVarType, std::string nVarName, bool nIsArray, size_t nArrayItemCnt, + std::string nText); + Declaration(std::string nIncludePath, size_t nSize, std::string nVarType, std::string nVarName); + +protected: + Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, + std::string nText); +}; diff --git a/tools/ZAPD/ZAPD/File.h b/tools/ZAPD/ZAPD/File.h index 62806d5f1c..69aa0441dc 100644 --- a/tools/ZAPD/ZAPD/File.h +++ b/tools/ZAPD/ZAPD/File.h @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include "StringHelper.h" diff --git a/tools/ZAPD/ZAPD/Globals.cpp b/tools/ZAPD/ZAPD/Globals.cpp index 93e7fdf255..a8676cc639 100644 --- a/tools/ZAPD/ZAPD/Globals.cpp +++ b/tools/ZAPD/ZAPD/Globals.cpp @@ -5,7 +5,6 @@ #include "tinyxml2.h" using namespace tinyxml2; -using namespace std; Globals* Globals::Instance; @@ -16,27 +15,26 @@ Globals::Globals() files = std::vector(); segments = std::vector(); symbolMap = std::map(); - segmentRefs = map(); - segmentRefFiles = map(); + segmentRefs = std::map(); + segmentRefFiles = std::map(); game = ZGame::OOT_RETAIL; genSourceFile = true; testMode = false; profile = false; - includeFilePrefix = false; useLegacyZDList = false; useExternalResources = true; lastScene = nullptr; - verbosity = VERBOSITY_SILENT; + verbosity = VerbosityLevel::VERBOSITY_SILENT; } -string Globals::FindSymbolSegRef(int32_t segNumber, uint32_t symbolAddress) +std::string Globals::FindSymbolSegRef(int32_t segNumber, uint32_t symbolAddress) { if (segmentRefs.find(segNumber) != segmentRefs.end()) { if (segmentRefFiles.find(segNumber) == segmentRefFiles.end()) { XMLDocument doc; - string filePath = segmentRefs[segNumber]; + std::string filePath = segmentRefs[segNumber]; XMLError eResult = doc.LoadFile(filePath.c_str()); if (eResult != tinyxml2::XML_SUCCESS) @@ -47,14 +45,12 @@ string Globals::FindSymbolSegRef(int32_t segNumber, uint32_t symbolAddress) if (root == nullptr) return "ERROR"; - // vector files = vector(); - for (XMLElement* child = root->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - if (string(child->Name()) == "File") + if (std::string(child->Name()) == "File") { - ZFile* file = new ZFile(fileMode, child, "", "", "", "", true); + ZFile* file = new ZFile(fileMode, child, "", "", "", filePath, true); file->GeneratePlaceholderDeclarations(); segmentRefFiles[segNumber] = file; break; @@ -87,41 +83,41 @@ void Globals::ReadConfigFile(const std::string& configFilePath) for (XMLElement* child = root->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - if (string(child->Name()) == "SymbolMap") + if (std::string(child->Name()) == "SymbolMap") { - string fileName = string(child->Attribute("File")); + std::string fileName = std::string(child->Attribute("File")); GenSymbolMap(Path::GetDirectoryName(configFilePath) + "/" + fileName); } - else if (string(child->Name()) == "Segment") + else if (std::string(child->Name()) == "Segment") { - string fileName = string(child->Attribute("File")); + std::string fileName = std::string(child->Attribute("File")); int32_t segNumber = child->IntAttribute("Number"); segmentRefs[segNumber] = fileName; } - else if (string(child->Name()) == "ActorList") + else if (std::string(child->Name()) == "ActorList") { - string fileName = string(child->Attribute("File")); + std::string fileName = std::string(child->Attribute("File")); std::vector lines = File::ReadAllLines(Path::GetDirectoryName(configFilePath) + "/" + fileName); for (std::string line : lines) cfg.actorList.push_back(StringHelper::Strip(line, "\r")); } - else if (string(child->Name()) == "ObjectList") + else if (std::string(child->Name()) == "ObjectList") { - string fileName = string(child->Attribute("File")); + std::string fileName = std::string(child->Attribute("File")); std::vector lines = File::ReadAllLines(Path::GetDirectoryName(configFilePath) + "/" + fileName); for (std::string line : lines) cfg.objectList.push_back(StringHelper::Strip(line, "\r")); } - else if (string(child->Name()) == "TexturePool") + else if (std::string(child->Name()) == "TexturePool") { - string fileName = string(child->Attribute("File")); + std::string fileName = std::string(child->Attribute("File")); ReadTexturePool(Path::GetDirectoryName(configFilePath) + "/" + fileName); } - else if (string(child->Name()) == "BGConfig") + else if (std::string(child->Name()) == "BGConfig") { cfg.bgScreenWidth = child->IntAttribute("ScreenWidth", 320); cfg.bgScreenHeight = child->IntAttribute("ScreenHeight", 240); @@ -148,11 +144,11 @@ void Globals::ReadTexturePool(const std::string& texturePoolXmlPath) for (XMLElement* child = root->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - if (string(child->Name()) == "Texture") + if (std::string(child->Name()) == "Texture") { - string crcStr = string(child->Attribute("CRC")); - string texPath = string(child->Attribute("Path")); - string texName = ""; + std::string crcStr = std::string(child->Attribute("CRC")); + fs::path texPath = std::string(child->Attribute("Path")); + std::string texName = ""; uint32_t crc = strtoul(crcStr.c_str(), NULL, 16); @@ -175,10 +171,13 @@ void Globals::GenSymbolMap(const std::string& symbolMapPath) } } -void Globals::AddSegment(int32_t segment) +void Globals::AddSegment(int32_t segment, ZFile* file) { if (std::find(segments.begin(), segments.end(), segment) == segments.end()) segments.push_back(segment); + + segmentRefs[segment] = file->GetXmlFilePath(); + segmentRefFiles[segment] = file; } bool Globals::HasSegment(int32_t segment) diff --git a/tools/ZAPD/ZAPD/Globals.h b/tools/ZAPD/ZAPD/Globals.h index 5186947243..a7f1fed059 100644 --- a/tools/ZAPD/ZAPD/Globals.h +++ b/tools/ZAPD/ZAPD/Globals.h @@ -7,7 +7,7 @@ #include "ZRoom/ZRoom.h" #include "ZTexture.h" -enum VerbosityLevel +enum class VerbosityLevel { VERBOSITY_SILENT, VERBOSITY_INFO, @@ -42,9 +42,9 @@ public: bool genSourceFile; // Used for extraction bool useExternalResources; - bool testMode; // Enables certain experimental features - bool profile; // Measure performance of certain operations - bool includeFilePrefix; // Include the file prefix in symbols + bool testMode; // Enables certain experimental features + bool outputCrc = false; + bool profile; // Measure performance of certain operations bool useLegacyZDList; VerbosityLevel verbosity; // ZAPD outputs additional information ZFileMode fileMode; @@ -66,7 +66,7 @@ public: void ReadConfigFile(const std::string& configFilePath); void ReadTexturePool(const std::string& texturePoolXmlPath); void GenSymbolMap(const std::string& symbolMapPath); - void AddSegment(int32_t segment); + void AddSegment(int32_t segment, ZFile* file); bool HasSegment(int32_t segment); }; diff --git a/tools/ZAPD/ZAPD/HighLevel/HLAnimationIntermediette.cpp b/tools/ZAPD/ZAPD/HighLevel/HLAnimationIntermediette.cpp index 6ae2264db9..f21d28ab6e 100644 --- a/tools/ZAPD/ZAPD/HighLevel/HLAnimationIntermediette.cpp +++ b/tools/ZAPD/ZAPD/HighLevel/HLAnimationIntermediette.cpp @@ -1,6 +1,5 @@ #include "HLAnimationIntermediette.h" -using namespace std; using namespace tinyxml2; HLAnimationIntermediette::HLAnimationIntermediette() @@ -8,8 +7,8 @@ HLAnimationIntermediette::HLAnimationIntermediette() limit = 0; limbCount = 0; frameCount = 0; - rotationValues = vector(); - rotationIndices = vector(); + rotationValues = std::vector(); + rotationIndices = std::vector(); } HLAnimationIntermediette::~HLAnimationIntermediette() @@ -32,16 +31,16 @@ HLAnimationIntermediette* HLAnimationIntermediette::FromXML(std::string xmlPath) for (XMLElement* child = root->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - if (string(child->Name()) == "RotationValues") + if (std::string(child->Name()) == "RotationValues") { for (XMLElement* child2 = child->FirstChildElement(); child2 != NULL; child2 = child2->NextSiblingElement()) { - string value = child2->GetText(); + std::string value = child2->GetText(); anim->rotationValues.push_back(atoi(value.c_str())); } } - else if (string(child->Name()) == "RotationIndices") + else if (std::string(child->Name()) == "RotationIndices") { for (XMLElement* child2 = child->FirstChildElement(); child2 != NULL; child2 = child2->NextSiblingElement()) @@ -68,9 +67,9 @@ ZAnimation* HLAnimationIntermediette::ToZAnimation() return zAnim; } -string HLAnimationIntermediette::OutputXML() +std::string HLAnimationIntermediette::OutputXML() { - string output = ""; + std::string output = ""; XMLDocument doc; XMLElement* root = doc.NewElement("HLAnimationIntermediette"); diff --git a/tools/ZAPD/ZAPD/HighLevel/HLAnimationIntermediette.h b/tools/ZAPD/ZAPD/HighLevel/HLAnimationIntermediette.h index 0f5c00b04f..171ac9d4d9 100644 --- a/tools/ZAPD/ZAPD/HighLevel/HLAnimationIntermediette.h +++ b/tools/ZAPD/ZAPD/HighLevel/HLAnimationIntermediette.h @@ -1,9 +1,9 @@ #pragma once #include -#include #include "../ZAnimation.h" #include "HLFileIntermediette.h" +#include "tinyxml2.h" /* * An intermediette format for animations. Going to use XML. diff --git a/tools/ZAPD/ZAPD/HighLevel/HLModelIntermediette.cpp b/tools/ZAPD/ZAPD/HighLevel/HLModelIntermediette.cpp index db7483a150..e621a5195f 100644 --- a/tools/ZAPD/ZAPD/HighLevel/HLModelIntermediette.cpp +++ b/tools/ZAPD/ZAPD/HighLevel/HLModelIntermediette.cpp @@ -12,12 +12,11 @@ #include #endif -using namespace std; using namespace tinyxml2; HLModelIntermediette::HLModelIntermediette() { - blocks = vector(); + blocks = std::vector(); startIndex = 0; meshStartIndex = 0; hasSkeleton = false; @@ -35,7 +34,7 @@ HLModelIntermediette* HLModelIntermediette::FromXML(tinyxml2::XMLElement* root) for (XMLElement* child = root->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - string childName = child->Name(); + std::string childName = child->Name(); HLIntermediette* block = nullptr; if (childName == "Mesh") @@ -66,16 +65,16 @@ void HLModelIntermediette::FromZDisplayList(HLModelIntermediette* model, ZDispla limb->name = zDisplayList->GetName(); // Go through verts - vector finalVerts = vector(); + std::vector finalVerts; int32_t vStart = -1; - for (pair> pair : zDisplayList->vertices) + for (auto& pair : zDisplayList->vertices) { if (vStart == -1) // TODO: Find a better way to do this vStart = pair.first; - for (Vertex v : pair.second) + for (auto& v : pair.second) finalVerts.push_back(v); } @@ -85,14 +84,17 @@ void HLModelIntermediette::FromZDisplayList(HLModelIntermediette* model, ZDispla model->blocks.push_back(vertIntr); // Go through textures + // TODO: Textures are now stored directly in ZFile + /* for (pair pair : zDisplayList->textures) { - HLTextureIntermediette* texIntr = new HLTextureIntermediette(); - texIntr->tex = pair.second; - texIntr->name = texIntr->tex->GetName(); + HLTextureIntermediette* texIntr = new HLTextureIntermediette(); + texIntr->tex = pair.second; + texIntr->name = texIntr->tex->GetName(); - model->blocks.push_back(texIntr); + model->blocks.push_back(texIntr); } + */ // Analyze display lists to determine components HLDisplayListIntermediette* dList = new HLDisplayListIntermediette(); @@ -173,9 +175,10 @@ void HLModelIntermediette::FromZDisplayList(HLModelIntermediette* model, ZDispla lastMat->clrM = lastClrM; // Bit of a hack here... - int32_t lastData = (int32_t)(zDisplayList->instructions[i - 1]); - string texName = zDisplayList->textures[lastData & 0x00FFFFFF]->GetName(); - lastMat->textureName = texName; + // int32_t lastData = (int32_t)(zDisplayList->instructions[i - 1]); + // TODO + // string texName = zDisplayList->textures[lastData & 0x00FFFFFF]->GetName(); + // lastMat->textureName = texName; // -------------------------- model->blocks.push_back(mesh); @@ -189,10 +192,11 @@ void HLModelIntermediette::FromZDisplayList(HLModelIntermediette* model, ZDispla } else if (opcode == F3DZEXOpcode::G_SETTIMG) { - int32_t texAddress = data & 0x00FFFFFF; + // int32_t texAddress = data & 0x00FFFFFF; - string texName = zDisplayList->textures[texAddress]->GetName(); - lastMat->textureName = texName; + // TODO + // string texName = zDisplayList->textures[texAddress]->GetName(); + // lastMat->textureName = texName; } else if (opcode == F3DZEXOpcode::G_VTX) { @@ -264,14 +268,14 @@ void HLModelIntermediette::ProcessZSkeletonLimb(HLModelIntermediette* model, ZSk } } -string HLModelIntermediette::ToOBJFile() +std::string HLModelIntermediette::ToOBJFile() { - string output = ""; + std::string output = ""; for (HLIntermediette* block : blocks) { block->parent = this; - string code = block->OutputOBJ(); + std::string code = block->OutputOBJ(); output += code; @@ -282,7 +286,7 @@ string HLModelIntermediette::ToOBJFile() return output; } -string HLModelIntermediette::ToAssimpFile() +std::string HLModelIntermediette::ToAssimpFile() { #ifdef USE_ASSIMP Assimp::Exporter exporter; @@ -330,13 +334,13 @@ string HLModelIntermediette::ToAssimpFile() return ""; } -string HLModelIntermediette::OutputCode() +std::string HLModelIntermediette::OutputCode() { - string output = ""; + std::string output = ""; for (HLIntermediette* block : blocks) { - string code = block->OutputCode(); + std::string code = block->OutputCode(); output += code; @@ -349,7 +353,7 @@ string HLModelIntermediette::OutputCode() std::string HLModelIntermediette::OutputXML() { - string output = ""; + std::string output = ""; XMLDocument doc; XMLElement* root = doc.NewElement("HLModelIntermediette"); @@ -366,7 +370,7 @@ std::string HLModelIntermediette::OutputXML() } template -inline T* HLModelIntermediette::FindByName(string name) +inline T* HLModelIntermediette::FindByName(std::string name) { for (HLIntermediette* block : blocks) { @@ -407,12 +411,12 @@ void HLIntermediette::InitFromXML(XMLElement* xmlElement) name = xmlElement->Attribute("Name"); } -string HLIntermediette::OutputCode() +std::string HLIntermediette::OutputCode() { return ""; } -string HLIntermediette::OutputOBJ() +std::string HLIntermediette::OutputOBJ() { return ""; } @@ -429,7 +433,7 @@ void HLMeshCommand::InitFromXML(XMLElement* xmlElement) { } -string HLMeshCommand::OutputCode(HLModelIntermediette* parent) +std::string HLMeshCommand::OutputCode(HLModelIntermediette* parent) { return ""; } @@ -449,35 +453,37 @@ void HLMeshCommand::OutputXML(tinyxml2::XMLElement* parent) HLVerticesIntermediette::HLVerticesIntermediette() : HLIntermediette() { - vertices = vector(); + vertices = std::vector(); } void HLVerticesIntermediette::InitFromXML(XMLElement* verticesElement) { name = verticesElement->Attribute("Name"); + /* for (XMLElement* child = verticesElement->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) - vertices.push_back(Vertex(child->IntAttribute("X"), child->IntAttribute("Y"), - child->IntAttribute("Z"), child->IntAttribute("Flags"), - child->IntAttribute("S"), child->IntAttribute("T"), - child->IntAttribute("R"), child->IntAttribute("G"), - child->IntAttribute("B"), child->IntAttribute("A"))); + vertices.push_back(ZVtx(child->IntAttribute("X"), child->IntAttribute("Y"), + child->IntAttribute("Z"), child->IntAttribute("Flags"), + child->IntAttribute("S"), child->IntAttribute("T"), + child->IntAttribute("R"), child->IntAttribute("G"), + child->IntAttribute("B"), child->IntAttribute("A"))); + */ } -void HLVerticesIntermediette::InitFromVertices(vector dispListVertices) +void HLVerticesIntermediette::InitFromVertices(std::vector dispListVertices) { - for (Vertex v : dispListVertices) + for (auto v : dispListVertices) vertices.push_back(v); } -string HLVerticesIntermediette::OutputCode(HLModelIntermediette* parent) +std::string HLVerticesIntermediette::OutputCode(HLModelIntermediette* parent) { - string output = ""; + std::string output = ""; output += StringHelper::Sprintf("Vtx %s_verts[] = \n{\n", name.c_str()); - for (Vertex v : vertices) + for (auto v : vertices) { output += StringHelper::Sprintf(" { %i, %i, %i, %i, %i, %i, %i, %i, %i, %i },\n", v.x, v.y, v.z, v.flag, v.s, v.t, v.r, v.g, v.b, v.a); @@ -490,9 +496,9 @@ string HLVerticesIntermediette::OutputCode(HLModelIntermediette* parent) std::string HLVerticesIntermediette::OutputOBJ() { - string output = ""; + std::string output = ""; - for (Vertex v : vertices) + for (auto& v : vertices) { output += StringHelper::Sprintf("v %f %f %f %i %i %i %i\n", (float)v.x * 0.1f, (float)v.y * 0.1f, (float)v.z * 0.1f, v.r, v.g, v.b, v.a); @@ -517,7 +523,7 @@ void HLVerticesIntermediette::OutputXML(tinyxml2::XMLDocument* doc, tinyxml2::XM element->SetAttribute("Name", name.c_str()); - for (Vertex v : vertices) + for (auto& v : vertices) { XMLElement* vElem = doc->NewElement("Vertex"); vElem->SetAttribute("X", v.x); @@ -549,9 +555,9 @@ void HLMeshCmdGeoSettings::InitFromXML(tinyxml2::XMLElement* xmlElement) off = xmlElement->Attribute("Off"); } -string HLMeshCmdGeoSettings::OutputCode(HLModelIntermediette* parent) +std::string HLMeshCmdGeoSettings::OutputCode(HLModelIntermediette* parent) { - string output = ""; + std::string output = ""; if (off != "") output += @@ -587,7 +593,7 @@ void HLMeshCmdTriangle1::InitFromXML(tinyxml2::XMLElement* xmlElement) flag = xmlElement->IntAttribute("flag"); } -string HLMeshCmdTriangle1::OutputCode(HLModelIntermediette* parent) +std::string HLMeshCmdTriangle1::OutputCode(HLModelIntermediette* parent) { return StringHelper::Sprintf("gsSP1Triangle(%i, %i, %i, %i),", v0, v1, v2, flag); } @@ -653,7 +659,7 @@ void HLMeshCmdTriangle2::InitFromXML(tinyxml2::XMLElement* xmlElement) flag1 = xmlElement->IntAttribute("Flag1"); } -string HLMeshCmdTriangle2::OutputCode(HLModelIntermediette* parent) +std::string HLMeshCmdTriangle2::OutputCode(HLModelIntermediette* parent) { return StringHelper::Sprintf("gsSP2Triangles(%i, %i, %i, %i, %i, %i, %i, %i),", v0, v1, v2, flag0, v10, v11, v12, flag1); @@ -661,7 +667,7 @@ string HLMeshCmdTriangle2::OutputCode(HLModelIntermediette* parent) std::string HLMeshCmdTriangle2::OutputOBJ(HLModelIntermediette* parent) { - string output = ""; + std::string output = ""; int32_t startIndex = parent->startIndex; @@ -753,7 +759,7 @@ void HLMeshCmdLoadVertices::OutputAssimp(HLModelIntermediette* parent, aiScene* parent->startIndex = startIndex; } -string HLMeshCmdLoadVertices::OutputCode(HLModelIntermediette* parent) +std::string HLMeshCmdLoadVertices::OutputCode(HLModelIntermediette* parent) { HLVerticesIntermediette* verts = parent->FindByType(); return StringHelper::Sprintf("gsSPVertex(&%s[%i], %i, %i),", verts->name.c_str(), startIndex, @@ -785,7 +791,7 @@ void HLMaterialIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) clrL = xmlElement->IntAttribute("ClrL"); } -string HLMaterialIntermediette::OutputCode() +std::string HLMaterialIntermediette::OutputCode() { return ""; } @@ -810,10 +816,10 @@ void HLMaterialIntermediette::OutputXML(tinyxml2::XMLDocument* doc, tinyxml2::XM HLDisplayListIntermediette::HLDisplayListIntermediette() { - commands = vector(); + commands = std::vector(); } -string HLDisplayListIntermediette::OutputCode() +std::string HLDisplayListIntermediette::OutputCode() { return std::string(); } @@ -823,7 +829,7 @@ void HLDisplayListIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) for (XMLElement* child = xmlElement->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - string name = child->Name(); + std::string name = child->Name(); HLDisplayListCommand* cmd = nullptr; @@ -870,13 +876,15 @@ void HLTextureIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) name = xmlElement->Attribute("Name"); fileName = xmlElement->Attribute("TextureName"); - // string format = xmlElement->Attribute("Format"); - string format = "rgb5a1"; // TEST + // std::string format = xmlElement->Attribute("Format"); + std::string format = "rgb5a1"; // TEST // tex = HLTexture::FromPNG(fileName, // (HLTextureType)ZTexture::GetTextureTypeFromString(format)); - tex = ZTexture::FromPNG(Path::GetDirectoryName(Globals::Instance->inputPath) + "/" + fileName, - ZTexture::GetTextureTypeFromString(format)); + tex = new ZTexture(nullptr); + tex->ZTexture::FromPNG(Path::GetDirectoryName(Globals::Instance->inputPath.string()) + "/" + + fileName, + ZTexture::GetTextureTypeFromString(format)); } std::string HLTextureIntermediette::OutputCode() @@ -892,7 +900,7 @@ void HLTextureIntermediette::OutputXML(tinyxml2::XMLDocument* doc, tinyxml2::XML element->SetAttribute("Name", name.c_str()); element->SetAttribute("TextureName", (name + "." + tex->GetExternalExtension() + ".png").c_str()); - tex->Save(Globals::Instance->outputPath); + tex->Save(Globals::Instance->outputPath.string()); root->InsertEndChild(element); } @@ -925,7 +933,7 @@ std::string HLMeshCmdCull::OutputCode(HLModelIntermediette* parent) HLMeshIntermediette::HLMeshIntermediette() : HLIntermediette() { - commands = vector(); + commands = std::vector(); } void HLMeshIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) @@ -935,7 +943,7 @@ void HLMeshIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) for (XMLElement* child = xmlElement->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - string name = child->Name(); + std::string name = child->Name(); HLMeshCommand* cmd = nullptr; @@ -958,9 +966,9 @@ void HLMeshIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) } } -string HLMeshIntermediette::OutputCode(string materialName) +std::string HLMeshIntermediette::OutputCode(std::string materialName) { - string output = ""; + std::string output = ""; HLMaterialIntermediette* mat = parent->FindByName(materialName); HLTextureIntermediette* tex = parent->FindByName(mat->textureName); @@ -982,9 +990,9 @@ string HLMeshIntermediette::OutputCode(string materialName) return output; } -string HLMeshIntermediette::OutputOBJ() +std::string HLMeshIntermediette::OutputOBJ() { - string output = ""; + std::string output = ""; output += StringHelper::Sprintf("o %s\n", name.c_str()); @@ -1031,7 +1039,7 @@ void HLMeshIntermediette::OutputXML(tinyxml2::XMLDocument* doc, tinyxml2::XMLEle HLLimbIntermediette::HLLimbIntermediette() { - commands = vector(); + commands = std::vector(); } void HLLimbIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) @@ -1041,7 +1049,7 @@ void HLLimbIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) for (XMLElement* child = xmlElement->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - string name = child->Name(); + std::string name = child->Name(); HLLimbCommand* cmd = nullptr; @@ -1058,7 +1066,7 @@ void HLLimbIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement) std::string HLLimbIntermediette::OutputCode() { - string output = ""; + std::string output = ""; output += StringHelper::Sprintf("Gfx %s[] = \n{\n", name.c_str()); @@ -1113,7 +1121,7 @@ void HLLimbCommand::OutputXML(tinyxml2::XMLElement* parent) std::string HLLimbCommand::OutputCode(HLModelIntermediette* parent) { - string output = ""; + std::string output = ""; // Time to generate the display list... HLMeshIntermediette* mesh = parent->FindByName(meshName); diff --git a/tools/ZAPD/ZAPD/HighLevel/HLModelIntermediette.h b/tools/ZAPD/ZAPD/HighLevel/HLModelIntermediette.h index 5fda096649..e591e2c8f0 100644 --- a/tools/ZAPD/ZAPD/HighLevel/HLModelIntermediette.h +++ b/tools/ZAPD/ZAPD/HighLevel/HLModelIntermediette.h @@ -4,11 +4,11 @@ #include #include #include -#include #include #include "../ZDisplayList.h" #include "../ZSkeleton.h" #include "HLFileIntermediette.h" +#include "tinyxml2.h" /* * An intermediette format for models. Goes from FBX<-->Intermediette<-->Display List C Code. @@ -156,12 +156,12 @@ public: class HLVerticesIntermediette : public HLIntermediette { public: - std::vector vertices; + std::vector vertices; HLVerticesIntermediette(); virtual void InitFromXML(tinyxml2::XMLElement* verticesElement); - void InitFromVertices(std::vector dispListVertices); + void InitFromVertices(std::vector dispListVertices); virtual std::string OutputCode(HLModelIntermediette* parent); virtual std::string OutputOBJ(); virtual void OutputAssimp(aiScene* scene, std::vector* verts); diff --git a/tools/ZAPD/ZAPD/HighLevel/HLTexture.cpp b/tools/ZAPD/ZAPD/HighLevel/HLTexture.cpp index 0bf6b36370..b7e3a93e01 100644 --- a/tools/ZAPD/ZAPD/HighLevel/HLTexture.cpp +++ b/tools/ZAPD/ZAPD/HighLevel/HLTexture.cpp @@ -1,16 +1,13 @@ #include "HLTexture.h" -#include #include "../StringHelper.h" -using namespace std; - HLTexture* HLTexture::FromPNG(std::string pngFilePath, HLTextureType texType) { - int32_t comp; + // int32_t comp; HLTexture* tex = new HLTexture(); tex->type = texType; - tex->bmpRgba = (uint8_t*)stbi_load((pngFilePath).c_str(), (int32_t*)&tex->width, - (int32_t*)&tex->height, &comp, STBI_rgb_alpha); + // tex->bmpRgba = (uint8_t*)stbi_load((pngFilePath).c_str(), (int32_t*)&tex->width, + // (int32_t*)&tex->height, &comp, STBI_rgb_alpha); return tex; } diff --git a/tools/ZAPD/ZAPD/ImageBackend.cpp b/tools/ZAPD/ZAPD/ImageBackend.cpp new file mode 100644 index 0000000000..0b4bce360a --- /dev/null +++ b/tools/ZAPD/ZAPD/ImageBackend.cpp @@ -0,0 +1,473 @@ +#include "ImageBackend.h" + +#include +#include +#include +#include + +#include "StringHelper.h" + +/* ImageBackend */ + +ImageBackend::~ImageBackend() +{ + FreeImageData(); +} + +void ImageBackend::ReadPng(const char* filename) +{ + FreeImageData(); + + FILE* fp = fopen(filename, "rb"); + if (fp == nullptr) + throw std::runtime_error(StringHelper::Sprintf( + "ImageBackend::ReadPng: Error.\n\t Couldn't open file '%s'.", filename)); + + png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); + if (!png) + throw std::runtime_error("ImageBackend::ReadPng: Error.\n\t Couldn't create png struct."); + + png_infop info = png_create_info_struct(png); + if (!info) + throw std::runtime_error("ImageBackend::ReadPng: Error.\n\t Couldn't create png info."); + + if (setjmp(png_jmpbuf(png))) + throw std::runtime_error("ImageBackend::ReadPng: Error.\n\t setjmp(png_jmpbuf(png))."); + + png_init_io(png, fp); + + png_read_info(png, info); + + width = png_get_image_width(png, info); + height = png_get_image_height(png, info); + colorType = png_get_color_type(png, info); + bitDepth = png_get_bit_depth(png, info); + +#ifdef TEXTURE_DEBUG + printf("Width: %u\n", width); + printf("Height: %u\n", height); + printf("ColorType: "); + switch (colorType) + { + case PNG_COLOR_TYPE_RGBA: + printf("PNG_COLOR_TYPE_RGBA\n"); + break; + + case PNG_COLOR_TYPE_RGB: + printf("PNG_COLOR_TYPE_RGB\n"); + break; + + case PNG_COLOR_TYPE_PALETTE: + printf("PNG_COLOR_TYPE_PALETTE\n"); + break; + + default: + printf("%u\n", colorType); + break; + } + printf("BitDepth: %u\n", bitDepth); + printf("\n"); +#endif + + // Read any color_type into 8bit depth, RGBA format. + // See http://www.libpng.org/pub/png/libpng-manual.txt + + if (bitDepth == 16) + png_set_strip_16(png); + + if (colorType == PNG_COLOR_TYPE_PALETTE) + { + // png_set_palette_to_rgb(png); + isColorIndexed = true; + } + + // PNG_COLOR_TYPE_GRAY_ALPHA is always 8 or 16bit depth. + if (colorType == PNG_COLOR_TYPE_GRAY && bitDepth < 8) + png_set_expand_gray_1_2_4_to_8(png); + + /*if (png_get_valid(png, info, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha(png);*/ + + // These color_type don't have an alpha channel then fill it with 0xff. + /*if(*color_type == PNG_COLOR_TYPE_RGB || + *color_type == PNG_COLOR_TYPE_GRAY || + *color_type == PNG_COLOR_TYPE_PALETTE) + png_set_filler(png, 0xFF, PNG_FILLER_AFTER);*/ + + if (colorType == PNG_COLOR_TYPE_GRAY || colorType == PNG_COLOR_TYPE_GRAY_ALPHA) + png_set_gray_to_rgb(png); + + png_read_update_info(png, info); + + size_t rowBytes = png_get_rowbytes(png, info); + pixelMatrix = (uint8_t**)malloc(sizeof(uint8_t*) * height); + for (size_t y = 0; y < height; y++) + { + pixelMatrix[y] = (uint8_t*)malloc(rowBytes); + } + + png_read_image(png, pixelMatrix); + +#ifdef TEXTURE_DEBUG + printf("rowBytes: %zu\n", rowBytes); + + size_t bytePerPixel = GetBytesPerPixel(); + printf("imgData\n"); + for (size_t y = 0; y < height; y++) + { + for (size_t x = 0; x < width; x++) + { + for (size_t z = 0; z < bytePerPixel; z++) + { + printf("%02X ", pixelMatrix[y][x * bytePerPixel + z]); + } + printf(" "); + } + printf("\n"); + } + printf("\n"); +#endif + + fclose(fp); + + png_destroy_read_struct(&png, &info, nullptr); + + hasImageData = true; +} + +void ImageBackend::ReadPng(const fs::path& filename) +{ + ReadPng(filename.c_str()); +} + +void ImageBackend::WritePng(const char* filename) +{ + assert(hasImageData); + + FILE* fp = fopen(filename, "wb"); + if (!fp) + throw std::runtime_error(StringHelper::Sprintf( + "ImageBackend::WritePng: Error.\n\t Couldn't open file '%s' in write mode.", filename)); + + png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); + if (!png) + throw std::runtime_error("ImageBackend::WritePng: Error.\n\t Couldn't create png struct."); + + png_infop info = png_create_info_struct(png); + if (!info) + throw std::runtime_error("ImageBackend::WritePng: Error.\n\t Couldn't create png info."); + + if (setjmp(png_jmpbuf(png))) + throw std::runtime_error("ImageBackend::WritePng: Error.\n\t setjmp(png_jmpbuf(png))."); + + png_init_io(png, fp); + + png_set_IHDR(png, info, width, height, + bitDepth, // 8, + colorType, // PNG_COLOR_TYPE_RGBA, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + if (isColorIndexed) + { + png_set_PLTE(png, info, static_cast(colorPalette), paletteSize); + +#ifdef TEXTURE_DEBUG + printf("palette\n"); + png_color* aux = (png_color*)colorPalette; + for (size_t y = 0; y < paletteSize; y++) + { + printf("#%02X%02X%02X ", aux[y].red, aux[y].green, aux[y].blue); + if ((y + 1) % 8 == 0) + printf("\n"); + } + printf("\n"); +#endif + + png_set_tRNS(png, info, alphaPalette, paletteSize, nullptr); + } + + png_write_info(png, info); + + // To remove the alpha channel for PNG_COLOR_TYPE_RGB format, + // Use png_set_filler(). + // png_set_filler(png, 0, PNG_FILLER_AFTER); + +#ifdef TEXTURE_DEBUG + size_t bytePerPixel = GetBytesPerPixel(); + printf("imgData\n"); + for (size_t y = 0; y < height; y++) + { + for (size_t x = 0; x < width * bytePerPixel; x++) + { + printf("%02X ", pixelMatrix[y][x]); + } + printf("\n"); + } + printf("\n"); +#endif + + png_write_image(png, pixelMatrix); + png_write_end(png, nullptr); + + fclose(fp); + + png_destroy_write_struct(&png, &info); +} + +void ImageBackend::WritePng(const fs::path& filename) +{ + WritePng(filename.c_str()); +} + +void ImageBackend::SetTextureData(const std::vector>& texData, + uint32_t nWidth, uint32_t nHeight, uint8_t nColorType, + uint8_t nBitDepth) +{ + FreeImageData(); + + width = nWidth; + height = nHeight; + colorType = nColorType; + bitDepth = nBitDepth; + + size_t bytePerPixel = GetBytesPerPixel(); + + pixelMatrix = static_cast(malloc(sizeof(uint8_t*) * height)); + for (size_t y = 0; y < height; y++) + { + pixelMatrix[y] = static_cast(malloc(sizeof(uint8_t*) * width * bytePerPixel)); + for (size_t x = 0; x < width; x++) + { + pixelMatrix[y][x * bytePerPixel + 0] = texData.at(y).at(x).r; + pixelMatrix[y][x * bytePerPixel + 1] = texData.at(y).at(x).g; + pixelMatrix[y][x * bytePerPixel + 2] = texData.at(y).at(x).b; + + if (colorType == PNG_COLOR_TYPE_RGBA) + pixelMatrix[y][x * bytePerPixel + 3] = texData.at(y).at(x).a; + } + } + hasImageData = true; +} + +void ImageBackend::InitEmptyRGBImage(uint32_t nWidth, uint32_t nHeight, bool alpha) +{ + FreeImageData(); + + width = nWidth; + height = nHeight; + colorType = PNG_COLOR_TYPE_RGB; + if (alpha) + colorType = PNG_COLOR_TYPE_RGBA; + bitDepth = 8; // nBitDepth; + + size_t bytePerPixel = GetBytesPerPixel(); + + pixelMatrix = static_cast(malloc(sizeof(uint8_t*) * height)); + for (size_t y = 0; y < height; y++) + { + pixelMatrix[y] = static_cast(calloc(width * bytePerPixel, sizeof(uint8_t*))); + } + + hasImageData = true; +} + +void ImageBackend::InitEmptyPaletteImage(uint32_t nWidth, uint32_t nHeight) +{ + FreeImageData(); + + width = nWidth; + height = nHeight; + colorType = PNG_COLOR_TYPE_PALETTE; + bitDepth = 8; + + size_t bytePerPixel = GetBytesPerPixel(); + + pixelMatrix = (uint8_t**)malloc(sizeof(uint8_t*) * height); + for (size_t y = 0; y < height; y++) + { + pixelMatrix[y] = static_cast(calloc(width * bytePerPixel, sizeof(uint8_t*))); + } + colorPalette = calloc(paletteSize, sizeof(png_color)); + alphaPalette = static_cast(calloc(paletteSize, sizeof(uint8_t))); + + hasImageData = true; + isColorIndexed = true; +} + +RGBAPixel ImageBackend::GetPixel(size_t y, size_t x) const +{ + assert(y < height); + assert(x < width); + assert(!isColorIndexed); + + RGBAPixel pixel; + size_t bytePerPixel = GetBytesPerPixel(); + pixel.r = pixelMatrix[y][x * bytePerPixel + 0]; + pixel.g = pixelMatrix[y][x * bytePerPixel + 1]; + pixel.b = pixelMatrix[y][x * bytePerPixel + 2]; + if (colorType == PNG_COLOR_TYPE_RGBA) + pixel.a = pixelMatrix[y][x * bytePerPixel + 3]; + return pixel; +} + +uint8_t ImageBackend::GetIndexedPixel(size_t y, size_t x) const +{ + assert(y < height); + assert(x < width); + assert(isColorIndexed); + + return pixelMatrix[y][x]; +} + +void ImageBackend::SetRGBPixel(size_t y, size_t x, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) +{ + assert(hasImageData); + assert(y < height); + assert(x < width); + + size_t bytePerPixel = GetBytesPerPixel(); + pixelMatrix[y][x * bytePerPixel + 0] = nR; + pixelMatrix[y][x * bytePerPixel + 1] = nG; + pixelMatrix[y][x * bytePerPixel + 2] = nB; + if (colorType == PNG_COLOR_TYPE_RGBA) + pixelMatrix[y][x * bytePerPixel + 3] = nA; +} + +void ImageBackend::SetGrayscalePixel(size_t y, size_t x, uint8_t grayscale, uint8_t alpha) +{ + assert(hasImageData); + assert(y < height); + assert(x < width); + + size_t bytePerPixel = GetBytesPerPixel(); + pixelMatrix[y][x * bytePerPixel + 0] = grayscale; + pixelMatrix[y][x * bytePerPixel + 1] = grayscale; + pixelMatrix[y][x * bytePerPixel + 2] = grayscale; + if (colorType == PNG_COLOR_TYPE_RGBA) + pixelMatrix[y][x * bytePerPixel + 3] = alpha; +} + +void ImageBackend::SetIndexedPixel(size_t y, size_t x, uint8_t index, uint8_t grayscale) +{ + assert(hasImageData); + assert(y < height); + assert(x < width); + + size_t bytePerPixel = GetBytesPerPixel(); + pixelMatrix[y][x * bytePerPixel + 0] = index; + + assert(index < paletteSize); + png_color* pal = static_cast(colorPalette); + pal[index].red = grayscale; + pal[index].green = grayscale; + pal[index].blue = grayscale; + alphaPalette[index] = 255; +} + +void ImageBackend::SetPaletteIndex(size_t index, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) +{ + assert(isColorIndexed); + assert(index < paletteSize); + + png_color* pal = static_cast(colorPalette); + pal[index].red = nR; + pal[index].green = nG; + pal[index].blue = nB; + alphaPalette[index] = nA; +} + +void ImageBackend::SetPalette(const ImageBackend& pal) +{ + assert(isColorIndexed); + size_t bytePerPixel = pal.GetBytesPerPixel(); + + for (size_t y = 0; y < pal.height; y++) + { + for (size_t x = 0; x < pal.width; x++) + { + uint8_t r = pal.pixelMatrix[y][x * bytePerPixel + 0]; + uint8_t g = pal.pixelMatrix[y][x * bytePerPixel + 1]; + uint8_t b = pal.pixelMatrix[y][x * bytePerPixel + 2]; + uint8_t a = pal.pixelMatrix[y][x * bytePerPixel + 3]; + SetPaletteIndex(y * pal.width + x, r, g, b, a); + } + } +} + +uint32_t ImageBackend::GetWidth() const +{ + return width; +} + +uint32_t ImageBackend::GetHeight() const +{ + return height; +} + +uint8_t ImageBackend::GetColorType() const +{ + return colorType; +} + +uint8_t ImageBackend::GetBitDepth() const +{ + return bitDepth; +} + +double ImageBackend::GetBytesPerPixel() const +{ + switch (colorType) + { + case PNG_COLOR_TYPE_RGBA: + return 4 * bitDepth / 8; + + case PNG_COLOR_TYPE_RGB: + return 3 * bitDepth / 8; + + case PNG_COLOR_TYPE_PALETTE: + return 1 * bitDepth / 8; + + default: + throw std::invalid_argument("ImageBackend::GetBytesPerPixel():\n\t Invalid color type."); + } +} + +void ImageBackend::FreeImageData() +{ + if (hasImageData) + { + for (size_t y = 0; y < height; y++) + free(pixelMatrix[y]); + free(pixelMatrix); + pixelMatrix = nullptr; + } + + if (isColorIndexed) + { + free(colorPalette); + free(alphaPalette); + colorPalette = nullptr; + alphaPalette = nullptr; + isColorIndexed = false; + } + + hasImageData = false; +} + +/* RGBAPixel */ + +void RGBAPixel::SetRGBA(uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) +{ + r = nR; + g = nG; + b = nB; + a = nA; +} + +void RGBAPixel::SetGrayscale(uint8_t grayscale, uint8_t alpha) +{ + r = grayscale; + g = grayscale; + b = grayscale; + a = alpha; +} diff --git a/tools/ZAPD/ZAPD/ImageBackend.h b/tools/ZAPD/ZAPD/ImageBackend.h new file mode 100644 index 0000000000..25ab83216f --- /dev/null +++ b/tools/ZAPD/ZAPD/ImageBackend.h @@ -0,0 +1,71 @@ +#pragma once + +#include +#include + +#include "Directory.h" + +class RGBAPixel +{ +public: + RGBAPixel() = default; + + void SetRGBA(uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA); + void SetGrayscale(uint8_t grayscale, uint8_t alpha = 0); + + uint8_t r = 0; + uint8_t g = 0; + uint8_t b = 0; + uint8_t a = 0; +}; + +class ImageBackend +{ +public: + ImageBackend() = default; + ~ImageBackend(); + + void ReadPng(const char* filename); + void ReadPng(const fs::path& filename); + void WritePng(const char* filename); + void WritePng(const fs::path& filename); + + void SetTextureData(const std::vector>& texData, uint32_t nWidth, + uint32_t nHeight, uint8_t nColorType, uint8_t nBitDepth); + void InitEmptyRGBImage(uint32_t nWidth, uint32_t nHeight, bool alpha); + void InitEmptyPaletteImage(uint32_t nWidth, uint32_t nHeight); + + RGBAPixel GetPixel(size_t y, size_t x) const; + uint8_t GetIndexedPixel(size_t y, size_t x) const; + + void SetRGBPixel(size_t y, size_t x, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA = 0); + void SetGrayscalePixel(size_t y, size_t x, uint8_t grayscale, uint8_t alpha = 0); + + void SetIndexedPixel(size_t y, size_t x, uint8_t index, uint8_t grayscale); + void SetPaletteIndex(size_t index, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA); + void SetPalette(const ImageBackend& pal); + + uint32_t GetWidth() const; + uint32_t GetHeight() const; + uint8_t GetColorType() const; + uint8_t GetBitDepth() const; + +protected: + uint8_t** pixelMatrix = nullptr; // height * [width * bytePerPixel] + + void* colorPalette = nullptr; + uint8_t* alphaPalette = nullptr; + size_t paletteSize = 16 * 16; + + uint32_t width = 0; + uint32_t height = 0; + uint8_t colorType = 0; + uint8_t bitDepth = 0; + + bool hasImageData = false; + bool isColorIndexed = false; + + double GetBytesPerPixel() const; + + void FreeImageData(); +}; diff --git a/tools/ZAPD/ZAPD/Main.cpp b/tools/ZAPD/ZAPD/Main.cpp index a1dfb2155c..c414edf2ca 100644 --- a/tools/ZAPD/ZAPD/Main.cpp +++ b/tools/ZAPD/ZAPD/Main.cpp @@ -24,7 +24,6 @@ #include "tinyxml2.h" using namespace tinyxml2; -using namespace std; bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path& outPath, ZFileMode fileMode); @@ -43,14 +42,20 @@ void ErrorHandler(int sig) size_t size = backtrace(array, nMaxFrames); char** symbols = backtrace_symbols(array, nMaxFrames); - // To prevent unused parameter warning - (void)sig; + fprintf(stderr, "\nZAPD crashed. (Signal: %i)\n", sig); + fprintf(stderr, "\n\t\tYou've met with a terrible fate, haven't you?\n\n"); + /** + * Other possible options: + * - SEA BEARS FOAM. SLEEP BEARS DREAMS. \n BOTH END IN THE SAME WAY: CRASSSH! + */ + + fprintf(stderr, "Traceback:\n"); for (size_t i = 1; i < size; i++) { Dl_info info; uint32_t gotAddress = dladdr(array[i], &info); - string functionName(symbols[i]); + std::string functionName(symbols[i]); if (gotAddress != 0 && info.dli_sname != nullptr) { @@ -71,7 +76,8 @@ void ErrorHandler(int sig) fprintf(stderr, "%-3zd %s\n", i, functionName.c_str()); } - // backtrace_symbols_fd(array, size, STDERR_FILENO); + fprintf(stderr, "\n"); + free(symbols); exit(1); } @@ -90,7 +96,7 @@ int main(int argc, char* argv[]) Globals* g = new Globals(); // Parse File Mode - string buildMode = argv[1]; + std::string buildMode = argv[1]; ZFileMode fileMode = ZFileMode::Invalid; if (buildMode == "btex") @@ -119,7 +125,7 @@ int main(int argc, char* argv[]) // Parse other "commands" for (int32_t i = 2; i < argc; i++) { - string arg = argv[i]; + std::string arg = argv[i]; if (arg == "-o" || arg == "--outputpath") // Set output path { @@ -147,34 +153,34 @@ int main(int argc, char* argv[]) } else if (arg == "-gsf") // Generate source file during extraction { - Globals::Instance->genSourceFile = string(argv[i + 1]) == "1"; - i++; - } - else if (arg == "-ifp") // Include file prefix in generated symbols - { - Globals::Instance->includeFilePrefix = string(argv[i + 1]) == "1"; + Globals::Instance->genSourceFile = std::string(argv[i + 1]) == "1"; i++; } else if (arg == "-tm") // Test Mode (enables certain experimental features) { - Globals::Instance->testMode = string(argv[i + 1]) == "1"; + Globals::Instance->testMode = std::string(argv[i + 1]) == "1"; i++; } + else if (arg == "-crc" || + arg == "--output-crc") // Outputs a CRC file for each extracted texture. + { + Globals::Instance->outputCrc = true; + } else if (arg == "-ulzdl") // Use Legacy ZDisplay List { - Globals::Instance->useLegacyZDList = string(argv[i + 1]) == "1"; + Globals::Instance->useLegacyZDList = std::string(argv[i + 1]) == "1"; i++; } else if (arg == "-profile") // Enable profiling { - Globals::Instance->profile = string(argv[i + 1]) == "1"; + Globals::Instance->profile = std::string(argv[i + 1]) == "1"; i++; } else if (arg == "-uer") // Split resources into their individual components (enabled by default) // TODO: We may wish to make this a part of the config file... { - Globals::Instance->useExternalResources = string(argv[i + 1]) == "1"; + Globals::Instance->useExternalResources = std::string(argv[i + 1]) == "1"; i++; } else if (arg == "-tt") // Set texture type @@ -182,8 +188,9 @@ int main(int argc, char* argv[]) Globals::Instance->texType = ZTexture::GetTextureTypeFromString(argv[i + 1]); i++; } - else if (arg == "-cfg") // Set cfg path (for overlays) - // TODO: Change the name of this to something else so it doesn't get confused with XML config files. + else if (arg == "-cfg") // Set cfg path (for overlays) + // TODO: Change the name of this to something else so it doesn't + // get confused with XML config files. { Globals::Instance->cfgPath = argv[i + 1]; i++; @@ -199,12 +206,13 @@ int main(int argc, char* argv[]) signal(SIGSEGV, ErrorHandler); signal(SIGABRT, ErrorHandler); #else - printf("Warning: Tried to set error handler, but this build lacks support for one.\n"); + fprintf(stderr, + "Warning: Tried to set error handler, but this build lacks support for one.\n"); #endif } else if (arg == "-v") // Verbose { - Globals::Instance->verbosity = (VerbosityLevel)strtol(argv[++i], NULL, 16); + Globals::Instance->verbosity = static_cast(strtol(argv[++i], NULL, 16)); } else if (arg == "-wu" || arg == "--warn-unaccounted") // Warn unaccounted { @@ -212,57 +220,50 @@ int main(int argc, char* argv[]) } } - if (Globals::Instance->verbosity >= VERBOSITY_INFO) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) printf("ZAPD: Zelda Asset Processor For Decomp: %s\n", gBuildHash); - try + if (fileMode == ZFileMode::Extract || fileMode == ZFileMode::BuildSourceFile) { - if (fileMode == ZFileMode::Extract || fileMode == ZFileMode::BuildSourceFile) - { - bool parseSuccessful = - Parse(Globals::Instance->inputPath, Globals::Instance->baseRomPath, - Globals::Instance->outputPath, fileMode); + bool parseSuccessful = Parse(Globals::Instance->inputPath, Globals::Instance->baseRomPath, + Globals::Instance->outputPath, fileMode); - if (!parseSuccessful) - return 1; - } - else if (fileMode == ZFileMode::BuildTexture) - { - TextureType texType = Globals::Instance->texType; - - BuildAssetTexture(Globals::Instance->inputPath, texType, Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildBackground) - { - BuildAssetBackground(Globals::Instance->inputPath, Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildBlob) - { - BuildAssetBlob(Globals::Instance->inputPath, Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildModelIntermediette) - { - BuildAssetModelIntermediette(Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildAnimationIntermediette) - { - BuildAssetAnimationIntermediette(Globals::Instance->inputPath, - Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildOverlay) - { - ZOverlay* overlay = - ZOverlay::FromBuild(Path::GetDirectoryName(Globals::Instance->inputPath), - Path::GetDirectoryName(Globals::Instance->cfgPath)); - - if (overlay) - File::WriteAllText(Globals::Instance->outputPath, overlay->GetSourceOutputCode("")); - } + if (!parseSuccessful) + return 1; } - catch (std::runtime_error& e) + else if (fileMode == ZFileMode::BuildTexture) { - printf("Exception occurred: %s\n", e.what()); + TextureType texType = Globals::Instance->texType; + BuildAssetTexture(Globals::Instance->inputPath, texType, Globals::Instance->outputPath); } + else if (fileMode == ZFileMode::BuildBackground) + { + BuildAssetBackground(Globals::Instance->inputPath, Globals::Instance->outputPath); + } + else if (fileMode == ZFileMode::BuildBlob) + { + BuildAssetBlob(Globals::Instance->inputPath, Globals::Instance->outputPath); + } + else if (fileMode == ZFileMode::BuildModelIntermediette) + { + BuildAssetModelIntermediette(Globals::Instance->outputPath); + } + else if (fileMode == ZFileMode::BuildAnimationIntermediette) + { + BuildAssetAnimationIntermediette(Globals::Instance->inputPath, + Globals::Instance->outputPath); + } + else if (fileMode == ZFileMode::BuildOverlay) + { + ZOverlay* overlay = + ZOverlay::FromBuild(Path::GetDirectoryName(Globals::Instance->inputPath), + Path::GetDirectoryName(Globals::Instance->cfgPath)); + + if (overlay) + File::WriteAllText(Globals::Instance->outputPath.string(), + overlay->GetSourceOutputCode("")); + } + delete g; return 0; } @@ -271,7 +272,7 @@ bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path ZFileMode fileMode) { XMLDocument doc; - XMLError eResult = doc.LoadFile(xmlFilePath.c_str()); + XMLError eResult = doc.LoadFile(xmlFilePath.string().c_str()); if (eResult != tinyxml2::XML_SUCCESS) { @@ -290,7 +291,7 @@ bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path for (XMLElement* child = root->FirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - if (string(child->Name()) == "File") + if (std::string(child->Name()) == "File") { ZFile* file = new ZFile(fileMode, child, basePath, outPath, "", xmlFilePath, false); Globals::Instance->files.push_back(file); @@ -323,37 +324,36 @@ bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path void BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath) { - string name = outPath.stem(); + std::string name = outPath.stem().string(); - ZTexture* tex = ZTexture::FromPNG(pngFilePath, texType); - string cfgPath = StringHelper::Split(pngFilePath, ".")[0] + ".cfg"; + ZTexture tex(nullptr); + tex.FromPNG(pngFilePath, texType); + std::string cfgPath = StringHelper::Split(pngFilePath.string(), ".")[0] + ".cfg"; if (File::Exists(cfgPath)) name = File::ReadAllText(cfgPath); - string src = tex->GetSourceOutputCode(name); + std::string src = tex.GetBodySourceCode(); - File::WriteAllText(outPath, src); - - delete tex; + File::WriteAllText(outPath.string(), src); } void BuildAssetBackground(const fs::path& imageFilePath, const fs::path& outPath) { ZBackground background(nullptr); - background.ParseBinaryFile(imageFilePath, false); + background.ParseBinaryFile(imageFilePath.string(), false); - File::WriteAllText(outPath, background.GetBodySourceCode()); + File::WriteAllText(outPath.string(), background.GetBodySourceCode()); } void BuildAssetBlob(const fs::path& blobFilePath, const fs::path& outPath) { - ZBlob* blob = ZBlob::FromFile(blobFilePath); - string name = outPath.stem(); // filename without extension + ZBlob* blob = ZBlob::FromFile(blobFilePath.string()); + std::string name = outPath.stem().string(); // filename without extension - string src = blob->GetSourceOutputCode(name); + std::string src = blob->GetSourceOutputCode(name); - File::WriteAllText(outPath, src); + File::WriteAllText(outPath.string(), src); delete blob; } @@ -363,30 +363,30 @@ void BuildAssetModelIntermediette(const fs::path& outPath) XMLDocument doc; HLModelIntermediette* mdl = HLModelIntermediette::FromXML(doc.RootElement()); - string output = mdl->OutputCode(); + std::string output = mdl->OutputCode(); - File::WriteAllText(outPath, output); + File::WriteAllText(outPath.string(), output); delete mdl; } void BuildAssetAnimationIntermediette(const fs::path& animPath, const fs::path& outPath) { - vector split = StringHelper::Split(outPath, "/"); + std::vector split = StringHelper::Split(outPath.string(), "/"); ZFile* file = new ZFile("", split[split.size() - 2]); - HLAnimationIntermediette* anim = HLAnimationIntermediette::FromXML(animPath); + HLAnimationIntermediette* anim = HLAnimationIntermediette::FromXML(animPath.string()); ZAnimation* zAnim = anim->ToZAnimation(); zAnim->SetName(Path::GetFileNameWithoutExtension(split[split.size() - 1])); zAnim->parent = file; zAnim->GetSourceOutputCode(split[split.size() - 2]); - string output = ""; + std::string output = ""; output += file->declarations[2]->text + "\n"; output += file->declarations[1]->text + "\n"; output += file->declarations[0]->text + "\n"; - File::WriteAllText(outPath, output); + File::WriteAllText(outPath.string(), output); delete zAnim; delete file; diff --git a/tools/ZAPD/ZAPD/Overlays/ZOverlay.cpp b/tools/ZAPD/ZAPD/Overlays/ZOverlay.cpp index d5969f7c04..a30d89ff5c 100644 --- a/tools/ZAPD/ZAPD/Overlays/ZOverlay.cpp +++ b/tools/ZAPD/ZAPD/Overlays/ZOverlay.cpp @@ -4,16 +4,15 @@ #include "../Path.h" #include "../StringHelper.h" -using namespace std; using namespace ELFIO; ZOverlay::ZOverlay() { name = ""; - entries = vector(); + entries = std::vector(); } -ZOverlay::ZOverlay(string nName) : ZOverlay() +ZOverlay::ZOverlay(std::string nName) : ZOverlay() { name = nName; } @@ -26,26 +25,27 @@ ZOverlay::~ZOverlay() entries.clear(); } -ZOverlay* ZOverlay::FromBuild(string buildPath, string cfgFolderPath) +ZOverlay* ZOverlay::FromBuild(std::string buildPath, std::string cfgFolderPath) { - string cfgText = File::ReadAllText(cfgFolderPath + "/overlay.cfg"); - vector cfgLines = StringHelper::Split(cfgText, "\n"); + std::string cfgText = File::ReadAllText(cfgFolderPath + "/overlay.cfg"); + std::vector cfgLines = StringHelper::Split(cfgText, "\n"); ZOverlay* ovl = new ZOverlay(StringHelper::Strip(cfgLines[0], "\r")); - vector relSections = {".rel.text", ".rel.data", ".rel.rodata"}; - vector sections = {".text", ".data", ".rodata"}; + std::vector relSections = {".rel.text", ".rel.data", ".rel.rodata"}; + std::vector sections = {".text", ".data", ".rodata"}; int32_t sectionOffs[5] = {0}; - vector textRelocs; - vector dataRelocs; - vector rodataRelocs; + std::vector textRelocs; + std::vector dataRelocs; + std::vector rodataRelocs; // get the elf files - vector readers; + std::vector readers; for (size_t i = 1; i < cfgLines.size(); i++) { - string elfPath = buildPath + "/" + cfgLines[i].substr(0, cfgLines[i].size() - 2) + ".o"; + std::string elfPath = + buildPath + "/" + cfgLines[i].substr(0, cfgLines[i].size() - 2) + ".o"; elfio* reader = new elfio(); if (!reader->load(elfPath)) @@ -88,7 +88,7 @@ ZOverlay* ZOverlay::FromBuild(string buildPath, string cfgFolderPath) relocs.get_entry(j, offset, symbol, type, addend); } - string curSymName; + std::string curSymName; Elf_Half curSymShndx = SHN_UNDEF; { symbol_section_accessor symbols( @@ -124,7 +124,7 @@ ZOverlay* ZOverlay::FromBuild(string buildPath, string cfgFolderPath) { Elf_Half shndx = SHN_UNDEF; Elf64_Addr value; - string name; + std::string name; Elf_Xword size; unsigned char bind; unsigned char type; @@ -189,9 +189,9 @@ ZOverlay* ZOverlay::FromBuild(string buildPath, string cfgFolderPath) return ovl; } -string ZOverlay::GetSourceOutputCode(const std::string& prefix) +std::string ZOverlay::GetSourceOutputCode(const std::string& prefix) { - string output = ""; + std::string output = ""; output += ".section .ovl\n"; @@ -220,7 +220,7 @@ string ZOverlay::GetSourceOutputCode(const std::string& prefix) return output; } -SectionType ZOverlay::GetSectionTypeFromStr(string sectionName) +SectionType ZOverlay::GetSectionTypeFromStr(std::string sectionName) { if (sectionName == ".rel.text" || sectionName == ".text") return SectionType::Text; diff --git a/tools/ZAPD/ZAPD/Overlays/ZOverlay.h b/tools/ZAPD/ZAPD/Overlays/ZOverlay.h index f43023092a..08e573de14 100644 --- a/tools/ZAPD/ZAPD/Overlays/ZOverlay.h +++ b/tools/ZAPD/ZAPD/Overlays/ZOverlay.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include "../ZResource.h" +#include "tinyxml2.h" enum SectionType { diff --git a/tools/ZAPD/ZAPD/Path.h b/tools/ZAPD/ZAPD/Path.h index a5c073c039..68cfaea4bc 100644 --- a/tools/ZAPD/ZAPD/Path.h +++ b/tools/ZAPD/ZAPD/Path.h @@ -46,8 +46,8 @@ public: return output; }; - static std::string GetDirectoryName(const std::string& path) + static std::string GetDirectoryName(const fs::path& path) { - return fs::path(path).parent_path().u8string(); + return path.parent_path().u8string(); }; }; diff --git a/tools/ZAPD/ZAPD/StringHelper.h b/tools/ZAPD/ZAPD/StringHelper.h index 3d63a749bc..1249cec453 100644 --- a/tools/ZAPD/ZAPD/StringHelper.h +++ b/tools/ZAPD/ZAPD/StringHelper.h @@ -1,8 +1,8 @@ #pragma once +#include #include #include -#include #include #include @@ -66,7 +66,7 @@ public: static bool EndsWith(const std::string& s, const std::string& input) { - int32_t inputLen = strlen(input.c_str()); + size_t inputLen = strlen(input.c_str()); return s.rfind(input) == (s.size() - inputLen); } @@ -92,4 +92,11 @@ public: return ss.empty() ? s : ss + separator + s; }); } + + static int64_t StrToL(const std::string& str, int32_t base = 10) + { + return std::strtoull(str.c_str(), nullptr, base); + } + + static std::string BoolStr(bool b) { return b ? "true" : "false"; } }; diff --git a/tools/ZAPD/ZAPD/ZAnimation.cpp b/tools/ZAPD/ZAPD/ZAnimation.cpp index 2eaeee2378..749abd95cb 100644 --- a/tools/ZAPD/ZAPD/ZAnimation.cpp +++ b/tools/ZAPD/ZAPD/ZAnimation.cpp @@ -7,8 +7,6 @@ #include "StringHelper.h" #include "ZFile.h" -using namespace std; - REGISTER_ZFILENODE(Animation, ZNormalAnimation); REGISTER_ZFILENODE(PlayerAnimation, ZLinkAnimation); REGISTER_ZFILENODE(CurveAnimation, ZCurveAnimation); @@ -26,13 +24,13 @@ void ZAnimation::ParseRawData() frameCount = BitConverter::ToInt16BE(data, rawDataIndex + 0); } -void ZAnimation::Save(const std::string& outFolder) +void ZAnimation::Save(const fs::path& outFolder) { if (Globals::Instance->testMode) { HLAnimationIntermediette* anim = HLAnimationIntermediette::FromZAnimation(this); - string xml = anim->OutputXML(); - File::WriteAllText(outFolder + "/" + name + ".anmi", xml); + std::string xml = anim->OutputXML(); + File::WriteAllText(outFolder / (name + ".anmi"), xml); delete anim; } @@ -43,20 +41,20 @@ void ZAnimation::ParseXML(tinyxml2::XMLElement* reader) ZResource::ParseXML(reader); } -string ZAnimation::GetSourceOutputCode(const std::string& prefix) +std::string ZAnimation::GetSourceOutputCode(const std::string& prefix) { return ""; } -ZResourceType ZAnimation::GetResourceType() +ZResourceType ZAnimation::GetResourceType() const { return ZResourceType::Animation; } ZNormalAnimation::ZNormalAnimation(ZFile* nParent) : ZAnimation(nParent) { - rotationValues = vector(); - rotationIndices = vector(); + rotationValues = std::vector(); + rotationIndices = std::vector(); limit = 0; } @@ -64,10 +62,10 @@ std::string ZNormalAnimation::GetSourceOutputCode(const std::string& prefix) { if (parent != nullptr) { - string defaultPrefix = name.c_str(); + std::string defaultPrefix = name.c_str(); defaultPrefix.replace(0, 1, "s"); // replace g prefix with s for local variables - string headerStr = StringHelper::Sprintf("\n\t{ %i },\n", frameCount); + std::string headerStr = StringHelper::Sprintf("\n\t{ %i },\n", frameCount); headerStr += StringHelper::Sprintf("\t%sFrameData,\n", defaultPrefix.c_str()); headerStr += StringHelper::Sprintf("\t%sJointIndices,\n", defaultPrefix.c_str()); headerStr += StringHelper::Sprintf("\t%i\n", limit); @@ -75,8 +73,8 @@ std::string ZNormalAnimation::GetSourceOutputCode(const std::string& prefix) GetSourceTypeName(), StringHelper::Sprintf("%s", name.c_str()), headerStr); - string indicesStr = ""; - string valuesStr = " "; + std::string indicesStr = ""; + std::string valuesStr = " "; const uint8_t lineLength = 14; const uint8_t offset = 0; @@ -112,19 +110,19 @@ std::string ZNormalAnimation::GetSourceOutputCode(const std::string& prefix) return ""; } -size_t ZNormalAnimation::GetRawDataSize() +size_t ZNormalAnimation::GetRawDataSize() const { return 16; } -std::string ZNormalAnimation::GetSourceTypeName() +std::string ZNormalAnimation::GetSourceTypeName() const { return "AnimationHeader"; } void ZNormalAnimation::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { rawData = std::move(nRawData); rawDataIndex = nRawDataIndex; @@ -172,12 +170,13 @@ std::string ZLinkAnimation::GetSourceOutputCode(const std::string& prefix) { if (parent != nullptr) { - string segSymbol = segmentAddress == 0 ? - "NULL" : - parent->GetDeclarationName( - segmentAddress, StringHelper::Sprintf("%sSeg%06X", name.c_str(), - segmentAddress)); - string headerStr = + std::string segSymbol = + segmentAddress == 0 ? + "NULL" : + parent->GetDeclarationName( + segmentAddress, + StringHelper::Sprintf("%sSeg%06X", name.c_str(), segmentAddress)); + std::string headerStr = StringHelper::Sprintf("\n\t{ %i },\n\t0x%08X\n", frameCount, segmentAddress); parent->AddDeclaration(rawDataIndex, DeclarationAlignment::None, GetRawDataSize(), GetSourceTypeName(), StringHelper::Sprintf("%s", name.c_str()), @@ -187,19 +186,19 @@ std::string ZLinkAnimation::GetSourceOutputCode(const std::string& prefix) return ""; } -size_t ZLinkAnimation::GetRawDataSize() +size_t ZLinkAnimation::GetRawDataSize() const { return 8; } -std::string ZLinkAnimation::GetSourceTypeName() +std::string ZLinkAnimation::GetSourceTypeName() const { return "LinkAnimationHeader"; } void ZLinkAnimation::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { rawData = std::move(nRawData); rawDataIndex = nRawDataIndex; @@ -240,7 +239,7 @@ std::string TransformData::GetBody(const std::string& prefix) const unk_08); } -size_t TransformData::GetRawDataSize() +size_t TransformData::GetRawDataSize() const { return 0x0C; } @@ -287,9 +286,9 @@ void ZCurveAnimation::ParseRawData() void ZCurveAnimation::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); skel = new ZSkeleton(ZSkeletonType::Curve, ZLimbType::Curve, "CurveAnim", nRawData, Seg2Filespace(skelOffset, parent->baseAddress), parent); @@ -342,10 +341,10 @@ void ZCurveAnimation::PreGenValues(const std::string& prefix) if (refIndex != 0) { uint32_t refIndexOffset = Seg2Filespace(refIndex, parent->baseAddress); - string refIndexStr = + std::string refIndexStr = StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), "Ref", refIndexOffset); - string entryStr = " "; + std::string entryStr = " "; uint16_t arrayItemCnt = refIndexArr.size(); size_t i = 0; @@ -370,11 +369,11 @@ void ZCurveAnimation::PreGenValues(const std::string& prefix) if (transformData != 0) { uint32_t transformDataOffset = Seg2Filespace(transformData, parent->baseAddress); - string transformDataStr = - StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), - TransformData::GetSourceTypeName().c_str(), transformDataOffset); + std::string transformDataStr = StringHelper::Sprintf( + "%sCurveAnime_%s_%06X", prefix.c_str(), + transformDataArr.at(0).GetSourceTypeName().c_str(), transformDataOffset); - string entryStr = ""; + std::string entryStr = ""; uint16_t arrayItemCnt = transformDataArr.size(); size_t i = 0; @@ -388,9 +387,9 @@ void ZCurveAnimation::PreGenValues(const std::string& prefix) if (decl == nullptr) { parent->AddDeclarationArray(transformDataOffset, DeclarationAlignment::None, - arrayItemCnt * TransformData::GetRawDataSize(), - TransformData::GetSourceTypeName(), transformDataStr, - arrayItemCnt, entryStr); + arrayItemCnt * transformDataArr.at(0).GetRawDataSize(), + transformDataArr.at(0).GetSourceTypeName(), + transformDataStr, arrayItemCnt, entryStr); } else { @@ -401,10 +400,10 @@ void ZCurveAnimation::PreGenValues(const std::string& prefix) if (copyValues != 0) { uint32_t copyValuesOffset = Seg2Filespace(copyValues, parent->baseAddress); - string copyValuesStr = + std::string copyValuesStr = StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), "Copy", copyValuesOffset); - string entryStr = " "; + std::string entryStr = " "; uint16_t arrayItemCnt = copyValuesArr.size(); size_t i = 0; @@ -427,19 +426,19 @@ void ZCurveAnimation::PreGenValues(const std::string& prefix) } } -size_t ZCurveAnimation::GetRawDataSize() +size_t ZCurveAnimation::GetRawDataSize() const { return 0x10; } std::string ZCurveAnimation::GetSourceOutputCode(const std::string& prefix) { - string bodyStr = ""; + std::string bodyStr = ""; uint32_t address = Seg2Filespace(rawDataIndex, parent->baseAddress); PreGenValues(prefix); - string refIndexStr = "NULL"; + std::string refIndexStr = "NULL"; if (refIndex != 0) { uint32_t refIndexOffset = Seg2Filespace(refIndex, parent->baseAddress); @@ -455,16 +454,16 @@ std::string ZCurveAnimation::GetSourceOutputCode(const std::string& prefix) } } - string transformDataStr = "NULL"; + std::string transformDataStr = "NULL"; if (transformData != 0) { uint32_t transformDataOffset = Seg2Filespace(transformData, parent->baseAddress); Declaration* decl = parent->GetDeclaration(transformDataOffset); if (decl == nullptr) { - transformDataStr = StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), - TransformData::GetSourceTypeName().c_str(), - transformDataOffset); + transformDataStr = StringHelper::Sprintf( + "%sCurveAnime_%s_%06X", prefix.c_str(), + transformDataArr.at(0).GetSourceTypeName().c_str(), transformDataOffset); } else { @@ -472,7 +471,7 @@ std::string ZCurveAnimation::GetSourceOutputCode(const std::string& prefix) } } - string copyValuesStr = "NULL"; + std::string copyValuesStr = "NULL"; if (copyValues != 0) { uint32_t copyValuesOffset = Seg2Filespace(copyValues, parent->baseAddress); @@ -506,7 +505,7 @@ std::string ZCurveAnimation::GetSourceOutputCode(const std::string& prefix) return ""; } -std::string ZCurveAnimation::GetSourceTypeName() +std::string ZCurveAnimation::GetSourceTypeName() const { return "TransformUpdateIndex"; } diff --git a/tools/ZAPD/ZAPD/ZAnimation.h b/tools/ZAPD/ZAPD/ZAnimation.h index e6dc1e23f3..ce62a95f12 100644 --- a/tools/ZAPD/ZAPD/ZAnimation.h +++ b/tools/ZAPD/ZAPD/ZAnimation.h @@ -29,11 +29,11 @@ public: ZAnimation(ZFile* nParent); std::string GetSourceOutputCode(const std::string& prefix) override; - ZResourceType GetResourceType() override; + ZResourceType GetResourceType() const override; protected: void ParseRawData() override; - void Save(const std::string& outFolder) override; + void Save(const fs::path& outFolder) override; void ParseXML(tinyxml2::XMLElement* reader) override; }; @@ -49,11 +49,11 @@ public: ZNormalAnimation(ZFile* nParent); std::string GetSourceOutputCode(const std::string& prefix) override; - size_t GetRawDataSize() override; - std::string GetSourceTypeName() override; + size_t GetRawDataSize() const override; + std::string GetSourceTypeName() const override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; protected: virtual void ParseRawData() override; @@ -67,11 +67,11 @@ public: ZLinkAnimation(ZFile* nParent); std::string GetSourceOutputCode(const std::string& prefix) override; - size_t GetRawDataSize() override; - std::string GetSourceTypeName() override; + size_t GetRawDataSize() const override; + std::string GetSourceTypeName() const override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; protected: virtual void ParseRawData() override; @@ -101,8 +101,8 @@ public: [[nodiscard]] std::string GetBody(const std::string& prefix) const; - static size_t GetRawDataSize(); - static std::string GetSourceTypeName(); + size_t GetRawDataSize() const; + std::string GetSourceTypeName(); }; class ZCurveAnimation : public ZAnimation @@ -134,12 +134,12 @@ public: void ParseXML(tinyxml2::XMLElement* reader) override; void ParseRawData() override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; void PreGenValues(const std::string& prefix); - size_t GetRawDataSize() override; + size_t GetRawDataSize() const override; std::string GetSourceOutputCode(const std::string& prefix) override; - std::string GetSourceTypeName() override; + std::string GetSourceTypeName() const override; }; // TransformUpdateIndex diff --git a/tools/ZAPD/ZAPD/ZArray.cpp b/tools/ZAPD/ZAPD/ZArray.cpp index ac9561b21a..5429277be3 100644 --- a/tools/ZAPD/ZAPD/ZArray.cpp +++ b/tools/ZAPD/ZAPD/ZArray.cpp @@ -63,13 +63,13 @@ std::string ZArray::GetSourceOutputCode(const std::string& prefix) return ""; } -size_t ZArray::GetRawDataSize() +size_t ZArray::GetRawDataSize() const { return arrayCnt * testFile->resources[0]->GetRawDataSize(); } void ZArray::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { rawData = nRawData; rawDataIndex = nRawDataIndex; diff --git a/tools/ZAPD/ZAPD/ZArray.h b/tools/ZAPD/ZAPD/ZArray.h index ebad2a4bb2..b00bee4f77 100644 --- a/tools/ZAPD/ZAPD/ZArray.h +++ b/tools/ZAPD/ZAPD/ZArray.h @@ -14,14 +14,12 @@ public: void ParseXML(tinyxml2::XMLElement* reader) override; std::string GetSourceOutputCode(const std::string& prefix) override; - size_t GetRawDataSize() override; + size_t GetRawDataSize() const override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; protected: size_t arrayCnt; ZFile* testFile; - - // void ParseRawData(const std::vector& data, const int32_t offset); }; \ No newline at end of file diff --git a/tools/ZAPD/ZAPD/ZBackground.cpp b/tools/ZAPD/ZAPD/ZBackground.cpp index 02ff4243df..94388bf28c 100644 --- a/tools/ZAPD/ZAPD/ZBackground.cpp +++ b/tools/ZAPD/ZAPD/ZBackground.cpp @@ -50,10 +50,10 @@ void ZBackground::ParseRawData() void ZBackground::ParseBinaryFile(const std::string& inFolder, bool appendOutName) { fs::path filepath(inFolder); + if (appendOutName) - { filepath = filepath / (outName + "." + GetExternalExtension()); - } + data = File::ReadAllBytes(filepath.string()); // Add padding. @@ -62,9 +62,9 @@ void ZBackground::ParseBinaryFile(const std::string& inFolder, bool appendOutNam } void ZBackground::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - uint32_t nRawDataIndex, const std::string& nRelPath) + uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); DeclareVar("", ""); } @@ -128,13 +128,13 @@ void ZBackground::CheckValidJpeg(const std::string& filepath) } } -size_t ZBackground::GetRawDataSize() +size_t ZBackground::GetRawDataSize() const { // Jpgs use the whole sceen buffer, which is a u16 matrix. return Globals::Instance->cfg.bgScreenHeight * Globals::Instance->cfg.bgScreenWidth * 2; } -void ZBackground::DeclareVar(const std::string& prefix, const std::string& bodyStr) +void ZBackground::DeclareVar(const std::string& prefix, const std::string& bodyStr) const { std::string auxName = name; @@ -142,23 +142,23 @@ void ZBackground::DeclareVar(const std::string& prefix, const std::string& bodyS auxName = GetDefaultName(prefix, rawDataIndex); parent->AddDeclarationArray(rawDataIndex, DeclarationAlignment::Align8, GetRawDataSize(), - GetSourceTypeName(), auxName, 0, bodyStr); + GetSourceTypeName(), auxName, "SCREEN_WIDTH * SCREEN_HEIGHT / 4", + bodyStr); } -bool ZBackground::IsExternalResource() +bool ZBackground::IsExternalResource() const { return true; } -std::string ZBackground::GetExternalExtension() +std::string ZBackground::GetExternalExtension() const { return "jpg"; } -void ZBackground::Save(const std::string& outFolder) +void ZBackground::Save(const fs::path& outFolder) { - fs::path folder(outFolder); - fs::path filepath = folder / (outName + "." + GetExternalExtension()); + fs::path filepath = outFolder / (outName + "." + GetExternalExtension()); File::WriteAllBytes(filepath.string(), data); } @@ -198,12 +198,12 @@ std::string ZBackground::GetDefaultName(const std::string& prefix, uint32_t addr return StringHelper::Sprintf("%sBackground_%06X", prefix.c_str(), address); } -std::string ZBackground::GetSourceTypeName() +std::string ZBackground::GetSourceTypeName() const { return "u64"; } -ZResourceType ZBackground::GetResourceType() +ZResourceType ZBackground::GetResourceType() const { return ZResourceType::Background; } diff --git a/tools/ZAPD/ZAPD/ZBackground.h b/tools/ZAPD/ZAPD/ZBackground.h index 55cbf2b613..3df5c794b7 100644 --- a/tools/ZAPD/ZAPD/ZBackground.h +++ b/tools/ZAPD/ZAPD/ZBackground.h @@ -16,22 +16,21 @@ public: void ParseRawData() override; void ParseBinaryFile(const std::string& inFolder, bool appendOutName); void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - uint32_t nRawDataIndex, const std::string& nRelPath) override; + uint32_t nRawDataIndex) override; void CheckValidJpeg(const std::string& filepath); - size_t GetRawDataSize() override; + size_t GetRawDataSize() const override; - void DeclareVar(const std::string& prefix, const std::string& bodyStr); - - bool IsExternalResource() override; - std::string GetExternalExtension() override; - void Save(const std::string& outFolder) override; + void DeclareVar(const std::string& prefix, const std::string& bodyStr) const; + bool IsExternalResource() const override; + std::string GetExternalExtension() const override; + void Save(const fs::path& outFolder) override; std::string GetBodySourceCode(); std::string GetSourceOutputCode(const std::string& prefix) override; static std::string GetDefaultName(const std::string& prefix, uint32_t address); - std::string GetSourceTypeName() override; - ZResourceType GetResourceType() override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; }; diff --git a/tools/ZAPD/ZAPD/ZBlob.cpp b/tools/ZAPD/ZAPD/ZBlob.cpp index 53cd0065a5..3131c12728 100644 --- a/tools/ZAPD/ZAPD/ZBlob.cpp +++ b/tools/ZAPD/ZAPD/ZBlob.cpp @@ -6,7 +6,6 @@ #include "ZFile.h" using namespace tinyxml2; -using namespace std; REGISTER_ZFILENODE(Blob, ZBlob); @@ -20,20 +19,19 @@ ZBlob::ZBlob(const std::vector& nRawData, uint32_t nRawDataIndex, size_ { rawDataIndex = nRawDataIndex; rawData = - vector(nRawData.data() + rawDataIndex, nRawData.data() + rawDataIndex + size); + std::vector(nRawData.data() + rawDataIndex, nRawData.data() + rawDataIndex + size); name = std::move(nName); } void ZBlob::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { rawDataIndex = nRawDataIndex; ParseXML(reader); long size = strtol(reader->Attribute("Size"), NULL, 16); rawData = - vector(nRawData.data() + rawDataIndex, nRawData.data() + rawDataIndex + size); - relativePath = std::move(nRelPath); + std::vector(nRawData.data() + rawDataIndex, nRawData.data() + rawDataIndex + size); } // Build Source File Mode @@ -58,7 +56,7 @@ ZBlob* ZBlob::FromFile(const std::string& filePath) return blob; } -string ZBlob::GetSourceOutputCode(const std::string& prefix) +std::string ZBlob::GetSourceOutputCode(const std::string& prefix) { sourceOutput = ""; @@ -81,32 +79,32 @@ string ZBlob::GetSourceOutputCode(const std::string& prefix) return sourceOutput; } -string ZBlob::GetSourceOutputHeader(const std::string& prefix) +std::string ZBlob::GetSourceOutputHeader(const std::string& prefix) { return StringHelper::Sprintf("extern u8 %s[];\n", name.c_str()); } -void ZBlob::Save(const std::string& outFolder) +void ZBlob::Save(const fs::path& outFolder) { - File::WriteAllBytes(outFolder + "/" + name + ".bin", rawData); + File::WriteAllBytes(outFolder / (name + ".bin"), rawData); } -bool ZBlob::IsExternalResource() +bool ZBlob::IsExternalResource() const { return true; } -string ZBlob::GetExternalExtension() +std::string ZBlob::GetExternalExtension() const { return "bin"; } -std::string ZBlob::GetSourceTypeName() +std::string ZBlob::GetSourceTypeName() const { return "u8"; } -ZResourceType ZBlob::GetResourceType() +ZResourceType ZBlob::GetResourceType() const { return ZResourceType::Blob; } diff --git a/tools/ZAPD/ZAPD/ZBlob.h b/tools/ZAPD/ZAPD/ZBlob.h index dda3e4e0a7..633a9c70f6 100644 --- a/tools/ZAPD/ZAPD/ZBlob.h +++ b/tools/ZAPD/ZAPD/ZBlob.h @@ -11,17 +11,16 @@ public: std::string nName, ZFile* nParent); void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, - const std::string& nRelPath) override; // Extract Mode + const uint32_t nRawDataIndex) override; // Extract Mode static ZBlob* BuildFromXML(tinyxml2::XMLElement* reader, const std::string& inFolder, bool readFile); static ZBlob* FromFile(const std::string& filePath); std::string GetSourceOutputCode(const std::string& prefix) override; std::string GetSourceOutputHeader(const std::string& prefix) override; - void Save(const std::string& outFolder) override; - bool IsExternalResource() override; - std::string GetExternalExtension() override; - std::string GetSourceTypeName() override; - ZResourceType GetResourceType() override; + void Save(const fs::path& outFolder) override; + bool IsExternalResource() const override; + std::string GetExternalExtension() const override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; }; diff --git a/tools/ZAPD/ZAPD/ZCollision.cpp b/tools/ZAPD/ZAPD/ZCollision.cpp index 118ef797fb..fd2f6ee91d 100644 --- a/tools/ZAPD/ZAPD/ZCollision.cpp +++ b/tools/ZAPD/ZAPD/ZCollision.cpp @@ -5,8 +5,6 @@ #include "Globals.h" #include "StringHelper.h" -using namespace std; - REGISTER_ZFILENODE(Collision, ZCollisionHeader); ZCollisionHeader::ZCollisionHeader(ZFile* nParent) : ZResource(nParent) @@ -21,16 +19,16 @@ ZCollisionHeader::~ZCollisionHeader() delete camData; } -ZResourceType ZCollisionHeader::GetResourceType() +ZResourceType ZCollisionHeader::GetResourceType() const { return ZResourceType::CollisionHeader; } void ZCollisionHeader::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); } void ZCollisionHeader::ParseRawData() @@ -91,7 +89,7 @@ void ZCollisionHeader::ParseRawData() rawData, waterBoxSegmentOffset + (i * (Globals::Instance->game == ZGame::OOT_SW97 ? 12 : 16)))); - string declaration = ""; + std::string declaration = ""; if (waterBoxes.size() > 0) { @@ -245,7 +243,7 @@ CameraDataList::CameraDataList(ZFile* parent, const std::string& prefix, const std::vector& rawData, uint32_t rawDataIndex, uint32_t polyTypeDefSegmentOffset, uint32_t polygonTypesCnt) { - string declaration = ""; + std::string declaration = ""; // Parse CameraDataEntries int32_t numElements = (polyTypeDefSegmentOffset - rawDataIndex) / 8; @@ -286,7 +284,7 @@ CameraDataList::CameraDataList(ZFile* parent, const std::string& prefix, index); } else - sprintf(camSegLine, "0x%08X", entries[i]->cameraPosDataSeg); + sprintf(camSegLine, "NULL"); declaration += StringHelper::Sprintf(" { 0x%04X, %i, %s },", entries[i]->cameraSType, diff --git a/tools/ZAPD/ZAPD/ZCollision.h b/tools/ZAPD/ZAPD/ZCollision.h index 7626da731b..4f35d9ddd1 100644 --- a/tools/ZAPD/ZAPD/ZCollision.h +++ b/tools/ZAPD/ZAPD/ZCollision.h @@ -90,9 +90,9 @@ public: ZCollisionHeader(ZFile* nParent); ~ZCollisionHeader(); - ZResourceType GetResourceType() override; + ZResourceType GetResourceType() const override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; void ParseRawData() override; }; diff --git a/tools/ZAPD/ZAPD/ZCutscene.cpp b/tools/ZAPD/ZAPD/ZCutscene.cpp index d947f627b3..48e6a46762 100644 --- a/tools/ZAPD/ZAPD/ZCutscene.cpp +++ b/tools/ZAPD/ZAPD/ZCutscene.cpp @@ -3,8 +3,6 @@ #include "StringHelper.h" #include "ZResource.h" -using namespace std; - REGISTER_ZFILENODE(Cutscene, ZCutscene); ZCutscene::ZCutscene(ZFile* nParent) : ZCutsceneBase(nParent) @@ -86,9 +84,9 @@ CutsceneCommandSceneTransFX::~CutsceneCommandSceneTransFX() { } -string ZCutscene::GetBodySourceCode() +std::string ZCutscene::GetBodySourceCode() { - string output = ""; + std::string output = ""; size_t size = 0; uint32_t curPtr = 0; @@ -107,7 +105,7 @@ string ZCutscene::GetBodySourceCode() return output; } -string ZCutscene::GetSourceOutputCode(const std::string& prefix) +std::string ZCutscene::GetSourceOutputCode(const std::string& prefix) { std::string bodyStr = GetBodySourceCode(); @@ -121,20 +119,19 @@ string ZCutscene::GetSourceOutputCode(const std::string& prefix) return ""; } -void ZCutscene::DeclareVar(const std::string& prefix, const std::string& bodyStr) +void ZCutscene::DeclareVar(const std::string& prefix, const std::string& bodyStr) const { std::string auxName = name; if (auxName == "") auxName = StringHelper::Sprintf("%sCutsceneData0x%06X", prefix.c_str(), rawDataIndex); - // auxName = GetDefaultName(prefix, getSegmentOffset()); parent->AddDeclarationArray(getSegmentOffset(), DeclarationAlignment::Align4, DeclarationPadding::Pad16, GetRawDataSize(), "s32", auxName, 0, bodyStr); } -size_t ZCutscene::GetRawDataSize() +size_t ZCutscene::GetRawDataSize() const { size_t size = 0; @@ -155,16 +152,16 @@ size_t ZCutscene::GetRawDataSize() } void ZCutscene::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); DeclareVar(parent->GetName(), ""); } void ZCutscene::ParseRawData() { numCommands = BitConverter::ToInt32BE(rawData, rawDataIndex + 0); - commands = vector(); + commands = std::vector(); endFrame = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); uint32_t currentPtr = rawDataIndex + 8; @@ -442,12 +439,12 @@ CutsceneCommands ZCutscene::GetCommandFromID(int32_t id) return CutsceneCommands::Error; } -ZResourceType ZCutscene::GetResourceType() +ZResourceType ZCutscene::GetResourceType() const { return ZResourceType::Cutscene; } -CutsceneCommand::CutsceneCommand(const vector& rawData, uint32_t rawDataIndex) +CutsceneCommand::CutsceneCommand(const std::vector& rawData, uint32_t rawDataIndex) { } @@ -455,12 +452,12 @@ CutsceneCommand::~CutsceneCommand() { } -string CutsceneCommand::GetCName() +std::string CutsceneCommand::GetCName() { return "SCmdCutsceneData"; } -string CutsceneCommand::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommand::GenerateSourceCode(uint32_t baseAddress) { return StringHelper::Sprintf("%s CutsceneData%04XCmd%02X = { 0x%02X,", GetCName().c_str(), baseAddress, commandIndex, commandID); @@ -471,7 +468,7 @@ size_t CutsceneCommand::GetCommandSize() return 4; } -CutsceneCameraPoint::CutsceneCameraPoint(const vector& rawData, uint32_t rawDataIndex) +CutsceneCameraPoint::CutsceneCameraPoint(const std::vector& rawData, uint32_t rawDataIndex) { const uint8_t* data = rawData.data(); @@ -487,7 +484,7 @@ CutsceneCameraPoint::CutsceneCameraPoint(const vector& rawData, uint32_ unused = BitConverter::ToInt16BE(data, rawDataIndex + 14); } -CutsceneCommandSetCameraPos::CutsceneCommandSetCameraPos(const vector& rawData, +CutsceneCommandSetCameraPos::CutsceneCommandSetCameraPos(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -498,7 +495,7 @@ CutsceneCommandSetCameraPos::CutsceneCommandSetCameraPos(const vector& endFrame = BitConverter::ToUInt16BE(data, rawDataIndex + 4); unused = BitConverter::ToUInt16BE(data, rawDataIndex + 6); - entries = vector(); + entries = std::vector(); bool shouldContinue = true; @@ -517,17 +514,17 @@ CutsceneCommandSetCameraPos::CutsceneCommandSetCameraPos(const vector& } // TODO -string CutsceneCommandSetCameraPos::GetCName() +std::string CutsceneCommandSetCameraPos::GetCName() { return ""; } -string CutsceneCommandSetCameraPos::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandSetCameraPos::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; - string listStr = ""; - string posStr = ""; + std::string listStr = ""; + std::string posStr = ""; if (commandID == (int32_t)CutsceneCommands::SetCameraFocus) { @@ -569,7 +566,7 @@ size_t CutsceneCommandSetCameraPos::GetCommandSize() return 8 + (entries.size() * 16); } -MusicFadeEntry::MusicFadeEntry(const vector& rawData, uint32_t rawDataIndex) +MusicFadeEntry::MusicFadeEntry(const std::vector& rawData, uint32_t rawDataIndex) { base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); @@ -590,7 +587,7 @@ MusicFadeEntry::MusicFadeEntry(const vector& rawData, uint32_t rawDataI rawDataIndex + 44); // Macro hardcodes it as zero } -CutsceneCommandFadeBGM::CutsceneCommandFadeBGM(const vector& rawData, +CutsceneCommandFadeBGM::CutsceneCommandFadeBGM(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -605,14 +602,14 @@ CutsceneCommandFadeBGM::CutsceneCommandFadeBGM(const vector& rawData, } } -string CutsceneCommandFadeBGM::GetCName() +std::string CutsceneCommandFadeBGM::GetCName() { return "CsCmdMusicFade"; } -string CutsceneCommandFadeBGM::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandFadeBGM::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_FADE_BGM_LIST(%i),\n", entries.size()); @@ -633,7 +630,7 @@ size_t CutsceneCommandFadeBGM::GetCommandSize() return CutsceneCommand::GetCommandSize() + 0x30 * entries.size(); } -MusicChangeEntry::MusicChangeEntry(const vector& rawData, uint32_t rawDataIndex) +MusicChangeEntry::MusicChangeEntry(const std::vector& rawData, uint32_t rawDataIndex) { sequence = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); @@ -648,7 +645,7 @@ MusicChangeEntry::MusicChangeEntry(const vector& rawData, uint32_t rawD unknown7 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 32); } -CutsceneCommandPlayBGM::CutsceneCommandPlayBGM(const vector& rawData, +CutsceneCommandPlayBGM::CutsceneCommandPlayBGM(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -663,9 +660,9 @@ CutsceneCommandPlayBGM::CutsceneCommandPlayBGM(const vector& rawData, } } -string CutsceneCommandPlayBGM::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandPlayBGM::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_PLAY_BGM_LIST(%i),\n", entries.size()); @@ -681,7 +678,7 @@ string CutsceneCommandPlayBGM::GenerateSourceCode(uint32_t baseAddress) return result; } -string CutsceneCommandPlayBGM::GetCName() +std::string CutsceneCommandPlayBGM::GetCName() { return "CsCmdMusicChange"; } @@ -691,7 +688,7 @@ size_t CutsceneCommandPlayBGM::GetCommandSize() return CutsceneCommand::GetCommandSize() + 0x30; } -CutsceneCommandStopBGM::CutsceneCommandStopBGM(const vector& rawData, +CutsceneCommandStopBGM::CutsceneCommandStopBGM(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -706,9 +703,9 @@ CutsceneCommandStopBGM::CutsceneCommandStopBGM(const vector& rawData, } } -string CutsceneCommandStopBGM::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandStopBGM::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_STOP_BGM_LIST(%i),\n", entries.size()); @@ -724,7 +721,7 @@ string CutsceneCommandStopBGM::GenerateSourceCode(uint32_t baseAddress) return result; } -string CutsceneCommandStopBGM::GetCName() +std::string CutsceneCommandStopBGM::GetCName() { return "CsCmdMusicChange"; } @@ -734,7 +731,7 @@ size_t CutsceneCommandStopBGM::GetCommandSize() return CutsceneCommand::GetCommandSize() + 0x30; } -EnvLightingEntry::EnvLightingEntry(const vector& rawData, uint32_t rawDataIndex) +EnvLightingEntry::EnvLightingEntry(const std::vector& rawData, uint32_t rawDataIndex) { setting = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0); startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2); @@ -749,7 +746,7 @@ EnvLightingEntry::EnvLightingEntry(const vector& rawData, uint32_t rawD unused7 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 32); } -CutsceneCommandEnvLighting::CutsceneCommandEnvLighting(const vector& rawData, +CutsceneCommandEnvLighting::CutsceneCommandEnvLighting(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -764,9 +761,9 @@ CutsceneCommandEnvLighting::CutsceneCommandEnvLighting(const vector& ra } } -string CutsceneCommandEnvLighting::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandEnvLighting::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_LIGHTING_LIST(%i),\n", entries.size()); @@ -782,7 +779,7 @@ string CutsceneCommandEnvLighting::GenerateSourceCode(uint32_t baseAddress) return result; } -string CutsceneCommandEnvLighting::GetCName() +std::string CutsceneCommandEnvLighting::GetCName() { return "CsCmdEnvLighting"; } @@ -792,7 +789,7 @@ size_t CutsceneCommandEnvLighting::GetCommandSize() return CutsceneCommand::GetCommandSize() + (0x30 * entries.size()); } -Unknown9Entry::Unknown9Entry(const vector& rawData, uint32_t rawDataIndex) +Unknown9Entry::Unknown9Entry(const std::vector& rawData, uint32_t rawDataIndex) { base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0); startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2); @@ -805,7 +802,7 @@ Unknown9Entry::Unknown9Entry(const vector& rawData, uint32_t rawDataInd ; } -CutsceneCommandUnknown9::CutsceneCommandUnknown9(const vector& rawData, +CutsceneCommandUnknown9::CutsceneCommandUnknown9(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -820,9 +817,9 @@ CutsceneCommandUnknown9::CutsceneCommandUnknown9(const vector& rawData, } } -string CutsceneCommandUnknown9::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandUnknown9::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_CMD_09_LIST(%i),\n", entries.size()); @@ -837,7 +834,7 @@ string CutsceneCommandUnknown9::GenerateSourceCode(uint32_t baseAddress) return result; } -string CutsceneCommandUnknown9::GetCName() +std::string CutsceneCommandUnknown9::GetCName() { return "CsCmdUnknown9"; } @@ -847,7 +844,7 @@ size_t CutsceneCommandUnknown9::GetCommandSize() return CutsceneCommand::GetCommandSize() + (entries.size() * 12); } -UnkEntry::UnkEntry(const vector& rawData, uint32_t rawDataIndex) +UnkEntry::UnkEntry(const std::vector& rawData, uint32_t rawDataIndex) { unused0 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 0); unused1 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 4); @@ -863,7 +860,7 @@ UnkEntry::UnkEntry(const vector& rawData, uint32_t rawDataIndex) unused11 = (uint32_t)BitConverter::ToInt32BE(rawData, rawDataIndex + 44); } -CutsceneCommandUnknown::CutsceneCommandUnknown(const vector& rawData, +CutsceneCommandUnknown::CutsceneCommandUnknown(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -878,9 +875,9 @@ CutsceneCommandUnknown::CutsceneCommandUnknown(const vector& rawData, } } -string CutsceneCommandUnknown::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandUnknown::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_UNK_DATA_LIST(0x%02X, %i),\n", commandID, entries.size()); @@ -896,7 +893,7 @@ string CutsceneCommandUnknown::GenerateSourceCode(uint32_t baseAddress) return result; } -string CutsceneCommandUnknown::GetCName() +std::string CutsceneCommandUnknown::GetCName() { return "CsCmdUnknown1A"; } @@ -906,7 +903,7 @@ size_t CutsceneCommandUnknown::GetCommandSize() return CutsceneCommand::GetCommandSize() + (entries.size() * 0x30); } -DayTimeEntry::DayTimeEntry(const vector& rawData, uint32_t rawDataIndex) +DayTimeEntry::DayTimeEntry(const std::vector& rawData, uint32_t rawDataIndex) { base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0); startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2); @@ -916,7 +913,7 @@ DayTimeEntry::DayTimeEntry(const vector& rawData, uint32_t rawDataIndex unused = rawData[rawDataIndex + 8]; } -CutsceneCommandDayTime::CutsceneCommandDayTime(const vector& rawData, +CutsceneCommandDayTime::CutsceneCommandDayTime(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -931,14 +928,14 @@ CutsceneCommandDayTime::CutsceneCommandDayTime(const vector& rawData, } } -string CutsceneCommandDayTime::GetCName() +std::string CutsceneCommandDayTime::GetCName() { return "CsCmdDayTime"; } -string CutsceneCommandDayTime::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandDayTime::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_TIME_LIST(%i),\n", entries.size()); @@ -957,7 +954,7 @@ size_t CutsceneCommandDayTime::GetCommandSize() return CutsceneCommand::GetCommandSize() + (entries.size() * 12); } -TextboxEntry::TextboxEntry(const vector& rawData, uint32_t rawDataIndex) +TextboxEntry::TextboxEntry(const std::vector& rawData, uint32_t rawDataIndex) { base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0); startFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 2); @@ -967,7 +964,7 @@ TextboxEntry::TextboxEntry(const vector& rawData, uint32_t rawDataIndex textID2 = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 10); } -CutsceneCommandTextbox::CutsceneCommandTextbox(const vector& rawData, +CutsceneCommandTextbox::CutsceneCommandTextbox(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -982,14 +979,14 @@ CutsceneCommandTextbox::CutsceneCommandTextbox(const vector& rawData, } } -string CutsceneCommandTextbox::GetCName() +std::string CutsceneCommandTextbox::GetCName() { return "CsCmdTextbox"; } -string CutsceneCommandTextbox::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandTextbox::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_TEXT_LIST(%i),\n", entries.size()); @@ -1017,7 +1014,7 @@ size_t CutsceneCommandTextbox::GetCommandSize() return CutsceneCommand::GetCommandSize() + (entries.size() * 12); } -ActorAction::ActorAction(const vector& rawData, uint32_t rawDataIndex) +ActorAction::ActorAction(const std::vector& rawData, uint32_t rawDataIndex) { const uint8_t* data = rawData.data(); @@ -1038,7 +1035,7 @@ ActorAction::ActorAction(const vector& rawData, uint32_t rawDataIndex) normalZ = BitConverter::ToInt32BE(data, rawDataIndex + 44); } -CutsceneCommandActorAction::CutsceneCommandActorAction(const vector& rawData, +CutsceneCommandActorAction::CutsceneCommandActorAction(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -1053,10 +1050,10 @@ CutsceneCommandActorAction::CutsceneCommandActorAction(const vector& ra } } -string CutsceneCommandActorAction::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandActorAction::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; - string subCommand = ""; + std::string result = ""; + std::string subCommand = ""; if (commandID == 10) { @@ -1084,7 +1081,7 @@ string CutsceneCommandActorAction::GenerateSourceCode(uint32_t baseAddress) return result; } -string CutsceneCommandActorAction::GetCName() +std::string CutsceneCommandActorAction::GetCName() { return "CsCmdBase"; } @@ -1094,7 +1091,7 @@ size_t CutsceneCommandActorAction::GetCommandSize() return CutsceneCommand::GetCommandSize() + (entries.size() * 0x30); } -CutsceneCommandTerminator::CutsceneCommandTerminator(const vector& rawData, +CutsceneCommandTerminator::CutsceneCommandTerminator(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -1106,14 +1103,14 @@ CutsceneCommandTerminator::CutsceneCommandTerminator(const vector& rawD unknown = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 6); // endFrame duplicate } -string CutsceneCommandTerminator::GetCName() +std::string CutsceneCommandTerminator::GetCName() { return "CsCmdBase"; } -string CutsceneCommandTerminator::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandTerminator::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_TERMINATOR(0x%04X, %i, %i),\n", base, startFrame, endFrame); @@ -1125,7 +1122,7 @@ size_t CutsceneCommandTerminator::GetCommandSize() return CutsceneCommand::GetCommandSize() + 8; } -CutsceneCommandEnd::CutsceneCommandEnd(const vector& rawData, uint32_t rawDataIndex) +CutsceneCommandEnd::CutsceneCommandEnd(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0); @@ -1133,16 +1130,16 @@ CutsceneCommandEnd::CutsceneCommandEnd(const vector& rawData, uint32_t endFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 4); } -string CutsceneCommandEnd::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandEnd::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_END(),\n"); return result; } -string CutsceneCommandEnd::GetCName() +std::string CutsceneCommandEnd::GetCName() { return "CsCmdBase"; } @@ -1152,7 +1149,7 @@ size_t CutsceneCommandEnd::GetCommandSize() return CutsceneCommand::GetCommandSize() + 6; } -SpecialActionEntry::SpecialActionEntry(const vector& rawData, uint32_t rawDataIndex) +SpecialActionEntry::SpecialActionEntry(const std::vector& rawData, uint32_t rawDataIndex) { const uint8_t* data = rawData.data(); @@ -1172,7 +1169,7 @@ SpecialActionEntry::SpecialActionEntry(const vector& rawData, uint32_t unused10 = BitConverter::ToUInt32BE(data, rawDataIndex + 44); } -CutsceneCommandSpecialAction::CutsceneCommandSpecialAction(const vector& rawData, +CutsceneCommandSpecialAction::CutsceneCommandSpecialAction(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -1187,9 +1184,9 @@ CutsceneCommandSpecialAction::CutsceneCommandSpecialAction(const vector } } -string CutsceneCommandSpecialAction::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandSpecialAction::GenerateSourceCode(uint32_t baseAddress) { - string result = ""; + std::string result = ""; result += StringHelper::Sprintf("CS_MISC_LIST(%i),\n", entries.size()); @@ -1207,7 +1204,7 @@ string CutsceneCommandSpecialAction::GenerateSourceCode(uint32_t baseAddress) return result; } -string CutsceneCommandSpecialAction::GetCName() +std::string CutsceneCommandSpecialAction::GetCName() { return "CsCmdBase"; } @@ -1217,7 +1214,7 @@ size_t CutsceneCommandSpecialAction::GetCommandSize() return CutsceneCommand::GetCommandSize() + (0x30 * entries.size()); } -CutsceneCommandNop::CutsceneCommandNop(const vector& rawData, uint32_t rawDataIndex) +CutsceneCommandNop::CutsceneCommandNop(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { base = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 0); @@ -1225,7 +1222,7 @@ CutsceneCommandNop::CutsceneCommandNop(const vector& rawData, uint32_t endFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 4); } -string CutsceneCommandNop::GetCName() +std::string CutsceneCommandNop::GetCName() { return "CsCmdBase"; } @@ -1235,7 +1232,7 @@ size_t CutsceneCommandNop::GetCommandSize() return CutsceneCommand::GetCommandSize() + 6; } -CutsceneCommandSceneTransFX::CutsceneCommandSceneTransFX(const vector& rawData, +CutsceneCommandSceneTransFX::CutsceneCommandSceneTransFX(const std::vector& rawData, uint32_t rawDataIndex) : CutsceneCommand(rawData, rawDataIndex) { @@ -1246,12 +1243,12 @@ CutsceneCommandSceneTransFX::CutsceneCommandSceneTransFX(const vector& endFrame = (uint16_t)BitConverter::ToInt16BE(rawData, rawDataIndex + 4); } -string CutsceneCommandSceneTransFX::GenerateSourceCode(uint32_t baseAddress) +std::string CutsceneCommandSceneTransFX::GenerateSourceCode(uint32_t baseAddress) { return StringHelper::Sprintf("CS_SCENE_TRANS_FX(%i, %i, %i),\n", base, startFrame, endFrame); } -string CutsceneCommandSceneTransFX::GetCName() +std::string CutsceneCommandSceneTransFX::GetCName() { return "CsCmdBase"; } diff --git a/tools/ZAPD/ZAPD/ZCutscene.h b/tools/ZAPD/ZAPD/ZCutscene.h index f5b68ea83a..525ade752b 100644 --- a/tools/ZAPD/ZAPD/ZCutscene.h +++ b/tools/ZAPD/ZAPD/ZCutscene.h @@ -413,8 +413,8 @@ class ZCutsceneBase : public ZResource public: ZCutsceneBase(ZFile* nParent); virtual std::string GetBodySourceCode() = 0; - virtual void DeclareVar(const std::string& prefix, const std::string& bodyStr) = 0; - virtual uint32_t getSegmentOffset() = 0; + virtual void DeclareVar(const std::string& prefix, const std::string& bodyStr) const = 0; + virtual uint32_t getSegmentOffset() const = 0; }; class ZCutscene : public ZCutsceneBase @@ -424,16 +424,16 @@ public: ~ZCutscene(); std::string GetBodySourceCode() override; - void DeclareVar(const std::string& prefix, const std::string& bodyStr) override; + void DeclareVar(const std::string& prefix, const std::string& bodyStr) const override; std::string GetSourceOutputCode(const std::string& prefix) override; - size_t GetRawDataSize() override; + size_t GetRawDataSize() const override; CutsceneCommands GetCommandFromID(int32_t id); - uint32_t getSegmentOffset() override { return rawDataIndex; } + uint32_t getSegmentOffset() const override { return rawDataIndex; } - ZResourceType GetResourceType() override; + ZResourceType GetResourceType() const override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; protected: int32_t numCommands; diff --git a/tools/ZAPD/ZAPD/ZCutsceneMM.cpp b/tools/ZAPD/ZAPD/ZCutsceneMM.cpp index 0474b631df..bb6724060c 100644 --- a/tools/ZAPD/ZAPD/ZCutsceneMM.cpp +++ b/tools/ZAPD/ZAPD/ZCutsceneMM.cpp @@ -2,8 +2,6 @@ #include "BitConverter.h" #include "StringHelper.h" -using namespace std; - ZCutsceneMM::ZCutsceneMM(ZFile* nParent) : ZCutsceneBase(nParent) { } @@ -14,9 +12,9 @@ ZCutsceneMM::~ZCutsceneMM() delete cmd; } -string ZCutsceneMM::GetBodySourceCode() +std::string ZCutsceneMM::GetBodySourceCode() { - string output = ""; + std::string output = ""; output += StringHelper::Sprintf(" CS_BEGIN_CUTSCENE(%i, %i),", numCommands, endFrame); @@ -30,7 +28,7 @@ string ZCutsceneMM::GetBodySourceCode() return output; } -string ZCutsceneMM::GetSourceOutputCode(const std::string& prefix) +std::string ZCutsceneMM::GetSourceOutputCode(const std::string& prefix) { std::string bodyStr = GetBodySourceCode(); @@ -44,27 +42,26 @@ string ZCutsceneMM::GetSourceOutputCode(const std::string& prefix) return ""; } -void ZCutsceneMM::DeclareVar(const std::string& prefix, const std::string& bodyStr) +void ZCutsceneMM::DeclareVar(const std::string& prefix, const std::string& bodyStr) const { std::string auxName = name; if (auxName == "") auxName = StringHelper::Sprintf("%sCutsceneData0x%06X", prefix.c_str(), rawDataIndex); - // auxName = GetDefaultName(prefix, getSegmentOffset()); parent->AddDeclarationArray(getSegmentOffset(), DeclarationAlignment::Align4, GetRawDataSize(), "s32", auxName, 0, bodyStr); } -size_t ZCutsceneMM::GetRawDataSize() +size_t ZCutsceneMM::GetRawDataSize() const { return 8 + data.size() * 4; } void ZCutsceneMM::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); DeclareVar(parent->GetName(), ""); } @@ -73,7 +70,7 @@ void ZCutsceneMM::ParseRawData() segmentOffset = rawDataIndex; numCommands = BitConverter::ToInt32BE(rawData, rawDataIndex + 0); - commands = vector(); + commands = std::vector(); endFrame = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); uint32_t currentPtr = rawDataIndex + 8; @@ -89,7 +86,7 @@ void ZCutsceneMM::ParseRawData() } while (lastData != 0xFFFFFFFF); } -ZResourceType ZCutsceneMM::GetResourceType() +ZResourceType ZCutsceneMM::GetResourceType() const { return ZResourceType::Cutscene; } diff --git a/tools/ZAPD/ZAPD/ZCutsceneMM.h b/tools/ZAPD/ZAPD/ZCutsceneMM.h index 97dae93e81..c0438ed726 100644 --- a/tools/ZAPD/ZAPD/ZCutsceneMM.h +++ b/tools/ZAPD/ZAPD/ZCutsceneMM.h @@ -16,16 +16,16 @@ public: virtual ~ZCutsceneMM(); std::string GetBodySourceCode() override; - void DeclareVar(const std::string& prefix, const std::string& bodyStr) override; + void DeclareVar(const std::string& prefix, const std::string& bodyStr) const override; std::string GetSourceOutputCode(const std::string& prefix) override; - size_t GetRawDataSize() override; - uint32_t getSegmentOffset() override { return segmentOffset; } + size_t GetRawDataSize() const override; + uint32_t getSegmentOffset() const override { return segmentOffset; } void ParseRawData() override; - ZResourceType GetResourceType() override; + ZResourceType GetResourceType() const override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; protected: int32_t numCommands; diff --git a/tools/ZAPD/ZAPD/ZDisplayList.cpp b/tools/ZAPD/ZAPD/ZDisplayList.cpp index 99abbbe2b0..d81460ed75 100644 --- a/tools/ZAPD/ZAPD/ZDisplayList.cpp +++ b/tools/ZAPD/ZAPD/ZDisplayList.cpp @@ -11,7 +11,6 @@ #include "StringHelper.h" #include "gfxd.h" -using namespace std; using namespace tinyxml2; REGISTER_ZFILENODE(DList, ZDisplayList); @@ -31,23 +30,10 @@ ZDisplayList::ZDisplayList(ZFile* nParent) : ZResource(nParent) name = ""; scene = nullptr; dListType = Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX; - - fileData = vector(); - instructions = vector(); - vertices = map>(); - vtxDeclarations = map(); - otherDLists = vector(); - textures = map(); - texDeclarations = map(); } ZDisplayList::~ZDisplayList() { - for (auto t : textures) - { - delete t.second; - } - for (auto o : otherDLists) { delete o; @@ -57,31 +43,29 @@ ZDisplayList::~ZDisplayList() // EXTRACT MODE void ZDisplayList::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { rawDataIndex = nRawDataIndex; ParseXML(reader); - // name = reader->Attribute("Name"); fileData = nRawData; - relativePath = nRelPath; int32_t rawDataSize = ZDisplayList::GetDListLength( nRawData, rawDataIndex, Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); - rawData = vector(nRawData.data() + rawDataIndex, - nRawData.data() + rawDataIndex + rawDataSize); + rawData = std::vector(nRawData.data() + rawDataIndex, + nRawData.data() + rawDataIndex + rawDataSize); ParseRawData(); } -ZDisplayList::ZDisplayList(vector nRawData, uint32_t nRawDataIndex, int32_t rawDataSize, - ZFile* nParent) +ZDisplayList::ZDisplayList(std::vector nRawData, uint32_t nRawDataIndex, + int32_t rawDataSize, ZFile* nParent) : ZDisplayList(nParent) { fileData = nRawData; rawDataIndex = nRawDataIndex; name = StringHelper::Sprintf("DL_%06X", rawDataIndex); - rawData = vector(nRawData.data() + rawDataIndex, - nRawData.data() + rawDataIndex + rawDataSize); + rawData = std::vector(nRawData.data() + rawDataIndex, + nRawData.data() + rawDataIndex + rawDataSize); ParseRawData(); } @@ -138,7 +122,7 @@ void ZDisplayList::ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int32_t i, st { int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32; int32_t ssssssss = (data & 0xFFFFFFFF); - string geoModeStr = "G_TEXTURE_ENABLE"; + std::string geoModeStr = "G_TEXTURE_ENABLE"; int32_t geoModeParam = ~cccccc; @@ -366,7 +350,7 @@ void ZDisplayList::ParseF3DEX(F3DEXOpcode opcode, uint64_t data, std::string pre { int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32; int32_t ssssssss = (data & 0xFFFFFFFF); - string geoModeStr = "G_TEXTURE_ENABLE"; + std::string geoModeStr = "G_TEXTURE_ENABLE"; int32_t geoModeParam = ~cccccc; @@ -418,7 +402,7 @@ void ZDisplayList::ParseF3DEX(F3DEXOpcode opcode, uint64_t data, std::string pre } } -int32_t ZDisplayList::GetDListLength(vector rawData, uint32_t rawDataIndex, +int32_t ZDisplayList::GetDListLength(std::vector rawData, uint32_t rawDataIndex, DListType dListType) { int32_t i = 0; @@ -440,7 +424,7 @@ int32_t ZDisplayList::GetDListLength(vector rawData, uint32_t rawDataIn } } -bool ZDisplayList::SequenceCheck(vector sequence, int32_t startIndex) +bool ZDisplayList::SequenceCheck(std::vector sequence, int32_t startIndex) { bool success = true; @@ -461,7 +445,8 @@ bool ZDisplayList::SequenceCheck(vector sequence, int32_t startInd return false; } -int32_t ZDisplayList::OptimizationChecks(int32_t startIndex, string& output, string prefix) +int32_t ZDisplayList::OptimizationChecks(int32_t startIndex, std::string& output, + std::string prefix) { int32_t result = -1; @@ -473,8 +458,8 @@ int32_t ZDisplayList::OptimizationChecks(int32_t startIndex, string& output, str return -1; } -int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, string& output, - string prefix) +int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, std::string& output, + std::string prefix) { if (scene == nullptr) { @@ -498,7 +483,7 @@ int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, str uint32_t texAddr, tmem, rtile, fmt, siz, sizB, width, height, width2, height2, pal, cms, cmt, masks, maskt, shifts, shiftt; - string texStr = ""; + std::string texStr = ""; // gsDPSetTextureImage { @@ -512,36 +497,19 @@ int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, str texAddr = Seg2Filespace(data, parent->baseAddress); int32_t segmentNumber = GETSEGNUM(data); - lastTexSeg = (data & 0xFF000000); + lastTexSeg = segmentNumber; - Declaration* texDecl = nullptr; + ZFile* auxParent = parent; + if (parent->segment != segmentNumber && Globals::Instance->HasSegment(segmentNumber)) + auxParent = Globals::Instance->segmentRefFiles.at(segmentNumber); - if (parent != nullptr && - segmentNumber != 2) // HACK: Until we have declarations use segment addresses, - // we'll exclude scene references... - { - texDecl = parent->GetDeclaration(texAddr); - - if (texDecl == nullptr) - texDecl = parent->GetDeclaration(data); - } - - if (texAddr != 0) - { - if (texDecl != nullptr) - texStr = StringHelper::Sprintf("%s", texDecl->varName.c_str()); - else if (segmentNumber == 2) - texStr = StringHelper::Sprintf("%sTex_%06X", scene->GetName().c_str(), texAddr); - else if (!Globals::Instance->HasSegment( - segmentNumber)) // Probably an external asset we are unable to track - texStr = StringHelper::Sprintf("0x%06X", data); - else - texStr = StringHelper::Sprintf("%sTex_%06X", prefix.c_str(), texAddr); - } - else if (segmentNumber != 3) - texStr = StringHelper::Sprintf("0x%06X", data); + Declaration* decl = auxParent->GetDeclaration(texAddr); + if (Globals::Instance->HasSegment(segmentNumber) && decl != nullptr) + texStr = decl->varName; + else if (lastTexture != nullptr) + texStr = lastTexture->GetName(); else - texStr = StringHelper::Sprintf("0"); + texStr = auxParent->GetDeclarationPtrName(data & 0xFFFFFFFF); } // gsDPSetTile @@ -610,9 +578,9 @@ int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, str height2 = (vvv >> 2) + 1; } - string fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", - "G_IM_FMT_I"}; - string sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; + std::string fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", + "G_IM_FMT_I"}; + std::string sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; // output += StringHelper::Sprintf("gsDPLoadTextureBlock(%s, %s, %s, %i, %i, %i, %i, %i, %i, // %i, %i, %i),", texStr.c_str(), fmtTbl[fmt].c_str(), sizTbl[siz].c_str(), width, height, @@ -880,12 +848,15 @@ void ZDisplayList::Opcode_G_VTX(uint64_t data, char* line) if (nn > 0) { - vector vtxList = vector(); + std::vector vtxList; vtxList.reserve(nn); for (int32_t i = 0; i < nn; i++) { - Vertex vtx = Vertex(fileData, currentPtr); + ZVtx vtx(parent); + vtx.SetRawData(fileData); + vtx.SetRawDataIndex(currentPtr); + vtx.ParseRawData(); vtxList.push_back(vtx); currentPtr += 16; @@ -918,13 +889,14 @@ void ZDisplayList::Opcode_G_SETTIMG(uint64_t data, std::string prefix, char* lin { int32_t __ = (data & 0x00FF000000000000) >> 48; int32_t www = (data & 0x00000FFF00000000) >> 32; - string fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", "G_IM_FMT_I"}; - string sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; + std::string fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", + "G_IM_FMT_I"}; + std::string sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; uint32_t fmt = (__ & 0xE0) >> 5; uint32_t siz = (__ & 0x18) >> 3; - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) printf("TextureGenCheck G_SETTIMG\n"); TextureGenCheck(prefix); // HOTSPOT @@ -956,9 +928,7 @@ void ZDisplayList::Opcode_G_SETTIMG(uint64_t data, std::string prefix, char* lin sprintf(texStr, "%sTex_%06X", prefix.c_str(), texAddress); else { - { - sprintf(texStr, "0x%08lX", data & 0xFFFFFFFF); - } + sprintf(texStr, "0x%08lX", data & 0xFFFFFFFF); } sprintf(line, "gsDPSetTextureImage(%s, %s, %i, %s),", fmtTbl[fmt].c_str(), @@ -991,8 +961,9 @@ void ZDisplayList::Opcode_G_SETTILE(uint64_t data, char* line) int32_t bbbb = (data & 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4; int32_t uuuu = (data & 0b0000000000000000000000000000000000000000000000000000000000001111); - string fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", "G_IM_FMT_I"}; - string sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; + std::string fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", + "G_IM_FMT_I"}; + std::string sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; if (fff == (int32_t)F3DZEXTexFormats::G_IM_FMT_CI) lastCISiz = (F3DZEXTexSizes)ii; @@ -1031,11 +1002,11 @@ void ZDisplayList::Opcode_G_SETTILESIZE(uint64_t data, std::string prefix, char* lastTexWidth = (uuu >> shiftAmtW) + 1; lastTexHeight = (vvv >> shiftAmtH) + 1; - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) printf("lastTexWidth: %i lastTexHeight: %i, lastTexSizTest: 0x%x, lastTexFmt: 0x%x\n", lastTexWidth, lastTexHeight, (uint32_t)lastTexSizTest, (uint32_t)lastTexFmt); - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) printf("TextureGenCheck G_SETTILESIZE\n"); TextureGenCheck(prefix); @@ -1075,51 +1046,51 @@ void ZDisplayList::Opcode_G_SETCOMBINE(uint64_t data, char* line) int32_t ab1 = (data & 0b00000000000000000000000000000000000000000000000000000000111000) >> 3; int32_t ad1 = (data & 0b00000000000000000000000000000000000000000000000000000000000111) >> 0; - string modesA[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", "SHADE", "ENVIRONMENT", - "1", "NOISE", "0", "9", "10", "11", - "12", "13", "14", "0"}; - string modesB[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", "SHADE", "ENVIRONMENT", - "CENTER", "K4", "8", "9", "10", "11", - "12", "13", "14", "0"}; - string modesC[] = {"COMBINED", - "TEXEL0", - "TEXEL1", - "PRIMITIVE", - "SHADE", - "ENVIRONMENT", - "1", - "COMBINED_ALPHA", - "TEXEL0_ALPHA", - "TEXEL1_ALPHA", - "PRIMITIVE_ALPHA", - "SHADE_ALPHA", - "ENV_ALPHA", - "LOD_FRACTION", - "PRIM_LOD_FRAC", - "K5", - "16", - "17", - "18", - "19", - "20", - "21", - "22", - "23", - "24", - "25", - "26", - "27", - "28", - "29", - "30", - "0"}; - string modesD[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "1", "0"}; + std::string modesA[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", "SHADE", "ENVIRONMENT", + "1", "NOISE", "0", "9", "10", "11", + "12", "13", "14", "0"}; + std::string modesB[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", "SHADE", "ENVIRONMENT", + "CENTER", "K4", "8", "9", "10", "11", + "12", "13", "14", "0"}; + std::string modesC[] = {"COMBINED", + "TEXEL0", + "TEXEL1", + "PRIMITIVE", + "SHADE", + "ENVIRONMENT", + "1", + "COMBINED_ALPHA", + "TEXEL0_ALPHA", + "TEXEL1_ALPHA", + "PRIMITIVE_ALPHA", + "SHADE_ALPHA", + "ENV_ALPHA", + "LOD_FRACTION", + "PRIM_LOD_FRAC", + "K5", + "16", + "17", + "18", + "19", + "20", + "21", + "22", + "23", + "24", + "25", + "26", + "27", + "28", + "29", + "30", + "0"}; + std::string modesD[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", + "SHADE", "ENVIRONMENT", "1", "0"}; - string modes2[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "1", "0"}; - string modes2C[] = {"LOD_FRACTION", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "PRIM_LOD_FRAC", "0"}; + std::string modes2[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", + "SHADE", "ENVIRONMENT", "1", "0"}; + std::string modes2C[] = {"LOD_FRACTION", "TEXEL0", "TEXEL1", "PRIMITIVE", + "SHADE", "ENVIRONMENT", "PRIM_LOD_FRAC", "0"}; sprintf(line, "gsDPSetCombineLERP(%s, %s, %s, %s, %s, %s, %s, %s,\n %s, %s, " @@ -1272,7 +1243,7 @@ void ZDisplayList::Opcode_G_SETOTHERMODE_L(uint64_t data, char* line) G_RM_VISCVG2, G_RM_OPA_CI2}; - map str = { + std::map str = { {G_RM_FOG_SHADE_A, "G_RM_FOG_SHADE_A"}, {G_RM_FOG_PRIM_A, "G_RM_FOG_PRIM_A"}, {G_RM_PASS, "G_RM_PASS"}, @@ -1517,7 +1488,7 @@ void ZDisplayList::Opcode_G_SETOTHERMODE_H(uint64_t data, char* line) if (sft == 14) // G_MDSFT_TEXTLUT { - string types[] = {"G_TT_NONE", "G_TT_NONE", "G_TT_RGBA16", "G_TT_IA16"}; + std::string types[] = {"G_TT_NONE", "G_TT_NONE", "G_TT_RGBA16", "G_TT_IA16"}; sprintf(line, "gsDPSetTextureLUT(%s),", types[dd >> 14].c_str()); } else @@ -1535,7 +1506,7 @@ void ZDisplayList::Opcode_G_LOADTLUT(uint64_t data, std::string prefix, char* li lastTexLoaded = true; lastTexIsPalette = true; - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) printf("TextureGenCheck G_LOADTLUT (lastCISiz: %i)\n", (uint32_t)lastCISiz); TextureGenCheck(prefix); @@ -1547,25 +1518,55 @@ void ZDisplayList::Opcode_G_ENDDL(std::string prefix, char* line) { sprintf(line, "gsSPEndDisplayList(),"); - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) printf("TextureGenCheck G_ENDDL\n"); TextureGenCheck(prefix); } -string ZDisplayList::GetSourceOutputHeader(const std::string& prefix) +std::string ZDisplayList::GetSourceOutputHeader(const std::string& prefix) { return ""; } static int32_t GfxdCallback_FormatSingleEntry(void) { + ZDisplayList* self = static_cast(gfxd_udata_get()); gfxd_puts("\t"); gfxd_macro_dflt(); gfxd_puts(","); + auto macroId = gfxd_macro_id(); + + switch (macroId) + { + case gfxd_SP1Triangle: + case gfxd_SP2Triangles: + if (self->lastTexture != nullptr && self->lastTexture->IsColorIndexed() && + !self->lastTexture->HasTlut()) + { + auto tex = self->lastTexture; + auto tlut = self->lastTlut; + + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) + { + if (tlut != nullptr) + printf("CI texture '%s' (0x%X), TLUT: '%s' (0x%X)\n", tex->GetName().c_str(), + tex->GetRawDataIndex(), tlut->GetName().c_str(), + tlut->GetRawDataIndex()); + else + printf("CI texture '%s' (0x%X), TLUT: null\n", tex->GetName().c_str(), + tex->GetRawDataIndex()); + } + + if (tlut != nullptr && !tex->HasTlut()) + tex->SetTlut(tlut); + } + break; + } + // dont print a new line after the last command - if (gfxd_macro_id() != gfxd_SPEndDisplayList) + if (macroId != gfxd_SPEndDisplayList) { gfxd_puts("\n"); } @@ -1577,10 +1578,10 @@ static int32_t GfxdCallback_Vtx(uint32_t seg, int32_t count) { ZDisplayList* self = static_cast(gfxd_udata_get()); uint32_t vtxOffset = Seg2Filespace(seg, self->parent->baseAddress); - string vtxName = ""; + std::string vtxName = ""; - if (!Globals::Instance->HasSegment( - GETSEGNUM(seg))) // Probably an external asset we are unable to track + // Probably an external asset we are unable to track + if (!Globals::Instance->HasSegment(GETSEGNUM(seg))) { vtxName = StringHelper::Sprintf("0x%08X", seg); } @@ -1616,13 +1617,17 @@ static int32_t GfxdCallback_Vtx(uint32_t seg, int32_t count) if (count > 0) { - vector vtxList = vector(); + std::vector vtxList; vtxList.reserve(count); uint32_t currentPtr = vtxOffset; for (int32_t i = 0; i < count; i++) { - Vertex vtx = Vertex(self->fileData, currentPtr); + ZVtx vtx(self->parent); + vtx.SetRawData(self->fileData); + vtx.SetRawDataIndex(currentPtr); + vtx.ParseRawData(); + vtxList.push_back(vtx); currentPtr += 16; } @@ -1642,29 +1647,7 @@ static int32_t GfxdCallback_Texture(segptr_t seg, int32_t fmt, int32_t siz, int3 { ZDisplayList* self = static_cast(gfxd_udata_get()); uint32_t texOffset = Seg2Filespace(seg, self->parent->baseAddress); - uint32_t texSegNum = GETSEGNUM(seg); - Declaration* texDecl = nullptr; - string texName = ""; - - if (self->parent != nullptr && - texSegNum != SEGMENT_SCENE) // HACK: Until we have declarations use segment addresses, - // we'll exclude scene references... - { - texDecl = self->parent->GetDeclaration(texOffset); - - if (texDecl == nullptr) - texDecl = self->parent->GetDeclaration(seg); - } - - if (!Globals::Instance->HasSegment( - texSegNum)) // Probably an external asset we are unable to track - texName = StringHelper::Sprintf("0x%08X", seg); - else if (texDecl != nullptr) - texName = StringHelper::Sprintf("%s", texDecl->varName.c_str()); - else if (texSegNum == 2) - texName = StringHelper::Sprintf("%sTex_%06X", self->scene->GetName().c_str(), texOffset); - else - texName = StringHelper::Sprintf("%sTex_%06X", self->curPrefix.c_str(), texOffset); + int32_t texSegNum = GETSEGNUM(seg); self->lastTexWidth = width; self->lastTexHeight = height; @@ -1677,6 +1660,20 @@ static int32_t GfxdCallback_Texture(segptr_t seg, int32_t fmt, int32_t siz, int3 self->TextureGenCheck(self->curPrefix); + std::string texName = ""; + + ZFile* auxParent = self->parent; + if (self->parent->segment != texSegNum && Globals::Instance->HasSegment(texSegNum)) + auxParent = Globals::Instance->segmentRefFiles.at(texSegNum); + + Declaration* decl = auxParent->GetDeclaration(texOffset); + if (Globals::Instance->HasSegment(texSegNum) && decl != nullptr) + texName = decl->varName; + else if (self->lastTexture != nullptr) + texName = self->lastTexture->GetName(); + else + texName = auxParent->GetDeclarationPtrName(seg); + gfxd_puts(texName.c_str()); return 1; @@ -1686,28 +1683,7 @@ static int32_t GfxdCallback_Palette(uint32_t seg, int32_t idx, int32_t count) { ZDisplayList* self = static_cast(gfxd_udata_get()); uint32_t palOffset = Seg2Filespace(seg, self->parent->baseAddress); - uint32_t palSegNum = GETSEGNUM(seg); - Declaration* palDecl = nullptr; - string palName = ""; - - if (self->parent != nullptr && palSegNum != 2) // HACK: Until we have declarations use segment - // addresses, we'll exclude scene references... - { - palDecl = self->parent->GetDeclaration(palOffset); - - if (palDecl == nullptr) - palDecl = self->parent->GetDeclaration(seg); - } - - if (!Globals::Instance->HasSegment( - palSegNum)) // Probably an external asset we are unable to track - palName = StringHelper::Sprintf("0x%08X", seg); - else if (palDecl != nullptr) - palName = StringHelper::Sprintf("%s", palDecl->varName.c_str()); - else if (palSegNum == 2) - palName = StringHelper::Sprintf("%sTex_%06X", self->scene->GetName().c_str(), palOffset); - else - palName = StringHelper::Sprintf("%sTex_%06X", self->curPrefix.c_str(), palOffset); + int32_t palSegNum = GETSEGNUM(seg); self->lastTexWidth = sqrt(count); self->lastTexHeight = sqrt(count); @@ -1719,6 +1695,21 @@ static int32_t GfxdCallback_Palette(uint32_t seg, int32_t idx, int32_t count) self->lastTexIsPalette = true; self->TextureGenCheck(self->curPrefix); + + std::string palName = ""; + + ZFile* auxParent = self->parent; + if (self->parent->segment != palSegNum && Globals::Instance->HasSegment(palSegNum)) + auxParent = Globals::Instance->segmentRefFiles.at(palSegNum); + + Declaration* decl = auxParent->GetDeclaration(palOffset); + if (Globals::Instance->HasSegment(palSegNum) && decl != nullptr) + palName = decl->varName; + else if (self->lastTlut != nullptr) + palName = self->lastTlut->GetName(); + else + palName = auxParent->GetDeclarationPtrName(seg); + gfxd_puts(palName.c_str()); return 1; @@ -1728,20 +1719,7 @@ static int32_t GfxdCallback_DisplayList(uint32_t seg) { ZDisplayList* self = static_cast(gfxd_udata_get()); uint32_t dListOffset = GETSEGOFFSET(seg); - uint32_t dListSegNum = GETSEGNUM(seg); - Declaration* dListDecl = nullptr; - string dListName = ""; - - if (self->parent != nullptr) - dListDecl = self->parent->GetDeclaration(dListOffset); - - if (!Globals::Instance->HasSegment( - dListSegNum)) // Probably an external asset we are unable to track - dListName = StringHelper::Sprintf("0x%08X", seg); - else if (dListDecl != nullptr) - dListName = StringHelper::Sprintf("%s", dListDecl->varName.c_str()); - else - dListName = StringHelper::Sprintf("%sDL_%06X", self->curPrefix.c_str(), dListOffset); + int32_t dListSegNum = GETSEGNUM(seg); if ((dListSegNum <= 6) && Globals::Instance->HasSegment(dListSegNum)) { @@ -1753,6 +1731,12 @@ static int32_t GfxdCallback_DisplayList(uint32_t seg) self->otherDLists.push_back(newDList); } + ZFile* auxParent = self->parent; + if (self->parent->segment != dListSegNum && Globals::Instance->HasSegment(dListSegNum)) + auxParent = Globals::Instance->segmentRefFiles.at(dListSegNum); + + std::string dListName = auxParent->GetDeclarationPtrName(seg); + gfxd_puts(dListName.c_str()); return 1; @@ -1760,7 +1744,7 @@ static int32_t GfxdCallback_DisplayList(uint32_t seg) static int32_t GfxdCallback_Matrix(uint32_t seg) { - string mtxName = ""; + std::string mtxName = ""; ZDisplayList* self = static_cast(gfxd_udata_get()); if (Globals::Instance->symbolMap.find(seg) != Globals::Instance->symbolMap.end()) @@ -1791,9 +1775,9 @@ static int32_t GfxdCallback_Matrix(uint32_t seg) return 1; } -string ZDisplayList::GetSourceOutputCode(const std::string& prefix) +std::string ZDisplayList::GetSourceOutputCode(const std::string& prefix) { - string sourceOutput = ""; + std::string sourceOutput = ""; if (Globals::Instance->useLegacyZDList) sourceOutput += ProcessLegacy(prefix); @@ -1803,32 +1787,21 @@ string ZDisplayList::GetSourceOutputCode(const std::string& prefix) // Iterate through our vertex lists, connect intersecting lists. if (vertices.size() > 0) { - vector>> verticesSorted(vertices.begin(), vertices.end()); - - sort(verticesSorted.begin(), verticesSorted.end(), - [](const auto& lhs, const auto& rhs) { return lhs.first < rhs.first; }); + std::vector>> verticesSorted(vertices.begin(), + vertices.end()); for (size_t i = 0; i < verticesSorted.size() - 1; i++) { - // int32_t vtxSize = verticesSorted[i].second.size() * 16; size_t vtxSize = vertices[verticesSorted[i].first].size() * 16; - if ((verticesSorted[i].first + (int32_t)vtxSize) > verticesSorted[i + 1].first) + if ((verticesSorted[i].first + vtxSize) > verticesSorted[i + 1].first) { int32_t intersectAmt = (verticesSorted[i].first + vtxSize) - verticesSorted[i + 1].first; int32_t intersectIndex = intersectAmt / 16; for (size_t j = intersectIndex; j < verticesSorted[i + 1].second.size(); j++) - { vertices[verticesSorted[i].first].push_back(verticesSorted[i + 1].second[j]); - } - - // defines += StringHelper::Sprintf("#define %sVtx_%06X ((u32)%sVtx_%06X + - // 0x%06X)\n", prefix.c_str(), verticesSorted[i + 1].first, prefix.c_str(), - // verticesSorted[i].first, verticesSorted[i + 1].first - verticesSorted[i].first); - - // isize_t nSize = (int32_t)vertices[verticesSorted[i].first].size(); vertices.erase(verticesSorted[i + 1].first); verticesSorted.erase(verticesSorted.begin() + i + 1); @@ -1841,20 +1814,18 @@ string ZDisplayList::GetSourceOutputCode(const std::string& prefix) parent->defines += defines; // Generate Vertex Declarations - for (pair> item : vertices) + for (auto& item : vertices) { - string declaration = ""; + std::string declaration = ""; - int32_t curAddr = item.first; + uint32_t curAddr = item.first; - for (Vertex vtx : item.second) + for (auto vtx : item.second) { if (curAddr != item.first) declaration += "\n"; - declaration += - StringHelper::Sprintf(" VTX(%i, %i, %i, %i, %i, %i, %i, %i, %i),", vtx.x, - vtx.y, vtx.z, vtx.s, vtx.t, vtx.r, vtx.g, vtx.b, vtx.a); + declaration += vtx.GetBodySourceCode(); curAddr += 16; } @@ -1872,120 +1843,8 @@ string ZDisplayList::GetSourceOutputCode(const std::string& prefix) } } - // Check for texture intersections - { - if (scene != nullptr && scene->textures.size() != 0) - { - vector> texturesSorted(scene->textures.begin(), - scene->textures.end()); - - sort(texturesSorted.begin(), texturesSorted.end(), - [](const auto& lhs, const auto& rhs) { return lhs.first < rhs.first; }); - - for (size_t i = 0; i < texturesSorted.size() - 1; i++) - { - int32_t texSize = scene->textures[texturesSorted[i].first]->GetRawDataSize(); - - if ((texturesSorted[i].first + texSize) > texturesSorted[i + 1].first) - { - defines += StringHelper::Sprintf( - "#define %sTex_%06X ((u32)%sTex_%06X + 0x%06X)\n", scene->GetName().c_str(), - texturesSorted[i + 1].first, scene->GetName().c_str(), - texturesSorted[i].first, - texturesSorted[i + 1].first - texturesSorted[i].first); - - scene->parent->declarations.erase(texturesSorted[i + 1].first); - scene->textures.erase(texturesSorted[i + 1].first); - texturesSorted.erase(texturesSorted.begin() + i + 1); - - i--; - } - } - - scene->extDefines += defines; - } - - { - vector> texturesSorted(textures.begin(), textures.end()); - - sort(texturesSorted.begin(), texturesSorted.end(), - [](const auto& lhs, const auto& rhs) { return lhs.first < rhs.first; }); - - for (size_t i = 0; i < texturesSorted.size() - 1; i++) - { - if (texturesSorted.size() == 0) // ????? - break; - - int32_t texSize = textures[texturesSorted[i].first]->GetRawDataSize(); - - if ((texturesSorted[i].first + texSize) > texturesSorted[i + 1].first) - { - // int32_t intersectAmt = (texturesSorted[i].first + texSize) - texturesSorted[i - // + 1].first; - - // If we're working with a palette, resize it to its "real" dimensions - if (texturesSorted[i].second->isPalette) - { - texturesSorted[i].second->SetWidth( - (texturesSorted[i + 1].first - texturesSorted[i].first) / 2); - texturesSorted[i].second->SetHeight(1); - } - else - { - defines += StringHelper::Sprintf( - "#define %sTex_%06X ((u32)%sTex_%06X + 0x%06X)\n", prefix.c_str(), - texturesSorted[i + 1].first, prefix.c_str(), texturesSorted[i].first, - texturesSorted[i + 1].first - texturesSorted[i].first); - - textures.erase(texturesSorted[i + 1].first); - texturesSorted.erase(texturesSorted.begin() + i + 1); - - i--; - } - } - } - } - - // Generate Texture Declarations - for (pair item : textures) - { - string declaration = ""; - - declaration += item.second->GetSourceOutputCode(prefix); - texDeclarations[item.first] = declaration; - - if (parent != nullptr) - { - if (parent->GetDeclaration(item.first) == nullptr) - { - // TEXTURE POOL CHECK - std::string texOutPath = - item.second->GetPoolOutPath(Globals::Instance->outputPath); - std::string texOutName = item.second->GetName(); - - auto start = chrono::steady_clock::now(); - item.second->Save(texOutPath); - auto end = chrono::steady_clock::now(); - auto diff = chrono::duration_cast(end - start).count(); - - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) - printf("SAVED IMAGE TO %s in %ims\n", Globals::Instance->outputPath.c_str(), - (int32_t)diff); - - auto filepath = Globals::Instance->outputPath / - Path::GetFileNameWithoutExtension(item.second->GetName()); - std::string incStr = - StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), - item.second->GetExternalExtension().c_str()); - std::string texName = - StringHelper::Sprintf("%sTex_%06X", prefix.c_str(), item.first); - - parent->AddDeclarationIncludeArray( - item.first, incStr, item.second->GetRawDataSize(), "u64", texName, 0); - } - } - } - } + if (scene != nullptr) + defines += scene->extDefines; if (parent != nullptr) { @@ -2000,10 +1859,8 @@ string ZDisplayList::GetSourceOutputCode(const std::string& prefix) // Iterate through our vertex lists, connect intersecting lists. if (vertices.size() > 0) { - vector>> verticesSorted(vertices.begin(), vertices.end()); - - sort(verticesSorted.begin(), verticesSorted.end(), - [](const auto& lhs, const auto& rhs) { return lhs.first < rhs.first; }); + std::vector>> verticesSorted(vertices.begin(), + vertices.end()); for (size_t i = 0; i < verticesSorted.size() - 1; i++) { @@ -2030,21 +1887,21 @@ string ZDisplayList::GetSourceOutputCode(const std::string& prefix) parent->defines += defines; // Generate Vertex Declarations - vector vtxKeys; + std::vector vtxKeys; - for (pair> item : vertices) + for (auto& item : vertices) vtxKeys.push_back(item.first); // for (pair> item : vertices) for (size_t i = 0; i < vtxKeys.size(); i++) { - vector item = vertices[vtxKeys[i]]; + auto& item = vertices[vtxKeys[i]]; - string declaration = ""; + std::string declaration = ""; int32_t curAddr = vtxKeys[i]; - for (Vertex vtx : item) + for (auto& vtx : item) { if (curAddr != vtxKeys[i]) declaration += "\n"; @@ -2091,7 +1948,7 @@ string ZDisplayList::GetSourceOutputCode(const std::string& prefix) std::string ZDisplayList::ProcessLegacy(const std::string& prefix) { char line[4096]; - string sourceOutput = ""; + std::string sourceOutput = ""; for (size_t i = 0; i < instructions.size(); i++) { @@ -2099,7 +1956,7 @@ std::string ZDisplayList::ProcessLegacy(const std::string& prefix) uint64_t data = instructions[i]; sourceOutput += " "; - auto start = chrono::steady_clock::now(); + auto start = std::chrono::steady_clock::now(); int32_t optimizationResult = OptimizationChecks(i, sourceOutput, prefix); @@ -2116,10 +1973,10 @@ std::string ZDisplayList::ProcessLegacy(const std::string& prefix) ParseF3DEX((F3DEXOpcode)opcode, data, prefix, line); } - auto end = chrono::steady_clock::now(); - auto diff = chrono::duration_cast(end - start).count(); + auto end = std::chrono::steady_clock::now(); + auto diff = std::chrono::duration_cast(end - start).count(); - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG && diff > 5) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG && diff > 5) printf("F3DOP: 0x%02X, TIME: %lims\n", opcode, diff); sourceOutput += line; @@ -2133,7 +1990,7 @@ std::string ZDisplayList::ProcessLegacy(const std::string& prefix) std::string ZDisplayList::ProcessGfxDis(const std::string& prefix) { - string sourceOutput = ""; + std::string sourceOutput = ""; OutputFormatter outputformatter; int32_t dListSize = instructions.size() * sizeof(instructions[0]); @@ -2166,11 +2023,10 @@ std::string ZDisplayList::ProcessGfxDis(const std::string& prefix) return sourceOutput; } -void ZDisplayList::TextureGenCheck(string prefix) +void ZDisplayList::TextureGenCheck(std::string prefix) { - if (TextureGenCheck(fileData, textures, scene, parent, prefix, lastTexWidth, lastTexHeight, - lastTexAddr, lastTexSeg, lastTexFmt, lastTexSiz, lastTexLoaded, - lastTexIsPalette)) + if (TextureGenCheck(fileData, scene, parent, prefix, lastTexWidth, lastTexHeight, lastTexAddr, + lastTexSeg, lastTexFmt, lastTexSiz, lastTexLoaded, lastTexIsPalette, this)) { lastTexAddr = 0; lastTexLoaded = false; @@ -2178,15 +2034,20 @@ void ZDisplayList::TextureGenCheck(string prefix) } } -bool ZDisplayList::TextureGenCheck(vector fileData, map& textures, - ZRoom* scene, ZFile* parent, string prefix, int32_t texWidth, - int32_t texHeight, uint32_t texAddr, uint32_t texSeg, - F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, bool texLoaded, - bool texIsPalette) +bool ZDisplayList::TextureGenCheck(std::vector fileData, ZRoom* scene, ZFile* parent, + std::string prefix, int32_t texWidth, int32_t texHeight, + uint32_t texAddr, uint32_t texSeg, F3DZEXTexFormats texFmt, + F3DZEXTexSizes texSiz, bool texLoaded, bool texIsPalette, + ZDisplayList* self) { int32_t segmentNumber = GETSEGNUM(texSeg); - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) + if (!texIsPalette) + self->lastTexture = nullptr; + else + self->lastTlut = nullptr; + + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) printf("TextureGenCheck seg=%i width=%i height=%i ispal=%i addr=0x%06X\n", segmentNumber, texWidth, texHeight, texIsPalette, texAddr); @@ -2195,36 +2056,55 @@ bool ZDisplayList::TextureGenCheck(vector fileData, mapisPalette = texIsPalette; - textures[texAddr] = tex; - return true; - } - else - { - ZTexture* tex = ZTexture::FromBinary( - TexFormatToTexType(texFmt, texSiz), scene->GetRawData(), texAddr, - StringHelper::Sprintf("%sTex_%06X", Globals::Instance->lastScene->GetName().c_str(), - texAddr), - texWidth, texHeight, parent); - - if (scene != nullptr) + if (texAddr < parent->GetRawData().size()) { - scene->textures[texAddr] = tex; + ZTexture* tex = parent->GetTextureResource(texAddr); + if (tex != nullptr) + tex->isPalette = texIsPalette; + else + { + tex = new ZTexture(parent); + tex->FromBinary(fileData, texAddr, texWidth, texHeight, + TexFormatToTexType(texFmt, texSiz), texIsPalette); + parent->AddTextureResource(texAddr, tex); + } + + if (!texIsPalette) + self->lastTexture = tex; + else + self->lastTlut = tex; + + return true; + } + } + else if (scene != nullptr) + { + if (scene->parent->GetDeclaration(texAddr) == nullptr) + { + ZTexture* tex = scene->parent->GetTextureResource(texAddr); + if (tex != nullptr) + tex->isPalette = texIsPalette; + else + { + tex = new ZTexture(scene->parent); + tex->FromBinary(scene->GetRawData(), texAddr, texWidth, texHeight, + TexFormatToTexType(texFmt, texSiz), texIsPalette); + + scene->parent->AddTextureResource(texAddr, tex); + } + + if (!texIsPalette) + self->lastTexture = tex; + else + self->lastTlut = tex; auto filepath = Globals::Instance->outputPath / Path::GetFileNameWithoutExtension(tex->GetName()); - scene->parent->AddDeclarationIncludeArray( - texAddr, - StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), - tex->GetExternalExtension().c_str()), - tex->GetRawDataSize(), "u64", - StringHelper::Sprintf("%sTex_%06X", - Globals::Instance->lastScene->GetName().c_str(), texAddr), - 0); + auto filename = StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), + tex->GetExternalExtension().c_str()); + scene->parent->AddDeclarationIncludeArray(texAddr, filename, tex->GetRawDataSize(), + tex->GetSourceTypeName(), tex->GetName(), + 0); } return true; } @@ -2276,10 +2156,6 @@ TextureType ZDisplayList::TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSize return TextureType::RGBA16bpp; } -void ZDisplayList::Save(const std::string& outFolder) -{ -} - void ZDisplayList::GenerateHLIntermediette(HLFileIntermediette& hlFile) { HLModelIntermediette* mdl = (HLModelIntermediette*)&hlFile; @@ -2287,72 +2163,27 @@ void ZDisplayList::GenerateHLIntermediette(HLFileIntermediette& hlFile) mdl->blocks.push_back(new HLTerminator()); } -bool ZDisplayList::IsExternalResource() +bool ZDisplayList::IsExternalResource() const { return false; } -std::string ZDisplayList::GetExternalExtension() +std::string ZDisplayList::GetExternalExtension() const { return "dlist"; } -std::string ZDisplayList::GetSourceTypeName() +std::string ZDisplayList::GetSourceTypeName() const { return "Gfx"; } -ZResourceType ZDisplayList::GetResourceType() +ZResourceType ZDisplayList::GetResourceType() const { return ZResourceType::DisplayList; } -size_t ZDisplayList::GetRawDataSize() +size_t ZDisplayList::GetRawDataSize() const { return instructions.size() * 8; } - -Vertex::Vertex() -{ - x = 0; - y = 0; - z = 0; - flag = 0; - s = 0; - t = 0; - r = 0; - g = 0; - b = 0; - a = 0; -} - -Vertex::Vertex(int16_t nX, int16_t nY, int16_t nZ, uint16_t nFlag, int16_t nS, int16_t nT, - uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) -{ - x = nX; - y = nY; - z = nZ; - flag = nFlag; - s = nS; - t = nT; - r = nR; - g = nG; - b = nB; - a = nA; -} - -Vertex::Vertex(std::vector rawData, uint32_t rawDataIndex) -{ - const uint8_t* data = rawData.data(); - - x = BitConverter::ToInt16BE(data, rawDataIndex + 0); - y = BitConverter::ToInt16BE(data, rawDataIndex + 2); - z = BitConverter::ToInt16BE(data, rawDataIndex + 4); - flag = BitConverter::ToInt16BE(data, rawDataIndex + 6); - s = BitConverter::ToInt16BE(data, rawDataIndex + 8); - t = BitConverter::ToInt16BE(data, rawDataIndex + 10); - r = data[rawDataIndex + 12]; - g = data[rawDataIndex + 13]; - b = data[rawDataIndex + 14]; - a = data[rawDataIndex + 15]; -} diff --git a/tools/ZAPD/ZAPD/ZDisplayList.h b/tools/ZAPD/ZAPD/ZDisplayList.h index f390720a2b..9f94e39c00 100644 --- a/tools/ZAPD/ZAPD/ZDisplayList.h +++ b/tools/ZAPD/ZAPD/ZDisplayList.h @@ -4,6 +4,7 @@ #include "ZResource.h" #include "ZRoom/ZRoom.h" #include "ZTexture.h" +#include "ZVtx.h" #include "tinyxml2.h" #include @@ -282,20 +283,6 @@ enum class OoTSegments #define FORCE_BL 0x4000 #define TEX_EDGE 0x0000 -class Vertex -{ -public: - int16_t x, y, z; - uint16_t flag; - int16_t s, t; - uint8_t r, g, b, a; - - Vertex(); - Vertex(int16_t nX, int16_t nY, int16_t nZ, uint16_t nFlag, int16_t nS, int16_t nT, uint8_t nR, - uint8_t nG, uint8_t nB, uint8_t nA); - Vertex(std::vector rawData, uint32_t rawDataIndex); -}; - class ZDisplayList : public ZResource { protected: @@ -350,14 +337,12 @@ public: DListType dListType; - // int32_t dListAddress; - - std::map> vertices; + std::map> vertices; std::map vtxDeclarations; std::vector otherDLists; - std::map textures; - std::map texDeclarations; + ZTexture* lastTexture = nullptr; + ZTexture* lastTlut = nullptr; std::vector references; @@ -371,31 +356,27 @@ public: ~ZDisplayList(); void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; - // static ZDisplayList* BuildFromXML(tinyxml2::XMLElement* reader, std::string inFolder, bool - // readFile, ZFile* nParent); + const uint32_t nRawDataIndex) override; void TextureGenCheck(std::string prefix); - static bool TextureGenCheck(std::vector fileData, - std::map& textures, ZRoom* scene, - ZFile* parent, std::string prefix, int32_t texWidth, - int32_t texHeight, uint32_t texAddr, uint32_t texSeg, - F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, bool texLoaded, - bool texIsPalette); + static bool TextureGenCheck(std::vector fileData, ZRoom* scene, ZFile* parent, + std::string prefix, int32_t texWidth, int32_t texHeight, + uint32_t texAddr, uint32_t texSeg, F3DZEXTexFormats texFmt, + F3DZEXTexSizes texSiz, bool texLoaded, bool texIsPalette, + ZDisplayList* self); static int32_t GetDListLength(std::vector rawData, uint32_t rawDataIndex, DListType dListType); - size_t GetRawDataSize() override; + size_t GetRawDataSize() const override; std::string GetSourceOutputHeader(const std::string& prefix) override; std::string GetSourceOutputCode(const std::string& prefix) override; std::string ProcessLegacy(const std::string& prefix); std::string ProcessGfxDis(const std::string& prefix); - void Save(const std::string& outFolder) override; virtual void GenerateHLIntermediette(HLFileIntermediette& hlFile) override; - bool IsExternalResource() override; - virtual std::string GetExternalExtension() override; - std::string GetSourceTypeName() override; + bool IsExternalResource() const override; + virtual std::string GetExternalExtension() const override; + std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() override; + ZResourceType GetResourceType() const override; }; diff --git a/tools/ZAPD/ZAPD/ZFile.cpp b/tools/ZAPD/ZAPD/ZFile.cpp index fa6ad07a41..d34df8c012 100644 --- a/tools/ZAPD/ZAPD/ZFile.cpp +++ b/tools/ZAPD/ZAPD/ZFile.cpp @@ -26,21 +26,20 @@ #include "ZVtx.h" using namespace tinyxml2; -using namespace std; ZFile::ZFile() { - resources = vector(); + resources = std::vector(); basePath = ""; outputPath = Directory::GetCurrentDirectory(); - declarations = map(); + declarations = std::map(); defines = ""; baseAddress = 0; rangeStart = 0x000000000; rangeEnd = 0xFFFFFFFF; } -ZFile::ZFile(const fs::path& nOutPath, string nName) : ZFile() +ZFile::ZFile(const fs::path& nOutPath, std::string nName) : ZFile() { outputPath = nOutPath; name = nName; @@ -63,6 +62,7 @@ ZFile::ZFile(ZFileMode mode, tinyxml2::XMLElement* reader, const fs::path& nBase outputPath = nOutPath; ParseXML(mode, reader, filename, placeholderMode); + DeclareResourceSubReferences(); } ZFile::~ZFile() @@ -85,53 +85,55 @@ void ZFile::ParseXML(ZFileMode mode, XMLElement* reader, std::string filename, b else name = filename; - int32_t segment = -1; - // TODO: This should be a variable on the ZFile, but it is a large change in order to force all // ZResource types to have a parent ZFile. const char* gameStr = reader->Attribute("Game"); if (reader->Attribute("Game") != nullptr) { - if (string(gameStr) == "MM") + if (std::string(gameStr) == "MM") Globals::Instance->game = ZGame::MM_RETAIL; - else if (string(gameStr) == "SW97" || string(gameStr) == "OOTSW97") + else if (std::string(gameStr) == "SW97" || std::string(gameStr) == "OOTSW97") Globals::Instance->game = ZGame::OOT_SW97; - else if (string(gameStr) == "OOT") + else if (std::string(gameStr) == "OOT") Globals::Instance->game = ZGame::OOT_RETAIL; else throw std::runtime_error( StringHelper::Sprintf("Error: Game type %s not supported.", gameStr)); } - if (reader->Attribute("BaseAddress") != NULL) - baseAddress = (uint32_t)strtoul( - StringHelper::Split(reader->Attribute("BaseAddress"), "0x")[1].c_str(), NULL, 16); + if (reader->Attribute("BaseAddress") != nullptr) + baseAddress = StringHelper::StrToL(reader->Attribute("BaseAddress"), 16); - if (reader->Attribute("RangeStart") != NULL) - rangeStart = (uint32_t)strtoul( - StringHelper::Split(reader->Attribute("RangeStart"), "0x")[1].c_str(), NULL, 16); + if (reader->Attribute("RangeStart") != nullptr) + rangeStart = StringHelper::StrToL(reader->Attribute("RangeStart"), 16); - if (reader->Attribute("RangeEnd") != NULL) - rangeEnd = (uint32_t)strtoul( - StringHelper::Split(reader->Attribute("RangeEnd"), "0x")[1].c_str(), NULL, 16); + if (reader->Attribute("RangeEnd") != nullptr) + rangeEnd = StringHelper::StrToL(reader->Attribute("RangeEnd"), 16); - if (reader->Attribute("Segment") != NULL) - segment = strtol(reader->Attribute("Segment"), NULL, 10); + // Commented until ZArray doesn't use a ZFile to parse it's contents anymore. + /* + if (reader->Attribute("Segment") == nullptr) + throw std::runtime_error(StringHelper::Sprintf( + "ZFile::ParseXML: Error in '%s'.\n" + "\t Missing 'Segment' attribute in File node. \n", + name.c_str())); + */ - if (segment != -1) + if (reader->Attribute("Segment") != nullptr) { - Globals::Instance->AddSegment(segment); + segment = StringHelper::StrToL(reader->Attribute("Segment"), 10); + Globals::Instance->AddSegment(segment, this); } - string folderName = basePath / Path::GetFileNameWithoutExtension(name); + std::string folderName = (basePath / Path::GetFileNameWithoutExtension(name)).string(); if (mode == ZFileMode::Extract) { - if (!File::Exists(basePath / name)) + if (!File::Exists((basePath / name).string())) throw std::runtime_error( StringHelper::Sprintf("Error! File %s does not exist.", (basePath / name).c_str())); - rawData = File::ReadAllBytes(basePath / name); + rawData = File::ReadAllBytes((basePath / name).string()); } std::unordered_set nameSet; @@ -148,10 +150,11 @@ void ZFile::ParseXML(ZFileMode mode, XMLElement* reader, std::string filename, b const char* outNameXml = child->Attribute("OutName"); const char* offsetXml = child->Attribute("Offset"); - if (Globals::Instance->verbosity >= VERBOSITY_INFO) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) printf("%s: 0x%06X\n", nameXml, rawDataIndex); - if (offsetXml != NULL) + // Check for repeated attributes. + if (offsetXml != nullptr) { rawDataIndex = strtol(StringHelper::Split(offsetXml, "0x")[1].c_str(), NULL, 16); @@ -163,7 +166,7 @@ void ZFile::ParseXML(ZFileMode mode, XMLElement* reader, std::string filename, b } offsetSet.insert(offsetXml); } - if (outNameXml != NULL) + if (outNameXml != nullptr) { if (outNameSet.find(outNameXml) != outNameSet.end()) { @@ -173,7 +176,7 @@ void ZFile::ParseXML(ZFileMode mode, XMLElement* reader, std::string filename, b } outNameSet.insert(outNameXml); } - if (nameXml != NULL) + if (nameXml != nullptr) { if (nameSet.find(nameXml) != nameSet.end()) { @@ -184,40 +187,24 @@ void ZFile::ParseXML(ZFileMode mode, XMLElement* reader, std::string filename, b nameSet.insert(nameXml); } - string nodeName = string(child->Name()); + std::string nodeName = std::string(child->Name()); if (nodeMap.find(nodeName) != nodeMap.end()) { - ZResource* nRes = nodeMap[nodeName](); - nRes->parent = this; + ZResource* nRes = nodeMap[nodeName](this); if (mode == ZFileMode::Extract) - nRes->ExtractFromXML(child, rawData, rawDataIndex, folderName); + nRes->ExtractFromXML(child, rawData, rawDataIndex); - // TODO: See if we can make this part of the ZRoom code... - if (nRes->GetResourceType() == ZResourceType::Room) - { - if (nodeName == "Scene") - { - Globals::Instance->lastScene = (ZRoom*)nRes; + auto resType = nRes->GetResourceType(); + if (resType == ZResourceType::Texture) + AddTextureResource(rawDataIndex, static_cast(nRes)); + else + resources.push_back(nRes); - if (segment == -1) - segment = SEGMENT_SCENE; - } - else - { - if (segment == -1) - segment = SEGMENT_ROOM; - } - - if (segment != -1) - Globals::Instance->AddSegment(segment); - } - - resources.push_back(nRes); rawDataIndex += nRes->GetRawDataSize(); } - else if (string(child->Name()) == "File") + else if (std::string(child->Name()) == "File") { throw std::runtime_error(StringHelper::Sprintf( "ZFile::ParseXML: Error in '%s'.\n\t Can't declare a File inside a File.\n", @@ -233,19 +220,27 @@ void ZFile::ParseXML(ZFileMode mode, XMLElement* reader, std::string filename, b } } +void ZFile::DeclareResourceSubReferences() +{ + for (size_t i = 0; i < resources.size(); i++) + { + resources.at(i)->DeclareReferences(name); + } +} + void ZFile::BuildSourceFile(fs::path outputDir) { - string folderName = Path::GetFileNameWithoutExtension(outputPath); + std::string folderName = Path::GetFileNameWithoutExtension(outputPath.string()); - if (!Directory::Exists(outputPath)) - Directory::CreateDirectory(outputPath); + if (!Directory::Exists(outputPath.string())) + Directory::CreateDirectory(outputPath.string()); GenerateSourceFiles(outputDir); } std::string ZFile::GetVarName(uint32_t address) { - for (pair pair : declarations) + for (std::pair pair : declarations) { if (pair.first == address) return pair.second->varName; @@ -254,20 +249,30 @@ std::string ZFile::GetVarName(uint32_t address) return ""; } -std::string ZFile::GetName() +std::string ZFile::GetName() const { return name; } +const fs::path& ZFile::GetXmlFilePath() const +{ + return xmlFilePath; +} + +const std::vector& ZFile::GetRawData() const +{ + return rawData; +} + void ZFile::ExtractResources(fs::path outputDir) { - string folderName = Path::GetFileNameWithoutExtension(outputPath); + std::string folderName = Path::GetFileNameWithoutExtension(outputPath.string()); - if (!Directory::Exists(outputPath)) - Directory::CreateDirectory(outputPath); + if (!Directory::Exists(outputPath.string())) + Directory::CreateDirectory(outputPath.string()); - if (!Directory::Exists(Globals::Instance->sourceOutputPath)) - Directory::CreateDirectory(Globals::Instance->sourceOutputPath); + if (!Directory::Exists(Globals::Instance->sourceOutputPath.string())) + Directory::CreateDirectory(Globals::Instance->sourceOutputPath.string()); for (ZResource* res : resources) res->PreGenSourceFiles(); @@ -277,10 +282,9 @@ void ZFile::ExtractResources(fs::path outputDir) for (ZResource* res : resources) { - if (Globals::Instance->verbosity >= VERBOSITY_INFO) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) printf("Saving resource %s\n", res->GetName().c_str()); - res->CalcHash(); // TEST res->Save(outputPath); } @@ -320,13 +324,7 @@ std::vector ZFile::GetResourcesOfType(ZResourceType resType) Declaration* ZFile::AddDeclaration(uint32_t address, DeclarationAlignment alignment, size_t size, std::string varType, std::string varName, std::string body) { -#if _DEBUG - if (declarations.find(address) != declarations.end()) - { - int32_t bp = 0; - } -#endif - + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); Declaration* decl = new Declaration(alignment, size, varType, varName, false, body); @@ -335,16 +333,10 @@ Declaration* ZFile::AddDeclaration(uint32_t address, DeclarationAlignment alignm } Declaration* ZFile::AddDeclaration(uint32_t address, DeclarationAlignment alignment, - DeclarationPadding padding, size_t size, string varType, - string varName, std::string body) + DeclarationPadding padding, size_t size, std::string varType, + std::string varName, std::string body) { -#if _DEBUG - if (declarations.find(address) != declarations.end()) - { - int32_t bp = 0; - } -#endif - + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); declarations[address] = @@ -356,13 +348,7 @@ Declaration* ZFile::AddDeclarationArray(uint32_t address, DeclarationAlignment a size_t size, std::string varType, std::string varName, size_t arrayItemCnt, std::string body) { -#if _DEBUG - if (declarations.find(address) != declarations.end()) - { - int32_t bp = 0; - } -#endif - + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); declarations[address] = @@ -370,17 +356,23 @@ Declaration* ZFile::AddDeclarationArray(uint32_t address, DeclarationAlignment a return declarations[address]; } +Declaration* ZFile::AddDeclarationArray(uint32_t address, DeclarationAlignment alignment, + size_t size, std::string varType, std::string varName, + std::string arrayItemCntStr, std::string body) +{ + assert(GETSEGNUM(address) == 0); + AddDeclarationDebugChecks(address); + + declarations[address] = + new Declaration(alignment, size, varType, varName, true, arrayItemCntStr, body); + return declarations[address]; +} + Declaration* ZFile::AddDeclarationArray(uint32_t address, DeclarationAlignment alignment, size_t size, std::string varType, std::string varName, size_t arrayItemCnt, std::string body, bool isExternal) { -#if _DEBUG - if (declarations.find(address) != declarations.end()) - { - int32_t bp = 0; - } -#endif - + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); declarations[address] = @@ -389,16 +381,11 @@ Declaration* ZFile::AddDeclarationArray(uint32_t address, DeclarationAlignment a } Declaration* ZFile::AddDeclarationArray(uint32_t address, DeclarationAlignment alignment, - DeclarationPadding padding, size_t size, string varType, - string varName, size_t arrayItemCnt, std::string body) + DeclarationPadding padding, size_t size, + std::string varType, std::string varName, + size_t arrayItemCnt, std::string body) { -#if _DEBUG - if (declarations.find(address) != declarations.end()) - { - int32_t bp = 0; - } -#endif - + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); declarations[address] = @@ -408,28 +395,44 @@ Declaration* ZFile::AddDeclarationArray(uint32_t address, DeclarationAlignment a Declaration* ZFile::AddDeclarationPlaceholder(uint32_t address) { + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); + Declaration* decl; if (declarations.find(address) == declarations.end()) - declarations[address] = new Declaration(DeclarationAlignment::None, 0, "", "", false, ""); + { + decl = new Declaration(DeclarationAlignment::None, 0, "", "", false, ""); + decl->isPlaceholder = true; + declarations[address] = decl; + } + else + decl = declarations[address]; - return declarations[address]; + return decl; } -Declaration* ZFile::AddDeclarationPlaceholder(uint32_t address, string varName) +Declaration* ZFile::AddDeclarationPlaceholder(uint32_t address, std::string varName) { + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); + Declaration* decl; if (declarations.find(address) == declarations.end()) - declarations[address] = - new Declaration(DeclarationAlignment::None, 0, "", varName, false, ""); + { + decl = new Declaration(DeclarationAlignment::None, 0, "", varName, false, ""); + decl->isPlaceholder = true; + declarations[address] = decl; + } + else + decl = declarations[address]; - return declarations[address]; + return decl; } -Declaration* ZFile::AddDeclarationInclude(uint32_t address, string includePath, size_t size, - string varType, string varName) +Declaration* ZFile::AddDeclarationInclude(uint32_t address, std::string includePath, size_t size, + std::string varType, std::string varName) { + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); if (declarations.find(address) == declarations.end()) @@ -442,18 +445,7 @@ Declaration* ZFile::AddDeclarationIncludeArray(uint32_t address, std::string inc size_t size, std::string varType, std::string varName, size_t arrayItemCnt) { -#if _DEBUG - if (declarations.find(address) != declarations.end()) - { - int32_t bp = 0; - } - - if (address == 0) - { - int32_t bp = 0; - } -#endif - + assert(GETSEGNUM(address) == 0); AddDeclarationDebugChecks(address); if (StringHelper::StartsWith(includePath, "assets/extracted/")) @@ -488,6 +480,7 @@ Declaration* ZFile::AddDeclarationIncludeArray(uint32_t address, std::string inc void ZFile::AddDeclarationDebugChecks(uint32_t address) { + assert(GETSEGNUM(address) == 0); #ifdef _DEBUG if (address == 0x0000) { @@ -496,30 +489,47 @@ void ZFile::AddDeclarationDebugChecks(uint32_t address) #endif } -std::string ZFile::GetDeclarationName(uint32_t address) +std::string ZFile::GetDeclarationName(uint32_t address) const { return GetDeclarationName(address, "ERROR_COULD_NOT_FIND_DECLARATION"); // Note: For now that default // message is just for testing } -std::string ZFile::GetDeclarationName(uint32_t address, std::string defaultResult) +std::string ZFile::GetDeclarationName(uint32_t address, std::string defaultResult) const { - if (declarations.find(address) != declarations.end()) - return declarations[address]->varName; + Declaration* decl = GetDeclaration(address); + if (decl != nullptr) + return decl->varName; return defaultResult; } -Declaration* ZFile::GetDeclaration(uint32_t address) +std::string ZFile::GetDeclarationPtrName(segptr_t segAddress) const +{ + if (segAddress == 0) + return "NULL"; + + Declaration* decl = GetDeclaration(Seg2Filespace(segAddress, baseAddress)); + + if (!Globals::Instance->HasSegment(GETSEGNUM(segAddress)) || decl == nullptr) + return StringHelper::Sprintf("0x%08X", segAddress); + + if (!decl->isArray) + return "&" + decl->varName; + + return decl->varName; +} + +Declaration* ZFile::GetDeclaration(uint32_t address) const { if (declarations.find(address) != declarations.end()) - return declarations[address]; + return declarations.at(address); return nullptr; } -Declaration* ZFile::GetDeclarationRanged(uint32_t address) +Declaration* ZFile::GetDeclarationRanged(uint32_t address) const { for (const auto decl : declarations) { @@ -530,7 +540,7 @@ Declaration* ZFile::GetDeclarationRanged(uint32_t address) return nullptr; } -uint32_t ZFile::GetDeclarationRangedAddress(uint32_t address) +uint32_t ZFile::GetDeclarationRangedAddress(uint32_t address) const { for (const auto decl : declarations) { @@ -543,7 +553,7 @@ uint32_t ZFile::GetDeclarationRangedAddress(uint32_t address) bool ZFile::HasDeclaration(uint32_t address) { - return (declarations.find(address) != declarations.end()); + return declarations.find(address) != declarations.end(); } void ZFile::GenerateSourceFiles(fs::path outputDir) @@ -558,32 +568,37 @@ void ZFile::GenerateSourceFiles(fs::path outputDir) GeneratePlaceholderDeclarations(); // Generate Code - for (ZResource* res : resources) + for (size_t i = 0; i < resources.size(); i++) { - string resSrc = res->GetSourceOutputCode(name); + ZResource* res = resources.at(i); + std::string resSrc = res->GetSourceOutputCode(name); if (res->IsExternalResource()) { - string path = Path::GetFileNameWithoutExtension(res->GetName()).c_str(); + std::string path = Path::GetFileNameWithoutExtension(res->GetName()).c_str(); - string assetOutDir = outputDir / Path::GetFileNameWithoutExtension(res->GetOutName()); - string declType = res->GetSourceTypeName(); + std::string assetOutDir = + (outputDir / Path::GetFileNameWithoutExtension(res->GetOutName())).string(); + std::string declType = res->GetSourceTypeName(); std::string incStr = StringHelper::Sprintf("%s.%s.inc", assetOutDir.c_str(), res->GetExternalExtension().c_str()); if (res->GetResourceType() == ZResourceType::Texture) { - ZTexture* tex = (ZTexture*)res; + ZTexture* tex = static_cast(res); - tex->CalcHash(); - - // TEXTURE POOL CHECK - if (Globals::Instance->cfg.texturePool.find(tex->hash) != - Globals::Instance->cfg.texturePool.end()) + if (!Globals::Instance->cfg.texturePool.empty()) { - incStr = Globals::Instance->cfg.texturePool[tex->hash].path.string() + "." + - res->GetExternalExtension() + ".inc"; + tex->CalcHash(); + + // TEXTURE POOL CHECK + if (Globals::Instance->cfg.texturePool.find(tex->hash) != + Globals::Instance->cfg.texturePool.end()) + { + incStr = Globals::Instance->cfg.texturePool[tex->hash].path.string() + "." + + res->GetExternalExtension() + ".inc"; + } } incStr += ".c"; @@ -599,7 +614,6 @@ void ZFile::GenerateSourceFiles(fs::path outputDir) } else { - // cout << "NOT EXTERN\n"; sourceOutput += resSrc; } @@ -609,8 +623,9 @@ void ZFile::GenerateSourceFiles(fs::path outputDir) sourceOutput += ProcessDeclarations(); - string outPath = - Globals::Instance->sourceOutputPath / (Path::GetFileNameWithoutExtension(name) + ".c"); + std::string outPath = + (Globals::Instance->sourceOutputPath / (Path::GetFileNameWithoutExtension(name) + ".c")) + .string(); OutputFormatter formatter; formatter.Write(sourceOutput); @@ -626,7 +641,7 @@ void ZFile::GenerateSourceHeaderFiles() for (ZResource* res : resources) { - string resSrc = res->GetSourceOutputHeader(""); + std::string resSrc = res->GetSourceOutputHeader(""); formatter.Write(resSrc); if (resSrc != "") @@ -638,7 +653,7 @@ void ZFile::GenerateSourceHeaderFiles() fs::path headerFilename = Globals::Instance->sourceOutputPath / (Path::GetFileNameWithoutExtension(name) + ".h"); - File::WriteAllText(headerFilename, formatter.GetOutput()); + File::WriteAllText(headerFilename.string(), formatter.GetOutput()); } void ZFile::GenerateHLIntermediette() @@ -673,6 +688,24 @@ void ZFile::GeneratePlaceholderDeclarations() } } +void ZFile::AddTextureResource(uint32_t offset, ZTexture* tex) +{ + for (auto res : resources) + assert(res->GetRawDataIndex() != offset); + + resources.push_back(tex); + texturesResources[offset] = tex; +} + +ZTexture* ZFile::GetTextureResource(uint32_t offset) const +{ + auto tex = texturesResources.find(offset); + if (tex != texturesResources.end()) + return tex->second; + + return nullptr; +} + std::map* ZFile::GetNodeMap() { static std::map nodeMap; @@ -685,13 +718,15 @@ void ZFile::RegisterNode(std::string nodeName, ZResourceFactoryFunc* nodeFunc) (*nodeMap)[nodeName] = nodeFunc; } -string ZFile::ProcessDeclarations() +std::string ZFile::ProcessDeclarations() { - string output = ""; + std::string output = ""; if (declarations.size() == 0) return output; + defines += ProcessTextureIntersections(name); + // Account for padding/alignment uint32_t lastAddr = 0; uint32_t lastSize = 0; @@ -699,16 +734,14 @@ string ZFile::ProcessDeclarations() // printf("RANGE START: 0x%06X - RANGE END: 0x%06X\n", rangeStart, rangeEnd); // Optimization: See if there are any arrays side by side that can be merged... - auto declarationKeys = - vector>(declarations.begin(), declarations.end()); - sort(declarationKeys.begin(), declarationKeys.end(), - [](const auto& lhs, const auto& rhs) { return lhs.first < rhs.first; }); + std::vector> declarationKeys(declarations.begin(), + declarations.end()); - pair lastItem = declarationKeys[0]; + std::pair lastItem = declarationKeys.at(0); for (size_t i = 1; i < declarationKeys.size(); i++) { - pair curItem = declarationKeys[i]; + std::pair curItem = declarationKeys[i]; if (curItem.second->isArray && lastItem.second->isArray) { @@ -737,10 +770,10 @@ string ZFile::ProcessDeclarations() lastItem = curItem; } - for (pair item : declarations) + for (std::pair item : declarations) ProcessDeclarationText(item.second); - for (pair item : declarations) + for (std::pair item : declarations) { while (item.second->size % 4 != 0) item.second->size++; @@ -865,7 +898,7 @@ string ZFile::ProcessDeclarations() int diff = currentAddress - unaccountedAddress; bool nonZeroUnaccounted = false; - string src = " "; + std::string src = " "; for (int i = 0; i < diff; i++) { @@ -927,20 +960,30 @@ string ZFile::ProcessDeclarations() // Go through include declarations // First, handle the prototypes (static only for now) int32_t protoCnt = 0; - for (pair item : declarations) + for (std::pair item : declarations) { if (StringHelper::StartsWith(item.second->varType, "static ") && !item.second->isUnaccounted) { if (item.second->isArray) { - if (item.second->arrayItemCnt == 0) + if (item.second->arrayItemCntStr != "") + { + output += StringHelper::Sprintf("%s %s[%s];\n", item.second->varType.c_str(), + item.second->varName.c_str(), + item.second->arrayItemCntStr.c_str()); + } + else if (item.second->arrayItemCnt == 0) + { output += StringHelper::Sprintf("%s %s[];\n", item.second->varType.c_str(), item.second->varName.c_str()); + } else + { output += StringHelper::Sprintf("%s %s[%i];\n", item.second->varType.c_str(), item.second->varName.c_str(), item.second->arrayItemCnt); + } } else output += StringHelper::Sprintf("%s %s;\n", item.second->varType.c_str(), @@ -954,7 +997,7 @@ string ZFile::ProcessDeclarations() output += "\n"; // Next, output the actual declarations - for (pair item : declarations) + for (std::pair item : declarations) { if (item.first < rangeStart || item.first >= rangeEnd) { @@ -963,11 +1006,6 @@ string ZFile::ProcessDeclarations() if (item.second->includePath != "") { - // output += StringHelper::Sprintf("#include \"%s\"\n", - // item.second->includePath.c_str()); output += StringHelper::Sprintf("%s %s[] = - // {\n#include \"%s\"\n};\n\n", item.second->varType.c_str(), - // item.second->varName.c_str(), item.second->includePath.c_str()); - if (item.second->isExternal) { // HACK @@ -984,48 +1022,28 @@ string ZFile::ProcessDeclarations() item.second->text); } - /*if (item.second->varType == "u64") - output += StringHelper::Sprintf("#pragma INC_ASSET_U64(\"%s\", \"%s\")\n", - item.second->varName.c_str(), item.second->includePath.c_str()); else if - (item.second->varType == "Gfx") output += StringHelper::Sprintf("#pragma - INC_ASSET_GFX(\"%s\", \"%s\")\n", item.second->varName.c_str(), - item.second->includePath.c_str()); else if (item.second->varType == "Vtx" || - item.second->varType == "static Vtx") output += StringHelper::Sprintf("#pragma - INC_ASSET_VTX(\"%s\", \"%s\")\n", item.second->varName.c_str(), - item.second->includePath.c_str()); else output += StringHelper::Sprintf("#pragma - INC_ASSET_U8(\"%s\", \"%s\")\n", item.second->varName.c_str(), - item.second->includePath.c_str());*/ - // Do not asm_process vertex arrays. They have no practical use being overridden. // if (item.second->varType == "Vtx" || item.second->varType == "static Vtx") if (item.second->varType != "u64" && item.second->varType != "static u64" && item.second->varType != "u8" && item.second->varType != "static u8") { - // output += StringHelper::Sprintf("%s %s[] = {\n #include \"%s\"\n};\n\n", - // item.second->varType.c_str(), item.second->varName.c_str(), - // StringHelper::Replace(item.second->includePath, "assets/", - // "../assets/extracted/").c_str()); output += StringHelper::Sprintf( "%s %s[] = {\n #include \"%s\"\n};\n\n", item.second->varType.c_str(), item.second->varName.c_str(), StringHelper::Replace(item.second->includePath, "assets/", "../assets/") .c_str()); - // output += StringHelper::Sprintf("%s %s[] = {\n #include \"%s\"\n};\n\n", - // item.second->varType.c_str(), item.second->varName.c_str(), - // Path::GetFileName(item.second->includePath).c_str()); } else { - // output += StringHelper::Sprintf("%s %s[] = {\n #pragma - // INC_ASSET(\"%s\")\n};\n\n", item.second->varType.c_str(), - // item.second->varName.c_str(), item.second->includePath.c_str()); output += - // StringHelper::Sprintf("%s %s[] = {\n #include \"%s\"\n};\n\n", - // item.second->varType.c_str(), item.second->varName.c_str(), - // StringHelper::Replace(item.second->includePath, "assets/", - // "assets/extracted/").c_str()); - output += StringHelper::Sprintf( - "%s %s[] = {\n #include \"%s\"\n};\n\n", item.second->varType.c_str(), - item.second->varName.c_str(), item.second->includePath.c_str()); + if (item.second->arrayItemCntStr != "") + output += StringHelper::Sprintf( + "%s %s[%s] = {\n #include \"%s\"\n};\n\n", item.second->varType.c_str(), + item.second->varName.c_str(), item.second->arrayItemCntStr.c_str(), + item.second->includePath.c_str()); + else + output += StringHelper::Sprintf( + "%s %s[] = {\n #include \"%s\"\n};\n\n", item.second->varType.c_str(), + item.second->varName.c_str(), item.second->includePath.c_str()); } } else if (item.second->varType != "") @@ -1036,14 +1054,23 @@ string ZFile::ProcessDeclarations() { if (item.second->isArray) { - if (item.second->arrayItemCnt == 0) - output += - StringHelper::Sprintf("%s %s[] = {\n", item.second->varType.c_str(), - item.second->varName.c_str()); - else + if (item.second->arrayItemCntStr != "") + { output += StringHelper::Sprintf( - "%s %s[%i] = {\n", item.second->varType.c_str(), - item.second->varName.c_str(), item.second->arrayItemCnt); + "%s %s[%s];\n", item.second->varType.c_str(), + item.second->varName.c_str(), item.second->arrayItemCntStr.c_str()); + } + else + { + if (item.second->arrayItemCnt == 0) + output += + StringHelper::Sprintf("%s %s[] = {\n", item.second->varType.c_str(), + item.second->varName.c_str()); + else + output += StringHelper::Sprintf( + "%s %s[%i] = {\n", item.second->varType.c_str(), + item.second->varName.c_str(), item.second->arrayItemCnt); + } output += item.second->text + "\n"; } @@ -1125,11 +1152,11 @@ void ZFile::ProcessDeclarationText(Declaration* decl) } } -string ZFile::ProcessExterns() +std::string ZFile::ProcessExterns() { - string output = ""; + std::string output = ""; - for (pair item : declarations) + for (std::pair item : declarations) { if (item.first < rangeStart || item.first >= rangeEnd) { @@ -1161,4 +1188,61 @@ string ZFile::ProcessExterns() output += defines; return output; -} \ No newline at end of file +} + +std::string ZFile::ProcessTextureIntersections(std::string prefix) +{ + if (texturesResources.empty()) + return ""; + + std::string defines = ""; + std::vector> texturesSorted(texturesResources.begin(), + texturesResources.end()); + + for (size_t i = 0; i < texturesSorted.size() - 1; i++) + { + uint32_t currentOffset = texturesSorted[i].first; + uint32_t nextOffset = texturesSorted[i + 1].first; + auto& currentTex = texturesResources.at(currentOffset); + int texSize = currentTex->GetRawDataSize(); + + if (currentTex->WasDeclaredInXml()) + { + // We believe the user is right. + continue; + } + + if ((currentOffset + texSize) > nextOffset) + { + uint32_t offsetDiff = nextOffset - currentOffset; + if (currentTex->isPalette) + { + // Shrink palette so it doesn't overlap + currentTex->SetDimensions(offsetDiff / currentTex->GetPixelMultiplyer(), 1); + declarations.at(currentOffset)->size = currentTex->GetRawDataSize(); + } + else + { + std::string texName = GetDeclarationPtrName(currentOffset); + std::string texNextName; + + Declaration* nextDecl = GetDeclaration(nextOffset); + if (nextDecl == nullptr) + texNextName = texturesResources.at(nextOffset)->GetName(); + else + texNextName = nextDecl->varName; + + defines += StringHelper::Sprintf("#define %s ((u32)%s + 0x%06X)\n", + texNextName.c_str(), texName.c_str(), offsetDiff); + + declarations.erase(nextOffset); + texturesResources.erase(nextOffset); + texturesSorted.erase(texturesSorted.begin() + i + 1); + + i--; + } + } + } + + return defines; +} diff --git a/tools/ZAPD/ZAPD/ZFile.h b/tools/ZAPD/ZAPD/ZFile.h index 80411e0b10..a3765a0a70 100644 --- a/tools/ZAPD/ZAPD/ZFile.h +++ b/tools/ZAPD/ZAPD/ZFile.h @@ -4,6 +4,7 @@ #include #include "Directory.h" #include "ZResource.h" +#include "ZTexture.h" #include "tinyxml2.h" enum class ZFileMode @@ -32,6 +33,7 @@ public: std::map declarations; std::string defines; std::vector resources; + int32_t segment; uint32_t baseAddress, rangeStart, rangeEnd; ZFile(const fs::path& nOutPath, std::string nName); @@ -41,7 +43,9 @@ public: ~ZFile(); std::string GetVarName(uint32_t address); - std::string GetName(); + std::string GetName() const; + const fs::path& GetXmlFilePath() const; + const std::vector& GetRawData() const; void ExtractResources(fs::path outputDir); void BuildSourceFile(fs::path outputDir); void AddResource(ZResource* res); @@ -59,6 +63,9 @@ public: Declaration* AddDeclarationArray(uint32_t address, DeclarationAlignment alignment, size_t size, std::string varType, std::string varName, size_t arrayItemCnt, std::string body, bool isExternal); + Declaration* AddDeclarationArray(uint32_t address, DeclarationAlignment alignment, size_t size, + std::string varType, std::string varName, + std::string arrayItemCntStr, std::string body); Declaration* AddDeclarationArray(uint32_t address, DeclarationAlignment alignment, DeclarationPadding padding, size_t size, std::string varType, std::string varName, size_t arrayItemCnt, std::string body); @@ -69,15 +76,19 @@ public: Declaration* AddDeclarationIncludeArray(uint32_t address, std::string includePath, size_t size, std::string varType, std::string varName, size_t arrayItemCnt); - std::string GetDeclarationName(uint32_t address); - std::string GetDeclarationName(uint32_t address, std::string defaultResult); - Declaration* GetDeclaration(uint32_t address); - Declaration* GetDeclarationRanged(uint32_t address); - uint32_t GetDeclarationRangedAddress(uint32_t address); + std::string GetDeclarationName(uint32_t address) const; + std::string GetDeclarationName(uint32_t address, std::string defaultResult) const; + std::string GetDeclarationPtrName(segptr_t segAddress) const; + Declaration* GetDeclaration(uint32_t address) const; + Declaration* GetDeclarationRanged(uint32_t address) const; + uint32_t GetDeclarationRangedAddress(uint32_t address) const; bool HasDeclaration(uint32_t address); std::string GetHeaderInclude(); void GeneratePlaceholderDeclarations(); + void AddTextureResource(uint32_t offset, ZTexture* tex); + ZTexture* GetTextureResource(uint32_t offset) const; + static std::map* GetNodeMap(); static void RegisterNode(std::string nodeName, ZResourceFactoryFunc* nodeFunc); @@ -87,10 +98,15 @@ protected: fs::path basePath; fs::path outputPath; fs::path xmlFilePath; + // Keep track of every texture of this ZFile. + // The pointers declared here are "borrowed" (somebody else is the owner), + // so ZFile shouldn't delete/free those textures. + std::map texturesResources; ZFile(); void ParseXML(ZFileMode mode, tinyxml2::XMLElement* reader, std::string filename, bool placeholderMode); + void DeclareResourceSubReferences(); void GenerateSourceFiles(fs::path outputDir); void GenerateSourceHeaderFiles(); void GenerateHLIntermediette(); @@ -98,4 +114,6 @@ protected: std::string ProcessDeclarations(); void ProcessDeclarationText(Declaration* decl); std::string ProcessExterns(); -}; \ No newline at end of file + + std::string ProcessTextureIntersections(std::string prefix); +}; diff --git a/tools/ZAPD/ZAPD/ZLimb.cpp b/tools/ZAPD/ZAPD/ZLimb.cpp index d71d16800c..aa29e4e48f 100644 --- a/tools/ZAPD/ZAPD/ZLimb.cpp +++ b/tools/ZAPD/ZAPD/ZLimb.cpp @@ -4,8 +4,6 @@ #include "Globals.h" #include "StringHelper.h" -using namespace std; - REGISTER_ZFILENODE(Limb, ZLimb); Struct_800A57C0::Struct_800A57C0(const std::vector& rawData, uint32_t fileOffset) @@ -105,12 +103,12 @@ Struct_800A598C::Struct_800A598C(ZFile* parent, const std::vector& rawD void Struct_800A598C::PreGenSourceFiles(const std::string& prefix) { - string entryStr; + std::string entryStr; if (unk_8 != 0) { uint32_t unk_8_Offset = Seg2Filespace(unk_8, parent->baseAddress); - string unk_8_Str = + std::string unk_8_Str = StringHelper::Sprintf("%sSkinLimb_%s_%06X", prefix.c_str(), Struct_800A57C0::GetSourceTypeName().c_str(), unk_8_Offset); @@ -142,7 +140,7 @@ void Struct_800A598C::PreGenSourceFiles(const std::string& prefix) if (unk_C != 0) { uint32_t unk_C_Offset = Seg2Filespace(unk_C, parent->baseAddress); - string unk_C_Str = + std::string unk_C_Str = StringHelper::Sprintf("%sSkinLimb_%s_%06X", prefix.c_str(), Struct_800A598C_2::GetSourceTypeName().c_str(), unk_C_Offset); @@ -173,9 +171,9 @@ void Struct_800A598C::PreGenSourceFiles(const std::string& prefix) std::string Struct_800A598C::GetSourceOutputCode(const std::string& prefix) const { - string entryStr; + std::string entryStr; - string unk_8_Str = "NULL"; + std::string unk_8_Str = "NULL"; if (unk_8 != 0) { @@ -185,7 +183,7 @@ std::string Struct_800A598C::GetSourceOutputCode(const std::string& prefix) cons Struct_800A57C0::GetSourceTypeName().c_str(), unk_8_Offset); } - string unk_C_Str = "NULL"; + std::string unk_C_Str = "NULL"; if (unk_C != 0) { @@ -253,11 +251,11 @@ void Struct_800A5E28::PreGenSourceFiles(const std::string& prefix) if (unk_4 != 0) { uint32_t unk_4_Offset = Seg2Filespace(unk_4, parent->baseAddress); - string unk_4_Str = + std::string unk_4_Str = StringHelper::Sprintf("%sSkinLimb_%s_%06X", prefix.c_str(), Struct_800A598C::GetSourceTypeName().c_str(), unk_4_Offset); - string entryStr = ""; + std::string entryStr = ""; uint16_t arrayItemCnt = unk_4_arr.size(); size_t i = 0; @@ -294,7 +292,8 @@ void Struct_800A5E28::PreGenSourceFiles(const std::string& prefix) Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); unk_8_dlist = new ZDisplayList(rawData, unk_8_Offset, dlistLength, parent); - string dListStr = StringHelper::Sprintf("%sSkinLimbDL_%06X", prefix.c_str(), unk_8_Offset); + std::string dListStr = + StringHelper::Sprintf("%sSkinLimbDL_%06X", prefix.c_str(), unk_8_Offset); unk_8_dlist->SetName(dListStr); unk_8_dlist->GetSourceOutputCode(prefix); } @@ -302,9 +301,9 @@ void Struct_800A5E28::PreGenSourceFiles(const std::string& prefix) std::string Struct_800A5E28::GetSourceOutputCode(const std::string& prefix) const { - string entryStr = ""; + std::string entryStr = ""; - string unk_4_Str = "NULL"; + std::string unk_4_Str = "NULL"; if (unk_4 != 0) { @@ -323,7 +322,7 @@ std::string Struct_800A5E28::GetSourceOutputCode(const std::string& prefix) cons } } - string unk_8_Str = "NULL"; + std::string unk_8_Str = "NULL"; if (unk_8 != 0) { uint32_t unk_8_Offset = Seg2Filespace(unk_8, parent->baseAddress); @@ -393,7 +392,7 @@ void ZLimb::ParseXML(tinyxml2::XMLElement* reader) } else { - string limbTypeStr(limbType); + std::string limbTypeStr(limbType); if (limbTypeStr == "Standard") { @@ -445,10 +444,11 @@ void ZLimb::ParseRawData() { case ZLimbType::LOD: dList2Ptr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12); + // Intended fallthrough case ZLimbType::Standard: dListPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - break; + case ZLimbType::Skin: skinSegmentType = static_cast(BitConverter::ToInt32BE(rawData, rawDataIndex + 8)); @@ -461,9 +461,9 @@ void ZLimb::ParseRawData() } void ZLimb::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); segAddress = nRawDataIndex; parent->AddDeclaration(GetFileAddress(), DeclarationAlignment::None, GetRawDataSize(), @@ -479,7 +479,7 @@ void ZLimb::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vectorbaseAddress); - string dListStr; + std::string dListStr; Declaration* decl = parent->GetDeclaration(dListOffset); if (decl == nullptr) { @@ -625,7 +625,7 @@ std::string ZLimb::GetSourceOutputCodeSkin_Type_4(const std::string& prefix) uint32_t skinSegmentOffset = Seg2Filespace(skinSegment, parent->baseAddress); - string struct_800A5E28_Str; + std::string struct_800A5E28_Str; Declaration* decl = parent->GetDeclaration(skinSegmentOffset); if (decl == nullptr) { @@ -634,7 +634,7 @@ std::string ZLimb::GetSourceOutputCodeSkin_Type_4(const std::string& prefix) Struct_800A5E28::GetSourceTypeName().c_str(), skinSegmentOffset); segmentStruct.PreGenSourceFiles(prefix); - string entryStr = segmentStruct.GetSourceOutputCode(prefix); + std::string entryStr = segmentStruct.GetSourceOutputCode(prefix); parent->AddDeclaration(skinSegmentOffset, DeclarationAlignment::None, Struct_800A5E28::GetRawDataSize(), @@ -652,7 +652,7 @@ std::string ZLimb::GetSourceOutputCodeSkin(const std::string& prefix) { assert(type == ZLimbType::Skin); - string skinSegmentStr = "NULL"; + std::string skinSegmentStr = "NULL"; if (skinSegment != 0) { @@ -681,7 +681,7 @@ std::string ZLimb::GetSourceOutputCodeSkin(const std::string& prefix) } } - string entryStr = + std::string entryStr = StringHelper::Sprintf(" 0x%02X, %s\n", skinSegmentType, skinSegmentStr.c_str()); return entryStr; diff --git a/tools/ZAPD/ZAPD/ZLimb.h b/tools/ZAPD/ZAPD/ZLimb.h index b923e6fc05..d3ac3d0a39 100644 --- a/tools/ZAPD/ZAPD/ZLimb.h +++ b/tools/ZAPD/ZAPD/ZLimb.h @@ -151,11 +151,11 @@ public: void ParseXML(tinyxml2::XMLElement* reader) override; void ParseRawData() override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; - size_t GetRawDataSize() override; + const uint32_t nRawDataIndex) override; + size_t GetRawDataSize() const override; std::string GetSourceOutputCode(const std::string& prefix) override; - std::string GetSourceTypeName() override; - ZResourceType GetResourceType() override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; ZLimbType GetLimbType(); void SetLimbType(ZLimbType value); diff --git a/tools/ZAPD/ZAPD/ZMtx.cpp b/tools/ZAPD/ZAPD/ZMtx.cpp index 9a90c29947..7beadeef1b 100644 --- a/tools/ZAPD/ZAPD/ZMtx.cpp +++ b/tools/ZAPD/ZAPD/ZMtx.cpp @@ -14,7 +14,7 @@ ZMtx::ZMtx(const std::string& prefix, const std::vector& nRawData, uint : ZResource(nParent) { name = GetDefaultName(prefix.c_str(), rawDataIndex); - ExtractFromFile(nRawData, nRawDataIndex, ""); + ExtractFromFile(nRawData, nRawDataIndex); DeclareVar("", ""); } @@ -28,18 +28,18 @@ void ZMtx::ParseRawData() } void ZMtx::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - uint32_t nRawDataIndex, const std::string& nRelPath) + uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); DeclareVar("", ""); } -size_t ZMtx::GetRawDataSize() +size_t ZMtx::GetRawDataSize() const { return 64; } -void ZMtx::DeclareVar(const std::string& prefix, const std::string& bodyStr) +void ZMtx::DeclareVar(const std::string& prefix, const std::string& bodyStr) const { std::string auxName = name; @@ -86,12 +86,12 @@ std::string ZMtx::GetDefaultName(const std::string& prefix, uint32_t address) return StringHelper::Sprintf("%sMtx_%06X", prefix.c_str(), address); } -std::string ZMtx::GetSourceTypeName() +std::string ZMtx::GetSourceTypeName() const { return "Mtx"; } -ZResourceType ZMtx::GetResourceType() +ZResourceType ZMtx::GetResourceType() const { return ZResourceType::Mtx; } diff --git a/tools/ZAPD/ZAPD/ZMtx.h b/tools/ZAPD/ZAPD/ZMtx.h index 5888882316..cf90b48873 100644 --- a/tools/ZAPD/ZAPD/ZMtx.h +++ b/tools/ZAPD/ZAPD/ZMtx.h @@ -16,16 +16,16 @@ public: ZFile* nParent); void ParseRawData() override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - uint32_t nRawDataIndex, const std::string& nRelPath) override; + uint32_t nRawDataIndex) override; - size_t GetRawDataSize() override; + size_t GetRawDataSize() const override; - void DeclareVar(const std::string& prefix, const std::string& bodyStr); + void DeclareVar(const std::string& prefix, const std::string& bodyStr) const; std::string GetBodySourceCode(); std::string GetSourceOutputCode(const std::string& prefix) override; static std::string GetDefaultName(const std::string& prefix, uint32_t address); - std::string GetSourceTypeName() override; - ZResourceType GetResourceType() override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; }; diff --git a/tools/ZAPD/ZAPD/ZPath.cpp b/tools/ZAPD/ZAPD/ZPath.cpp new file mode 100644 index 0000000000..63970ae4f5 --- /dev/null +++ b/tools/ZAPD/ZAPD/ZPath.cpp @@ -0,0 +1,201 @@ +#include "ZPath.h" + +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" + +REGISTER_ZFILENODE(Path, ZPath); + +ZPath::ZPath(ZFile* nParent) : ZResource(nParent) +{ + numPaths = 1; +} + +void ZPath::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, + const uint32_t nRawDataIndex) +{ + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); + + parent->AddDeclarationArray(rawDataIndex, DeclarationAlignment::Align4, pathways.size() * 8, + GetSourceTypeName(), name, pathways.size(), ""); +} + +void ZPath::ParseXML(tinyxml2::XMLElement* reader) +{ + ZResource::ParseXML(reader); + + const char* numPathsXml = reader->Attribute("NumPaths"); + if (numPathsXml != nullptr) + { + numPaths = StringHelper::StrToL(std::string(numPathsXml)); + if (numPaths < 1) + throw std::runtime_error( + StringHelper::Sprintf("ZPath::ParseXML: Fatal error in '%s'.\n" + "\t Invalid value for attribute 'NumPaths': '%i'\n", + name.c_str(), numPaths)); + } +} + +void ZPath::ParseRawData() +{ + ZResource::ParseRawData(); + + uint32_t currentPtr = rawDataIndex; + + for (size_t pathIndex = 0; pathIndex < numPaths; pathIndex++) + { + PathwayEntry path(parent); + path.SetRawDataIndex(currentPtr); + path.ParseRawData(); + + if (path.GetListAddress() == 0) + break; + + currentPtr += path.GetRawDataSize(); + pathways.push_back(path); + } +} + +void ZPath::DeclareReferences(const std::string& prefix) +{ + ZResource::DeclareReferences(prefix); + + for (auto& entry : pathways) + entry.DeclareReferences(prefix); +} + +std::string ZPath::GetBodySourceCode() const +{ + std::string declaration = ""; + + size_t index = 0; + for (const auto& entry : pathways) + { + declaration += entry.GetBodySourceCode(); + + if (index < pathways.size() - 1) + declaration += "\n"; + + index++; + } + + return declaration; +} + +std::string ZPath::GetSourceOutputCode(const std::string& prefix) +{ + std::string declaration = GetBodySourceCode(); + + Declaration* decl = parent->GetDeclaration(rawDataIndex); + if (decl == nullptr || decl->isPlaceholder) + parent->AddDeclarationArray(rawDataIndex, DeclarationAlignment::Align4, pathways.size() * 8, + GetSourceTypeName(), name, pathways.size(), declaration); + else + decl->text = declaration; + + return ""; +} + +std::string ZPath::GetSourceTypeName() const +{ + return "Path"; +} + +size_t ZPath::GetRawDataSize() const +{ + return pathways.size() * pathways.at(0).GetRawDataSize(); +} + +void ZPath::SetNumPaths(uint32_t nNumPaths) +{ + numPaths = nNumPaths; +} + +/* PathwayEntry */ + +PathwayEntry::PathwayEntry(ZFile* nParent) : ZResource(nParent) +{ +} + +void PathwayEntry::ParseRawData() +{ + ZResource::ParseRawData(); + auto parentRawData = parent->GetRawData(); + numPoints = parentRawData.at(rawDataIndex + 0); + unk1 = parentRawData.at(rawDataIndex + 1); + unk2 = BitConverter::ToInt16BE(parentRawData, rawDataIndex + 2); + listSegmentAddress = BitConverter::ToInt32BE(parentRawData, rawDataIndex + 4); + + uint32_t currentPtr = GETSEGOFFSET(listSegmentAddress); + + for (int32_t i = 0; i < numPoints; i++) + { + ZVector vec(parent); + vec.SetRawData(parentRawData); + vec.SetRawDataIndex(currentPtr); + vec.SetScalarType(ZScalarType::ZSCALAR_S16); + vec.SetDimensions(3); + vec.ParseRawData(); + + currentPtr += vec.GetRawDataSize(); + points.push_back(vec); + } +} + +void PathwayEntry::DeclareReferences(const std::string& prefix) +{ + ZResource::DeclareReferences(prefix); + if (points.empty()) + return; + + std::string declaration = ""; + + size_t index = 0; + for (const auto& point : points) + { + declaration += StringHelper::Sprintf("\t%s,", point.GetBodySourceCode().c_str()); + + if (index < points.size() - 1) + declaration += "\n"; + + index++; + } + + Declaration* decl = parent->GetDeclaration(GETSEGOFFSET(listSegmentAddress)); + if (decl == nullptr) + { + parent->AddDeclarationArray(GETSEGOFFSET(listSegmentAddress), DeclarationAlignment::Align4, + DeclarationPadding::Pad4, points.size() * 6, + points.at(0).GetSourceTypeName(), + StringHelper::Sprintf("%sPathwayList0x%06X", prefix.c_str(), + GETSEGOFFSET(listSegmentAddress)), + points.size(), declaration); + } + else + decl->text = declaration; +} + +std::string PathwayEntry::GetBodySourceCode() const +{ + std::string declaration = ""; + std::string listName = parent->GetDeclarationPtrName(listSegmentAddress); + + if (Globals::Instance->game == ZGame::MM_RETAIL) + declaration += + StringHelper::Sprintf(" { %i, %i, %i, %s },", numPoints, unk1, unk2, listName.c_str()); + else + declaration += StringHelper::Sprintf(" { %i, %s },", numPoints, listName.c_str()); + + return declaration; +} + +size_t PathwayEntry::GetRawDataSize() const +{ + return 0x08; +} + +segptr_t PathwayEntry::GetListAddress() const +{ + return listSegmentAddress; +} diff --git a/tools/ZAPD/ZAPD/ZPath.h b/tools/ZAPD/ZAPD/ZPath.h new file mode 100644 index 0000000000..d02f163831 --- /dev/null +++ b/tools/ZAPD/ZAPD/ZPath.h @@ -0,0 +1,51 @@ +#pragma once + +#include "ZResource.h" +#include "ZVector.h" + +class PathwayEntry : public ZResource +{ +public: + PathwayEntry(ZFile* nParent); + + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const; + void DeclareVar(); + + size_t GetRawDataSize() const; + segptr_t GetListAddress() const; + +protected: + int32_t numPoints; + int8_t unk1; // (MM Only) + int16_t unk2; // (MM Only) + segptr_t listSegmentAddress; + std::vector points; +}; + +class ZPath : public ZResource +{ +public: + ZPath(ZFile* nParent); + + void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, + const uint32_t nRawDataIndex); + + void ParseXML(tinyxml2::XMLElement* reader) override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const; + std::string GetSourceOutputCode(const std::string& prefix) override; + + std::string GetSourceTypeName() const override; + + size_t GetRawDataSize() const override; + void SetNumPaths(uint32_t nNumPaths); + +protected: + uint32_t numPaths; + std::vector pathways; +}; diff --git a/tools/ZAPD/ZAPD/ZResource.cpp b/tools/ZAPD/ZAPD/ZResource.cpp index 9e16f27d6f..93d48628ca 100644 --- a/tools/ZAPD/ZAPD/ZResource.cpp +++ b/tools/ZAPD/ZAPD/ZResource.cpp @@ -1,43 +1,41 @@ #include "ZResource.h" +#include #include #include "StringHelper.h" -using namespace std; - ZResource::ZResource(ZFile* nParent) { + // assert(nParent != nullptr); parent = nParent; name = ""; outName = ""; - relativePath = ""; sourceOutput = ""; - rawData = vector(); + rawData = std::vector(); rawDataIndex = 0; outputDeclaration = true; } void ZResource::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { rawData = nRawData; rawDataIndex = nRawDataIndex; - relativePath = nRelPath; if (reader != nullptr) ParseXML(reader); ParseRawData(); + CalcHash(); } -void ZResource::ExtractFromFile(const std::vector& nRawData, uint32_t nRawDataIndex, - const std::string& nRelPath) +void ZResource::ExtractFromFile(const std::vector& nRawData, uint32_t nRawDataIndex) { rawData = nRawData; rawDataIndex = nRawDataIndex; - relativePath = nRelPath; ParseRawData(); + CalcHash(); } void ZResource::ParseXML(tinyxml2::XMLElement* reader) @@ -78,10 +76,12 @@ void ZResource::ParseXML(tinyxml2::XMLElement* reader) "with inner element/child detected.\n", name.c_str(), reader->Name())); } + + declaredInXml = true; } } -void ZResource::Save(const std::string& outFolder) +void ZResource::Save(const fs::path& outFolder) { } @@ -89,12 +89,12 @@ void ZResource::PreGenSourceFiles() { } -string ZResource::GetName() +std::string ZResource::GetName() const { return name; } -std::string ZResource::GetOutName() +const std::string& ZResource::GetOutName() const { return outName; } @@ -104,47 +104,47 @@ void ZResource::SetOutName(std::string nName) outName = nName; } -void ZResource::SetName(string nName) +void ZResource::SetName(std::string nName) { name = std::move(nName); } -bool ZResource::IsExternalResource() +bool ZResource::IsExternalResource() const { return false; } -bool ZResource::DoesSupportArray() +bool ZResource::DoesSupportArray() const { return false; } -std::string ZResource::GetExternalExtension() +std::string ZResource::GetExternalExtension() const { return ""; } -string ZResource::GetRelativePath() -{ - return relativePath; -} - -vector ZResource::GetRawData() +const std::vector& ZResource::GetRawData() const { return rawData; } -void ZResource::SetRawData(std::vector nData) +void ZResource::SetRawData(const std::vector& nData) { rawData = nData; } -uint32_t ZResource::GetRawDataIndex() +bool ZResource::WasDeclaredInXml() const +{ + return declaredInXml; +} + +uint32_t ZResource::GetRawDataIndex() const { return rawDataIndex; } -size_t ZResource::GetRawDataSize() +size_t ZResource::GetRawDataSize() const { return rawData.size(); } @@ -154,12 +154,12 @@ void ZResource::SetRawDataIndex(uint32_t value) rawDataIndex = value; } -string ZResource::GetSourceOutputCode(const std::string& prefix) +std::string ZResource::GetSourceOutputCode(const std::string& prefix) { return ""; } -string ZResource::GetSourceOutputHeader(const std::string& prefix) +std::string ZResource::GetSourceOutputHeader(const std::string& prefix) { return ""; } @@ -168,16 +168,20 @@ void ZResource::ParseRawData() { } +void ZResource::DeclareReferences(const std::string& prefix) +{ +} + void ZResource::GenerateHLIntermediette(HLFileIntermediette& hlFile) { } -std::string ZResource::GetSourceTypeName() +std::string ZResource::GetSourceTypeName() const { return "u8"; } -ZResourceType ZResource::GetResourceType() +ZResourceType ZResource::GetResourceType() const { return ZResourceType::Error; } diff --git a/tools/ZAPD/ZAPD/ZResource.h b/tools/ZAPD/ZAPD/ZResource.h index aa9f86abfe..99d3dfff06 100644 --- a/tools/ZAPD/ZAPD/ZResource.h +++ b/tools/ZAPD/ZAPD/ZResource.h @@ -5,8 +5,11 @@ #include #include #include +#include "Declaration.h" #include "tinyxml2.h" +#include "Directory.h" + #define SEGMENT_SCENE 2 #define SEGMENT_ROOM 3 #define SEGMENT_KEEP 4 @@ -22,151 +25,94 @@ typedef uint32_t segptr_t; class ZFile; class HLFileIntermediette; -class Declaration; -struct CommandSet; - enum class ZResourceType { Error, - Texture, - DisplayList, - Room, Animation, - Cutscene, + Background, Blob, + CollisionHeader, + Cutscene, + DisplayList, Limb, - Skeleton, + Mtx, + Path, + Room, Scalar, + Skeleton, + String, + Symbol, + Texture, Vector, Vertex, - CollisionHeader, - Symbol, - Mtx, - Background, }; class ZResource { public: ZFile* parent; - bool outputDeclaration; - uint32_t hash; + bool outputDeclaration = true; + uint32_t hash = 0; ZResource(ZFile* nParent); virtual ~ZResource(); // Parsing from File virtual void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, - const std::string& nRelPath); // Extract Mode - virtual void ExtractFromFile(const std::vector& nRawData, uint32_t nRawDataIndex, - const std::string& nRelPath); + uint32_t nRawDataIndex); + virtual void ExtractFromFile(const std::vector& nRawData, uint32_t nRawDataIndex); // Misc virtual void ParseXML(tinyxml2::XMLElement* reader); virtual void ParseRawData(); + virtual void DeclareReferences(const std::string& prefix); + virtual std::string GetSourceOutputCode(const std::string& prefix); virtual std::string GetSourceOutputHeader(const std::string& prefix); virtual void PreGenSourceFiles(); virtual void GenerateHLIntermediette(HLFileIntermediette& hlFile); virtual void CalcHash(); - virtual void Save(const std::string& outFolder); + virtual void Save(const fs::path& outFolder); // Properties - virtual bool IsExternalResource(); - virtual bool DoesSupportArray(); // Can this type be wrapped in an node? - virtual std::string GetSourceTypeName(); - virtual ZResourceType GetResourceType(); - virtual std::string GetExternalExtension(); + virtual bool IsExternalResource() const; + virtual bool DoesSupportArray() const; // Can this type be wrapped in an node? + virtual std::string GetSourceTypeName() const; + virtual ZResourceType GetResourceType() const; + virtual std::string GetExternalExtension() const; // Getters/Setters - std::string GetName(); + std::string GetName() const; void SetName(std::string nName); - std::string GetOutName(); + const std::string& GetOutName() const; void SetOutName(std::string nName); - std::string GetRelativePath(); - virtual uint32_t GetRawDataIndex(); + virtual uint32_t GetRawDataIndex() const; virtual void SetRawDataIndex(uint32_t value); - virtual size_t GetRawDataSize(); - virtual std::vector GetRawData(); - virtual void SetRawData(std::vector nData); + virtual size_t GetRawDataSize() const; + virtual const std::vector& GetRawData() const; + virtual void SetRawData(const std::vector& nData); + bool WasDeclaredInXml() const; protected: std::string name; std::string outName; - std::string relativePath; std::vector rawData; uint32_t rawDataIndex; std::string sourceOutput; bool canHaveInner = false; // Can this type have an inner node? bool isCustomAsset; // If set to true, create a reference for the asset in the file, but don't // actually try to extract it from the file -}; - -enum class DeclarationAlignment -{ - None, - Align4, - Align8, - Align16 -}; - -enum class DeclarationPadding -{ - None, - Pad4, - Pad8, - Pad16 -}; - -class Declaration -{ -public: - DeclarationAlignment alignment; - DeclarationPadding padding; - size_t size; - std::string preText; - std::string text; - std::string rightText; - std::string postText; - std::string preComment; - std::string postComment; - std::string varType; - std::string varName; - std::string includePath; - bool isExternal; - bool isArray; - size_t arrayItemCnt; - std::vector references; - bool isUnaccounted = false; - - Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, - std::string nVarName, bool nIsArray, std::string nText); - Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, - std::string nVarType, std::string nVarName, bool nIsArray, std::string nText); - Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, - std::string nVarName, bool nIsArray, size_t nArrayItemCnt, std::string nText); - Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, - std::string nVarName, bool nIsArray, size_t nArrayItemCnt, std::string nText, - bool nIsExternal); - Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, - std::string nVarType, std::string nVarName, bool nIsArray, size_t nArrayItemCnt, - std::string nText); - Declaration(std::string nIncludePath, size_t nSize, std::string nVarType, std::string nVarName); - -protected: - Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, size_t nSize, - std::string nText); + bool declaredInXml = false; }; uint32_t Seg2Filespace(segptr_t segmentedAddress, uint32_t parentBaseAddress); -typedef ZResource*(ZResourceFactoryFunc)(); +typedef ZResource*(ZResourceFactoryFunc)(ZFile* nParent); #define REGISTER_ZFILENODE(nodeName, zResClass) \ - static ZResource* ZResourceFactory_##zResClass_##nodeName() \ + static ZResource* ZResourceFactory_##zResClass_##nodeName(ZFile* nParent) \ { \ - return static_cast(new zResClass(nullptr)); \ + return static_cast(new zResClass(nParent)); \ } \ \ class ZRes_##nodeName \ @@ -177,4 +123,4 @@ typedef ZResource*(ZResourceFactoryFunc)(); ZFile::RegisterNode(#nodeName, &ZResourceFactory_##zResClass_##nodeName); \ } \ }; \ - static ZRes_##nodeName inst_ZRes_##nodeName; + static ZRes_##nodeName inst_ZRes_##nodeName diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.cpp index 3eabebf19e..3f64af168f 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.cpp @@ -1,25 +1,20 @@ #include "EndMarker.h" -#include "../../StringHelper.h" -using namespace std; - -EndMarker::EndMarker(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +EndMarker::EndMarker(ZFile* nParent) : ZRoomCommand(nParent) { } -string EndMarker::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string EndMarker::GetBodySourceCode() const { - return StringHelper::Sprintf( - "%s 0x00, 0x00", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str()); + return "SCENE_CMD_END()"; } -string EndMarker::GetCommandCName() +std::string EndMarker::GetCommandCName() const { return "SCmdEndMarker"; } -RoomCommand EndMarker::GetRoomCommand() +RoomCommand EndMarker::GetRoomCommand() const { return RoomCommand::EndMarker; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.h b/tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.h index e63d2729ef..daa477c945 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/EndMarker.h @@ -1,15 +1,13 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class EndMarker : public ZRoomCommand { public: - EndMarker(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + EndMarker(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; - -private: + std::string GetBodySourceCode() const override; + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; }; \ No newline at end of file diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp index 17846274b9..18cfd1ef61 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp @@ -1,88 +1,79 @@ #include "SetActorCutsceneList.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -SetActorCutsceneList::SetActorCutsceneList(ZRoom* nZRoom, std::vector rawData, - uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetActorCutsceneList::SetActorCutsceneList(ZFile* nParent) : ZRoomCommand(nParent) { - int32_t numCutscenes = rawData[rawDataIndex + 1]; - segmentOffset = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF; - - cutscenes = vector(); +} +void SetActorCutsceneList::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + int numCutscenes = cmdArg1; int32_t currentPtr = segmentOffset; for (int32_t i = 0; i < numCutscenes; i++) { - ActorCutsceneEntry* entry = new ActorCutsceneEntry(rawData, currentPtr); + ActorCutsceneEntry entry(parent->GetRawData(), currentPtr); cutscenes.push_back(entry); currentPtr += 16; } +} - string declaration = ""; - - for (ActorCutsceneEntry* entry : cutscenes) +void SetActorCutsceneList::DeclareReferences(const std::string& prefix) +{ + if (cutscenes.size() > 0) { - declaration += StringHelper::Sprintf( - " { %i, %i, %i, %i, %i, %i, %i, %i, %i, %i },\n", entry->priority, entry->length, - entry->unk4, entry->unk6, entry->additionalCutscene, entry->sound, entry->unkB, - entry->unkC, entry->unkE, entry->letterboxSize); + std::string declaration = ""; + + for (size_t i = 0; i < cutscenes.size(); i++) + { + const auto& entry = cutscenes.at(i); + declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); + + if (i + 1 < cutscenes.size()) + { + declaration += "\n"; + } + } + + std::string typeName = cutscenes.at(0).GetSourceTypeName(); + + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::Align4, cutscenes.size() * 16, typeName, + StringHelper::Sprintf("%s%sList_%06X", prefix.c_str(), typeName.c_str(), segmentOffset), + 0, declaration); } - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, cutscenes.size() * 16, "ActorCutscene", - StringHelper::Sprintf("%sActorCutsceneList0x%06X", zRoom->GetName().c_str(), segmentOffset), - 0, declaration); } -SetActorCutsceneList::~SetActorCutsceneList() +std::string SetActorCutsceneList::GetBodySourceCode() const { - for (ActorCutsceneEntry* entry : cutscenes) - delete entry; + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_ACTOR_CUTSCENE_LIST(%i, %s)", cutscenes.size(), + listName.c_str()); } -string SetActorCutsceneList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - return StringHelper::Sprintf( - "%s 0x%02X, (u32)&%sActorCutsceneList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), cutscenes.size(), - zRoom->GetName().c_str(), segmentOffset); -} - -string SetActorCutsceneList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - return ""; -} - -size_t SetActorCutsceneList::GetRawDataSize() +size_t SetActorCutsceneList::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (cutscenes.size() * 16); } -string SetActorCutsceneList::GenerateExterns() -{ - return StringHelper::Sprintf("extern ActorCutscene %sActorCutsceneList0x%06X[];\n", - zRoom->GetName().c_str(), segmentOffset); -} - -string SetActorCutsceneList::GetCommandCName() +std::string SetActorCutsceneList::GetCommandCName() const { return "SCmdCutsceneActorList"; } -RoomCommand SetActorCutsceneList::GetRoomCommand() +RoomCommand SetActorCutsceneList::GetRoomCommand() const { return RoomCommand::SetActorCutsceneList; } -ActorCutsceneEntry::ActorCutsceneEntry(std::vector rawData, uint32_t rawDataIndex) +ActorCutsceneEntry::ActorCutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex) : priority(BitConverter::ToInt16BE(rawData, rawDataIndex + 0)), length(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)), unk4(BitConverter::ToInt16BE(rawData, rawDataIndex + 4)), @@ -93,3 +84,14 @@ ActorCutsceneEntry::ActorCutsceneEntry(std::vector rawData, uint32_t ra letterboxSize(rawData[rawDataIndex + 0xF]) { } + +std::string ActorCutsceneEntry::GetBodySourceCode() const +{ + return StringHelper::Sprintf("%i, %i, %i, %i, %i, %i, %i, %i, %i, %i", priority, length, unk4, + unk6, additionalCutscene, sound, unkB, unkC, unkE, letterboxSize); +} + +std::string ActorCutsceneEntry::GetSourceTypeName() const +{ + return "ActorCutscene"; +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorCutsceneList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorCutsceneList.h index 96d7b7653e..d36dd4c2ff 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorCutsceneList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorCutsceneList.h @@ -1,10 +1,10 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class ActorCutsceneEntry { -public: +protected: int16_t priority; int16_t length; int16_t unk4; @@ -16,23 +16,27 @@ public: uint8_t unkE; uint8_t letterboxSize; - ActorCutsceneEntry(std::vector rawData, uint32_t rawDataIndex); +public: + ActorCutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex); + + std::string GetBodySourceCode() const; + std::string GetSourceTypeName() const; }; class SetActorCutsceneList : public ZRoomCommand { public: - SetActorCutsceneList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetActorCutsceneList(); + SetActorCutsceneList(ZFile* nParent); - std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - std::string GetCommandCName() override; - std::string GenerateExterns() override; - RoomCommand GetRoomCommand() override; - size_t GetRawDataSize() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; private: - std::vector cutscenes; - uint32_t segmentOffset; + std::vector cutscenes; }; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.cpp index 8d094e7b31..b93623b986 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.cpp @@ -1,121 +1,77 @@ #include "SetActorList.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZNames.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZNames.h" +#include "ZRoom/ZRoom.h" -SetActorList::SetActorList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetActorList::SetActorList(ZFile* nParent) : ZRoomCommand(nParent) { - numActors = rawData[rawDataIndex + 1]; - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - - _rawData = rawData; - _rawDataIndex = rawDataIndex; - - if (segmentOffset != 0) - zRoom->parent->AddDeclarationPlaceholder(segmentOffset); } -SetActorList::~SetActorList() +void SetActorList::ParseRawData() { - for (ActorSpawnEntry* entry : actors) - delete entry; + ZRoomCommand::ParseRawData(); + numActors = cmdArg1; -} - -string SetActorList::GetSourceOutputCode(std::string prefix) -{ - return ""; -} - -string SetActorList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - return ""; -} - -string SetActorList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - string sourceOutput = ""; - size_t numActorsReal = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 16; - actors = vector(); uint32_t currentPtr = segmentOffset; - for (size_t i = 0; i < numActorsReal; i++) + for (size_t i = 0; i < numActors; i++) { - ActorSpawnEntry* entry = new ActorSpawnEntry(_rawData, currentPtr); + ActorSpawnEntry entry(parent->GetRawData(), currentPtr); + + currentPtr += entry.GetRawDataSize(); actors.push_back(entry); - - currentPtr += 16; } +} - sourceOutput += - StringHelper::Sprintf("\n %s 0x%02X, (u32)%sActorList0x%06X \n};", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - numActors, roomName.c_str(), segmentOffset); - - // zRoom->parent->AddDeclaration(segmentOffset, DeclarationAlignment::None, - // DeclarationPadding::None, GetRawDataSize(), "SCmdActorList", - // ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress), sourceOutput); - - string declaration = ""; - - size_t index = 0; - for (ActorSpawnEntry* entry : actors) +void SetActorList::DeclareReferences(const std::string& prefix) +{ + if (!actors.empty()) { - uint16_t actorNum = entry->actorNum; + std::string declaration = ""; - if (Globals::Instance->game == ZGame::MM_RETAIL) + size_t index = 0; + for (const auto& entry : actors) { - declaration += StringHelper::Sprintf( - " { %s, %i, %i, %i, SPAWN_ROT_FLAGS(%i, 0x%04X), SPAWN_ROT_FLAGS(%i, 0x%04X), " - "SPAWN_ROT_FLAGS(%i, 0x%04X), 0x%04X }, //0x%06X", - ZNames::GetActorName(actorNum).c_str(), entry->posX, entry->posY, entry->posZ, - (entry->rotX >> 7) & 0b111111111, entry->rotX & 0b1111111, - (entry->rotY >> 7) & 0b111111111, entry->rotY & 0b1111111, - (entry->rotZ >> 7) & 0b111111111, entry->rotZ & 0b1111111, (uint16_t)entry->initVar, - segmentOffset + (index * 16)); - } - else - { - declaration += StringHelper::Sprintf( - " { %s, %i, %i, %i, %i, %i, %i, 0x%04X }, //0x%06X", - ZNames::GetActorName(actorNum).c_str(), entry->posX, entry->posY, entry->posZ, - entry->rotX, entry->rotY, entry->rotZ, (uint16_t)entry->initVar, - segmentOffset + (index * 16)); + declaration += + StringHelper::Sprintf("\t{ %s }, // 0x%06X", entry.GetBodySourceCode().c_str(), + segmentOffset + (index * 16)); if (index < actors.size() - 1) declaration += "\n"; + + index++; } - if (index < actors.size() - 1) - declaration += "\n"; + const auto& entry = actors.front(); - index++; + DeclarationPadding padding = DeclarationPadding::Pad16; + if (Globals::Instance->game == ZGame::MM_RETAIL) + padding = DeclarationPadding::None; + + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::Align4, padding, + actors.size() * entry.GetRawDataSize(), entry.GetSourceTypeName(), + StringHelper::Sprintf("%sActorList_%06X", prefix.c_str(), segmentOffset), + GetActorListArraySize(), declaration); } - - DeclarationPadding padding = DeclarationPadding::Pad16; - if (Globals::Instance->game == ZGame::MM_RETAIL) - padding = DeclarationPadding::None; - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, padding, actors.size() * 16, "ActorEntry", - StringHelper::Sprintf("%sActorList0x%06X", roomName.c_str(), segmentOffset), - GetActorListArraySize(), declaration); - - return sourceOutput; } -size_t SetActorList::GetRawDataSize() +std::string SetActorList::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_ACTOR_LIST(%i, %s)", numActors, listName.c_str()); +} + +size_t SetActorList::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + ((int32_t)actors.size() * 16); } -size_t SetActorList::GetActorListArraySize() +size_t SetActorList::GetActorListArraySize() const { size_t actorCount = 0; @@ -126,8 +82,8 @@ size_t SetActorList::GetActorListArraySize() { actorCount = 0; - for (ActorSpawnEntry* entry : actors) - if (entry->actorNum != 0x22) + for (const auto& entry : actors) + if (entry.GetActorId() != 0x22) actorCount++; } else @@ -138,32 +94,58 @@ size_t SetActorList::GetActorListArraySize() return actorCount; } -string SetActorList::GenerateExterns() -{ - return StringHelper::Sprintf("extern ActorEntry %sActorList0x%06X[%i];\n", - zRoom->GetName().c_str(), segmentOffset, GetActorListArraySize()); -} - -string SetActorList::GetCommandCName() +std::string SetActorList::GetCommandCName() const { return "SCmdActorList"; } -RoomCommand SetActorList::GetRoomCommand() +RoomCommand SetActorList::GetRoomCommand() const { return RoomCommand::SetActorList; } -ActorSpawnEntry::ActorSpawnEntry(std::vector rawData, uint32_t rawDataIndex) +ActorSpawnEntry::ActorSpawnEntry(const std::vector& rawData, uint32_t rawDataIndex) { - const uint8_t* data = rawData.data(); - - actorNum = BitConverter::ToInt16BE(data, rawDataIndex + 0); - posX = BitConverter::ToInt16BE(data, rawDataIndex + 2); - posY = BitConverter::ToInt16BE(data, rawDataIndex + 4); - posZ = BitConverter::ToInt16BE(data, rawDataIndex + 6); - rotX = BitConverter::ToInt16BE(data, rawDataIndex + 8); - rotY = BitConverter::ToInt16BE(data, rawDataIndex + 10); - rotZ = BitConverter::ToInt16BE(data, rawDataIndex + 12); - initVar = BitConverter::ToInt16BE(data, rawDataIndex + 14); + actorNum = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); + posX = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); + posY = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); + posZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); + rotX = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); + rotY = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); + rotZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); + initVar = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); +} + +std::string ActorSpawnEntry::GetBodySourceCode() const +{ + std::string body = "\n"; + + body += "\t\t" + ZNames::GetActorName(actorNum) + ",\n"; + body += StringHelper::Sprintf("\t\t{ %6i, %6i, %6i },\n", posX, posY, posZ); + if (Globals::Instance->game == ZGame::MM_RETAIL) + body += StringHelper::Sprintf("\t\t{ SPAWN_ROT_FLAGS(%i, 0x%04X), SPAWN_ROT_FLAGS(%i, " + "0x%04X), SPAWN_ROT_FLAGS(%i, 0x%04X)},\n", + (rotX >> 7) & 0b111111111, rotX & 0b1111111, + (rotY >> 7) & 0b111111111, rotY & 0b1111111, + (rotZ >> 7) & 0b111111111, rotZ & 0b1111111); + else + body += StringHelper::Sprintf("\t\t{ %6i, %6i, %6i },\n", rotX, rotY, rotZ); + body += StringHelper::Sprintf("\t\t0x%04X\n ", initVar); + + return body; +} + +std::string ActorSpawnEntry::GetSourceTypeName() const +{ + return "ActorEntry"; +} + +int32_t ActorSpawnEntry::GetRawDataSize() const +{ + return 16; +} + +uint16_t ActorSpawnEntry::GetActorId() const +{ + return actorNum; } diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.h index 34a386ccb8..bb4091fe3e 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetActorList.h @@ -1,10 +1,20 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class ActorSpawnEntry { public: + ActorSpawnEntry(const std::vector& rawData, uint32_t rawDataIndex); + + std::string GetBodySourceCode() const; + + std::string GetSourceTypeName() const; + int32_t GetRawDataSize() const; + + uint16_t GetActorId() const; + +protected: uint16_t actorNum; int16_t posX; int16_t posY; @@ -13,29 +23,25 @@ public: int16_t rotY; int16_t rotZ; uint16_t initVar; - - ActorSpawnEntry(std::vector rawData, uint32_t rawDataIndex); }; class SetActorList : public ZRoomCommand { public: - SetActorList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetActorList(); + SetActorList(ZFile* nParent); - std::string GetSourceOutputCode(std::string prefix); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - virtual RoomCommand GetRoomCommand() override; - virtual size_t GetRawDataSize() override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; -private: - size_t GetActorListArraySize(); - int32_t numActors; - std::vector actors; - uint32_t segmentOffset; - std::vector _rawData; - uint32_t _rawDataIndex; -}; \ No newline at end of file + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; + +protected: + size_t GetActorListArraySize() const; + + uint8_t numActors; + std::vector actors; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp index d52f423df9..c5f9387bd6 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp @@ -1,74 +1,70 @@ #include "SetAlternateHeaders.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -using namespace std; +#include "BitConverter.h" +#include "StringHelper.h" +#include "ZFile.h" -SetAlternateHeaders::SetAlternateHeaders(ZRoom* nZRoom, std::vector rawData, - uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetAlternateHeaders::SetAlternateHeaders(ZFile* nParent) : ZRoomCommand(nParent) { - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - - if (segmentOffset != 0) - zRoom->parent->AddDeclarationPlaceholder(segmentOffset); - - _rawData = rawData; - _rawDataIndex = rawDataIndex; } -string SetAlternateHeaders::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetAlternateHeaders::DeclareReferences(const std::string& prefix) { - string sourceOutput = ""; - int32_t numHeaders = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 4; + if (segmentOffset != 0) + parent->AddDeclarationPlaceholder(segmentOffset); +} + +void SetAlternateHeaders::ParseRawDataLate() +{ + int numHeaders = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 4; for (int32_t i = 0; i < numHeaders; i++) { - int32_t address = BitConverter::ToInt32BE(_rawData, segmentOffset + (i * 4)); + int32_t address = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset + (i * 4)); headers.push_back(address); if (address != 0) zRoom->commandSets.push_back(CommandSet(address)); } - - sourceOutput += - StringHelper::Sprintf("%s 0, (u32)&%sAlternateHeaders0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - roomName.c_str(), segmentOffset); - - string declaration = ""; - - for (int32_t i = 0; i < numHeaders; i++) - { - // sprintf(line, " 0x%06X,\n", headers[i]); - - if (headers[i] == 0) - declaration += StringHelper::Sprintf(" 0,\n"); - else - declaration += StringHelper::Sprintf(" (u32)&%sSet%04XCmd00,\n", roomName.c_str(), - headers[i] & 0x00FFFFFF); - } - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, headers.size() * 4, "u32", - StringHelper::Sprintf("%sAlternateHeaders0x%06X", roomName.c_str(), segmentOffset), 0, - declaration); - - return sourceOutput; } -size_t SetAlternateHeaders::GetRawDataSize() +void SetAlternateHeaders::DeclareReferencesLate(const std::string& prefix) { - return ZRoomCommand::GetRawDataSize() + 0; + if (!headers.empty()) + { + std::string declaration = ""; + + for (size_t i = 0; i < headers.size(); i++) + { + if (headers.at(i) == 0) + declaration += StringHelper::Sprintf("\tNULL,"); + else + declaration += + StringHelper::Sprintf("\t%sSet%04X,", prefix.c_str(), GETSEGOFFSET(headers[i])); + + if (i + 1 < headers.size()) + declaration += "\n"; + } + + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::None, headers.size() * 4, "SCmdBase*", + StringHelper::Sprintf("%sAlternateHeaders0x%06X", prefix.c_str(), segmentOffset), 0, + declaration); + } } -string SetAlternateHeaders::GetCommandCName() +std::string SetAlternateHeaders::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_ALTERNATE_HEADER_LIST(%s)", listName.c_str()); +} + +std::string SetAlternateHeaders::GetCommandCName() const { return "SCmdAltHeaders"; } -RoomCommand SetAlternateHeaders::GetRoomCommand() +RoomCommand SetAlternateHeaders::GetRoomCommand() const { return RoomCommand::SetAlternateHeaders; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAlternateHeaders.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAlternateHeaders.h index b6aafdc7b6..e6e7baf45c 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAlternateHeaders.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAlternateHeaders.h @@ -1,21 +1,22 @@ #pragma once -#include "../ZRoom.h" -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoom.h" +#include "ZRoom/ZRoomCommand.h" class SetAlternateHeaders : public ZRoomCommand { public: - SetAlternateHeaders(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetAlternateHeaders(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual size_t GetRawDataSize() override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void DeclareReferences(const std::string& prefix) override; + void ParseRawDataLate() override; + void DeclareReferencesLate(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: - int32_t segmentOffset; std::vector headers; - std::vector _rawData; - int32_t _rawDataIndex; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp new file mode 100644 index 0000000000..ef606a2670 --- /dev/null +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp @@ -0,0 +1,402 @@ +#include "SetAnimatedMaterialList.h" + +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" + +SetAnimatedMaterialList::SetAnimatedMaterialList(ZFile* nParent) : ZRoomCommand(nParent) +{ +} + +void SetAnimatedMaterialList::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + int32_t currentPtr = segmentOffset; + bool keepGoing = true; + + do + { + AnimatedMaterial lastTexture(parent->GetRawData(), currentPtr); + keepGoing = (lastTexture.segment != 0) && (lastTexture.segment > -1); + currentPtr += 8; + textures.push_back(lastTexture); + } while (keepGoing); +} + +void SetAnimatedMaterialList::DeclareReferences(const std::string& prefix) +{ + std::string nameStr = + StringHelper::Sprintf("%sAnimatedMaterialList0x%06X", prefix.c_str(), segmentOffset); + + for (auto& texture : textures) + { + size_t declSize = 0; + std::string declTypeName = ""; + std::string declName = StringHelper::Sprintf("%sAnimatedMaterialParams0x%06X", + prefix.c_str(), texture.segmentOffset); + std::string declaration = ""; + size_t index = 0; + + switch (texture.type) + { + case 0: + case 1: + for (const auto& param : texture.params) + { + declaration += param->GenerateSourceCode(zRoom, texture.segmentOffset); + + if (index < texture.params.size() - 1) + declaration += "\n"; + + index++; + } + + declSize = texture.params.size() * 4; + declTypeName = "AnimatedMatTexScrollParams"; + + parent->AddDeclarationArray(texture.segmentOffset, DeclarationAlignment::Align4, + declSize, declTypeName, declName, texture.params.size(), + declaration); + break; + case 2: + case 3: + case 4: + declSize = texture.params.at(0)->GetParamsSize(); + declTypeName = "AnimatedMatColorParams"; + declaration = texture.params.at(0)->GenerateSourceCode(zRoom, texture.segmentOffset); + + parent->AddDeclaration(texture.segmentOffset, DeclarationAlignment::Align4, declSize, + declTypeName, declName, + StringHelper::Sprintf("\n\t%s\n", declaration.c_str())); + break; + case 5: + declSize = texture.params.at(0)->GetParamsSize(); + declTypeName = "AnimatedMatTexCycleParams"; + declaration = texture.params.at(0)->GenerateSourceCode(zRoom, texture.segmentOffset); + + parent->AddDeclaration(texture.segmentOffset, DeclarationAlignment::Align4, declSize, + declTypeName, declName, + StringHelper::Sprintf("\n\t%s\n", declaration.c_str())); + break; + case 6: + continue; + + default: + throw std::runtime_error( + StringHelper::Sprintf("Error in SetAnimatedMaterialList::DeclareReferences (%s)\n" + "\t Unknown texture.type: %i\n", + nameStr.c_str(), texture.type)); + } + } + + if (!textures.empty()) + { + std::string declaration = ""; + + for (size_t i = 0; i < textures.size(); i++) + { + std::string textureName = parent->GetDeclarationPtrName(textures.at(i).segmentOffset); + + declaration += StringHelper::Sprintf("\t{ %2i, %2i, %s },", textures.at(i).segment, + textures.at(i).type, textureName.c_str()); + + if (i + 1 < textures.size()) + declaration += "\n"; + } + + parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::Align4, + DeclarationPadding::Pad16, textures.size() * 8, + "AnimatedMaterial", nameStr, textures.size(), declaration); + } +} + +std::string SetAnimatedMaterialList::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_ANIMATED_MATERIAL_LIST(%s)", listName.c_str()); +} + +size_t SetAnimatedMaterialList::GetRawDataSize() const +{ + size_t paramsSize = 0; + for (const auto& texture : textures) + { + for (const auto& param : texture.params) + { + paramsSize += param->GetParamsSize(); + } + } + + return ZRoomCommand::GetRawDataSize() + paramsSize; +} + +std::string SetAnimatedMaterialList::GetCommandCName() const +{ + return "SCmdTextureAnimations"; +} + +RoomCommand SetAnimatedMaterialList::GetRoomCommand() const +{ + return RoomCommand::SetAnimatedMaterialList; +} + +AnimatedMaterial::AnimatedMaterial(const std::vector& rawData, uint32_t rawDataIndex) + : segment(rawData.at(rawDataIndex)), type(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)), + segmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4))) +{ + switch (type) + { + case 0: + params.push_back(std::make_shared(rawData, segmentOffset)); + break; + case 1: + params.push_back(std::make_shared(rawData, segmentOffset)); + params.push_back(std::make_shared(rawData, segmentOffset + 4)); + break; + case 2: + case 3: + case 4: + params.push_back(std::make_shared(rawData, segmentOffset, type)); + break; + case 5: + params.push_back(std::make_shared(rawData, segmentOffset)); + break; + case 6: // Some terminator when there are no animated textures? + break; + } +} + +ScrollingTexture::ScrollingTexture(const std::vector& rawData, uint32_t rawDataIndex) + : xStep(rawData.at(rawDataIndex + 0)), yStep(rawData.at(rawDataIndex + 1)), + width(rawData.at(rawDataIndex + 2)), height(rawData.at(rawDataIndex + 3)) +{ +} + +std::string ScrollingTexture::GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) +{ + return StringHelper::Sprintf(" { %i, %i, 0x%02X, 0x%02X },", xStep, yStep, width, height); +} + +size_t ScrollingTexture::GetParamsSize() +{ + return 4; +} + +F3DPrimColor::F3DPrimColor(const std::vector& rawData, uint32_t rawDataIndex) + : r(rawData.at(rawDataIndex + 0)), g(rawData.at(rawDataIndex + 1)), + b(rawData.at(rawDataIndex + 2)), a(rawData.at(rawDataIndex + 3)), + lodFrac(rawData.at(rawDataIndex + 4)) +{ +} + +FlashingTextureEnvColor::FlashingTextureEnvColor(const std::vector& rawData, + uint32_t rawDataIndex) + : r(rawData.at(rawDataIndex + 0)), g(rawData.at(rawDataIndex + 1)), + b(rawData.at(rawDataIndex + 2)), a(rawData.at(rawDataIndex + 3)) +{ +} + +FlashingTexture::FlashingTexture(const std::vector& rawData, uint32_t rawDataIndex, + int32_t type) + : cycleLength(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), + numKeyFrames(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), + primColorSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4))), + envColorSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 8))), + keyFrameSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 12))) +{ + uint16_t length = (type == 2) ? cycleLength : numKeyFrames; + + int32_t currentPtr = primColorSegmentOffset; + for (uint16_t i = 0; i < length; i++) + { + primColors.push_back(F3DPrimColor(rawData, currentPtr)); + currentPtr += 5; + } + + currentPtr = envColorSegmentOffset; + for (uint16_t i = 0; i < length; i++) + { + envColors.push_back(FlashingTextureEnvColor(rawData, currentPtr)); + currentPtr += 4; + } + + currentPtr = keyFrameSegmentOffset; + for (uint16_t i = 0; i < length; i++) + { + keyFrames.push_back(BitConverter::ToUInt16BE(rawData, currentPtr)); + currentPtr += 2; + } +} + +std::string FlashingTexture::GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) +{ + if (primColorSegmentOffset != 0) + { + std::string declaration = ""; + size_t index = 0; + + for (F3DPrimColor& color : primColors) + { + declaration += StringHelper::Sprintf(" { 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X },", + color.r, color.g, color.b, color.a, color.lodFrac); + + if (index < primColors.size() - 1) + declaration += "\n"; + + index++; + } + + zRoom->parent->AddDeclarationArray( + primColorSegmentOffset, DeclarationAlignment::Align4, primColors.size() * 5, + "F3DPrimColor", + StringHelper::Sprintf("%sAnimatedMaterialPrimColor0x%06X", zRoom->GetName().c_str(), + primColorSegmentOffset), + primColors.size(), declaration); + } + + if (envColorSegmentOffset != 0) + { + std::string declaration = ""; + size_t index = 0; + + for (FlashingTextureEnvColor& color : envColors) + { + declaration += StringHelper::Sprintf(" { 0x%02X, 0x%02X, 0x%02X, 0x%02X },", color.r, + color.g, color.b, color.a); + + if (index < envColors.size() - 1) + declaration += "\n"; + + index++; + } + + zRoom->parent->AddDeclarationArray( + envColorSegmentOffset, DeclarationAlignment::Align4, envColors.size() * 4, + "Color_RGBA8", + StringHelper::Sprintf("%sAnimatedMaterialEnvColors0x%06X", zRoom->GetName().c_str(), + envColorSegmentOffset), + envColors.size(), declaration); + } + + if (keyFrameSegmentOffset != 0) + { + std::string declaration = ""; + size_t index = 0; + + for (uint16_t keyFrame : keyFrames) + { + declaration += StringHelper::Sprintf(" 0x%02X,", keyFrame); + + if (index < keyFrames.size() - 1) + declaration += "\n"; + + index++; + } + + zRoom->parent->AddDeclarationArray( + keyFrameSegmentOffset, DeclarationAlignment::Align4, keyFrames.size() * 2, "u16", + StringHelper::Sprintf("%sAnimatedMaterialKeyFrames0x%06X", zRoom->GetName().c_str(), + keyFrameSegmentOffset), + keyFrames.size(), declaration); + } + + std::string primName = zRoom->parent->GetDeclarationPtrName(primColorSegmentOffset); + std::string envName = zRoom->parent->GetDeclarationPtrName(envColorSegmentOffset); + std::string keyName = zRoom->parent->GetDeclarationPtrName(keyFrameSegmentOffset); + + return StringHelper::Sprintf("%i, %i, %s, %s, %s", cycleLength, numKeyFrames, primName.c_str(), + envName.c_str(), keyName.c_str()); +} + +size_t FlashingTexture::GetParamsSize() +{ + return 16; +} + +AnimatedMatTexCycleParams::AnimatedMatTexCycleParams(const std::vector& rawData, + uint32_t rawDataIndex) + : cycleLength(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), + textureSegmentOffsetsSegmentOffset( + GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4))), + textureIndicesSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 8))) +{ + int32_t currentPtr = textureIndicesSegmentOffset; + int32_t maxIndex = 0; + + for (uint16_t i = 0; i < cycleLength; i++) + { + uint8_t newIndex = rawData.at(currentPtr); + textureIndices.push_back(newIndex); + currentPtr++; + if (newIndex > maxIndex) + maxIndex = newIndex; + } + + currentPtr = textureSegmentOffsetsSegmentOffset; + for (int32_t i = 0; i < maxIndex + 1; i++) + { + textureSegmentOffsets.push_back(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, currentPtr))); + currentPtr += 4; + } +} + +std::string AnimatedMatTexCycleParams::GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) +{ + if (textureSegmentOffsetsSegmentOffset != 0) + { + std::string declaration = ""; + size_t index = 0; + + for (uint32_t offset : textureSegmentOffsets) + { + declaration += + StringHelper::Sprintf(" %sTex_%06X,", zRoom->GetName().c_str(), offset); + + if (index < textureSegmentOffsets.size() - 1) + declaration += "\n"; + + index++; + } + + zRoom->parent->AddDeclarationArray( + textureSegmentOffsetsSegmentOffset, DeclarationAlignment::Align4, + textureSegmentOffsets.size() * 4, "u64*", + StringHelper::Sprintf("%sAnimatedMaterialTexSegOffsets0x%06X", zRoom->GetName().c_str(), + textureSegmentOffsetsSegmentOffset), + textureSegmentOffsets.size(), declaration); + } + + if (textureIndicesSegmentOffset != 0) + { + std::string declaration = ""; + size_t index = 0; + + for (uint8_t textureIndex : textureIndices) + { + declaration += StringHelper::Sprintf(" 0x%02X,", textureIndex); + + if (index < textureIndices.size() - 1) + declaration += "\n"; + + index++; + } + + zRoom->parent->AddDeclarationArray( + textureIndicesSegmentOffset, DeclarationAlignment::Align4, textureIndices.size(), "u8", + StringHelper::Sprintf("%sAnimatedMaterialTexIndices0x%06X", zRoom->GetName().c_str(), + textureIndicesSegmentOffset), + textureIndices.size(), declaration); + } + + std::string segmName = zRoom->parent->GetDeclarationPtrName(textureSegmentOffsetsSegmentOffset); + std::string indexesName = zRoom->parent->GetDeclarationPtrName(textureIndicesSegmentOffset); + + return StringHelper::Sprintf("%i, %s, %s", cycleLength, segmName.c_str(), indexesName.c_str()); +} + +size_t AnimatedMatTexCycleParams::GetParamsSize() +{ + return 12; +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedTextureList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h similarity index 51% rename from tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedTextureList.h rename to tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h index 035ba998ce..003d37d44f 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedTextureList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h @@ -1,12 +1,12 @@ #pragma once -#include "../ZRoomCommand.h" +#include +#include "ZRoom/ZRoomCommand.h" // TODO move into header and add all types class AnitmatedTextureParams { public: - virtual ~AnitmatedTextureParams(); virtual std::string GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) = 0; virtual size_t GetParamsSize() = 0; }; @@ -14,7 +14,7 @@ public: class ScrollingTexture : public AnitmatedTextureParams { public: - ScrollingTexture(std::vector rawData, uint32_t rawDataIndex); + ScrollingTexture(const std::vector& rawData, uint32_t rawDataIndex); std::string GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) override; size_t GetParamsSize() override; @@ -24,10 +24,10 @@ public: uint8_t height; }; -class FlashingTexturePrimColor +class F3DPrimColor { public: - FlashingTexturePrimColor(std::vector rawData, uint32_t rawDataIndex); + F3DPrimColor(const std::vector& rawData, uint32_t rawDataIndex); uint8_t r; uint8_t g; @@ -39,7 +39,7 @@ public: class FlashingTextureEnvColor { public: - FlashingTextureEnvColor(std::vector rawData, uint32_t rawDataIndex); + FlashingTextureEnvColor(const std::vector& rawData, uint32_t rawDataIndex); uint8_t r; uint8_t g; @@ -50,7 +50,7 @@ public: class FlashingTexture : public AnitmatedTextureParams { public: - FlashingTexture(std::vector rawData, uint32_t rawDataIndex, int32_t type); + FlashingTexture(const std::vector& rawData, uint32_t rawDataIndex, int32_t type); std::string GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) override; size_t GetParamsSize() override; @@ -60,15 +60,15 @@ public: uint32_t envColorSegmentOffset; uint32_t keyFrameSegmentOffset; - std::vector primColors; + std::vector primColors; std::vector envColors; std::vector keyFrames; }; -class CyclingTextureParams : public AnitmatedTextureParams +class AnimatedMatTexCycleParams : public AnitmatedTextureParams { public: - CyclingTextureParams(std::vector rawData, uint32_t rawDataIndex); + AnimatedMatTexCycleParams(const std::vector& rawData, uint32_t rawDataIndex); std::string GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) override; size_t GetParamsSize() override; @@ -80,34 +80,31 @@ public: std::vector textureIndices; }; -class AnimatedTexture +class AnimatedMaterial { public: - AnimatedTexture(std::vector rawData, uint32_t rawDataIndex); - virtual ~AnimatedTexture(); + AnimatedMaterial(const std::vector& rawData, uint32_t rawDataIndex); int8_t segment; int16_t type; uint32_t segmentOffset; - std::vector params; + std::vector> params; }; -class SetAnimatedTextureList : public ZRoomCommand +class SetAnimatedMaterialList : public ZRoomCommand { public: - SetAnimatedTextureList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetAnimatedTextureList(); + SetAnimatedMaterialList(ZFile* nParent); - std::string GetSourceOutputCode(std::string prefix); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual RoomCommand GetRoomCommand() override; - virtual size_t GetRawDataSize() override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; private: - uint32_t segmentOffset; - std::vector textures; - std::vector _rawData; - int32_t _rawDataIndex; -}; \ No newline at end of file + std::vector textures; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedTextureList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedTextureList.cpp deleted file mode 100644 index 9668f08821..0000000000 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetAnimatedTextureList.cpp +++ /dev/null @@ -1,432 +0,0 @@ -#include "SetAnimatedTextureList.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" - -using namespace std; - -SetAnimatedTextureList::SetAnimatedTextureList(ZRoom* nZRoom, std::vector rawData, - uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) -{ - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - - { - string declaration = ""; - - int32_t currentPtr = segmentOffset; - - AnimatedTexture* lastTexture = nullptr; - - do - { - if (textures.size() > 0) - declaration += "\n"; - - lastTexture = new AnimatedTexture(rawData, currentPtr); - currentPtr += 8; - textures.push_back(lastTexture); - - string textureName = - (lastTexture->segmentOffset != 0) ? - StringHelper::Sprintf("&%sAnimatedTextureParams0x%06X", - zRoom->GetName().c_str(), lastTexture->segmentOffset) : - "NULL"; - - declaration += StringHelper::Sprintf(" { %i, %i, (u32)%s },", lastTexture->segment, - lastTexture->type, textureName.c_str()); - } while ((lastTexture->segment != 0) && (lastTexture->segment > -1)); - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, DeclarationPadding::Pad16, - textures.size() * 8, "AnimatedTexture", - StringHelper::Sprintf("%sAnimatedTextureList0x%06X", zRoom->GetName().c_str(), - segmentOffset), - textures.size(), declaration); - } - - for (AnimatedTexture* texture : textures) - { - string declaration = ""; - size_t index = 0; - - switch (texture->type) - { - case 0: - case 1: - for (AnitmatedTextureParams* param : texture->params) - { - declaration += param->GenerateSourceCode(zRoom, texture->segmentOffset); - - if (index < texture->params.size() - 1) - declaration += "\n"; - - index++; - } - - zRoom->parent->AddDeclarationArray( - texture->segmentOffset, DeclarationAlignment::None, DeclarationPadding::None, - texture->params.size() * 4, "ScrollingTextureParams", - StringHelper::Sprintf("%sAnimatedTextureParams0x%06X", zRoom->GetName().c_str(), - texture->segmentOffset), - texture->params.size(), declaration); - break; - case 2: - case 3: - case 4: - zRoom->parent->AddDeclaration( - texture->segmentOffset, DeclarationAlignment::Align4, DeclarationPadding::None, 16, - "FlashingTextureParams", - StringHelper::Sprintf("%sAnimatedTextureParams0x%06X", zRoom->GetName().c_str(), - texture->segmentOffset), - texture->params[0]->GenerateSourceCode(zRoom, texture->segmentOffset)); - break; - case 5: - zRoom->parent->AddDeclaration( - texture->segmentOffset, DeclarationAlignment::Align4, DeclarationPadding::None, 12, - "CyclingTextureParams", - StringHelper::Sprintf("%sAnimatedTextureParams0x%06X", zRoom->GetName().c_str(), - texture->segmentOffset), - texture->params[0]->GenerateSourceCode(zRoom, texture->segmentOffset)); - break; - case 6: - break; - } - } -} - -SetAnimatedTextureList::~SetAnimatedTextureList() -{ - for (AnimatedTexture* texture : textures) - delete texture; -} - -AnitmatedTextureParams::~AnitmatedTextureParams() -{ -} - -string SetAnimatedTextureList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - return StringHelper::Sprintf( - "%s 0, (u32)%sAnimatedTextureList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - zRoom->GetName().c_str(), segmentOffset); -} - -size_t SetAnimatedTextureList::GetRawDataSize() -{ - size_t paramsSize = 0; - for (AnimatedTexture* texture : textures) - { - for (AnitmatedTextureParams* param : texture->params) - { - paramsSize += param->GetParamsSize(); - } - } - - return ZRoomCommand::GetRawDataSize() + paramsSize; -} - -string SetAnimatedTextureList::GenerateExterns() -{ - return ""; -} - -string SetAnimatedTextureList::GetCommandCName() -{ - return "SCmdTextureAnimations"; -} - -RoomCommand SetAnimatedTextureList::GetRoomCommand() -{ - return RoomCommand::SetAnimatedTextureList; -} - -string SetAnimatedTextureList::GetSourceOutputCode(std::string prefix) -{ - return ""; -} - -AnimatedTexture::AnimatedTexture(std::vector rawData, uint32_t rawDataIndex) - : segment(rawData[rawDataIndex]), type(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)), - segmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4))) -{ - switch (type) - { - case 0: - params.push_back(new ScrollingTexture(rawData, segmentOffset)); - break; - case 1: - params.push_back(new ScrollingTexture(rawData, segmentOffset)); - params.push_back(new ScrollingTexture(rawData, segmentOffset + 4)); - break; - case 2: - case 3: - case 4: - params.push_back(new FlashingTexture(rawData, segmentOffset, type)); - break; - case 5: - params.push_back(new CyclingTextureParams(rawData, segmentOffset)); - break; - case 6: // Some terminator when there are no animated textures? - break; - } -} - -AnimatedTexture::~AnimatedTexture() -{ - for (AnitmatedTextureParams* param : params) - delete param; -} - -ScrollingTexture::ScrollingTexture(std::vector rawData, uint32_t rawDataIndex) - : xStep(rawData[rawDataIndex + 0]), yStep(rawData[rawDataIndex + 1]), - width(rawData[rawDataIndex + 2]), height(rawData[rawDataIndex + 3]) -{ -} - -std::string ScrollingTexture::GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) -{ - return StringHelper::Sprintf(" { %i, %i, 0x%02X, 0x%02X },", xStep, yStep, width, height); -} - -size_t ScrollingTexture::GetParamsSize() -{ - return 4; -} - -FlashingTexturePrimColor::FlashingTexturePrimColor(std::vector rawData, uint32_t rawDataIndex) - : r(rawData[rawDataIndex + 0]), g(rawData[rawDataIndex + 1]), b(rawData[rawDataIndex + 2]), - a(rawData[rawDataIndex + 3]), lodFrac(rawData[rawDataIndex + 4]) -{ -} - -FlashingTextureEnvColor::FlashingTextureEnvColor(std::vector rawData, uint32_t rawDataIndex) - : r(rawData[rawDataIndex + 0]), g(rawData[rawDataIndex + 1]), b(rawData[rawDataIndex + 2]), - a(rawData[rawDataIndex + 3]) -{ -} - -FlashingTexture::FlashingTexture(std::vector rawData, uint32_t rawDataIndex, int32_t type) - : cycleLength(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), - numKeyFrames(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), - primColorSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4))), - envColorSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 8))), - keyFrameSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 12))) -{ - uint16_t length = (type == 2) ? cycleLength : numKeyFrames; - - int32_t currentPtr = primColorSegmentOffset; - for (uint16_t i = 0; i < length; i++) - { - primColors.push_back(FlashingTexturePrimColor(rawData, currentPtr)); - currentPtr += 5; - } - - currentPtr = envColorSegmentOffset; - for (uint16_t i = 0; i < length; i++) - { - envColors.push_back(FlashingTextureEnvColor(rawData, currentPtr)); - currentPtr += 4; - } - - currentPtr = keyFrameSegmentOffset; - for (uint16_t i = 0; i < length; i++) - { - keyFrames.push_back(BitConverter::ToUInt16BE(rawData, currentPtr)); - currentPtr += 2; - } -} - -std::string FlashingTexture::GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) -{ - if (primColorSegmentOffset != 0) - { - string declaration = ""; - size_t index = 0; - - for (FlashingTexturePrimColor& color : primColors) - { - declaration += StringHelper::Sprintf(" { 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X },", - color.r, color.g, color.b, color.a, color.lodFrac); - - if (index < primColors.size() - 1) - declaration += "\n"; - - index++; - } - - zRoom->parent->AddDeclarationArray( - primColorSegmentOffset, DeclarationAlignment::Align4, DeclarationPadding::None, - primColors.size() * 5, "FlashingTexturePrimColor", - StringHelper::Sprintf("%sAnimatedTexturePrimColor0x%06X", zRoom->GetName().c_str(), - primColorSegmentOffset), - primColors.size(), declaration); - } - - if (envColorSegmentOffset != 0) - { - string declaration = ""; - size_t index = 0; - - for (FlashingTextureEnvColor& color : envColors) - { - declaration += StringHelper::Sprintf(" { 0x%02X, 0x%02X, 0x%02X, 0x%02X },", color.r, - color.g, color.b, color.a); - - if (index < envColors.size() - 1) - declaration += "\n"; - - index++; - } - - zRoom->parent->AddDeclarationArray( - envColorSegmentOffset, DeclarationAlignment::Align4, DeclarationPadding::None, - envColors.size() * 4, "Color_RGBA8", - StringHelper::Sprintf("%sAnimatedTextureEnvColors0x%06X", zRoom->GetName().c_str(), - envColorSegmentOffset), - envColors.size(), declaration); - } - - if (keyFrameSegmentOffset != 0) - { - string declaration = ""; - size_t index = 0; - - for (uint16_t keyFrame : keyFrames) - { - declaration += StringHelper::Sprintf(" 0x%02X,", keyFrame); - - if (index < keyFrames.size() - 1) - declaration += "\n"; - - index++; - } - - zRoom->parent->AddDeclarationArray(keyFrameSegmentOffset, DeclarationAlignment::Align4, - DeclarationPadding::None, keyFrames.size() * 2, "u16", - StringHelper::Sprintf("%sAnimatedTextureKeyFrames0x%06X", - zRoom->GetName().c_str(), - keyFrameSegmentOffset), - keyFrames.size(), declaration); - } - - return StringHelper::Sprintf( - "%i, %i, (u32)%s, (u32)%s, (u32)%s", cycleLength, numKeyFrames, - (primColorSegmentOffset != 0) ? - StringHelper::Sprintf("%sAnimatedTexturePrimColor0x%06X", zRoom->GetName().c_str(), - primColorSegmentOffset) - .c_str() : - "NULL", - (envColorSegmentOffset != 0) ? - StringHelper::Sprintf("%sAnimatedTextureEnvColors0x%06X", zRoom->GetName().c_str(), - envColorSegmentOffset) - .c_str() : - "NULL", - (keyFrameSegmentOffset != 0) ? - StringHelper::Sprintf("%sAnimatedTextureKeyFrames0x%06X", zRoom->GetName().c_str(), - keyFrameSegmentOffset) - .c_str() : - "NULL"); -} - -size_t FlashingTexture::GetParamsSize() -{ - return 16; -} - -CyclingTextureParams::CyclingTextureParams(std::vector rawData, uint32_t rawDataIndex) - : cycleLength(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), - textureSegmentOffsetsSegmentOffset( - GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4))), - textureIndicesSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 8))) -{ - int32_t currentPtr = textureIndicesSegmentOffset; - int32_t maxIndex = 0; - - for (uint16_t i = 0; i < cycleLength; i++) - { - int32_t newIndex = rawData[currentPtr]; - textureIndices.push_back(newIndex); - currentPtr++; - if (newIndex > maxIndex) - maxIndex = newIndex; - } - - currentPtr = textureSegmentOffsetsSegmentOffset; - for (int32_t i = 0; i < maxIndex + 1; i++) - { - textureSegmentOffsets.push_back(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, currentPtr))); - currentPtr += 4; - } -} - -std::string CyclingTextureParams::GenerateSourceCode(ZRoom* zRoom, uint32_t baseAddress) -{ - if (textureSegmentOffsetsSegmentOffset != 0) - { - string declaration = ""; - size_t index = 0; - - for (uint32_t offset : textureSegmentOffsets) - { - declaration += - StringHelper::Sprintf(" %sTex_%06X,", zRoom->GetName().c_str(), offset); - - if (index < textureSegmentOffsets.size() - 1) - declaration += "\n"; - - index++; - } - - zRoom->parent->AddDeclarationArray( - textureSegmentOffsetsSegmentOffset, DeclarationAlignment::Align4, - DeclarationPadding::None, textureSegmentOffsets.size() * 4, "u64*", - StringHelper::Sprintf("%sAnimatedTextureTexSegOffsets0x%06X", zRoom->GetName().c_str(), - textureSegmentOffsetsSegmentOffset), - textureSegmentOffsets.size(), declaration); - } - - if (textureIndicesSegmentOffset != 0) - { - string declaration = ""; - size_t index = 0; - - for (uint8_t textureIndex : textureIndices) - { - declaration += StringHelper::Sprintf(" 0x%02X,", textureIndex); - - if (index < textureIndices.size() - 1) - declaration += "\n"; - - index++; - } - - zRoom->parent->AddDeclarationArray( - textureIndicesSegmentOffset, DeclarationAlignment::Align4, DeclarationPadding::None, - textureIndices.size(), "u8", - StringHelper::Sprintf("%sAnimatedTextureTexIndices0x%06X", zRoom->GetName().c_str(), - textureIndicesSegmentOffset), - textureIndices.size(), declaration); - } - - return StringHelper::Sprintf( - "%i, (u32)%s, (u32)%s", cycleLength, - (textureSegmentOffsetsSegmentOffset != 0) ? - StringHelper::Sprintf("%sAnimatedTextureTexSegOffsets0x%06X", zRoom->GetName().c_str(), - textureSegmentOffsetsSegmentOffset) - .c_str() : - "NULL", - (textureIndicesSegmentOffset != 0) ? - StringHelper::Sprintf("%sAnimatedTextureTexIndices0x%06X", zRoom->GetName().c_str(), - textureIndicesSegmentOffset) - .c_str() : - "NULL"); -} - -size_t CyclingTextureParams::GetParamsSize() -{ - return 12; -} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCameraSettings.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCameraSettings.cpp index b6894a3695..fb41b88626 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCameraSettings.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCameraSettings.cpp @@ -1,29 +1,31 @@ #include "SetCameraSettings.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" -using namespace std; +#include "BitConverter.h" +#include "StringHelper.h" -SetCameraSettings::SetCameraSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetCameraSettings::SetCameraSettings(ZFile* nParent) : ZRoomCommand(nParent) { - cameraMovement = rawData[rawDataIndex + 0x01]; - mapHighlight = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); } -string SetCameraSettings::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetCameraSettings::ParseRawData() { - return StringHelper::Sprintf( - "%s 0x%02X, 0x%08X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - cameraMovement, mapHighlight); + ZRoomCommand::ParseRawData(); + cameraMovement = cmdArg1; + mapHighlight = BitConverter::ToUInt32BE(parent->GetRawData(), rawDataIndex + 4); } -string SetCameraSettings::GetCommandCName() +std::string SetCameraSettings::GetBodySourceCode() const +{ + return StringHelper::Sprintf("SCENE_CMD_MISC_SETTINGS(0x%02X, 0x%08X)", cameraMovement, + mapHighlight); +} + +std::string SetCameraSettings::GetCommandCName() const { return "SCmdMiscSettings"; } -RoomCommand SetCameraSettings::GetRoomCommand() +RoomCommand SetCameraSettings::GetRoomCommand() const { return RoomCommand::SetCameraSettings; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCameraSettings.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCameraSettings.h index 894c9a90d1..1a0eb11b8c 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCameraSettings.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCameraSettings.h @@ -1,17 +1,20 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetCameraSettings : public ZRoomCommand { public: - SetCameraSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetCameraSettings(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; private: uint8_t cameraMovement; uint32_t mapHighlight; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp index 79d2c505d0..1eb13f6ba2 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp @@ -1,48 +1,42 @@ #include "SetCollisionHeader.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -SetCollisionHeader::SetCollisionHeader(ZRoom* nZRoom, std::vector rawData, - uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetCollisionHeader::SetCollisionHeader(ZFile* nParent) : ZRoomCommand(nParent) { - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - collisionHeader = new ZCollisionHeader(nZRoom->parent); - collisionHeader->SetRawData(rawData); +} + +void SetCollisionHeader::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + collisionHeader = new ZCollisionHeader(parent); + collisionHeader->SetRawData(parent->GetRawData()); collisionHeader->SetRawDataIndex(segmentOffset); collisionHeader->SetName( - StringHelper::Sprintf("%sCollisionHeader0x%06X", nZRoom->GetName().c_str(), segmentOffset)); + StringHelper::Sprintf("%sCollisionHeader_%06X", parent->GetName().c_str(), segmentOffset)); collisionHeader->ParseRawData(); } -string SetCollisionHeader::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +SetCollisionHeader::~SetCollisionHeader() { - return StringHelper::Sprintf( - "%s 0x00, (u32)&%sCollisionHeader0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - zRoom->GetName().c_str(), segmentOffset); + delete collisionHeader; } -string SetCollisionHeader::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +std::string SetCollisionHeader::GetBodySourceCode() const { - return ""; + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_COL_HEADER(%s)", listName.c_str()); } -string SetCollisionHeader::GetCommandCName() +std::string SetCollisionHeader::GetCommandCName() const { return "SCmdColHeader"; } -string SetCollisionHeader::GenerateExterns() -{ - return ""; -} - -RoomCommand SetCollisionHeader::GetRoomCommand() +RoomCommand SetCollisionHeader::GetRoomCommand() const { return RoomCommand::SetCollisionHeader; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCollisionHeader.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCollisionHeader.h index d1ada1d26b..7ea15eff8a 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCollisionHeader.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCollisionHeader.h @@ -1,20 +1,21 @@ #pragma once -#include "../../ZCollision.h" -#include "../ZRoomCommand.h" +#include "ZCollision.h" +#include "ZRoom/ZRoomCommand.h" class SetCollisionHeader : public ZRoomCommand { public: - SetCollisionHeader(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetCollisionHeader(ZFile* nParent); + ~SetCollisionHeader(); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; private: ZCollisionHeader* collisionHeader; - uint32_t segmentOffset; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.cpp index b7bed8aa75..02e2e61784 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.cpp @@ -1,87 +1,64 @@ #include "SetCsCamera.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -SetCsCamera::SetCsCamera(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetCsCamera::SetCsCamera(ZFile* nParent) : ZRoomCommand(nParent) { - _rawData = rawData; - _rawDataIndex = rawDataIndex; +} - segmentOffset = 0; - - int32_t numCameras = rawData[rawDataIndex + 1]; - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); +void SetCsCamera::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + int numCameras = cmdArg1; uint32_t currentPtr = segmentOffset; int32_t numPoints = 0; for (int32_t i = 0; i < numCameras; i++) { - CsCameraEntry* entry = new CsCameraEntry(_rawData, currentPtr); + CsCameraEntry entry(parent->GetRawData(), currentPtr); + numPoints += entry.GetNumPoints(); + currentPtr += entry.GetRawDataSize(); cameras.push_back(entry); - numPoints += entry->numPoints; - - currentPtr += 8; } if (numPoints > 0) { - uint32_t currentPtr = cameras[0]->segmentOffset; + uint32_t currentPtr = cameras.at(0).GetSegmentOffset(); for (int32_t i = 0; i < numPoints; i++) { - int16_t x = BitConverter::ToInt16BE(rawData, currentPtr + 0); - int16_t y = BitConverter::ToInt16BE(rawData, currentPtr + 2); - int16_t z = BitConverter::ToInt16BE(rawData, currentPtr + 4); - Vec3s p = {x, y, z}; - points.push_back(p); - currentPtr += 6; + ZVector vec(parent); + vec.SetRawData(parent->GetRawData()); + vec.SetRawDataIndex(currentPtr); + vec.SetScalarType(ZScalarType::ZSCALAR_S16); + vec.SetDimensions(3); + vec.ParseRawData(); + + currentPtr += vec.GetRawDataSize(); + points.push_back(vec); } } if (segmentOffset != 0) - zRoom->parent->AddDeclarationPlaceholder(segmentOffset); + parent->AddDeclarationPlaceholder(segmentOffset); } -SetCsCamera::~SetCsCamera() +void SetCsCamera::DeclareReferences(const std::string& prefix) { - for (CsCameraEntry* entry : cameras) - delete entry; -} - -string SetCsCamera::GetSourceOutputCode(std::string prefix) -{ - return ""; -} - -string SetCsCamera::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - return ""; -} - -string SetCsCamera::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - string sourceOutput = ""; - - sourceOutput += - StringHelper::Sprintf("%s %i, (u32)&%sCsCameraList0x%06X };", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - cameras.size(), roomName.c_str(), segmentOffset); - if (points.size() > 0) { - string declaration = ""; + std::string declaration = ""; size_t index = 0; - for (Vec3s point : points) + for (auto& point : points) { - declaration += StringHelper::Sprintf(" { %i, %i, %i }, //0x%06X", point.x, point.y, - point.z, cameras[0]->segmentOffset + (index * 6)); + declaration += + StringHelper::Sprintf("\t%s, //0x%06X", point.GetBodySourceCode().c_str(), + cameras.at(0).segmentOffset + (index * 6)); if (index < points.size() - 1) declaration += "\n"; @@ -89,65 +66,97 @@ string SetCsCamera::GenerateSourceCodePass2(string roomName, uint32_t baseAddres index++; } - zRoom->parent->AddDeclarationArray(cameras[0]->segmentOffset, DeclarationAlignment::None, - DeclarationPadding::None, points.size() * 6, "Vec3s", - StringHelper::Sprintf("%sCsCameraPoints0x%06X", - roomName.c_str(), - cameras[0]->segmentOffset), - points.size(), declaration); + uint32_t segOffset = cameras.at(0).GetSegmentOffset(); + + parent->AddDeclarationArray( + segOffset, DeclarationAlignment::Align4, points.size() * points.at(0).GetRawDataSize(), + points.at(0).GetSourceTypeName().c_str(), + StringHelper::Sprintf("%sCsCameraPoints_%06X", prefix.c_str(), segOffset), + points.size(), declaration); } + if (!cameras.empty()) { - string declaration = ""; + std::string camPointsName = parent->GetDeclarationName(cameras.at(0).GetSegmentOffset()); + std::string declaration = ""; size_t index = 0; size_t pointsIndex = 0; - for (CsCameraEntry* entry : cameras) + for (const auto& entry : cameras) { - declaration += StringHelper::Sprintf(" %i, %i, (u32)&%sCsCameraPoints0x%06X[%i],", - entry->type, entry->numPoints, roomName.c_str(), - cameras[0]->segmentOffset, pointsIndex); + declaration += + StringHelper::Sprintf("\t{ %i, %i, &%s[%i] },", entry.type, entry.numPoints, + camPointsName.c_str(), pointsIndex); if (index < cameras.size() - 1) declaration += "\n"; index++; - pointsIndex += entry->numPoints; + pointsIndex += entry.GetNumPoints(); } - zRoom->parent->AddDeclarationArray( + const auto& entry = cameras.front(); + std::string camTypename = entry.GetSourceTypeName(); + + parent->AddDeclarationArray( segmentOffset, DeclarationAlignment::Align4, DeclarationPadding::Pad16, - cameras.size() * 8, "CsCameraEntry", - StringHelper::Sprintf("%sCsCameraList0x%06X", roomName.c_str(), segmentOffset), + cameras.size() * entry.GetRawDataSize(), camTypename, + StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), camTypename.c_str(), segmentOffset), cameras.size(), declaration); } - - return sourceOutput; } -size_t SetCsCamera::GetRawDataSize() +std::string SetCsCamera::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_ACTOR_CUTSCENE_CAM_LIST(%i, %s)", cameras.size(), + listName.c_str()); +} + +size_t SetCsCamera::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (cameras.size() * 8) + (points.size() * 6); } -string SetCsCamera::GenerateExterns() -{ - return ""; -} - -string SetCsCamera::GetCommandCName() +std::string SetCsCamera::GetCommandCName() const { return "SCmdCsCameraList"; } -RoomCommand SetCsCamera::GetRoomCommand() +RoomCommand SetCsCamera::GetRoomCommand() const { return RoomCommand::SetCsCamera; } -CsCameraEntry::CsCameraEntry(std::vector rawData, uint32_t rawDataIndex) +CsCameraEntry::CsCameraEntry(const std::vector& rawData, uint32_t rawDataIndex) : baseOffset(rawDataIndex), type(BitConverter::ToInt16BE(rawData, rawDataIndex + 0)), - numPoints(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)), - segmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4))) + numPoints(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)) { + camAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); + segmentOffset = GETSEGOFFSET(camAddress); +} + +std::string CsCameraEntry::GetSourceTypeName() const +{ + return "CsCameraEntry"; +} + +int32_t CsCameraEntry::GetRawDataSize() const +{ + return 8; +} + +int16_t CsCameraEntry::GetNumPoints() const +{ + return numPoints; +} + +segptr_t CsCameraEntry::GetCamAddress() const +{ + return camAddress; +} + +uint32_t CsCameraEntry::GetSegmentOffset() const +{ + return segmentOffset; } diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.h index 674309ae54..e62b073902 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCsCamera.h @@ -1,37 +1,42 @@ #pragma once -#include "../../Vec3s.h" -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" +#include "ZVector.h" class CsCameraEntry { public: - CsCameraEntry(std::vector rawData, uint32_t rawDataIndex); + CsCameraEntry(const std::vector& rawData, uint32_t rawDataIndex); - int32_t baseOffset; - int32_t type; - int32_t numPoints; + std::string GetSourceTypeName() const; + int32_t GetRawDataSize() const; + + int16_t GetNumPoints() const; + segptr_t GetCamAddress() const; + uint32_t GetSegmentOffset() const; + + int baseOffset; + int16_t type; + int16_t numPoints; + segptr_t camAddress; uint32_t segmentOffset; }; class SetCsCamera : public ZRoomCommand { public: - SetCsCamera(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetCsCamera(); + SetCsCamera(ZFile* nParent); - std::string GetSourceOutputCode(std::string prefix); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - virtual RoomCommand GetRoomCommand() override; - virtual size_t GetRawDataSize() override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; private: - uint32_t segmentOffset; - std::vector cameras; - std::vector points; - std::vector _rawData; - int32_t _rawDataIndex; + std::vector cameras; + std::vector points; }; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.cpp index b342e86cd1..8007ac0ab9 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.cpp @@ -1,26 +1,27 @@ #include "SetCutscenes.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -SetCutscenes::SetCutscenes(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetCutscenes::SetCutscenes(ZFile* nParent) : ZRoomCommand(nParent) { - numCutscenes = rawData[rawDataIndex + 1]; - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); +} - string output = ""; +void SetCutscenes::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + std::string output = ""; + numCutscenes = cmdArg1; if (Globals::Instance->game == ZGame::OOT_RETAIL || Globals::Instance->game == ZGame::OOT_SW97) { - ZCutscene* cutscene = new ZCutscene(nZRoom->parent); - cutscene->ExtractFromFile(rawData, segmentOffset, ""); + ZCutscene* cutscene = new ZCutscene(parent); + cutscene->ExtractFromFile(parent->GetRawData(), segmentOffset); - auto decl = nZRoom->parent->GetDeclaration(segmentOffset); + auto decl = parent->GetDeclaration(segmentOffset); if (decl == nullptr) { cutscene->DeclareVar(zRoom->GetName().c_str(), ""); @@ -31,41 +32,38 @@ SetCutscenes::SetCutscenes(ZRoom* nZRoom, std::vector rawData, uint32_t else { int32_t currentPtr = segmentOffset; - string declaration = ""; + std::string declaration = ""; for (uint8_t i = 0; i < numCutscenes; i++) { - CutsceneEntry* entry = new CutsceneEntry(rawData, currentPtr); + CutsceneEntry entry(parent->GetRawData(), currentPtr); cutsceneEntries.push_back(entry); currentPtr += 8; declaration += StringHelper::Sprintf( " { %sCutsceneData0x%06X, 0x%04X, 0x%02X, 0x%02X },", zRoom->GetName().c_str(), - entry->segmentOffset, entry->exit, entry->entrance, entry->flag); + entry.segmentOffset, entry.exit, entry.entrance, entry.flag); if (i < numCutscenes - 1) declaration += "\n"; - ZCutsceneMM* cutscene = new ZCutsceneMM(nZRoom->parent); - cutscene->ExtractFromXML( - nullptr, rawData, entry->segmentOffset, - ""); // TODO: Use ExtractFromFile() here when that gets implemented + ZCutsceneMM* cutscene = new ZCutsceneMM(parent); + cutscene->ExtractFromFile(parent->GetRawData(), entry.segmentOffset); cutscenes.push_back(cutscene); } - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, DeclarationPadding::None, - cutsceneEntries.size() * 8, "CutsceneEntry", - StringHelper::Sprintf("%sCutsceneEntryList0x%06X", zRoom->GetName().c_str(), - segmentOffset), - cutsceneEntries.size(), declaration); + parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::Align4, + cutsceneEntries.size() * 8, "CutsceneEntry", + StringHelper::Sprintf("%sCutsceneEntryList_%06X", + zRoom->GetName().c_str(), segmentOffset), + cutsceneEntries.size(), declaration); } for (ZCutsceneBase* cutscene : cutscenes) { if (cutscene->getSegmentOffset() != 0) { - Declaration* decl = zRoom->parent->GetDeclaration(cutscene->getSegmentOffset()); + Declaration* decl = parent->GetDeclaration(cutscene->getSegmentOffset()); if (decl == nullptr) { cutscene->GetSourceOutputCode(zRoom->GetName()); @@ -82,63 +80,35 @@ SetCutscenes::~SetCutscenes() { for (ZCutsceneBase* cutscene : cutscenes) delete cutscene; - - for (CutsceneEntry* entry : cutsceneEntries) - delete entry; } -string SetCutscenes::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetCutscenes::GetBodySourceCode() const { - string pass1 = ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress); - Declaration* decl = zRoom->parent->GetDeclaration(segmentOffset); - if (decl != nullptr) - { - return StringHelper::Sprintf("%s %i, (u32)%s", pass1.c_str(), numCutscenes, - decl->varName.c_str()); - } - return StringHelper::Sprintf("%s %i, (u32)%sCutsceneData0x%06X", pass1.c_str(), numCutscenes, - zRoom->GetName().c_str(), segmentOffset); -} + std::string listName = parent->GetDeclarationPtrName(cmdArg2); -size_t SetCutscenes::GetRawDataSize() -{ - return ZRoomCommand::GetRawDataSize() + (0); -} - -string SetCutscenes::GenerateExterns() -{ if (Globals::Instance->game == ZGame::MM_RETAIL) - { - return StringHelper::Sprintf("extern CutsceneEntry %sCutsceneEntryList0x%06X[];\n", - zRoom->GetName().c_str(), segmentOffset); - } - - Declaration* decl = zRoom->parent->GetDeclaration(segmentOffset); - if (decl != nullptr && decl->varName != "") - { - return StringHelper::Sprintf("extern s32 %s[];\n", decl->varName.c_str()); - } - return StringHelper::Sprintf("extern s32 %sCutsceneData0x%06X[];\n", zRoom->GetName().c_str(), - segmentOffset); + return StringHelper::Sprintf("SCENE_CMD_CUTSCENE_LIST(%i, %s)", numCutscenes, + listName.c_str()); + return StringHelper::Sprintf("SCENE_CMD_CUTSCENE_DATA(%s)", listName.c_str()); } -string SetCutscenes::GetCommandCName() +size_t SetCutscenes::GetRawDataSize() const +{ + return ZRoomCommand::GetRawDataSize(); +} + +std::string SetCutscenes::GetCommandCName() const { return "SCmdCutsceneData"; } -RoomCommand SetCutscenes::GetRoomCommand() +RoomCommand SetCutscenes::GetRoomCommand() const { return RoomCommand::SetCutscenes; } -string SetCutscenes::GetSourceOutputCode(std::string prefix) -{ - return ""; -} - -CutsceneEntry::CutsceneEntry(std::vector rawData, uint32_t rawDataIndex) - : segmentOffset(BitConverter::ToInt32BE(rawData, rawDataIndex + 0) & 0x00FFFFFF), +CutsceneEntry::CutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex) + : segmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 0))), exit(BitConverter::ToInt16BE(rawData, rawDataIndex + 4)), entrance(rawData[rawDataIndex + 6]), flag(rawData[rawDataIndex + 7]) { diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.h index 6930636d28..0d1def29a1 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetCutscenes.h @@ -1,13 +1,13 @@ #pragma once -#include "../../ZCutscene.h" -#include "../../ZCutsceneMM.h" -#include "../ZRoomCommand.h" +#include "ZCutscene.h" +#include "ZCutsceneMM.h" +#include "ZRoom/ZRoomCommand.h" class CutsceneEntry { public: - CutsceneEntry(std::vector rawData, uint32_t rawDataIndex); + CutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex); uint32_t segmentOffset; uint16_t exit; @@ -18,21 +18,19 @@ public: class SetCutscenes : public ZRoomCommand { public: - SetCutscenes(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetCutscenes(ZFile* nParent); ~SetCutscenes(); - std::string GetSourceOutputCode(std::string prefix); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual RoomCommand GetRoomCommand() override; - virtual size_t GetRawDataSize() override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; private: std::vector cutscenes; - std::vector cutsceneEntries; // (MM Only) - uint32_t segmentOffset; - uint8_t numCutscenes; // (MM Only) - std::vector _rawData; - int32_t _rawDataIndex; -}; \ No newline at end of file + std::vector cutsceneEntries; // (MM Only) + uint8_t numCutscenes; // (MM Only) +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetEchoSettings.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetEchoSettings.cpp index 24f383e108..275dc632db 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetEchoSettings.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetEchoSettings.cpp @@ -1,27 +1,27 @@ #include "SetEchoSettings.h" -#include "../../StringHelper.h" +#include "StringHelper.h" -using namespace std; - -SetEchoSettings::SetEchoSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetEchoSettings::SetEchoSettings(ZFile* nParent) : ZRoomCommand(nParent) { - echo = rawData[rawDataIndex + 0x07]; } -string SetEchoSettings::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetEchoSettings::ParseRawData() { - return StringHelper::Sprintf( - "%s 0, { 0 }, 0x%02X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - echo); + ZRoomCommand::ParseRawData(); + echo = parent->GetRawData().at(rawDataIndex + 0x07); } -string SetEchoSettings::GetCommandCName() +std::string SetEchoSettings::GetBodySourceCode() const +{ + return StringHelper::Sprintf("SCENE_CMD_ECHO_SETTINGS(%i)", echo); +} + +std::string SetEchoSettings::GetCommandCName() const { return "SCmdEchoSettings"; } -RoomCommand SetEchoSettings::GetRoomCommand() +RoomCommand SetEchoSettings::GetRoomCommand() const { return RoomCommand::SetEchoSettings; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetEchoSettings.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetEchoSettings.h index f3481025b7..59632631b4 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetEchoSettings.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetEchoSettings.h @@ -1,16 +1,19 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetEchoSettings : public ZRoomCommand { public: - SetEchoSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetEchoSettings(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; private: uint8_t echo; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetEntranceList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetEntranceList.cpp index e4b37912d6..4ba73a2e80 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetEntranceList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetEntranceList.cpp @@ -1,86 +1,83 @@ #include "SetEntranceList.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" +#include "BitConverter.h" #include "SetStartPositionList.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -using namespace std; - -SetEntranceList::SetEntranceList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetEntranceList::SetEntranceList(ZFile* nParent) : ZRoomCommand(nParent) { - segmentOffset = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF; - entrances = vector(); - - _rawData = rawData; - _rawDataIndex = rawDataIndex; } -SetEntranceList::~SetEntranceList() +void SetEntranceList::DeclareReferences(const std::string& prefix) { - for (EntranceEntry* entry : entrances) - delete entry; + if (segmentOffset != 0) + parent->AddDeclarationPlaceholder(segmentOffset); } -string SetEntranceList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetEntranceList::ParseRawDataLate() { - string sourceOutput = - StringHelper::Sprintf("%s 0x00, (u32)&%sEntranceList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - zRoom->GetName().c_str(), segmentOffset); - // Parse Entrances and Generate Declaration - zRoom->parent->AddDeclarationPlaceholder(segmentOffset); // Make sure this segment is defined - int32_t numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; + int numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; uint32_t currentPtr = segmentOffset; for (int32_t i = 0; i < numEntrances; i++) { - EntranceEntry* entry = new EntranceEntry(_rawData, currentPtr); + EntranceEntry entry(parent->GetRawData(), currentPtr); entrances.push_back(entry); currentPtr += 2; } - - string declaration = ""; - - int32_t index = 0; - - for (EntranceEntry* entry : entrances) - { - declaration += - StringHelper::Sprintf(" { 0x%02X, 0x%02X }, //0x%06X \n", entry->startPositionIndex, - entry->roomToLoad, segmentOffset + (index * 2)); - index++; - } - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, entrances.size() * 2, "EntranceEntry", - StringHelper::Sprintf("%sEntranceList0x%06X", zRoom->GetName().c_str(), segmentOffset), - entrances.size(), declaration); - - return sourceOutput; } -string SetEntranceList::GenerateExterns() +void SetEntranceList::DeclareReferencesLate(const std::string& prefix) { - return StringHelper::Sprintf("extern EntranceEntry %sEntranceList0x%06X[];\n", - zRoom->GetName().c_str(), segmentOffset); + if (!entrances.empty()) + { + std::string declaration = ""; + + size_t index = 0; + for (const auto& entry : entrances) + { + declaration += + StringHelper::Sprintf(" { %s }, //0x%06X", entry.GetBodySourceCode().c_str(), + segmentOffset + (index * 2)); + if (index + 1 < entrances.size()) + declaration += "\n"; + + index++; + } + + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::None, entrances.size() * 2, "EntranceEntry", + StringHelper::Sprintf("%sEntranceList0x%06X", zRoom->GetName().c_str(), segmentOffset), + entrances.size(), declaration); + } } -string SetEntranceList::GetCommandCName() +std::string SetEntranceList::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_ENTRANCE_LIST(%s)", listName.c_str()); +} + +std::string SetEntranceList::GetCommandCName() const { return "SCmdEntranceList"; } -RoomCommand SetEntranceList::GetRoomCommand() +RoomCommand SetEntranceList::GetRoomCommand() const { return RoomCommand::SetEntranceList; } -EntranceEntry::EntranceEntry(std::vector rawData, uint32_t rawDataIndex) +EntranceEntry::EntranceEntry(const std::vector& rawData, uint32_t rawDataIndex) { - startPositionIndex = rawData[rawDataIndex + 0]; - roomToLoad = rawData[rawDataIndex + 1]; -} \ No newline at end of file + startPositionIndex = rawData.at(rawDataIndex + 0); + roomToLoad = rawData.at(rawDataIndex + 1); +} + +std::string EntranceEntry::GetBodySourceCode() const +{ + return StringHelper::Sprintf("0x%02X, 0x%02X", startPositionIndex, roomToLoad); +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetEntranceList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetEntranceList.h index b3c61ca8c8..5e76f9f6c9 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetEntranceList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetEntranceList.h @@ -1,30 +1,33 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class EntranceEntry { public: + EntranceEntry(const std::vector& rawData, uint32_t rawDataIndex); + + std::string GetBodySourceCode() const; + +protected: uint8_t startPositionIndex; uint8_t roomToLoad; - - EntranceEntry(std::vector rawData, uint32_t rawDataIndex); }; class SetEntranceList : public ZRoomCommand { public: - SetEntranceList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetEntranceList(); + SetEntranceList(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateExterns() override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void DeclareReferences(const std::string& prefix) override; + void ParseRawDataLate() override; + void DeclareReferencesLate(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: - std::vector entrances; - uint32_t segmentOffset; - std::vector _rawData; - int32_t _rawDataIndex; -}; \ No newline at end of file + std::vector entrances; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.cpp index 89512dd896..5bfd19a578 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.cpp @@ -1,71 +1,67 @@ #include "SetExitList.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -SetExitList::SetExitList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetExitList::SetExitList(ZFile* nParent) : ZRoomCommand(nParent) { - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - exits = vector(); - - if (segmentOffset != 0) - zRoom->parent->AddDeclarationPlaceholder(segmentOffset); - - _rawData = rawData; - _rawDataIndex = rawDataIndex; } -string SetExitList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetExitList::DeclareReferences(const std::string& prefix) { - string sourceOutput = - StringHelper::Sprintf("%s 0x00, (u32)&%sExitList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - zRoom->GetName().c_str(), segmentOffset); + if (segmentOffset != 0) + parent->AddDeclarationPlaceholder(segmentOffset); +} +void SetExitList::ParseRawDataLate() +{ // Parse Entrances and Generate Declaration - zRoom->parent->AddDeclarationPlaceholder(segmentOffset); // Make sure this segment is defined - int32_t numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; + int numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; uint32_t currentPtr = segmentOffset; for (int32_t i = 0; i < numEntrances; i++) { - uint16_t exit = BitConverter::ToInt16BE(_rawData, currentPtr); + uint16_t exit = BitConverter::ToUInt16BE(parent->GetRawData(), currentPtr); exits.push_back(exit); currentPtr += 2; } - - string declaration = ""; - - for (uint16_t exit : exits) - declaration += StringHelper::Sprintf(" 0x%04X,\n", exit); - ; - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, exits.size() * 2, "u16", - StringHelper::Sprintf("%sExitList0x%06X", zRoom->GetName().c_str(), segmentOffset), - exits.size(), declaration); - - return sourceOutput; } -string SetExitList::GenerateExterns() +void SetExitList::DeclareReferencesLate(const std::string& prefix) { - return StringHelper::Sprintf("extern u16 %sExitList0x%06X[];\n", zRoom->GetName().c_str(), - segmentOffset); - ; + if (!exits.empty()) + { + std::string declaration = ""; + + for (size_t i = 0; i < exits.size(); i++) + { + declaration += StringHelper::Sprintf(" 0x%04X,", exits.at(i)); + if (i + 1 < exits.size()) + declaration += "\n"; + } + + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::Align4, exits.size() * 2, "u16", + StringHelper::Sprintf("%sExitList_%06X", zRoom->GetName().c_str(), segmentOffset), + exits.size(), declaration); + } } -string SetExitList::GetCommandCName() +std::string SetExitList::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_EXIT_LIST(%s)", listName.c_str()); +} + +std::string SetExitList::GetCommandCName() const { return "SCmdExitList"; } -RoomCommand SetExitList::GetRoomCommand() +RoomCommand SetExitList::GetRoomCommand() const { return RoomCommand::SetExitList; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.h index ea9277363c..8d220b1cd1 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetExitList.h @@ -1,20 +1,21 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetExitList : public ZRoomCommand { public: - SetExitList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetExitList(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateExterns() override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void DeclareReferences(const std::string& prefix) override; + void ParseRawDataLate() override; + void DeclareReferencesLate(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: std::vector exits; - uint32_t segmentOffset; - std::vector _rawData; - int32_t _rawDataIndex; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.cpp index 5966c38207..a12832c0a3 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.cpp @@ -1,69 +1,94 @@ #include "SetLightList.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" +#include "BitConverter.h" +#include "StringHelper.h" -using namespace std; - -SetLightList::SetLightList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetLightList::SetLightList(ZFile* nParent) : ZRoomCommand(nParent) { - this->ptrRoom = nZRoom; - this->numLights = rawData[rawDataIndex + 1]; - this->segment = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF; +} - // std::string declarations = StringHelper::Sprintf("LightInfo %sLightInfo0x%06X[] =\n{\n", - // this->ptrRoom->GetName().c_str(), this->segment); - string declarations = ""; +void SetLightList::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + std::string declarations = ""; - int32_t currentPtr = this->segment; - for (int32_t i = 0; i < this->numLights; i++) + numLights = cmdArg1; + int32_t currentPtr = segmentOffset; + for (int i = 0; i < this->numLights; i++) { - uint8_t type = rawData[currentPtr + 0]; - int16_t x = BitConverter::ToInt16BE(rawData, currentPtr + 2); - int16_t y = BitConverter::ToInt16BE(rawData, currentPtr + 4); - int16_t z = BitConverter::ToInt16BE(rawData, currentPtr + 6); - uint8_t r = rawData[currentPtr + 8]; - uint8_t g = rawData[currentPtr + 9]; - uint8_t b = rawData[currentPtr + 10]; - uint8_t drawGlow = rawData[currentPtr + 11]; - int16_t radius = BitConverter::ToInt16BE(rawData, currentPtr + 12); + LightInfo light(parent->GetRawData(), currentPtr); - currentPtr += 14; - - declarations += StringHelper::Sprintf( - " { 0x%02X, { %i, %i, %i, { 0x%02X, 0x%02X, 0x%02X }, 0x%02X, 0x%04X } },", type, x, - y, z, r, g, b, drawGlow, radius); - - if (i < this->numLights - 1) - declarations += "\n"; + currentPtr += light.GetRawDataSize(); + lights.push_back(light); } - - this->ptrRoom->parent->AddDeclarationArray( - this->segment, DeclarationAlignment::None, this->numLights * 0xE, "LightInfo", - StringHelper::Sprintf("%sLightInfo0x%06X", this->ptrRoom->GetName().c_str(), this->segment), - this->numLights, declarations); } -string SetLightList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetLightList::DeclareReferences(const std::string& prefix) { - return StringHelper::Sprintf( - "%s %i, &%sLightInfo0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), this->numLights, - this->ptrRoom->GetName().c_str(), this->segment); + if (!lights.empty()) + { + std::string declarations = ""; + + for (size_t i = 0; i < lights.size(); i++) + { + declarations += + StringHelper::Sprintf("\t{ %s },", lights.at(i).GetBodySourceCode().c_str()); + + if (i < lights.size() - 1) + declarations += "\n"; + } + + const auto& light = lights.front(); + + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::None, lights.size() * light.GetRawDataSize(), + light.GetSourceTypeName(), + StringHelper::Sprintf("%sLightInfo0x%06X", prefix.c_str(), segmentOffset), + lights.size(), declarations); + } } -string SetLightList::GetCommandCName() +std::string SetLightList::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_LIGHT_LIST(%i, %s)", numLights, listName.c_str()); +} + +std::string SetLightList::GetCommandCName() const { return "SCmdLightList"; } -string SetLightList::GenerateExterns() -{ - return StringHelper::Sprintf("extern LightInfo %sLightInfo0x%06X[];\n", - this->ptrRoom->GetName().c_str(), this->segment); -} - -RoomCommand SetLightList::GetRoomCommand() +RoomCommand SetLightList::GetRoomCommand() const { return RoomCommand::SetLightList; -} \ No newline at end of file +} + +LightInfo::LightInfo(const std::vector& rawData, uint32_t rawDataIndex) +{ + type = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0); + x = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); + y = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); + z = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); + r = BitConverter::ToUInt8BE(rawData, rawDataIndex + 8); + g = BitConverter::ToUInt8BE(rawData, rawDataIndex + 9); + b = BitConverter::ToUInt8BE(rawData, rawDataIndex + 10); + drawGlow = BitConverter::ToUInt8BE(rawData, rawDataIndex + 11); + radius = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); +} + +std::string LightInfo::GetBodySourceCode() const +{ + return StringHelper::Sprintf( + "0x%02X, { %i, %i, %i, { 0x%02X, 0x%02X, 0x%02X }, 0x%02X, 0x%04X }", type, x, y, z, r, g, + b, drawGlow, radius); +} + +std::string LightInfo::GetSourceTypeName() const +{ + return "LightInfo"; +} + +size_t LightInfo::GetRawDataSize() const +{ + return 0x0E; +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.h index 13d5e8cecf..389ffef0f9 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightList.h @@ -2,23 +2,42 @@ #include -#include "../ZRoom.h" -#include "../ZRoomCommand.h" #include "ZFile.h" +#include "ZRoom/ZRoom.h" +#include "ZRoom/ZRoomCommand.h" + +class LightInfo +{ +public: + LightInfo(const std::vector& rawData, uint32_t rawDataIndex); + + std::string GetBodySourceCode() const; + + std::string GetSourceTypeName() const; + size_t GetRawDataSize() const; + +protected: + uint8_t type; + int16_t x, y, z; + uint8_t r, g, b; + uint8_t drawGlow; + int16_t radius; +}; class SetLightList : public ZRoomCommand { public: - SetLightList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetLightList(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; - virtual std::string GenerateExterns() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: uint8_t numLights; - uint32_t segment; - - ZRoom* ptrRoom; -}; \ No newline at end of file + std::vector lights; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightingSettings.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightingSettings.cpp index de9448dac0..e677738f5c 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightingSettings.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightingSettings.cpp @@ -1,113 +1,103 @@ #include "SetLightingSettings.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" +#include "BitConverter.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -using namespace std; - -SetLightingSettings::SetLightingSettings(ZRoom* nZRoom, std::vector rawData, - uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetLightingSettings::SetLightingSettings(ZFile* nParent) : ZRoomCommand(nParent) { - uint8_t numLights = rawData[rawDataIndex + 1]; - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); +} - for (int32_t i = 0; i < numLights; i++) - settings.push_back(new LightingSettings(rawData, segmentOffset + (i * 22))); +void SetLightingSettings::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + uint8_t numLights = cmdArg1; - if (numLights > 0) + for (int i = 0; i < numLights; i++) + settings.push_back(LightingSettings(parent->GetRawData(), segmentOffset + (i * 22))); +} + +void SetLightingSettings::DeclareReferences(const std::string& prefix) +{ + if (settings.size() > 0) { - string declaration = ""; + std::string declaration = ""; - for (int32_t i = 0; i < numLights; i++) + for (size_t i = 0; i < settings.size(); i++) { - declaration += StringHelper::Sprintf( - "\t{ 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, " - "0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%04X, " - "0x%04X }, // 0x%06X", - settings[i]->ambientClrR, settings[i]->ambientClrG, settings[i]->ambientClrB, - settings[i]->diffuseClrA_R, settings[i]->diffuseClrA_G, settings[i]->diffuseClrA_B, - settings[i]->diffuseDirA_X, settings[i]->diffuseDirA_Y, settings[i]->diffuseDirA_Z, - settings[i]->diffuseClrB_R, settings[i]->diffuseClrB_G, settings[i]->diffuseClrB_B, - settings[i]->diffuseDirB_X, settings[i]->diffuseDirB_Y, settings[i]->diffuseDirB_Z, - settings[i]->fogClrR, settings[i]->fogClrG, settings[i]->fogClrB, settings[i]->unk, - settings[i]->drawDistance, segmentOffset + (i * 22)); - if (i + 1 < numLights) + declaration += StringHelper::Sprintf("\t{ %s }, // 0x%06X", + settings.at(i).GetBodySourceCode().c_str(), + segmentOffset + (i * 22)); + if (i + 1 < settings.size()) declaration += "\n"; } - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, DeclarationPadding::None, numLights * 22, - "LightSettings", - StringHelper::Sprintf("%sLightSettings_%06X", zRoom->GetName().c_str(), segmentOffset), - numLights, declaration); + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::Align4, + settings.size() * settings.front().GetRawDataSize(), "LightSettings", + StringHelper::Sprintf("%sLightSettings0x%06X", prefix.c_str(), segmentOffset), + settings.size(), declaration); } } -SetLightingSettings::~SetLightingSettings() +std::string SetLightingSettings::GetBodySourceCode() const { - for (LightingSettings* setting : settings) - delete setting; + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_ENV_LIGHT_SETTINGS(%i, %s)", settings.size(), + listName.c_str()); } -string SetLightingSettings::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - return StringHelper::Sprintf( - "%s %i, (u32)&%sLightSettings_%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), settings.size(), - zRoom->GetName().c_str(), segmentOffset); -} - -string SetLightingSettings::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - return ""; -} - -string SetLightingSettings::GetCommandCName() +std::string SetLightingSettings::GetCommandCName() const { return "SCmdLightSettingList"; } -string SetLightingSettings::GenerateExterns() -{ - return StringHelper::Sprintf("extern LightSettings %sLightSettings_%06X[];\n", - zRoom->GetName().c_str(), segmentOffset); -} - -RoomCommand SetLightingSettings::GetRoomCommand() +RoomCommand SetLightingSettings::GetRoomCommand() const { return RoomCommand::SetLightingSettings; } -LightingSettings::LightingSettings(vector rawData, uint32_t rawDataIndex) +LightingSettings::LightingSettings(const std::vector& rawData, uint32_t rawDataIndex) { - const uint8_t* data = rawData.data(); + ambientClrR = rawData.at(rawDataIndex + 0); + ambientClrG = rawData.at(rawDataIndex + 1); + ambientClrB = rawData.at(rawDataIndex + 2); - ambientClrR = data[rawDataIndex + 0]; - ambientClrG = data[rawDataIndex + 1]; - ambientClrB = data[rawDataIndex + 2]; + diffuseClrA_R = rawData.at(rawDataIndex + 3); + diffuseClrA_G = rawData.at(rawDataIndex + 4); + diffuseClrA_B = rawData.at(rawDataIndex + 5); - diffuseClrA_R = data[rawDataIndex + 3]; - diffuseClrA_G = data[rawDataIndex + 4]; - diffuseClrA_B = data[rawDataIndex + 5]; + diffuseDirA_X = rawData.at(rawDataIndex + 6); + diffuseDirA_Y = rawData.at(rawDataIndex + 7); + diffuseDirA_Z = rawData.at(rawDataIndex + 8); - diffuseDirA_X = data[rawDataIndex + 6]; - diffuseDirA_Y = data[rawDataIndex + 7]; - diffuseDirA_Z = data[rawDataIndex + 8]; + diffuseClrB_R = rawData.at(rawDataIndex + 9); + diffuseClrB_G = rawData.at(rawDataIndex + 10); + diffuseClrB_B = rawData.at(rawDataIndex + 11); - diffuseClrB_R = data[rawDataIndex + 9]; - diffuseClrB_G = data[rawDataIndex + 10]; - diffuseClrB_B = data[rawDataIndex + 11]; + diffuseDirB_X = rawData.at(rawDataIndex + 12); + diffuseDirB_Y = rawData.at(rawDataIndex + 13); + diffuseDirB_Z = rawData.at(rawDataIndex + 14); - diffuseDirB_X = data[rawDataIndex + 12]; - diffuseDirB_Y = data[rawDataIndex + 13]; - diffuseDirB_Z = data[rawDataIndex + 14]; + fogClrR = rawData.at(rawDataIndex + 15); + fogClrG = rawData.at(rawDataIndex + 16); + fogClrB = rawData.at(rawDataIndex + 17); - fogClrR = data[rawDataIndex + 15]; - fogClrG = data[rawDataIndex + 16]; - fogClrB = data[rawDataIndex + 17]; - - unk = BitConverter::ToInt16BE(data, rawDataIndex + 18); - drawDistance = BitConverter::ToInt16BE(data, rawDataIndex + 20); + unk = BitConverter::ToInt16BE(rawData, rawDataIndex + 18); + drawDistance = BitConverter::ToInt16BE(rawData, rawDataIndex + 20); +} + +std::string LightingSettings::GetBodySourceCode() const +{ + return StringHelper::Sprintf( + "0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, " + "0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%04X, 0x%04X", + ambientClrR, ambientClrG, ambientClrB, diffuseClrA_R, diffuseClrA_G, diffuseClrA_B, + diffuseDirA_X, diffuseDirA_Y, diffuseDirA_Z, diffuseClrB_R, diffuseClrB_G, diffuseClrB_B, + diffuseDirB_X, diffuseDirB_Y, diffuseDirB_Z, fogClrR, fogClrG, fogClrB, unk, drawDistance); +} + +size_t LightingSettings::GetRawDataSize() const +{ + return 0x16; } diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightingSettings.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightingSettings.h index 889a34395d..7717957fa3 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightingSettings.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetLightingSettings.h @@ -1,10 +1,17 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class LightingSettings { public: + LightingSettings(const std::vector& rawData, uint32_t rawDataIndex); + + std::string GetBodySourceCode() const; + + size_t GetRawDataSize() const; + +protected: uint8_t ambientClrR, ambientClrG, ambientClrB; uint8_t diffuseClrA_R, diffuseClrA_G, diffuseClrA_B; uint8_t diffuseDirA_X, diffuseDirA_Y, diffuseDirA_Z; @@ -13,23 +20,21 @@ public: uint8_t fogClrR, fogClrG, fogClrB; uint16_t unk; uint16_t drawDistance; - - LightingSettings(std::vector rawData, uint32_t rawDataIndex); }; class SetLightingSettings : public ZRoomCommand { public: - SetLightingSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetLightingSettings(); + SetLightingSettings(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: - uint32_t segmentOffset; - std::vector settings; -}; \ No newline at end of file + std::vector settings; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.cpp index 62e1b1bc73..2635e7ff3b 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.cpp @@ -1,319 +1,114 @@ #include "SetMesh.h" #include #include -#include "../../BitConverter.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" +#include "BitConverter.h" +#include "StringHelper.h" #include "ZBackground.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -using namespace std; +void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList); -SetMesh::SetMesh(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex, - int32_t segAddressOffset) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetMesh::SetMesh(ZFile* nParent) : ZRoomCommand(nParent) { - data = rawData[rawDataIndex + 1]; - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - - string declaration = ""; - meshHeaderType = rawData[segmentOffset + 0]; - - if (meshHeaderType == 0) - { - uint32_t dListStart = Seg2Filespace(BitConverter::ToInt32BE(rawData, segmentOffset + 4), - zRoom->parent->baseAddress); - uint32_t dListEnd = Seg2Filespace(BitConverter::ToInt32BE(rawData, segmentOffset + 8), - zRoom->parent->baseAddress); - - int8_t numEntries = rawData[segmentOffset + 1]; - uint32_t currentPtr = dListStart; - - // Hack for Syotes - for (int32_t i = 0; i < abs(segAddressOffset); i++) - { - rawData.erase(rawData.begin()); - segmentOffset--; - } - - if (numEntries > 0) - { - std::string polyGfxBody = ""; - std::string polyGfxType = ""; - int32_t polyGfxSize = 0; - - for (int32_t i = 0; i < numEntries; i++) - { - PolygonDlist polyGfxList(zRoom->GetName(), rawData, currentPtr, zRoom->parent, - zRoom); - if (polyGfxList.opaDList != nullptr) - { - GenDListDeclarations(rawData, polyGfxList.opaDList); - } - if (polyGfxList.xluDList != nullptr) - { - GenDListDeclarations(rawData, polyGfxList.xluDList); - } - polyGfxBody += polyGfxList.GetBodySourceCode(true); - polyGfxType = polyGfxList.GetSourceTypeName(); - polyGfxSize = polyGfxList.GetRawDataSize(); - - currentPtr += polyGfxList.GetRawDataSize(); - } - - zRoom->parent->AddDeclarationArray( - dListStart, DeclarationAlignment::Align4, numEntries * polyGfxSize, polyGfxType, - StringHelper::Sprintf("%s%s0x%06X", zRoom->GetName().c_str(), polyGfxType.c_str(), - dListStart), - numEntries, polyGfxBody); - } - - declaration = "\n "; - declaration += StringHelper::Sprintf("{ 0 }, 0x%02X, ", numEntries); - declaration += "\n "; - - std::string entriesStr = "NULL"; - - if (dListStart != 0) - { - entriesStr = zRoom->parent->GetDeclaration(dListStart)->varName; - } - declaration += StringHelper::Sprintf("%s, ", entriesStr.c_str()); - declaration += "\n "; - - if (dListEnd != 0) - declaration += StringHelper::Sprintf("%s + ARRAY_COUNT(%s), ", entriesStr.c_str(), - entriesStr.c_str()); - else - declaration += "NULL, "; - declaration += "\n"; - - zRoom->parent->AddDeclaration( - segmentOffset, DeclarationAlignment::Align16, 12, "MeshHeader0", - StringHelper::Sprintf("%sMeshHeader0x%06X", zRoom->GetName().c_str(), segmentOffset), - declaration); - - zRoom->parent->AddDeclaration(dListStart + (numEntries * 8), DeclarationAlignment::None, - DeclarationPadding::Pad16, 4, "static s32", "terminatorMaybe", - "0x01000000"); - } - else if (meshHeaderType == 1) - { - PolygonType1 polygon1(zRoom->GetName().c_str(), rawData, segmentOffset, zRoom->parent, - zRoom); - if (polygon1.polyGfxList.opaDList != nullptr) - { - GenDListDeclarations(rawData, polygon1.polyGfxList.opaDList); - } - if (polygon1.polyGfxList.xluDList != nullptr) - { - GenDListDeclarations(rawData, polygon1.polyGfxList.xluDList); - } - polygon1.DeclareAndGenerateOutputCode(); - } - else if (meshHeaderType == 2) - { - MeshHeader2* meshHeader2 = new MeshHeader2(); - meshHeader2->headerType = 2; - - meshHeader2->entries = vector(); - meshHeader2->dListStart = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, segmentOffset + 4)); - meshHeader2->dListEnd = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, segmentOffset + 8)); - - int8_t numEntries = rawData[segmentOffset + 1]; - uint32_t currentPtr = meshHeader2->dListStart; - - for (int32_t i = 0; i < numEntries; i++) - { - MeshEntry2* entry = new MeshEntry2(); - entry->playerXMax = BitConverter::ToInt16BE(rawData, currentPtr + 0); - entry->playerZMax = BitConverter::ToInt16BE(rawData, currentPtr + 2); - entry->playerXMin = BitConverter::ToInt16BE(rawData, currentPtr + 4); - entry->playerZMin = BitConverter::ToInt16BE(rawData, currentPtr + 6); - - entry->opaqueDListAddr = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, currentPtr + 8)); - entry->translucentDListAddr = - GETSEGOFFSET(BitConverter::ToInt32BE(rawData, currentPtr + 12)); - - if (entry->opaqueDListAddr != 0) - { - entry->opaqueDList = new ZDisplayList( - rawData, entry->opaqueDListAddr, - ZDisplayList::GetDListLength(rawData, entry->opaqueDListAddr, - Globals::Instance->game == ZGame::OOT_SW97 ? - DListType::F3DEX : - DListType::F3DZEX), - zRoom->parent); - entry->opaqueDList->scene = zRoom->scene; - GenDListDeclarations(rawData, entry->opaqueDList); - } - - if (entry->translucentDListAddr != 0) - { - entry->translucentDList = new ZDisplayList( - rawData, entry->translucentDListAddr, - ZDisplayList::GetDListLength(rawData, entry->translucentDListAddr, - Globals::Instance->game == ZGame::OOT_SW97 ? - DListType::F3DEX : - DListType::F3DZEX), - zRoom->parent); - entry->translucentDList->scene = zRoom->scene; - GenDListDeclarations(rawData, entry->translucentDList); - } - - meshHeader2->entries.push_back(entry); - - currentPtr += 16; - } - - declaration += StringHelper::Sprintf("{ 2 }, 0x%02lX, ", meshHeader2->entries.size()); - - if (meshHeader2->dListStart != 0) - declaration += StringHelper::Sprintf("(u32)&%sMeshDListEntry0x%06X, ", - zRoom->GetName().c_str(), meshHeader2->dListStart); - else - declaration += "0, "; - - if (meshHeader2->dListEnd != 0) - declaration += StringHelper::Sprintf( - "(u32)&(%sMeshDListEntry0x%06X) + sizeof(%sMeshDListEntry0x%06X)", - zRoom->GetName().c_str(), meshHeader2->dListStart, zRoom->GetName().c_str(), - meshHeader2->dListStart); - else - declaration += "0"; - declaration += "\n"; - - zRoom->parent->AddDeclaration( - segmentOffset, DeclarationAlignment::None, 12, "MeshHeader2", - StringHelper::Sprintf("%sMeshHeader0x%06X", zRoom->GetName().c_str(), segmentOffset), - declaration); - - declaration = ""; - - for (size_t i = 0; i < meshHeader2->entries.size(); i++) - { - declaration += StringHelper::Sprintf( - " { %i, %i, %i, %i, ", meshHeader2->entries[i]->playerXMax, - meshHeader2->entries[i]->playerZMax, meshHeader2->entries[i]->playerXMin, - meshHeader2->entries[i]->playerZMin); - - if (meshHeader2->entries[i]->opaqueDListAddr != 0) - declaration += StringHelper::Sprintf("(u32)%sDL_%06X, ", zRoom->GetName().c_str(), - meshHeader2->entries[i]->opaqueDListAddr); - else - declaration += "0, "; - - if (meshHeader2->entries[i]->translucentDListAddr != 0) - declaration += - StringHelper::Sprintf("(u32)%sDL_%06X },\n", zRoom->GetName().c_str(), - meshHeader2->entries[i]->translucentDListAddr); - else - declaration += "0 },\n"; - } - - zRoom->parent->AddDeclarationArray( - meshHeader2->dListStart, DeclarationAlignment::None, DeclarationPadding::None, - (meshHeader2->entries.size() * 16) + 0, "MeshEntry2", - StringHelper::Sprintf("%sMeshDListEntry0x%06X", zRoom->GetName().c_str(), - meshHeader2->dListStart, meshHeader2->entries.size()), - meshHeader2->entries.size(), declaration); - - zRoom->parent->AddDeclaration(meshHeader2->dListStart + (meshHeader2->entries.size() * 16), - DeclarationAlignment::None, DeclarationPadding::Pad16, 4, - "static s32", "terminatorMaybe", "0x01000000"); - - meshHeader = meshHeader2; - } } -SetMesh::~SetMesh() +void SetMesh::ParseRawData() { - if (meshHeader != nullptr) + ZRoomCommand::ParseRawData(); + auto& parentRawData = parent->GetRawData(); + meshHeaderType = parentRawData.at(segmentOffset); + + switch (meshHeaderType) { - delete meshHeader; - meshHeader = nullptr; + case 0: + polyType = std::make_shared(parent, parentRawData, segmentOffset, zRoom); + break; + + case 1: + polyType = std::make_shared(parent, parentRawData, segmentOffset, zRoom); + break; + + case 2: + polyType = std::make_shared(parent, parentRawData, segmentOffset, zRoom); + break; + + default: + throw std::runtime_error(StringHelper::Sprintf("Error in SetMesh::ParseRawData\n" + "\t Unknown meshHeaderType: %i\n", + meshHeaderType)); } + + polyType->ParseRawData(); } -void SetMesh::GenDListDeclarations(std::vector rawData, ZDisplayList* dList) +void SetMesh::DeclareReferences(const std::string& prefix) { - string srcVarName = + polyType->SetName(polyType->GetDefaultName(prefix)); + polyType->DeclareReferences(prefix); + polyType->DeclareAndGenerateOutputCode(prefix); +} + +void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList) +{ + if (dList == nullptr) + { + return; + } + std::string srcVarName = StringHelper::Sprintf("%s%s", zRoom->GetName().c_str(), dList->GetName().c_str()); dList->SetName(srcVarName); - string sourceOutput = dList->GetSourceOutputCode(zRoom->GetName()); + dList->scene = zRoom->scene; + std::string sourceOutput = dList->GetSourceOutputCode(zRoom->GetName()); for (ZDisplayList* otherDList : dList->otherDLists) - GenDListDeclarations(rawData, otherDList); + GenDListDeclarations(zRoom, parent, otherDList); - for (pair vtxEntry : dList->vtxDeclarations) + for (const auto& vtxEntry : dList->vtxDeclarations) { - DeclarationAlignment alignment = DeclarationAlignment::Align8; + DeclarationAlignment alignment = DeclarationAlignment::Align4; if (Globals::Instance->game == ZGame::MM_RETAIL) alignment = DeclarationAlignment::None; - zRoom->parent->AddDeclarationArray( + parent->AddDeclarationArray( vtxEntry.first, alignment, dList->vertices[vtxEntry.first].size() * 16, "static Vtx", StringHelper::Sprintf("%sVtx_%06X", zRoom->GetName().c_str(), vtxEntry.first), dList->vertices[vtxEntry.first].size(), vtxEntry.second); } - - for (pair texEntry : dList->texDeclarations) - { - zRoom->textures[texEntry.first] = dList->textures[texEntry.first]; - } } std::string SetMesh::GenDListExterns(ZDisplayList* dList) { - string sourceOutput = ""; + std::string sourceOutput = ""; - if (Globals::Instance->includeFilePrefix) - sourceOutput += StringHelper::Sprintf("extern Gfx %sDL_%06X[];\n", zRoom->GetName().c_str(), - dList->GetRawDataIndex()); - else - sourceOutput += StringHelper::Sprintf("extern Gfx DL_%06X[];\n", dList->GetRawDataIndex()); + sourceOutput += StringHelper::Sprintf("extern Gfx %sDL_%06X[];\n", zRoom->GetName().c_str(), + dList->GetRawDataIndex()); for (ZDisplayList* otherDList : dList->otherDLists) sourceOutput += GenDListExterns(otherDList); - for (pair texEntry : dList->texDeclarations) - sourceOutput += StringHelper::Sprintf("extern u64 %sTex_%06X[];\n", - zRoom->GetName().c_str(), texEntry.first); - sourceOutput += dList->defines; return sourceOutput; } -string SetMesh::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetMesh::GetBodySourceCode() const { - string sourceOutput = ""; - - Declaration* decl = zRoom->parent->GetDeclaration(segmentOffset); - - sourceOutput += StringHelper::Sprintf( - "%s %i, &%s", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), data, - decl->varName.c_str()); - - return sourceOutput; + std::string list = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_MESH(%s)", list.c_str()); } -string SetMesh::GenerateExterns() -{ - return ""; -} - -size_t SetMesh::GetRawDataSize() +size_t SetMesh::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize(); } -string SetMesh::GetCommandCName() +std::string SetMesh::GetCommandCName() const { return "SCmdMesh"; } -RoomCommand SetMesh::GetRoomCommand() +RoomCommand SetMesh::GetRoomCommand() const { return RoomCommand::SetMesh; } @@ -324,20 +119,36 @@ PolygonDlist::PolygonDlist(const std::string& prefix, const std::vector rawData.assign(nRawData.begin(), nRawData.end()); rawDataIndex = nRawDataIndex; parent = nParent; - room = nRoom; + zRoom = nRoom; name = GetDefaultName(prefix.c_str(), rawDataIndex); - - ParseRawData(); - - opaDList = MakeDlist(opa, prefix); - xluDList = MakeDlist(xlu, prefix); } void PolygonDlist::ParseRawData() { - opa = BitConverter::ToUInt32BE(rawData, rawDataIndex); - xlu = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); + switch (polyType) + { + case 2: + x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); + y = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); + z = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); + unk_06 = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); + + opa = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); + xlu = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12); + break; + + default: + opa = BitConverter::ToUInt32BE(rawData, rawDataIndex); + xlu = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); + break; + } +} + +void PolygonDlist::DeclareReferences(const std::string& prefix) +{ + opaDList = MakeDlist(opa, prefix); + xluDList = MakeDlist(xlu, prefix); } ZDisplayList* PolygonDlist::MakeDlist(segptr_t ptr, const std::string& prefix) @@ -353,18 +164,26 @@ ZDisplayList* PolygonDlist::MakeDlist(segptr_t ptr, const std::string& prefix) rawData, dlistAddress, Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); ZDisplayList* dlist = new ZDisplayList(rawData, dlistAddress, dlistLength, parent); - - string dListStr = StringHelper::Sprintf("%sPolygonDlist_%06X", prefix.c_str(), dlistAddress); - dlist->SetName(dListStr); - dlist->scene = room->scene; - dlist->GetSourceOutputCode(prefix); + GenDListDeclarations(zRoom, parent, dlist); return dlist; } -size_t PolygonDlist::GetRawDataSize() +size_t PolygonDlist::GetRawDataSize() const { - return 0x08; + switch (polyType) + { + case 2: + return 0x10; + + default: + return 0x08; + } +} + +void PolygonDlist::SetPolyType(uint8_t nPolyType) +{ + polyType = nPolyType; } void PolygonDlist::DeclareVar(const std::string& prefix, const std::string& bodyStr) @@ -381,55 +200,34 @@ void PolygonDlist::DeclareVar(const std::string& prefix, const std::string& body std::string PolygonDlist::GetBodySourceCode(bool arrayElement) { std::string bodyStr = ""; - std::string opaStr = "NULL"; - std::string xluStr = "NULL"; + std::string opaStr = parent->GetDeclarationPtrName(opa); + std::string xluStr = parent->GetDeclarationPtrName(xlu); if (arrayElement) { - bodyStr += " { \n "; + bodyStr += " { "; + } + else + { + bodyStr += "\n "; + } + + if (polyType == 2) + { + bodyStr += StringHelper::Sprintf("{ %6i, %6i, %6i }, %6i, ", x, y, z, unk_06); + } + + bodyStr += StringHelper::Sprintf("%s, ", opaStr.c_str()); + bodyStr += StringHelper::Sprintf("%s", xluStr.c_str()); + + if (arrayElement) + { + bodyStr += " },"; } else { bodyStr += "\n"; } - if (opa != 0) - { - Declaration* decl = parent->GetDeclaration(Seg2Filespace(opa, parent->baseAddress)); - if (decl != nullptr) - { - opaStr = decl->varName; - } - else - { - opaStr = StringHelper::Sprintf("0x%08X", opa); - } - } - if (xlu != 0) - { - Declaration* decl = parent->GetDeclaration(Seg2Filespace(xlu, parent->baseAddress)); - if (decl != nullptr) - { - xluStr = decl->varName; - } - else - { - xluStr = StringHelper::Sprintf("0x%08X", xlu); - } - } - - bodyStr += StringHelper::Sprintf(" %s, \n", opaStr.c_str()); - if (arrayElement) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf(" %s, \n", xluStr.c_str()); - - if (arrayElement) - { - bodyStr += " },"; - } - return bodyStr; } @@ -455,7 +253,14 @@ std::string PolygonDlist::GetDefaultName(const std::string& prefix, uint32_t add std::string PolygonDlist::GetSourceTypeName() { - return "PolygonDlist"; + switch (polyType) + { + case 2: + return "PolygonDlist2"; + + default: + return "PolygonDlist"; + } } std::string PolygonDlist::GetName() @@ -519,12 +324,12 @@ size_t BgImage::GetRawDataSize() return 0x1C; } -std::string BgImage::GetBodySourceCode(bool arrayElement) +std::string BgImage::GetBodySourceCode(bool arrayElement) const { - std::string bodyStr = ""; + std::string bodyStr = " "; if (arrayElement) { - bodyStr += " { \n "; + bodyStr += "{ \n "; } if (!isSubStruct) @@ -538,21 +343,7 @@ std::string BgImage::GetBodySourceCode(bool arrayElement) } } - std::string backgroundName = "NULL"; - if (source != 0) - { - uint32_t address = Seg2Filespace(source, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(address); - - if (decl == nullptr) - { - backgroundName += StringHelper::Sprintf("0x%08X, ", source); - } - else - { - backgroundName = decl->varName; - } - } + std::string backgroundName = parent->GetDeclarationPtrName(source); bodyStr += StringHelper::Sprintf("%s, ", backgroundName.c_str()); bodyStr += "\n "; if (arrayElement) @@ -590,6 +381,10 @@ std::string BgImage::GetBodySourceCode(bool arrayElement) { bodyStr += " \n }, "; } + else + { + bodyStr += "\n"; + } return bodyStr; } @@ -609,29 +404,109 @@ std::string BgImage::GetName() return name; } -PolygonType1::PolygonType1(const std::string& prefix, const std::vector& nRawData, - uint32_t nRawDataIndex, ZFile* nParent, ZRoom* nRoom) +/* PolygonType section */ + +PolygonTypeBase::PolygonTypeBase(ZFile* nParent, const std::vector& nRawData, + uint32_t nRawDataIndex, ZRoom* nRoom) + : rawData{nRawData}, rawDataIndex{nRawDataIndex}, parent{nParent}, zRoom{nRoom} { - rawData.assign(nRawData.begin(), nRawData.end()); - rawDataIndex = nRawDataIndex; - parent = nParent; + type = BitConverter::ToUInt8BE(rawData, rawDataIndex); +} - name = GetDefaultName(prefix.c_str(), rawDataIndex); +void PolygonTypeBase::DeclareVar(const std::string& prefix, const std::string& bodyStr) +{ + std::string auxName = name; + if (name == "") + auxName = GetDefaultName(prefix); - ParseRawData(); + parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align4, GetRawDataSize(), + GetSourceTypeName(), auxName, bodyStr); +} + +void PolygonTypeBase::DeclareAndGenerateOutputCode(const std::string& prefix) +{ + std::string bodyStr = GetBodySourceCode(); + + Declaration* decl = parent->GetDeclaration(rawDataIndex); + if (decl == nullptr) + { + DeclareVar(prefix, bodyStr); + } + else + { + decl->text = bodyStr; + } +} + +std::string PolygonTypeBase::GetSourceTypeName() const +{ + switch (type) + { + case 2: + return "PolygonType2"; + + case 1: + return "PolygonType1"; + + default: + return "PolygonType0"; + } +} + +std::string PolygonTypeBase::GetName() const +{ + return name; +} + +void PolygonTypeBase::SetName(const std::string& newName) +{ + name = newName; +} + +std::string PolygonTypeBase::GetDefaultName(const std::string& prefix) const +{ + return StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), GetSourceTypeName().c_str(), + rawDataIndex); +} + +PolygonType1::PolygonType1(ZFile* nParent, const std::vector& nRawData, + uint32_t nRawDataIndex, ZRoom* nRoom) + : PolygonTypeBase(nParent, nRawData, nRawDataIndex, nRoom) +{ +} + +void PolygonType1::ParseRawData() +{ + format = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x01); + dlist = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); + + if (format == 2) + { + count = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); + list = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x0C); + } if (dlist != 0) { - polyGfxList = - PolygonDlist(prefix, rawData, Seg2Filespace(dlist, parent->baseAddress), parent, nRoom); + PolygonDlist polyGfxList(zRoom->GetName(), rawData, + Seg2Filespace(dlist, parent->baseAddress), parent, zRoom); + polyGfxList.SetPolyType(type); + polyGfxList.ParseRawData(); + polyGfxList.DeclareReferences(zRoom->GetName()); + polyDLists.push_back(polyGfxList); } +} + +void PolygonType1::DeclareReferences(const std::string& prefix) +{ + polyDLists.at(0).DeclareAndGenerateOutputCode(); uint32_t listAddress; std::string bgImageArrayBody = ""; switch (format) { case 1: - single = BgImage(true, prefix, nRawData, nRawDataIndex + 0x08, parent); + single = BgImage(true, prefix, rawData, rawDataIndex + 0x08, parent); break; case 2: @@ -668,20 +543,7 @@ PolygonType1::PolygonType1(const std::string& prefix, const std::vector } } -void PolygonType1::ParseRawData() -{ - type = BitConverter::ToUInt8BE(rawData, rawDataIndex); - format = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x01); - dlist = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - - if (format == 2) - { - count = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); - list = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x0C); - } -} - -size_t PolygonType1::GetRawDataSize() +size_t PolygonType1::GetRawDataSize() const { switch (format) { @@ -694,40 +556,14 @@ size_t PolygonType1::GetRawDataSize() return 0x20; } -void PolygonType1::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - if (name == "") - { - auxName = GetDefaultName(prefix, rawDataIndex); - } - parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align4, GetRawDataSize(), - GetSourceTypeName(), auxName, bodyStr); -} - -std::string PolygonType1::GetBodySourceCode() +std::string PolygonType1::GetBodySourceCode() const { std::string bodyStr = "\n "; bodyStr += "{ "; bodyStr += StringHelper::Sprintf("%i, %i, ", type, format); - std::string dlistStr = "NULL"; - if (dlist != 0) - { - uint32_t entryRecordAddress = Seg2Filespace(dlist, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(entryRecordAddress); - - if (decl == nullptr) - { - polyGfxList.DeclareAndGenerateOutputCode(); - dlistStr = "&" + polyGfxList.GetName(); - } - else - { - dlistStr = "&" + decl->varName; - } - } + std::string dlistStr = parent->GetDeclarationPtrName(dlist); bodyStr += StringHelper::Sprintf("%s, ", dlistStr.c_str()); bodyStr += "}, \n"; @@ -736,22 +572,10 @@ std::string PolygonType1::GetBodySourceCode() switch (format) { case 1: - bodyStr += " " + single.GetBodySourceCode(false) + "\n"; + bodyStr += single.GetBodySourceCode(false); break; case 2: - if (list != 0) - { - uint32_t listAddress = Seg2Filespace(list, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(listAddress); - if (decl != nullptr) - { - listStr = decl->varName; - } - else - { - listStr = StringHelper::Sprintf("0x%08X", list); - } - } + listStr = parent->GetDeclarationPtrName(list); bodyStr += StringHelper::Sprintf(" %i, %s, \n", count, listStr.c_str()); break; @@ -763,27 +587,7 @@ std::string PolygonType1::GetBodySourceCode() return bodyStr; } -void PolygonType1::DeclareAndGenerateOutputCode() -{ - std::string bodyStr = GetBodySourceCode(); - - Declaration* decl = parent->GetDeclaration(rawDataIndex); - if (decl == nullptr) - { - DeclareVar("", bodyStr); - } - else - { - decl->text = bodyStr; - } -} - -std::string PolygonType1::GetDefaultName(const std::string& prefix, uint32_t address) -{ - return StringHelper::Sprintf("%sPolygonType1_%06X", prefix.c_str(), address); -} - -std::string PolygonType1::GetSourceTypeName() +std::string PolygonType1::GetSourceTypeName() const { switch (format) { @@ -797,7 +601,71 @@ std::string PolygonType1::GetSourceTypeName() // return "PolygonType1"; } -std::string PolygonType1::GetName() +PolygonType2::PolygonType2(ZFile* nParent, const std::vector& nRawData, + uint32_t nRawDataIndex, ZRoom* nRoom) + : PolygonTypeBase(nParent, nRawData, nRawDataIndex, nRoom) { - return name; +} + +void PolygonType2::ParseRawData() +{ + num = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x01); + + start = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); + end = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); + + uint32_t currentPtr = GETSEGOFFSET(start); + for (size_t i = 0; i < num; i++) + { + PolygonDlist entry(zRoom->GetName(), rawData, currentPtr, parent, zRoom); + entry.SetPolyType(type); + entry.ParseRawData(); + entry.DeclareReferences(zRoom->GetName()); + polyDLists.push_back(entry); + currentPtr += entry.GetRawDataSize(); + } +} + +void PolygonType2::DeclareReferences(const std::string& prefix) +{ + if (num > 0) + { + std::string declaration = ""; + + for (size_t i = 0; i < polyDLists.size(); i++) + { + declaration += polyDLists.at(i).GetBodySourceCode(true); + if (i + 1 < polyDLists.size()) + declaration += "\n"; + } + + std::string polyDlistType = polyDLists.at(0).GetSourceTypeName(); + std::string polyDListName = ""; + polyDListName = StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), polyDlistType.c_str(), + GETSEGOFFSET(start)); + + parent->AddDeclarationArray(GETSEGOFFSET(start), DeclarationAlignment::Align4, + polyDLists.size() * polyDLists.at(0).GetRawDataSize(), + polyDlistType, polyDListName, polyDLists.size(), declaration); + } + + parent->AddDeclaration(GETSEGOFFSET(end), DeclarationAlignment::Align4, + DeclarationPadding::Pad16, 4, "static s32", "terminatorMaybe", + "0x01000000"); +} + +std::string PolygonType2::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(start); + + std::string body = StringHelper::Sprintf("\n %i, %i,\n", type, polyDLists.size()); + body += StringHelper::Sprintf(" %s,\n", listName.c_str()); + body += + StringHelper::Sprintf(" %s + ARRAY_COUNTU(%s)\n", listName.c_str(), listName.c_str()); + return body; +} + +size_t PolygonType2::GetRawDataSize() const +{ + return 0x0C; } diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.h index 62fabd76cc..fb99dbdb30 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMesh.h @@ -1,57 +1,22 @@ #pragma once -#include "../../ZDisplayList.h" -#include "../ZRoomCommand.h" +#include #include "ZBackground.h" - -class MeshHeaderBase -{ -public: - int8_t headerType; // 0x00 -}; - -class MeshEntry2 -{ -public: - int16_t playerXMax, playerZMax; - int16_t playerXMin, playerZMin; - - int32_t opaqueDListAddr; - int32_t translucentDListAddr; - - ZDisplayList* opaqueDList; - ZDisplayList* translucentDList; -}; - -class MeshHeader2 : public MeshHeaderBase -{ -public: - std::vector entries; - uint32_t dListStart; - uint32_t dListEnd; -}; +#include "ZDisplayList.h" +#include "ZRoom/ZRoomCommand.h" class PolygonDlist { -protected: - segptr_t opa = 0; // Gfx* - segptr_t xlu = 0; // Gfx* - - std::vector rawData; - uint32_t rawDataIndex; - ZFile* parent; - ZRoom* room; - std::string name; - - void ParseRawData(); - ZDisplayList* MakeDlist(segptr_t ptr, const std::string& prefix); - public: PolygonDlist() = default; - PolygonDlist(const std::string& prefix, const std::vector& nRawData, uint32_t nRawDataIndex, - ZFile* nParent, ZRoom* nRoom); + PolygonDlist(const std::string& prefix, const std::vector& nRawData, + uint32_t nRawDataIndex, ZFile* nParent, ZRoom* nRoom); - size_t GetRawDataSize(); + void ParseRawData(); + void DeclareReferences(const std::string& prefix); + + size_t GetRawDataSize() const; + void SetPolyType(uint8_t nPolyType); void DeclareVar(const std::string& prefix, const std::string& bodyStr); @@ -62,8 +27,25 @@ public: std::string GetSourceTypeName(); std::string GetName(); +protected: + int16_t x, y, z; // polyType == 2 + int16_t unk_06; // polyType == 2 + + segptr_t opa = 0; // Gfx* + segptr_t xlu = 0; // Gfx* + + uint8_t polyType; + ZDisplayList* opaDList = nullptr; // Gfx* ZDisplayList* xluDList = nullptr; // Gfx* + + std::vector rawData; + uint32_t rawDataIndex; + ZFile* parent; + ZRoom* zRoom; + std::string name; + + ZDisplayList* MakeDlist(segptr_t ptr, const std::string& prefix); }; class BgImage @@ -97,19 +79,51 @@ public: BgImage(bool nIsSubStruct, const std::string& prefix, const std::vector& nRawData, uint32_t nRawDataIndex, ZFile* nParent); - static size_t GetRawDataSize() ; + static size_t GetRawDataSize(); - std::string GetBodySourceCode(bool arrayElement); + std::string GetBodySourceCode(bool arrayElement) const; static std::string GetDefaultName(const std::string& prefix, uint32_t address); static std::string GetSourceTypeName(); std::string GetName(); }; -class PolygonType1 +class PolygonTypeBase { +public: + PolygonTypeBase(ZFile* nParent, const std::vector& nRawData, uint32_t nRawDataIndex, + ZRoom* nRoom); + + virtual void ParseRawData() = 0; + virtual void DeclareReferences(const std::string& prefix) = 0; + + virtual std::string GetBodySourceCode() const = 0; + void DeclareVar(const std::string& prefix, const std::string& bodyStr); + void DeclareAndGenerateOutputCode(const std::string& prefix); + + virtual std::string GetSourceTypeName() const; + + std::string GetName() const; + void SetName(const std::string& newName); + virtual size_t GetRawDataSize() const = 0; + + std::string GetDefaultName(const std::string& prefix) const; + protected: uint8_t type; + + std::vector polyDLists; + + std::vector rawData; + uint32_t rawDataIndex; + ZFile* parent; + ZRoom* zRoom; + std::string name; +}; + +class PolygonType1 : public PolygonTypeBase +{ +protected: uint8_t format; segptr_t dlist; @@ -121,49 +135,56 @@ protected: segptr_t list; // BgImage* std::vector multiList; - std::vector rawData; - uint32_t rawDataIndex; - ZFile* parent; - std::string name; - - void ParseRawData(); - public: - PolygonType1(const std::string& prefix, const std::vector& nRawData, uint32_t nRawDataIndex, - ZFile* nParent, ZRoom* nRoom); + PolygonType1(ZFile* nParent, const std::vector& nRawData, uint32_t nRawDataIndex, + ZRoom* nRoom); - size_t GetRawDataSize() ; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; - void DeclareVar(const std::string& prefix, const std::string& bodyStr); + std::string GetBodySourceCode() const override; - std::string GetBodySourceCode(); - void DeclareAndGenerateOutputCode(); + std::string GetSourceTypeName() const override; - static std::string GetDefaultName(const std::string& prefix, uint32_t address); - std::string GetSourceTypeName(); - std::string GetName(); + size_t GetRawDataSize() const override; +}; - PolygonDlist polyGfxList; +class PolygonType2 : public PolygonTypeBase +{ +public: + PolygonType2(ZFile* nParent, const std::vector& nRawData, uint32_t nRawDataIndex, + ZRoom* nRoom); + + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + size_t GetRawDataSize() const override; + +protected: + uint8_t num; + segptr_t start; + segptr_t end; }; class SetMesh : public ZRoomCommand { public: - SetMesh(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex, int32_t segAddressOffset); - ~SetMesh(); + SetMesh(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateExterns() override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; - virtual size_t GetRawDataSize() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; private: - MeshHeaderBase* meshHeader = nullptr; - uint32_t segmentOffset; - uint8_t data; uint8_t meshHeaderType; + std::shared_ptr polyType; - void GenDListDeclarations(std::vector rawData, ZDisplayList* dList); std::string GenDListExterns(ZDisplayList* dList); }; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapChests.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapChests.cpp index 64b1d31762..bd9c8a004a 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapChests.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapChests.cpp @@ -1,101 +1,85 @@ #include "SetMinimapChests.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -SetMinimapChests::SetMinimapChests(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetMinimapChests::SetMinimapChests(ZFile* nParent) : ZRoomCommand(nParent) { - int32_t numChests = rawData[rawDataIndex + 1]; - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); +} + +void SetMinimapChests::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + int numChests = cmdArg1; int32_t currentPtr = segmentOffset; for (int32_t i = 0; i < numChests; i++) { - MinimapChest* chest = new MinimapChest(rawData, currentPtr); + MinimapChest chest(parent->GetRawData(), currentPtr); chests.push_back(chest); currentPtr += 10; } } -SetMinimapChests::~SetMinimapChests() +void SetMinimapChests::DeclareReferences(const std::string& prefix) { - for (MinimapChest* chest : chests) - delete chest; -} - -string SetMinimapChests::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - return std::string(); -} - -string SetMinimapChests::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - string sourceOutput = ""; - - sourceOutput += - StringHelper::Sprintf("%s 0x%02X, (u32)%sMinimapChests0x%06X };", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - chests.size(), roomName.c_str(), segmentOffset); + std::string declaration = ""; + size_t index = 0; + for (const auto& chest : chests) { - string declaration = ""; + declaration += StringHelper::Sprintf(" { %s },", chest.GetBodySourceCode().c_str()); - size_t index = 0; - for (MinimapChest* chest : chests) - { - declaration += StringHelper::Sprintf(" { 0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X },", - chest->unk0, chest->unk2, chest->unk4, chest->unk6, - chest->unk8); + if (index < chests.size() - 1) + declaration += "\n"; - if (index < chests.size() - 1) - declaration += "\n"; - - index++; - } - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, DeclarationPadding::None, chests.size() * 10, - "MinimapChest", - StringHelper::Sprintf("%sMinimapChests0x%06X", roomName.c_str(), segmentOffset), - chests.size(), declaration); + index++; } - return sourceOutput; + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::None, chests.size() * 10, "MinimapChest", + StringHelper::Sprintf("%sMinimapChests0x%06X", prefix.c_str(), segmentOffset), + chests.size(), declaration); } -string SetMinimapChests::GenerateExterns() +std::string SetMinimapChests::GetBodySourceCode() const { - return StringHelper::Sprintf("extern MinimapChest %sMinimapChests0x%06X[%i];\n", - zRoom->GetName().c_str(), segmentOffset, chests.size()); + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_MINIMAP_COMPASS_ICON_INFO(0x%02X, %s)", chests.size(), + listName.c_str()); } -string SetMinimapChests::GetCommandCName() +std::string SetMinimapChests::GetCommandCName() const { return "SCmdMinimapChests"; } -RoomCommand SetMinimapChests::GetRoomCommand() +RoomCommand SetMinimapChests::GetRoomCommand() const { return RoomCommand::SetMinimapChests; } -size_t SetMinimapChests::GetRawDataSize() +size_t SetMinimapChests::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (chests.size() * 10); } -MinimapChest::MinimapChest(std::vector rawData, uint32_t rawDataIndex) +MinimapChest::MinimapChest(const std::vector& rawData, uint32_t rawDataIndex) : unk0(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), unk2(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), unk4(BitConverter::ToUInt16BE(rawData, rawDataIndex + 4)), unk6(BitConverter::ToUInt16BE(rawData, rawDataIndex + 6)), unk8(BitConverter::ToUInt16BE(rawData, rawDataIndex + 8)) { -} \ No newline at end of file +} + +std::string MinimapChest::GetBodySourceCode() const +{ + return StringHelper::Sprintf("0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X", unk0, unk2, unk4, unk6, + unk8); +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapChests.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapChests.h index 37e42708ac..b18534d5ef 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapChests.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapChests.h @@ -1,33 +1,36 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class MinimapChest { public: + MinimapChest(const std::vector& rawData, uint32_t rawDataIndex); + + std::string GetBodySourceCode() const; + +protected: uint16_t unk0; uint16_t unk2; uint16_t unk4; uint16_t unk6; uint16_t unk8; - - MinimapChest(std::vector rawData, uint32_t rawDataIndex); }; class SetMinimapChests : public ZRoomCommand { public: - SetMinimapChests(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetMinimapChests(); + SetMinimapChests(ZFile* nParent); - std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - std::string GetCommandCName() override; - std::string GenerateExterns() override; - RoomCommand GetRoomCommand() override; - size_t GetRawDataSize() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; private: - std::vector chests; - uint32_t segmentOffset; -}; \ No newline at end of file + std::vector chests; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.cpp index 0dd19617cf..51a8a81126 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.cpp @@ -1,74 +1,42 @@ #include "SetMinimapList.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -SetMinimapList::SetMinimapList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetMinimapList::SetMinimapList(ZFile* nParent) : ZRoomCommand(nParent) { - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - listSegmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, segmentOffset + 0)); - unk4 = BitConverter::ToInt32BE(rawData, segmentOffset + 4); +} - minimaps = vector(); +void SetMinimapList::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + listSegmentOffset = + GETSEGOFFSET(BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset + 0)); + unk4 = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset + 4); int32_t currentPtr = listSegmentOffset; for (int32_t i = 0; i < zRoom->roomCount; i++) { - MinimapEntry* entry = new MinimapEntry(rawData, currentPtr); + MinimapEntry entry(parent->GetRawData(), currentPtr); minimaps.push_back(entry); currentPtr += 10; } } -SetMinimapList::~SetMinimapList() +void SetMinimapList::DeclareReferences(const std::string& prefix) { - for (MinimapEntry* entry : minimaps) - delete entry; -} - -string SetMinimapList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - return StringHelper::Sprintf( - "%s 0x%02X, (u32)&%sMinimapList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), minimaps.size(), - zRoom->GetName().c_str(), segmentOffset); -} - -string SetMinimapList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - string sourceOutput = ""; - - sourceOutput += - StringHelper::Sprintf("%s 0, (u32)&%sMinimapList0x%06X };", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - roomName.c_str(), segmentOffset, unk4); - { - string declaration = StringHelper::Sprintf("(u32)%sMinimapEntryList0x%06X, 0x%08X", - roomName.c_str(), listSegmentOffset, unk4); - - zRoom->parent->AddDeclaration( - segmentOffset, DeclarationAlignment::Align4, DeclarationPadding::None, 8, "MinimapList", - StringHelper::Sprintf("%sMinimapList0x%06X", roomName.c_str(), segmentOffset), - declaration); - } - - { - string declaration = ""; + std::string declaration = ""; size_t index = 0; - for (MinimapEntry* entry : minimaps) + for (const auto& entry : minimaps) { - declaration += StringHelper::Sprintf(" { 0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X },", - entry->unk0, entry->unk2, entry->unk4, entry->unk6, - entry->unk8); + declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); if (index < minimaps.size() - 1) declaration += "\n"; @@ -76,42 +44,56 @@ string SetMinimapList::GenerateSourceCodePass2(string roomName, uint32_t baseAdd index++; } - zRoom->parent->AddDeclarationArray( - listSegmentOffset, DeclarationAlignment::None, DeclarationPadding::None, - minimaps.size() * 10, "MinimapEntry", - StringHelper::Sprintf("%sMinimapEntryList0x%06X", roomName.c_str(), listSegmentOffset), + parent->AddDeclarationArray( + listSegmentOffset, DeclarationAlignment::Align4, minimaps.size() * 10, "MinimapEntry", + StringHelper::Sprintf("%sMinimapEntryList0x%06X", prefix.c_str(), listSegmentOffset), minimaps.size(), declaration); } - return sourceOutput; + { + std::string listName = parent->GetDeclarationPtrName(listSegmentOffset); + + std::string declaration = StringHelper::Sprintf("(u32)%s, 0x%08X", listName.c_str(), unk4); + + parent->AddDeclaration( + segmentOffset, DeclarationAlignment::Align4, 8, "MinimapList", + StringHelper::Sprintf("%sMinimapList0x%06X", prefix.c_str(), segmentOffset), + declaration); + } } -string SetMinimapList::GenerateExterns() +std::string SetMinimapList::GetBodySourceCode() const { - return StringHelper::Sprintf("extern MinimapList %sMinimapList0x%06X;\n", - zRoom->GetName().c_str(), listSegmentOffset); + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_MINIMAP_INFO(%s)", listName.c_str()); } -string SetMinimapList::GetCommandCName() +std::string SetMinimapList::GetCommandCName() const { return "SCmdMinimapSettings"; } -RoomCommand SetMinimapList::GetRoomCommand() +RoomCommand SetMinimapList::GetRoomCommand() const { return RoomCommand::SetMinimapList; } -size_t SetMinimapList::GetRawDataSize() +size_t SetMinimapList::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (minimaps.size() * 10); } -MinimapEntry::MinimapEntry(std::vector rawData, uint32_t rawDataIndex) +MinimapEntry::MinimapEntry(const std::vector& rawData, uint32_t rawDataIndex) : unk0(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), unk2(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), unk4(BitConverter::ToUInt16BE(rawData, rawDataIndex + 4)), unk6(BitConverter::ToUInt16BE(rawData, rawDataIndex + 6)), unk8(BitConverter::ToUInt16BE(rawData, rawDataIndex + 8)) { -} \ No newline at end of file +} + +std::string MinimapEntry::GetBodySourceCode() const +{ + return StringHelper::Sprintf("0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X", unk0, unk2, unk4, unk6, + unk8); +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.h index f382881e5a..2794c8011d 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetMinimapList.h @@ -1,36 +1,39 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class MinimapEntry { public: + MinimapEntry(const std::vector& rawData, uint32_t rawDataIndex); + + std::string GetBodySourceCode() const; + +protected: uint16_t unk0; uint16_t unk2; uint16_t unk4; uint16_t unk6; uint16_t unk8; - - MinimapEntry(std::vector rawData, uint32_t rawDataIndex); }; class SetMinimapList : public ZRoomCommand { public: - SetMinimapList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetMinimapList(); + SetMinimapList(ZFile* nParent); - std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - std::string GetCommandCName() override; - std::string GenerateExterns() override; - RoomCommand GetRoomCommand() override; - size_t GetRawDataSize() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; private: - std::vector minimaps; - uint32_t segmentOffset; + std::vector minimaps; uint32_t listSegmentOffset; uint32_t unk4; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetObjectList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetObjectList.cpp index 52e2052215..d3184b4e62 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetObjectList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetObjectList.cpp @@ -1,77 +1,73 @@ #include "SetObjectList.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZNames.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZNames.h" +#include "ZRoom/ZRoom.h" -SetObjectList::SetObjectList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetObjectList::SetObjectList(ZFile* nParent) : ZRoomCommand(nParent) { - objects = vector(); - uint8_t objectCnt = rawData[rawDataIndex + 1]; - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); +} + +void SetObjectList::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + uint8_t objectCnt = parent->GetRawData().at(rawDataIndex + 1); uint32_t currentPtr = segmentOffset; for (uint8_t i = 0; i < objectCnt; i++) { - uint16_t objectIndex = BitConverter::ToInt16BE(rawData, currentPtr); + uint16_t objectIndex = BitConverter::ToInt16BE(parent->GetRawData(), currentPtr); objects.push_back(objectIndex); currentPtr += 2; } if (segmentOffset != 0) - zRoom->parent->AddDeclarationPlaceholder(segmentOffset); + parent->AddDeclarationPlaceholder(segmentOffset); } -string SetObjectList::GenerateExterns() +void SetObjectList::DeclareReferences(const std::string& prefix) { - return StringHelper::Sprintf("s16 %sObjectList0x%06X[];\n", zRoom->GetName().c_str(), - segmentOffset); -} - -string SetObjectList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - string sourceOutput = ""; - - sourceOutput += - StringHelper::Sprintf("%s 0x%02X, (u32)%sObjectList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - objects.size(), zRoom->GetName().c_str(), segmentOffset); - - string declaration = ""; - - for (size_t i = 0; i < objects.size(); i++) + if (!objects.empty()) { - uint16_t objectIndex = objects[i]; - declaration += StringHelper::Sprintf(" %s,", ZNames::GetObjectName(objectIndex).c_str()); + std::string declaration = ""; - if (i < objects.size() - 1) - declaration += "\n"; + for (size_t i = 0; i < objects.size(); i++) + { + uint16_t objectIndex = objects[i]; + declaration += + StringHelper::Sprintf(" %s,", ZNames::GetObjectName(objectIndex).c_str()); + + if (i < objects.size() - 1) + declaration += "\n"; + } + + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::None, objects.size() * 2, "s16", + StringHelper::Sprintf("%sObjectList_%06X", prefix.c_str(), segmentOffset), + objects.size(), declaration); } - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, objects.size() * 2, "s16", - StringHelper::Sprintf("%sObjectList0x%06X", zRoom->GetName().c_str(), segmentOffset), - objects.size(), declaration); - - return sourceOutput; } -size_t SetObjectList::GetRawDataSize() +std::string SetObjectList::GetBodySourceCode() const +{ + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_OBJECT_LIST(%i, %s)", objects.size(), listName.c_str()); +} + +size_t SetObjectList::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (objects.size() * 2); } -string SetObjectList::GetCommandCName() +std::string SetObjectList::GetCommandCName() const { return "SCmdObjectList"; } -RoomCommand SetObjectList::GetRoomCommand() +RoomCommand SetObjectList::GetRoomCommand() const { return RoomCommand::SetObjectList; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetObjectList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetObjectList.h index 8bf82f4f60..c952333fb7 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetObjectList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetObjectList.h @@ -1,19 +1,21 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetObjectList : public ZRoomCommand { public: - SetObjectList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetObjectList(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; - virtual size_t GetRawDataSize() override; - virtual std::string GenerateExterns() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix); + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; private: std::vector objects; - uint32_t segmentOffset; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.cpp index 149f4fa88a..13ee7a7cab 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.cpp @@ -1,241 +1,58 @@ #include "SetPathways.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -REGISTER_ZFILENODE(Path, ZSetPathways); - -using namespace std; - -ZSetPathways::ZSetPathways(ZFile* nParent) : ZResource(nParent) +SetPathways::SetPathways(ZFile* nParent) : ZRoomCommand(nParent), pathwayList(nParent) { } -ZSetPathways::ZSetPathways(ZRoom* nZRoom, const std::vector& nRawData, uint32_t nRawDataIndex, - bool nIsFromHeader) - : ZResource(nZRoom->parent), ZRoomCommand(nZRoom, nRawData, nRawDataIndex) +void SetPathways::DeclareReferences(const std::string& prefix) { - rawData = nRawData; - rawDataIndex = nRawDataIndex; - isFromHeader = nIsFromHeader; -} - -ZSetPathways::~ZSetPathways() -{ - delete pathwayList; -} - -void ZSetPathways::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - parent->AddDeclaration(cmdAddress, DeclarationAlignment::None, 8, - StringHelper::Sprintf("static %s", GetCommandCName().c_str()), - StringHelper::Sprintf("%sSet%04XCmd%02X", name.c_str(), - commandSet & 0x00FFFFFF, cmdIndex, cmdID), - StringHelper::Sprintf("%s // 0x%04X", bodyStr.c_str(), cmdAddress)); -} - -string ZSetPathways::GetSourceOutputCode(const std::string& prefix) -{ - if (pathwayList != nullptr) - pathwayList->GetSourceOutputCode(parent->GetName()); - - return ""; -} - -void ZSetPathways::ParseRawData() -{ - if (isFromHeader) - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - else - segmentOffset = rawDataIndex; - if (segmentOffset != 0) parent->AddDeclarationPlaceholder(segmentOffset); - - int32_t numPaths = (Globals::Instance->game != ZGame::MM_RETAIL) ? - 1 : - zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 8; - - pathwayList = new PathwayList(parent, rawData, segmentOffset, numPaths); } -string ZSetPathways::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetPathways::ParseRawDataLate() { - ParseRawData(); - return ""; + if (Globals::Instance->game == ZGame::MM_RETAIL) + { + auto numPaths = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 8; + pathwayList.SetNumPaths(numPaths); + } + + pathwayList.SetRawDataIndex(segmentOffset); + pathwayList.ParseRawData(); } -string ZSetPathways::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +void SetPathways::DeclareReferencesLate(const std::string& prefix) { - string sourceOutput = ""; - - sourceOutput += StringHelper::Sprintf("\n\t%s 0, (u32)%sPathway0x%06X\n};", - ZRoomCommand::GenerateSourceCodePass1("", 0).c_str(), - parent->GetName().c_str(), segmentOffset); - - if (pathwayList != nullptr) - pathwayList->GetSourceOutputCode(parent->GetName()); - - return sourceOutput; + pathwayList.SetName(StringHelper::Sprintf("%sPathway_%06X", prefix.c_str(), segmentOffset)); + pathwayList.DeclareReferences(prefix); + pathwayList.GetSourceOutputCode(prefix); } -size_t ZSetPathways::GetRawDataSize() +std::string SetPathways::GetBodySourceCode() const { - size_t size = 0; - if (pathwayList != nullptr) - size += pathwayList->GetRawDataSize(); + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_PATH_LIST(%s)", listName.c_str()); +} + +size_t SetPathways::GetRawDataSize() const +{ + int32_t size = pathwayList.GetRawDataSize(); return ZRoomCommand::GetRawDataSize() + size; } -string ZSetPathways::GenerateExterns() -{ - if (pathwayList != nullptr) - return pathwayList->GenerateExterns(parent->GetName()); - - return ""; -} - -string ZSetPathways::GetCommandCName() +std::string SetPathways::GetCommandCName() const { return "SCmdPathList"; } -RoomCommand ZSetPathways::GetRoomCommand() +RoomCommand SetPathways::GetRoomCommand() const { return RoomCommand::SetPathways; } - -PathwayEntry::PathwayEntry(std::vector rawData, uint32_t rawDataIndex) - : numPoints(rawData[rawDataIndex + 0]), unk1(rawData[rawDataIndex + 1]), - unk2(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)), - listSegmentOffset(GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4))) -{ - uint32_t currentPtr = listSegmentOffset; - uint8_t* data = rawData.data(); - - for (int32_t i = 0; i < numPoints; i++) - { - x = BitConverter::ToInt16BE(data, currentPtr + 0); - y = BitConverter::ToInt16BE(data, currentPtr + 2); - z = BitConverter::ToInt16BE(data, currentPtr + 4); - - Vec3s point = Vec3s(x, y, z); - points.push_back(point); - - currentPtr += 6; - } - - if (numPoints == 0) // Hack for SharpOcarina - { - for (int32_t i = 0; i < 3; i++) - { - Vec3s point = Vec3s(0, 0, 0); - points.push_back(point); - } - } -} - -PathwayList::PathwayList(ZFile* nParent, std::vector rawData, uint32_t rawDataIndex, int32_t length) -{ - parent = nParent; - _rawDataIndex = rawDataIndex; - - uint32_t currentPtr = rawDataIndex; - - for (int32_t pathIndex = 0; pathIndex < length; pathIndex++) - { - PathwayEntry* path = new PathwayEntry(rawData, currentPtr); - currentPtr += 8; - - if (path->listSegmentOffset == 0) - break; - - pathways.push_back(path); - } -} - -PathwayList::~PathwayList() -{ - for (PathwayEntry* path : pathways) - delete path; -} - -void PathwayList::GetSourceOutputCode(const std::string& prefix) -{ - { - string declaration = ""; - size_t index = 0; - for (PathwayEntry* entry : pathways) - { - if (Globals::Instance->game == ZGame::MM_RETAIL) - declaration += StringHelper::Sprintf(" { %i, %i, %i, (u32)%sPathwayList0x%06X },", - entry->numPoints, entry->unk1, entry->unk2, - prefix.c_str(), entry->listSegmentOffset); - else - declaration += - StringHelper::Sprintf(" { %i, (u32)%sPathwayList0x%06X },", entry->numPoints, - prefix.c_str(), entry->listSegmentOffset); - - if (index < pathways.size() - 1) - declaration += "\n"; - - index++; - } - - parent->AddDeclarationArray( - _rawDataIndex, DeclarationAlignment::None, DeclarationPadding::None, - pathways.size() * 8, "Path", - StringHelper::Sprintf("%sPathway0x%06X", prefix.c_str(), _rawDataIndex), - pathways.size(), declaration); - } - - for (PathwayEntry* entry : pathways) - { - string declaration = ""; - - size_t index = 0; - for (Vec3s& point : entry->points) - { - declaration += StringHelper::Sprintf(" { %i, %i, %i }, //0x%06X", point.x, point.y, - point.z, entry->listSegmentOffset + (index * 6)); - - if (index < entry->points.size() - 1) - declaration += "\n"; - - index++; - } - - parent->AddDeclarationArray( - entry->listSegmentOffset, DeclarationAlignment::Align4, DeclarationPadding::Pad4, - entry->points.size() * 6, "Vec3s", - StringHelper::Sprintf("%sPathwayList0x%06X", prefix.c_str(), entry->listSegmentOffset), - entry->points.size(), declaration); - } -} - -size_t PathwayList::GetRawDataSize() -{ - size_t pointsSize = 0; - - for (PathwayEntry* entry : pathways) - { - pointsSize += entry->points.size() * 6; - } - - return pathways.size() * 8 + pointsSize; -} - -string PathwayList::GenerateExterns(const std::string& prefix) -{ - string declaration = ""; - for (PathwayEntry* entry : pathways) - { - declaration += StringHelper::Sprintf("extern Vec3s %sPathwayList0x%06X[];\n", - prefix.c_str(), entry->listSegmentOffset); - } - - return declaration; -} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.h index 4468fe9114..30b765b564 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.h @@ -1,62 +1,28 @@ #pragma once -#include "../../Vec3s.h" -#include "../ZRoomCommand.h" +#include "Vec3s.h" +#include "ZPath.h" #include "ZResource.h" +#include "ZRoom/ZRoomCommand.h" -class PathwayEntry +class SetPathways : public ZRoomCommand { public: - int16_t x, y, z; + SetPathways(ZFile* nParent); - PathwayEntry(std::vector rawData, uint32_t rawDataIndex); + void DeclareReferences(const std::string& prefix) override; - int32_t numPoints; - int8_t unk1; // (MM Only) - int16_t unk2; // (MM Only) - uint32_t listSegmentOffset; - std::vector points; -}; - -struct PathwayList -{ -public: - PathwayList(ZFile* nParent, std::vector rawData, uint32_t rawDataIndex, int32_t length); - ~PathwayList(); - - void GetSourceOutputCode(const std::string& prefix) ; - size_t GetRawDataSize(); - std::string GenerateExterns(const std::string& prefix); - -private: - ZFile* parent; - std::vector pathways; - std::vector _rawData; - uint32_t _rawDataIndex; -}; - -class ZSetPathways : public ZResource, public ZRoomCommand -{ -public: - ZSetPathways(ZFile* nParent); - ZSetPathways(ZRoom* nZRoom, const std::vector& nRawData, uint32_t nRawDataIndex, - bool nIsFromHeader); - ~ZSetPathways(); - - void ParseRawData() override; + void ParseRawDataLate() override; + void DeclareReferencesLate(const std::string& prefix) override; void DeclareVar(const std::string& prefix, const std::string& bodyStr); - std::string GetSourceOutputCode(const std::string& prefix) override; - std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - RoomCommand GetRoomCommand() override; - size_t GetRawDataSize() override; - std::string GetCommandCName() override; - std::string GenerateExterns() override; + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; private: - uint32_t segmentOffset; - PathwayList* pathwayList; - bool isFromHeader = false; -}; \ No newline at end of file + ZPath pathwayList; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp index fc9c852a98..d667328b78 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp @@ -1,30 +1,49 @@ #include "SetRoomBehavior.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" -using namespace std; - -SetRoomBehavior::SetRoomBehavior(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetRoomBehavior::SetRoomBehavior(ZFile* nParent) : ZRoomCommand(nParent) { - gameplayFlags = rawData[rawDataIndex + 0x01]; - gameplayFlags2 = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x04); } -string SetRoomBehavior::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetRoomBehavior::ParseRawData() { - return StringHelper::Sprintf( - "%s 0x%02X, 0x%08X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - gameplayFlags, gameplayFlags2); - ; + ZRoomCommand::ParseRawData(); + gameplayFlags = cmdArg1; + gameplayFlags2 = BitConverter::ToInt32BE(parent->GetRawData(), rawDataIndex + 0x04); + + currRoomUnk2 = gameplayFlags2 & 0xFF; + + currRoomUnk5 = showInvisActors = (gameplayFlags2 >> 8) & 1; + + msgCtxUnk = (gameplayFlags2 >> 10) & 1; + + enablePosLights = (gameplayFlags2 >> 11) & 1; + kankyoContextUnkE2 = (gameplayFlags2 >> 12) & 1; } -string SetRoomBehavior::GetCommandCName() +std::string SetRoomBehavior::GetBodySourceCode() const +{ + if (Globals::Instance->game == ZGame::MM_RETAIL) + { + std::string enableLights = StringHelper::BoolStr(enablePosLights); + return StringHelper::Sprintf("SCENE_CMD_ROOM_BEHAVIOR(0x%02X, 0x%02X, %i, %i, %s, %i)", + gameplayFlags, currRoomUnk2, currRoomUnk5, msgCtxUnk, + enableLights.c_str(), kankyoContextUnkE2); + } + std::string showInvisible = StringHelper::BoolStr(showInvisActors); + std::string disableWarps = StringHelper::BoolStr(msgCtxUnk); + return StringHelper::Sprintf("SCENE_CMD_ROOM_BEHAVIOR(0x%02X, 0x%02X, %s, %s)", gameplayFlags, + currRoomUnk2, showInvisible.c_str(), disableWarps.c_str()); +} + +std::string SetRoomBehavior::GetCommandCName() const { return "SCmdRoomBehavior"; } -RoomCommand SetRoomBehavior::GetRoomCommand() +RoomCommand SetRoomBehavior::GetRoomCommand() const { return RoomCommand::SetRoomBehavior; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomBehavior.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomBehavior.h index 9f89580d29..7989ea37ab 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomBehavior.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomBehavior.h @@ -1,17 +1,30 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetRoomBehavior : public ZRoomCommand { public: - SetRoomBehavior(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetRoomBehavior(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; -private: + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; + +protected: uint8_t gameplayFlags; uint32_t gameplayFlags2; -}; \ No newline at end of file + + uint8_t currRoomUnk2; + + uint8_t showInvisActors; + uint8_t currRoomUnk5; + + uint8_t msgCtxUnk; + + uint8_t enablePosLights; + uint8_t kankyoContextUnkE2; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.cpp index 38e651472f..8cac82e87f 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.cpp @@ -1,25 +1,25 @@ #include "SetRoomList.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZRoom.h" -SetRoomList::SetRoomList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetRoomList::SetRoomList(ZFile* nParent) : ZRoomCommand(nParent) { - int32_t numRooms = rawData[rawDataIndex + 1]; - segmentOffset = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF; +} - rooms = vector(); +void SetRoomList::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + int numRooms = cmdArg1; int32_t currentPtr = segmentOffset; for (int32_t i = 0; i < numRooms; i++) { - RoomEntry* entry = new RoomEntry(rawData, currentPtr); + RoomEntry entry(parent->GetRawData(), currentPtr); rooms.push_back(entry); currentPtr += 8; @@ -28,44 +28,32 @@ SetRoomList::SetRoomList(ZRoom* nZRoom, std::vector rawData, uint32_t r zRoom->roomCount = numRooms; } -SetRoomList::~SetRoomList() +void SetRoomList::DeclareReferences(const std::string& prefix) { - for (RoomEntry* entry : rooms) - delete entry; + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::None, rooms.size() * 8, "RomFile", + StringHelper::Sprintf("%sRoomList0x%06X", prefix.c_str(), segmentOffset), 0, ""); } -string SetRoomList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetRoomList::GetBodySourceCode() const { - return StringHelper::Sprintf( - "%s 0x%02X, (u32)&%sRoomList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), rooms.size(), - zRoom->GetName().c_str(), segmentOffset); + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_ROOM_LIST(%i, %s)", rooms.size(), listName.c_str()); } -string SetRoomList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - return ""; -} - -string SetRoomList::GenerateExterns() -{ - return StringHelper::Sprintf("extern RomFile %sRoomList0x%06X[];\n", zRoom->GetName().c_str(), - segmentOffset); -} - -string SetRoomList::GetCommandCName() +std::string SetRoomList::GetCommandCName() const { return "SCmdRoomList"; } -RoomCommand SetRoomList::GetRoomCommand() +RoomCommand SetRoomList::GetRoomCommand() const { return RoomCommand::SetRoomList; } -std::string SetRoomList::PreGenSourceFiles() +void SetRoomList::PreGenSourceFiles() { - string declaration = ""; + std::string declaration = ""; for (ZFile* file : Globals::Instance->files) { @@ -73,35 +61,28 @@ std::string SetRoomList::PreGenSourceFiles() { if (res->GetResourceType() == ZResourceType::Room && res != zRoom) { - string roomName = res->GetName(); - declaration += StringHelper::Sprintf( - " { (u32)_%sSegmentRomStart, (u32)_%sSegmentRomEnd },\n", roomName.c_str(), - roomName.c_str()); + std::string roomName = res->GetName(); + declaration += + StringHelper::Sprintf("\t{ (u32)_%sSegmentRomStart, (u32)_%sSegmentRomEnd },\n", + roomName.c_str(), roomName.c_str()); } } } - zRoom->parent->AddDeclarationArray( + parent->AddDeclarationArray( segmentOffset, DeclarationAlignment::None, rooms.size() * 8, "RomFile", StringHelper::Sprintf("%sRoomList0x%06X", zRoom->GetName().c_str(), segmentOffset), 0, declaration); - - return std::string(); } -std::string SetRoomList::Save() -{ - return std::string(); -} - -RoomEntry::RoomEntry(int32_t nVAS, int32_t nVAE) +RoomEntry::RoomEntry(uint32_t nVAS, uint32_t nVAE) { virtualAddressStart = nVAS; virtualAddressEnd = nVAE; } -RoomEntry::RoomEntry(std::vector rawData, uint32_t rawDataIndex) +RoomEntry::RoomEntry(const std::vector& rawData, uint32_t rawDataIndex) : RoomEntry(BitConverter::ToInt32BE(rawData, rawDataIndex + 0), BitConverter::ToInt32BE(rawData, rawDataIndex + 4)) { -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.h index f198c2f5d5..eaa2013f4d 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetRoomList.h @@ -1,32 +1,32 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class RoomEntry { public: + RoomEntry(uint32_t nVAS, uint32_t nVAE); + RoomEntry(const std::vector& rawData, uint32_t rawDataIndex); + +protected: int32_t virtualAddressStart; int32_t virtualAddressEnd; - - RoomEntry(int32_t nVAS, int32_t nVAE); - RoomEntry(std::vector rawData, uint32_t rawDataIndex); }; class SetRoomList : public ZRoomCommand { public: - SetRoomList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetRoomList(); + SetRoomList(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; - virtual RoomCommand GetRoomCommand() override; - virtual std::string PreGenSourceFiles() override; - virtual std::string Save() override; + void ParseRawData() override; + virtual void DeclareReferences(const std::string& prefix); + + std::string GetBodySourceCode() const override; + void PreGenSourceFiles() override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: - std::vector rooms; - uint32_t segmentOffset; -}; \ No newline at end of file + std::vector rooms; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp index a5007818d2..d8af2d11f1 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp @@ -1,30 +1,32 @@ #include "SetSkyboxModifier.h" -#include "../../StringHelper.h" -using namespace std; +#include "StringHelper.h" -SetSkyboxModifier::SetSkyboxModifier(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetSkyboxModifier::SetSkyboxModifier(ZFile* nParent) : ZRoomCommand(nParent) { - disableSky = rawData[rawDataIndex + 0x04]; - disableSunMoon = rawData[rawDataIndex + 0x05]; } -string SetSkyboxModifier::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetSkyboxModifier::ParseRawData() { - return StringHelper::Sprintf( - "%s 0, 0, 0, 0x%02X, 0x%02X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), disableSky, - disableSunMoon); - ; + ZRoomCommand::ParseRawData(); + disableSky = parent->GetRawData().at(rawDataIndex + 0x04); + disableSunMoon = parent->GetRawData().at(rawDataIndex + 0x05); } -string SetSkyboxModifier::GetCommandCName() +std::string SetSkyboxModifier::GetBodySourceCode() const +{ + std::string sky = StringHelper::BoolStr(disableSky); + std::string soonMoon = StringHelper::BoolStr(disableSunMoon); + return StringHelper::Sprintf("SCENE_CMD_SKYBOX_DISABLES(%s, %s)", sky.c_str(), + soonMoon.c_str()); +} + +std::string SetSkyboxModifier::GetCommandCName() const { return "SCmdSkyboxDisables"; } -RoomCommand SetSkyboxModifier::GetRoomCommand() +RoomCommand SetSkyboxModifier::GetRoomCommand() const { return RoomCommand::SetSkyboxModifier; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxModifier.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxModifier.h index 9306387757..1b0e02231d 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxModifier.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxModifier.h @@ -1,17 +1,20 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetSkyboxModifier : public ZRoomCommand { public: - SetSkyboxModifier(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetSkyboxModifier(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; private: uint8_t disableSky; uint8_t disableSunMoon; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp index ddbe77a8ca..43c5c1e9cd 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp @@ -1,32 +1,36 @@ #include "SetSkyboxSettings.h" -#include "../../Globals.h" -#include "../../StringHelper.h" +#include "Globals.h" +#include "StringHelper.h" -using namespace std; - -SetSkyboxSettings::SetSkyboxSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetSkyboxSettings::SetSkyboxSettings(ZFile* nParent) : ZRoomCommand(nParent) { - unk1 = rawData[rawDataIndex + 0x01]; - skyboxNumber = rawData[rawDataIndex + 0x04]; - cloudsType = rawData[rawDataIndex + 0x05]; - lightingSettingsControl = rawData[rawDataIndex + 0x06]; } -string SetSkyboxSettings::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetSkyboxSettings::ParseRawData() { - return StringHelper::Sprintf( - "%s 0x%02X, 0x00, 0x00, 0x%02X, 0x%02X, 0x%02X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), unk1, skyboxNumber, - cloudsType, lightingSettingsControl); + ZRoomCommand::ParseRawData(); + unk1 = cmdArg1; + skyboxNumber = parent->GetRawData().at(rawDataIndex + 0x04); + cloudsType = parent->GetRawData().at(rawDataIndex + 0x05); + isIndoors = parent->GetRawData().at(rawDataIndex + 0x06); } -string SetSkyboxSettings::GetCommandCName() +std::string SetSkyboxSettings::GetBodySourceCode() const +{ + std::string indoors = StringHelper::BoolStr(isIndoors); + if (Globals::Instance->game == ZGame::MM_RETAIL) + return StringHelper::Sprintf("SCENE_CMD_SKYBOX_SETTINGS(0x%02X, %i, %i, %s)", unk1, + skyboxNumber, cloudsType, indoors.c_str()); + return StringHelper::Sprintf("SCENE_CMD_SKYBOX_SETTINGS(%i, %i, %s)", skyboxNumber, cloudsType, + indoors.c_str()); +} + +std::string SetSkyboxSettings::GetCommandCName() const { return "SCmdSkyboxSettings"; } -RoomCommand SetSkyboxSettings::GetRoomCommand() +RoomCommand SetSkyboxSettings::GetRoomCommand() const { return RoomCommand::SetSkyboxSettings; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxSettings.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxSettings.h index c54cbe9f55..380addcf0f 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxSettings.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSkyboxSettings.h @@ -1,19 +1,22 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetSkyboxSettings : public ZRoomCommand { public: - SetSkyboxSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetSkyboxSettings(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; private: uint8_t unk1; // (MM Only) uint8_t skyboxNumber; uint8_t cloudsType; - uint8_t lightingSettingsControl; -}; \ No newline at end of file + uint8_t isIndoors; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSoundSettings.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSoundSettings.cpp index e1552704bd..9472468cec 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSoundSettings.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSoundSettings.cpp @@ -1,30 +1,30 @@ #include "SetSoundSettings.h" -#include "../../StringHelper.h" +#include "StringHelper.h" -using namespace std; - -SetSoundSettings::SetSoundSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetSoundSettings::SetSoundSettings(ZFile* nParent) : ZRoomCommand(nParent) { - reverb = rawData[rawDataIndex + 0x01]; - nightTimeSFX = rawData[rawDataIndex + 0x06]; - musicSequence = rawData[rawDataIndex + 0x07]; } -string SetSoundSettings::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetSoundSettings::ParseRawData() { - return StringHelper::Sprintf( - "%s 0x%02X, 0x00, 0x00, 0x00, 0x00, 0x%02X, 0x%02X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), reverb, nightTimeSFX, - musicSequence); + ZRoomCommand::ParseRawData(); + reverb = cmdArg1; + nightTimeSFX = parent->GetRawData().at(rawDataIndex + 0x06); + musicSequence = parent->GetRawData().at(rawDataIndex + 0x07); } -string SetSoundSettings::GetCommandCName() +std::string SetSoundSettings::GetBodySourceCode() const +{ + return StringHelper::Sprintf("SCENE_CMD_SOUND_SETTINGS(%i, %i, %i)", reverb, nightTimeSFX, + musicSequence); +} + +std::string SetSoundSettings::GetCommandCName() const { return "SCmdSoundSettings"; } -RoomCommand SetSoundSettings::GetRoomCommand() +RoomCommand SetSoundSettings::GetRoomCommand() const { return RoomCommand::SetSoundSettings; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSoundSettings.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSoundSettings.h index 24e7168312..0e35af7d12 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSoundSettings.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSoundSettings.h @@ -1,18 +1,21 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetSoundSettings : public ZRoomCommand { public: - SetSoundSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetSoundSettings(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: uint8_t reverb; uint8_t nightTimeSFX; uint8_t musicSequence; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp index 3cbe25219e..b202c4d9d3 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp @@ -1,29 +1,30 @@ #include "SetSpecialObjects.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" +#include "BitConverter.h" +#include "StringHelper.h" -using namespace std; - -SetSpecialObjects::SetSpecialObjects(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetSpecialObjects::SetSpecialObjects(ZFile* nParent) : ZRoomCommand(nParent) { - elfMessage = rawData[rawDataIndex + 0x01]; - globalObject = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); } -string SetSpecialObjects::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetSpecialObjects::ParseRawData() { - return StringHelper::Sprintf( - "%s 0x%02X, 0x%04X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - elfMessage, globalObject); + ZRoomCommand::ParseRawData(); + elfMessage = cmdArg1; + globalObject = BitConverter::ToUInt16BE(parent->GetRawData(), rawDataIndex + 0x06); } -string SetSpecialObjects::GetCommandCName() +std::string SetSpecialObjects::GetBodySourceCode() const +{ + return StringHelper::Sprintf("SCENE_CMD_SPECIAL_FILES(0x%02X, 0x%04X)", elfMessage, + globalObject); +} + +std::string SetSpecialObjects::GetCommandCName() const { return "SCmdSpecialFiles"; } -RoomCommand SetSpecialObjects::GetRoomCommand() +RoomCommand SetSpecialObjects::GetRoomCommand() const { return RoomCommand::SetSpecialObjects; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSpecialObjects.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSpecialObjects.h index 16f0398f97..959133d9e2 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetSpecialObjects.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetSpecialObjects.h @@ -1,17 +1,20 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetSpecialObjects : public ZRoomCommand { public: - SetSpecialObjects(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetSpecialObjects(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: uint8_t elfMessage; uint16_t globalObject; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetStartPositionList.cpp index 7d29e232cf..01bd1bf6e0 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetStartPositionList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetStartPositionList.cpp @@ -1,84 +1,65 @@ #include "SetStartPositionList.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZNames.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZNames.h" +#include "ZRoom/ZRoom.h" -SetStartPositionList::SetStartPositionList(ZRoom* nZRoom, std::vector rawData, - uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetStartPositionList::SetStartPositionList(ZFile* nParent) : ZRoomCommand(nParent) { - uint8_t numActors = rawData[rawDataIndex + 1]; - segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); +} - if (segmentOffset != 0) - zRoom->parent->AddDeclarationPlaceholder(segmentOffset); - - actors = vector(); +void SetStartPositionList::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + uint8_t numActors = cmdArg1; uint32_t currentPtr = segmentOffset; for (int32_t i = 0; i < numActors; i++) { - actors.push_back(new ActorSpawnEntry(rawData, currentPtr)); + actors.push_back(ActorSpawnEntry(parent->GetRawData(), currentPtr)); currentPtr += 16; } } -SetStartPositionList::~SetStartPositionList() +void SetStartPositionList::DeclareReferences(const std::string& prefix) { - for (ActorSpawnEntry* entry : actors) - delete entry; -} - -string SetStartPositionList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - string sourceOutput = ""; - - sourceOutput += - StringHelper::Sprintf("%s 0x%02X, (u32)&%sStartPositionList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - actors.size(), zRoom->GetName().c_str(), segmentOffset); - - string declaration = ""; - - for (ActorSpawnEntry* entry : actors) + if (!actors.empty()) { - declaration += StringHelper::Sprintf(" { %s, %i, %i, %i, %i, %i, %i, 0x%04X },\n", - ZNames::GetActorName(entry->actorNum).c_str(), - entry->posX, entry->posY, entry->posZ, entry->rotX, - entry->rotY, entry->rotZ, entry->initVar); + std::string declaration = ""; + + size_t index = 0; + for (const auto& entry : actors) + { + declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); + if (index + 1 < actors.size()) + declaration += "\n"; + + index++; + } + + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::Align4, actors.size() * 16, "ActorEntry", + StringHelper::Sprintf("%sStartPositionList0x%06X", prefix.c_str(), segmentOffset), 0, + declaration); } - - zRoom->parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::None, actors.size() * 16, "ActorEntry", - StringHelper::Sprintf("%sStartPositionList0x%06X", zRoom->GetName().c_str(), segmentOffset), - 0, declaration); - - return sourceOutput; } -string SetStartPositionList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +std::string SetStartPositionList::GetBodySourceCode() const { - return ""; + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_SPAWN_LIST(%i, %s)", actors.size(), listName.c_str()); } -string SetStartPositionList::GenerateExterns() -{ - return StringHelper::Sprintf("extern ActorEntry %sStartPositionList0x%06X[];\n", - zRoom->GetName().c_str(), segmentOffset); -} - -string SetStartPositionList::GetCommandCName() +std::string SetStartPositionList::GetCommandCName() const { return "SCmdSpawnList"; } -RoomCommand SetStartPositionList::GetRoomCommand() +RoomCommand SetStartPositionList::GetRoomCommand() const { return RoomCommand::SetStartPositionList; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetStartPositionList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetStartPositionList.h index 414cc3e01f..02cf7c65ad 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetStartPositionList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetStartPositionList.h @@ -1,22 +1,21 @@ #pragma once -#include "../ZRoomCommand.h" #include "SetActorList.h" +#include "ZRoom/ZRoomCommand.h" class SetStartPositionList : public ZRoomCommand { public: - std::vector actors; + SetStartPositionList(ZFile* nParent); - SetStartPositionList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetStartPositionList(); + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; - virtual RoomCommand GetRoomCommand() override; + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; private: - uint32_t segmentOffset; -}; \ No newline at end of file + std::vector actors; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetTimeSettings.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetTimeSettings.cpp index 0f5d449898..708c421228 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetTimeSettings.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetTimeSettings.cpp @@ -1,30 +1,30 @@ #include "SetTimeSettings.h" -#include "../../BitConverter.h" -#include "../../StringHelper.h" +#include "BitConverter.h" +#include "StringHelper.h" -using namespace std; - -SetTimeSettings::SetTimeSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetTimeSettings::SetTimeSettings(ZFile* nParent) : ZRoomCommand(nParent) { - hour = rawData[rawDataIndex + 4]; - min = rawData[rawDataIndex + 5]; - unk = rawData[rawDataIndex + 6]; } -string SetTimeSettings::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetTimeSettings::ParseRawData() { - return StringHelper::Sprintf( - "%s 0x00, 0x00, 0x00, 0x%02X, 0x%02X, 0x%02X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), hour, min, unk); + ZRoomCommand::ParseRawData(); + hour = parent->GetRawData().at(rawDataIndex + 4); + min = parent->GetRawData().at(rawDataIndex + 5); + unk = parent->GetRawData().at(rawDataIndex + 6); } -string SetTimeSettings::GetCommandCName() +std::string SetTimeSettings::GetBodySourceCode() const +{ + return StringHelper::Sprintf("SCENE_CMD_TIME_SETTINGS(%i, %i, %i)", hour, min, unk); +} + +std::string SetTimeSettings::GetCommandCName() const { return "SCmdTimeSettings"; } -RoomCommand SetTimeSettings::GetRoomCommand() +RoomCommand SetTimeSettings::GetRoomCommand() const { return RoomCommand::SetTimeSettings; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetTimeSettings.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetTimeSettings.h index f1104f2762..cafafc16e4 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetTimeSettings.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetTimeSettings.h @@ -1,21 +1,21 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetTimeSettings : public ZRoomCommand { public: - SetTimeSettings(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetTimeSettings(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; private: - // uint16_t time; - // int8_t speed; - uint8_t hour; uint8_t min; uint8_t unk; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp index 42f53f76e9..9d70e6d7b2 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp @@ -1,99 +1,77 @@ #include "SetTransitionActorList.h" -#include "../../BitConverter.h" -#include "../../Globals.h" -#include "../../StringHelper.h" -#include "../../ZFile.h" -#include "../ZNames.h" -#include "../ZRoom.h" -using namespace std; +#include "BitConverter.h" +#include "Globals.h" +#include "StringHelper.h" +#include "ZFile.h" +#include "ZRoom/ZNames.h" +#include "ZRoom/ZRoom.h" -SetTransitionActorList::SetTransitionActorList(ZRoom* nZRoom, std::vector rawData, - uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetTransitionActorList::SetTransitionActorList(ZFile* nParent) : ZRoomCommand(nParent) { - int32_t numActors = rawData[rawDataIndex + 1]; - segmentOffset = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF; - - transitionActors = vector(); +} +void SetTransitionActorList::ParseRawData() +{ + ZRoomCommand::ParseRawData(); + int numActors = cmdArg1; uint32_t currentPtr = segmentOffset; for (int32_t i = 0; i < numActors; i++) { - TransitionActorEntry* entry = new TransitionActorEntry(rawData, currentPtr); + TransitionActorEntry entry(parent->GetRawData(), currentPtr); transitionActors.push_back(entry); currentPtr += 16; } } -SetTransitionActorList::~SetTransitionActorList() +void SetTransitionActorList::DeclareReferences(const std::string& prefix) { - for (TransitionActorEntry* actor : transitionActors) - delete actor; -} + std::string declaration = ""; -string SetTransitionActorList::GetSourceOutputCode(std::string prefix) -{ - return ""; -} - -string SetTransitionActorList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) -{ - string sourceOutput = - StringHelper::Sprintf("%s 0x%02X, (u32)%sTransitionActorList0x%06X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), - transitionActors.size(), roomName.c_str(), segmentOffset); - string declaration = ""; - - for (TransitionActorEntry* entry : transitionActors) + size_t index = 0; + for (const auto& entry : transitionActors) { - string actorStr = ZNames::GetActorName(entry->actorNum); + declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); + if (index + 1 < transitionActors.size()) + { + declaration += "\n"; + } - declaration += StringHelper::Sprintf( - " { %i, %i, %i, %i, %s, %i, %i, %i, %i, 0x%04X }, \n", entry->frontObjectRoom, - entry->frontTransitionReaction, entry->backObjectRoom, entry->backTransitionReaction, - actorStr.c_str(), entry->posX, entry->posY, entry->posZ, entry->rotY, - (uint16_t)entry->initVar); + index++; } - zRoom->parent->AddDeclarationArray( + parent->AddDeclarationArray( segmentOffset, DeclarationAlignment::None, transitionActors.size() * 16, "TransitionActorEntry", - StringHelper::Sprintf("%sTransitionActorList0x%06X", roomName.c_str(), segmentOffset), 0, + StringHelper::Sprintf("%sTransitionActorList_%06X", prefix.c_str(), segmentOffset), 0, declaration); - - return sourceOutput; } -string SetTransitionActorList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +std::string SetTransitionActorList::GetBodySourceCode() const { - return ""; + std::string listName = parent->GetDeclarationPtrName(cmdArg2); + return StringHelper::Sprintf("SCENE_CMD_TRANSITION_ACTOR_LIST(%i, %s)", transitionActors.size(), + listName.c_str()); } -size_t SetTransitionActorList::GetRawDataSize() +size_t SetTransitionActorList::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (transitionActors.size() * 16); } -string SetTransitionActorList::GenerateExterns() -{ - return StringHelper::Sprintf("extern TransitionActorEntry %sTransitionActorList0x%06X[];\n", - zRoom->GetName().c_str(), segmentOffset); -} - -string SetTransitionActorList::GetCommandCName() +std::string SetTransitionActorList::GetCommandCName() const { return "SCmdTransiActorList"; } -RoomCommand SetTransitionActorList::GetRoomCommand() +RoomCommand SetTransitionActorList::GetRoomCommand() const { return RoomCommand::SetTransitionActorList; } -TransitionActorEntry::TransitionActorEntry(std::vector rawData, uint32_t rawDataIndex) +TransitionActorEntry::TransitionActorEntry(const std::vector& rawData, int rawDataIndex) { frontObjectRoom = rawData[rawDataIndex + 0]; frontTransitionReaction = rawData[rawDataIndex + 1]; @@ -105,4 +83,13 @@ TransitionActorEntry::TransitionActorEntry(std::vector rawData, uint32_ posZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); rotY = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); initVar = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); -} \ No newline at end of file +} + +std::string TransitionActorEntry::GetBodySourceCode() const +{ + std::string actorStr = ZNames::GetActorName(actorNum); + + return StringHelper::Sprintf("%i, %i, %i, %i, %s, %i, %i, %i, %i, 0x%04X", frontObjectRoom, + frontTransitionReaction, backObjectRoom, backTransitionReaction, + actorStr.c_str(), posX, posY, posZ, rotY, initVar); +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetTransitionActorList.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetTransitionActorList.h index d976ac1c4b..dba7a80e8c 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetTransitionActorList.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetTransitionActorList.h @@ -1,10 +1,15 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class TransitionActorEntry { public: + TransitionActorEntry(const std::vector& rawData, int rawDataIndex); + + std::string GetBodySourceCode() const; + +protected: uint8_t frontObjectRoom; uint8_t frontTransitionReaction; uint8_t backObjectRoom; @@ -13,25 +18,22 @@ public: int16_t posX, posY, posZ; int16_t rotY; uint16_t initVar; - - TransitionActorEntry(std::vector rawData, uint32_t rawDataIndex); }; class SetTransitionActorList : public ZRoomCommand { public: - SetTransitionActorList(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - ~SetTransitionActorList(); + SetTransitionActorList(ZFile* nParent); - std::string GetSourceOutputCode(std::string prefix); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - virtual RoomCommand GetRoomCommand() override; - virtual size_t GetRawDataSize() override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + + std::string GetBodySourceCode() const override; + + RoomCommand GetRoomCommand() const override; + size_t GetRawDataSize() const override; + std::string GetCommandCName() const override; private: - std::vector transitionActors; - uint32_t segmentOffset; -}; \ No newline at end of file + std::vector transitionActors; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.cpp index a82a99dafe..3b50c811f1 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.cpp @@ -1,31 +1,32 @@ #include "SetWind.h" -#include "../../StringHelper.h" +#include "StringHelper.h" -using namespace std; - -SetWind::SetWind(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetWind::SetWind(ZFile* nParent) : ZRoomCommand(nParent) { - windWest = rawData[rawDataIndex + 0x04]; - windVertical = rawData[rawDataIndex + 0x05]; - windSouth = rawData[rawDataIndex + 0x06]; - clothFlappingStrength = rawData[rawDataIndex + 0x07]; } -string SetWind::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void SetWind::ParseRawData() { - return StringHelper::Sprintf( - "%s 0x00, 0x00, 0x00, 0x%02X, 0x%02X, 0x%02X, 0x%02X", - ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), windWest, - windVertical, windSouth, clothFlappingStrength); + ZRoomCommand::ParseRawData(); + auto& parentRawData = parent->GetRawData(); + windWest = parentRawData.at(rawDataIndex + 0x04); + windVertical = parentRawData.at(rawDataIndex + 0x05); + windSouth = parentRawData.at(rawDataIndex + 0x06); + clothFlappingStrength = parentRawData.at(rawDataIndex + 0x07); } -string SetWind::GetCommandCName() +std::string SetWind::GetBodySourceCode() const +{ + return StringHelper::Sprintf("SCENE_CMD_WIND_SETTINGS(%i, %i, %i, %i)", windWest, windVertical, + windSouth, clothFlappingStrength); +} + +std::string SetWind::GetCommandCName() const { return "SCmdWindSettings"; } -RoomCommand SetWind::GetRoomCommand() +RoomCommand SetWind::GetRoomCommand() const { return RoomCommand::SetWind; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.h index a1c152cde9..8e00b4fd8d 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetWind.h @@ -1,19 +1,22 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetWind : public ZRoomCommand { public: - SetWind(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetWind(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + void ParseRawData() override; + + std::string GetBodySourceCode() const override; + + std::string GetCommandCName() const override; + RoomCommand GetRoomCommand() const override; private: uint8_t windWest; uint8_t windVertical; uint8_t windSouth; uint8_t clothFlappingStrength; -}; \ No newline at end of file +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp index cfd994bfb3..4420c9d4fe 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp @@ -1,26 +1,22 @@ #include "SetWorldMapVisited.h" -#include "../../StringHelper.h" -using namespace std; +#include "StringHelper.h" -SetWorldMapVisited::SetWorldMapVisited(ZRoom* nZRoom, std::vector rawData, - uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +SetWorldMapVisited::SetWorldMapVisited(ZFile* nParent) : ZRoomCommand(nParent) { } -string SetWorldMapVisited::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetWorldMapVisited::GetBodySourceCode() const { - return StringHelper::Sprintf( - "%s 0x00, 0x00", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str()); + return "SCENE_CMD_MISC_SETTINGS()"; } -string SetWorldMapVisited::GetCommandCName() +std::string SetWorldMapVisited::GetCommandCName() const { return "SCmdWorldMapVisited"; } -RoomCommand SetWorldMapVisited::GetRoomCommand() +RoomCommand SetWorldMapVisited::GetRoomCommand() const { return RoomCommand::SetWorldMapVisited; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/SetWorldMapVisited.h b/tools/ZAPD/ZAPD/ZRoom/Commands/SetWorldMapVisited.h index e0546c3863..a7ad93154d 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/SetWorldMapVisited.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/SetWorldMapVisited.h @@ -1,15 +1,14 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class SetWorldMapVisited : public ZRoomCommand { public: - SetWorldMapVisited(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + SetWorldMapVisited(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + std::string GetBodySourceCode() const override; -private: -}; \ No newline at end of file + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.cpp index 9bd0f96c99..69db353a49 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.cpp @@ -1,25 +1,21 @@ #include "Unused09.h" -#include "../../StringHelper.h" +#include "StringHelper.h" -using namespace std; - -Unused09::Unused09(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +Unused09::Unused09(ZFile* nParent) : ZRoomCommand(nParent) { } -string Unused09::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string Unused09::GetBodySourceCode() const { - return StringHelper::Sprintf( - "%s 0x00, 0x00", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str()); + return StringHelper::Sprintf("{ %s, 0x00, 0x00 }", GetCommandHex().c_str()); } -string Unused09::GetCommandCName() +std::string Unused09::GetCommandCName() const { return "SCmdBase"; } -RoomCommand Unused09::GetRoomCommand() +RoomCommand Unused09::GetRoomCommand() const { return RoomCommand::Unused09; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.h b/tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.h index 172ed3cc57..a38985eeaa 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/Unused09.h @@ -1,15 +1,14 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class Unused09 : public ZRoomCommand { public: - Unused09(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + Unused09(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + std::string GetBodySourceCode() const override; -private: -}; \ No newline at end of file + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.cpp index 501a5a8333..14ac6e410a 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.cpp @@ -1,25 +1,21 @@ #include "Unused1D.h" -#include "../../StringHelper.h" +#include "StringHelper.h" -using namespace std; - -Unused1D::Unused1D(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +Unused1D::Unused1D(ZFile* nParent) : ZRoomCommand(nParent) { } -string Unused1D::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string Unused1D::GetBodySourceCode() const { - return StringHelper::Sprintf( - "%s 0x00, 0x00", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str()); + return StringHelper::Sprintf("{ %s, 0x00, 0x00 }", GetCommandHex().c_str()); } -string Unused1D::GetCommandCName() +std::string Unused1D::GetCommandCName() const { return "SCmdBase"; } -RoomCommand Unused1D::GetRoomCommand() +RoomCommand Unused1D::GetRoomCommand() const { return RoomCommand::Unused1D; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.h b/tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.h index 6256e42e79..dea0f98ee5 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/Unused1D.h @@ -1,15 +1,14 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class Unused1D : public ZRoomCommand { public: - Unused1D(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + Unused1D(ZFile* nParent); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GetCommandCName() override; - virtual RoomCommand GetRoomCommand() override; + std::string GetBodySourceCode() const override; -private: -}; \ No newline at end of file + RoomCommand GetRoomCommand() const override; + std::string GetCommandCName() const override; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp b/tools/ZAPD/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp index a57fd188fc..3f35c13182 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp @@ -1,54 +1,20 @@ #include "ZRoomCommandUnk.h" -#include "../../StringHelper.h" #include "BitConverter.h" +#include "StringHelper.h" +#include "ZRoom/ZRoom.h" -using namespace std; - -ZRoomCommandUnk::ZRoomCommandUnk(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) - : ZRoomCommand(nZRoom, rawData, rawDataIndex) +ZRoomCommandUnk::ZRoomCommandUnk(ZFile* nParent) : ZRoomCommand(nParent) { - cmdID = (RoomCommand)rawData[rawDataIndex]; - cmdAddress = rawDataIndex; - zRoom = nZRoom; - - data1 = rawData[rawDataIndex + 1]; - data2 = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); } -string ZRoomCommandUnk::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string ZRoomCommandUnk::GetBodySourceCode() const { - return StringHelper::Sprintf("%s %sSet%04XCmd%02X = { 0x%02X, 0x%02X, 0x%06X }; /* WARNING: " + return StringHelper::Sprintf("{ %s, 0x%02X, 0x%06X } /* WARNING: " "UNIMPLEMENTED ROOM COMMAND */", - GetCommandCName().c_str(), roomName.c_str(), baseAddress, data2, - cmdID, data1, data2); + GetCommandHex().c_str(), cmdArg1, cmdArg2); } -string ZRoomCommandUnk::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - return ""; -} - -string ZRoomCommandUnk::GenerateSourceCodePass3(string roomName) -{ - return ""; -} - -string ZRoomCommandUnk::GenerateExterns() -{ - return ""; -} - -size_t ZRoomCommandUnk::GetRawDataSize() -{ - return 8; -} - -string ZRoomCommandUnk::GetCommandCName() -{ - return "SCmdBase"; -} - -RoomCommand ZRoomCommandUnk::GetRoomCommand() +RoomCommand ZRoomCommandUnk::GetRoomCommand() const { return RoomCommand::Error; -} \ No newline at end of file +} diff --git a/tools/ZAPD/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h b/tools/ZAPD/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h index a1877e6ac0..e381fe5a52 100644 --- a/tools/ZAPD/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h +++ b/tools/ZAPD/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h @@ -1,27 +1,12 @@ #pragma once -#include "../ZRoomCommand.h" +#include "ZRoom/ZRoomCommand.h" class ZRoomCommandUnk : public ZRoomCommand { public: - RoomCommand cmdID; - int32_t cmdAddress; - int32_t cmdIndex; - int32_t cmdSet; - uint32_t commandSet; - uint8_t data1; - uint32_t data2; + ZRoomCommandUnk(ZFile* nParent); - ZRoomCommandUnk(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); + std::string GetBodySourceCode() const override; - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) override; - virtual std::string GenerateSourceCodePass3(std::string roomName) override; - virtual RoomCommand GetRoomCommand() override; - virtual size_t GetRawDataSize() override; - virtual std::string GetCommandCName() override; - virtual std::string GenerateExterns() override; - -protected: - ZRoom* zRoom; -}; \ No newline at end of file + RoomCommand GetRoomCommand() const override; +}; diff --git a/tools/ZAPD/ZAPD/ZRoom/ZNames.h b/tools/ZAPD/ZAPD/ZRoom/ZNames.h index 6b99cd3e8e..bee03869e0 100644 --- a/tools/ZAPD/ZAPD/ZRoom/ZNames.h +++ b/tools/ZAPD/ZAPD/ZRoom/ZNames.h @@ -1,10 +1,10 @@ #pragma once -#include "../Globals.h" -#include "../StringHelper.h" - #include +#include "Globals.h" +#include "StringHelper.h" + class ZNames { public: diff --git a/tools/ZAPD/ZAPD/ZRoom/ZRoom.cpp b/tools/ZAPD/ZAPD/ZRoom/ZRoom.cpp index e280f3876b..7e4a79a5f7 100644 --- a/tools/ZAPD/ZAPD/ZRoom/ZRoom.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/ZRoom.cpp @@ -10,7 +10,7 @@ #include "Commands/SetActorCutsceneList.h" #include "Commands/SetActorList.h" #include "Commands/SetAlternateHeaders.h" -#include "Commands/SetAnimatedTextureList.h" +#include "Commands/SetAnimatedMaterialList.h" #include "Commands/SetCameraSettings.h" #include "Commands/SetCollisionHeader.h" #include "Commands/SetCsCamera.h" @@ -42,7 +42,6 @@ #include "ZCutscene.h" #include "ZFile.h" -using namespace std; using namespace tinyxml2; REGISTER_ZFILENODE(Room, ZRoom); @@ -50,11 +49,6 @@ REGISTER_ZFILENODE(Scene, ZRoom); ZRoom::ZRoom(ZFile* nParent) : ZResource(nParent) { - textures = map(); - commands = vector(); - commandSets = vector(); - extDefines = ""; - scene = nullptr; roomCount = -1; canHaveInner = true; } @@ -63,28 +57,22 @@ ZRoom::~ZRoom() { for (ZRoomCommand* cmd : commands) delete cmd; - - for(auto t : textures) - delete t.second; } void ZRoom::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); // room->scene = nScene; scene = Globals::Instance->lastScene; - if (string(reader->Name()) == "Scene") + if (std::string(reader->Name()) == "Scene") { scene = this; Globals::Instance->lastScene = this; } - Globals::Instance->AddSegment(SEGMENT_ROOM); - Globals::Instance->AddSegment(SEGMENT_SCENE); - uint32_t cmdCount = UINT32_MAX; if (name == "syotes_room_0") @@ -96,15 +84,16 @@ void ZRoom::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vectorFirstChildElement(); child != NULL; child = child->NextSiblingElement()) { - string childName = child->Attribute("Name") == NULL ? "" : string(child->Attribute("Name")); - string childComment = child->Attribute("Comment") == NULL ? - "" : - "// " + string(child->Attribute("Comment")) + "\n"; + std::string childName = + child->Attribute("Name") == NULL ? "" : std::string(child->Attribute("Name")); + std::string childComment = child->Attribute("Comment") == NULL ? + "" : + "// " + std::string(child->Attribute("Comment")) + "\n"; // TODO: Bunch of repeated code between all of these that needs to be combined. - if (string(child->Name()) == "DListHint") + if (std::string(child->Name()) == "DListHint") { - string addressStr = child->Attribute("Offset"); + std::string addressStr = child->Attribute("Offset"); int32_t address = strtol(StringHelper::Split(addressStr, "0x")[1].c_str(), NULL, 16); ZDisplayList* dList = new ZDisplayList( @@ -118,55 +107,59 @@ void ZRoom::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vectorGetSourceOutputCode(name); delete dList; } - else if (string(child->Name()) == "CutsceneHint") + else if (std::string(child->Name()) == "CutsceneHint") { - string addressStr = child->Attribute("Offset"); + std::string addressStr = child->Attribute("Offset"); int32_t address = strtol(StringHelper::Split(addressStr, "0x")[1].c_str(), NULL, 16); // ZCutscene* cutscene = new ZCutscene(rawData, address, 9999, parent); ZCutscene* cutscene = new ZCutscene(parent); - cutscene->ExtractFromXML(child, rawData, address, ""); + cutscene->ExtractFromXML(child, rawData, address); cutscene->GetSourceOutputCode(name); delete cutscene; } - else if (string(child->Name()) == "AltHeaderHint") + else if (std::string(child->Name()) == "AltHeaderHint") { - string addressStr = child->Attribute("Offset"); + std::string addressStr = child->Attribute("Offset"); int32_t address = strtol(StringHelper::Split(addressStr, "0x")[1].c_str(), NULL, 16); uint32_t commandsCount = UINT32_MAX; if (child->FindAttribute("Count") != NULL) { - string commandCountStr = child->Attribute("Count"); + std::string commandCountStr = child->Attribute("Count"); commandsCount = strtol(commandCountStr.c_str(), NULL, 10); } commandSets.push_back(CommandSet(address, commandsCount)); } - else if (string(child->Name()) == "PathHint") + else if (std::string(child->Name()) == "PathHint") { - string addressStr = child->Attribute("Offset"); + std::string addressStr = child->Attribute("Offset"); int32_t address = strtol(StringHelper::Split(addressStr, "0x")[1].c_str(), NULL, 16); - ZSetPathways* pathway = new ZSetPathways(this, rawData, address, false); - pathway->GenerateSourceCodePass1(name, 0); - pathway->GenerateSourceCodePass2(name, 0); + // TODO: add this to command set + ZPath* pathway = new ZPath(parent); + pathway->SetRawDataIndex(address); + pathway->ParseRawData(); + pathway->DeclareReferences(name); + pathway->GetSourceOutputCode(name); delete pathway; } +#ifndef DEPRECATION_OFF fprintf(stderr, "ZRoom::ExtractFromXML: Deprecation warning in '%s'.\n" "\t The resource '%s' is currently deprecated, and will be removed in a future " "version.\n" "\t Use the non-hint version instead.\n", name.c_str(), child->Name()); +#endif } - // ParseCommands(rawDataIndex); commandSets.push_back(CommandSet(rawDataIndex, cmdCount)); ProcessCommandSets(); } @@ -184,116 +177,119 @@ void ZRoom::ParseCommands(std::vector& commandList, CommandSet co if (commandsLeft <= 0) break; - RoomCommand opcode = (RoomCommand)rawData[rawDataIndex]; + RoomCommand opcode = static_cast(rawData.at(rawDataIndex)); ZRoomCommand* cmd = nullptr; - auto start = chrono::steady_clock::now(); + auto start = std::chrono::steady_clock::now(); switch (opcode) { case RoomCommand::SetStartPositionList: - cmd = new SetStartPositionList(this, rawData, rawDataIndex); + cmd = new SetStartPositionList(parent); break; // 0x00 case RoomCommand::SetActorList: - cmd = new SetActorList(this, rawData, rawDataIndex); + cmd = new SetActorList(parent); break; // 0x01 case RoomCommand::SetCsCamera: - cmd = new SetCsCamera(this, rawData, rawDataIndex); + cmd = new SetCsCamera(parent); break; // 0x02 (MM-ONLY) case RoomCommand::SetCollisionHeader: - cmd = new SetCollisionHeader(this, rawData, rawDataIndex); + cmd = new SetCollisionHeader(parent); break; // 0x03 case RoomCommand::SetRoomList: - cmd = new SetRoomList(this, rawData, rawDataIndex); + cmd = new SetRoomList(parent); break; // 0x04 case RoomCommand::SetWind: - cmd = new SetWind(this, rawData, rawDataIndex); + cmd = new SetWind(parent); break; // 0x05 case RoomCommand::SetEntranceList: - cmd = new SetEntranceList(this, rawData, rawDataIndex); + cmd = new SetEntranceList(parent); break; // 0x06 case RoomCommand::SetSpecialObjects: - cmd = new SetSpecialObjects(this, rawData, rawDataIndex); + cmd = new SetSpecialObjects(parent); break; // 0x07 case RoomCommand::SetRoomBehavior: - cmd = new SetRoomBehavior(this, rawData, rawDataIndex); + cmd = new SetRoomBehavior(parent); break; // 0x08 case RoomCommand::Unused09: - cmd = new Unused09(this, rawData, rawDataIndex); + cmd = new Unused09(parent); break; // 0x09 case RoomCommand::SetMesh: - cmd = new SetMesh(this, rawData, rawDataIndex, 0); + cmd = new SetMesh(parent); break; // 0x0A case RoomCommand::SetObjectList: - cmd = new SetObjectList(this, rawData, rawDataIndex); + cmd = new SetObjectList(parent); break; // 0x0B case RoomCommand::SetLightList: - cmd = new SetLightList(this, rawData, rawDataIndex); + cmd = new SetLightList(parent); break; // 0x0C (MM-ONLY) case RoomCommand::SetPathways: - cmd = new ZSetPathways(this, rawData, rawDataIndex, true); + cmd = new SetPathways(parent); break; // 0x0D case RoomCommand::SetTransitionActorList: - cmd = new SetTransitionActorList(this, rawData, rawDataIndex); + cmd = new SetTransitionActorList(parent); break; // 0x0E case RoomCommand::SetLightingSettings: - cmd = new SetLightingSettings(this, rawData, rawDataIndex); + cmd = new SetLightingSettings(parent); break; // 0x0F case RoomCommand::SetTimeSettings: - cmd = new SetTimeSettings(this, rawData, rawDataIndex); + cmd = new SetTimeSettings(parent); break; // 0x10 case RoomCommand::SetSkyboxSettings: - cmd = new SetSkyboxSettings(this, rawData, rawDataIndex); + cmd = new SetSkyboxSettings(parent); break; // 0x11 case RoomCommand::SetSkyboxModifier: - cmd = new SetSkyboxModifier(this, rawData, rawDataIndex); + cmd = new SetSkyboxModifier(parent); break; // 0x12 case RoomCommand::SetExitList: - cmd = new SetExitList(this, rawData, rawDataIndex); + cmd = new SetExitList(parent); break; // 0x13 case RoomCommand::EndMarker: - cmd = new EndMarker(this, rawData, rawDataIndex); + cmd = new EndMarker(parent); break; // 0x14 case RoomCommand::SetSoundSettings: - cmd = new SetSoundSettings(this, rawData, rawDataIndex); + cmd = new SetSoundSettings(parent); break; // 0x15 case RoomCommand::SetEchoSettings: - cmd = new SetEchoSettings(this, rawData, rawDataIndex); + cmd = new SetEchoSettings(parent); break; // 0x16 case RoomCommand::SetCutscenes: - cmd = new SetCutscenes(this, rawData, rawDataIndex); + cmd = new SetCutscenes(parent); break; // 0x17 case RoomCommand::SetAlternateHeaders: - cmd = new SetAlternateHeaders(this, rawData, rawDataIndex); + cmd = new SetAlternateHeaders(parent); break; // 0x18 case RoomCommand::SetCameraSettings: if (Globals::Instance->game == ZGame::MM_RETAIL) - cmd = new SetWorldMapVisited(this, rawData, rawDataIndex); + cmd = new SetWorldMapVisited(parent); else - cmd = new SetCameraSettings(this, rawData, rawDataIndex); + cmd = new SetCameraSettings(parent); break; // 0x19 - case RoomCommand::SetAnimatedTextureList: - cmd = new SetAnimatedTextureList(this, rawData, rawDataIndex); + case RoomCommand::SetAnimatedMaterialList: + cmd = new SetAnimatedMaterialList(parent); break; // 0x1A (MM-ONLY) case RoomCommand::SetActorCutsceneList: - cmd = new SetActorCutsceneList(this, rawData, rawDataIndex); + cmd = new SetActorCutsceneList(parent); break; // 0x1B (MM-ONLY) case RoomCommand::SetMinimapList: - cmd = new SetMinimapList(this, rawData, rawDataIndex); + cmd = new SetMinimapList(parent); break; // 0x1C (MM-ONLY) case RoomCommand::Unused1D: - cmd = new Unused1D(this, rawData, rawDataIndex); + cmd = new Unused1D(parent); break; // 0x1D case RoomCommand::SetMinimapChests: - cmd = new SetMinimapChests(this, rawData, rawDataIndex); + cmd = new SetMinimapChests(parent); break; // 0x1E (MM-ONLY) default: - cmd = new ZRoomCommandUnk(this, rawData, rawDataIndex); + cmd = new ZRoomCommandUnk(parent); } - auto end = chrono::steady_clock::now(); - auto diff = chrono::duration_cast(end - start).count(); + cmd->ExtractCommandFromRoom(this, rawDataIndex); + cmd->DeclareReferences(GetName()); + + auto end = std::chrono::steady_clock::now(); + auto diff = std::chrono::duration_cast(end - start).count(); if (Globals::Instance->profile) { @@ -301,10 +297,7 @@ void ZRoom::ParseCommands(std::vector& commandList, CommandSet co printf("OP: %s, TIME: %lims\n", cmd->GetCommandCName().c_str(), diff); } - // printf("OP: %s\n", cmd->GetCommandCName().c_str()); - cmd->cmdIndex = currentIndex; - cmd->cmdSet = rawDataIndex; commandList.push_back(cmd); @@ -328,40 +321,37 @@ void ZRoom::ProcessCommandSets() ParseCommands(setCommands, commandSets[0]); commandSets.erase(commandSets.begin()); - for (size_t i = 0; i < setCommands.size(); i++) + for (auto& cmd : setCommands) { - ZRoomCommand* cmd = setCommands[i]; - cmd->commandSet = commandSet & 0x00FFFFFF; - string pass1 = cmd->GenerateSourceCodePass1(name, cmd->commandSet); - - Declaration* decl = parent->AddDeclaration( - cmd->cmdAddress, - i == 0 ? DeclarationAlignment::Align16 : DeclarationAlignment::None, 8, - StringHelper::Sprintf("static %s", cmd->GetCommandCName().c_str()), - StringHelper::Sprintf("%sSet%04XCmd%02X", name.c_str(), commandSet & 0x00FFFFFF, - cmd->cmdIndex, cmd->cmdID), - StringHelper::Sprintf("\n %s\n", pass1.c_str())); - - decl->rightText = StringHelper::Sprintf("// 0x%04X", cmd->cmdAddress); + cmd->ParseRawDataLate(); + cmd->DeclareReferencesLate(name); } - sourceOutput += "\n"; + if (!setCommands.empty()) + { + std::string declaration = ""; - for (ZRoomCommand* cmd : setCommands) - commands.push_back(cmd); - } + for (size_t i = 0; i < setCommands.size(); i++) + { + ZRoomCommand* cmd = setCommands[i]; + cmd->commandSet = GETSEGOFFSET(commandSet); + declaration += StringHelper::Sprintf("\t%s,", cmd->GetBodySourceCode().c_str()); - for (ZRoomCommand* cmd : commands) - { - string pass2 = cmd->GenerateSourceCodePass2(name, cmd->commandSet); + if (i + 1 < setCommands.size()) + declaration += "\n"; + } - if (pass2 != "") - parent->AddDeclaration( - cmd->cmdAddress, DeclarationAlignment::None, 8, - StringHelper::Sprintf("static %s", cmd->GetCommandCName().c_str()), - StringHelper::Sprintf("%sSet%04XCmd%02X", name.c_str(), - cmd->commandSet & 0x00FFFFFF, cmd->cmdIndex, cmd->cmdID), - StringHelper::Sprintf("%s // 0x%04X", pass2.c_str(), cmd->cmdAddress)); + parent->AddDeclarationArray( + GETSEGOFFSET(commandSet), DeclarationAlignment::Align16, 8 * setCommands.size(), + "static SCmdBase", + StringHelper::Sprintf("%sSet%04X", name.c_str(), GETSEGOFFSET(commandSet)), + setCommands.size(), declaration); + + sourceOutput += "\n"; + + for (ZRoomCommand* cmd : setCommands) + commands.push_back(cmd); + } } } @@ -372,64 +362,38 @@ void ZRoom::ProcessCommandSets() */ void ZRoom::SyotesRoomHack() { - char headerData[] = {0x0A, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08}; + PolygonType2 poly(parent, parent->GetRawData(), 0, this); - for (size_t i = 0; i < sizeof(headerData); i++) - rawData.insert(rawData.begin() + i, headerData[i]); - - SetMesh* cmdSetMesh = new SetMesh(this, rawData, 0, -8); - - for (size_t i = 0; i < sizeof(headerData); i++) - rawData.erase(rawData.begin()); - - cmdSetMesh->cmdIndex = 0; - cmdSetMesh->cmdSet = 0; - - commands.push_back(cmdSetMesh); + poly.ParseRawData(); + poly.DeclareReferences(GetName()); + parent->AddDeclaration(0, DeclarationAlignment::Align4, poly.GetRawDataSize(), + poly.GetSourceTypeName(), poly.GetDefaultName(GetName()), + poly.GetBodySourceCode()); } ZRoomCommand* ZRoom::FindCommandOfType(RoomCommand cmdType) { for (size_t i = 0; i < commands.size(); i++) { - if (commands[i]->cmdID == cmdType) + if (commands[i]->GetRoomCommand() == cmdType) return commands[i]; } return nullptr; } -size_t ZRoom::GetDeclarationSizeFromNeighbor(int32_t declarationAddress) +size_t ZRoom::GetDeclarationSizeFromNeighbor(uint32_t declarationAddress) { - size_t declarationIndex = -1; + auto currentDecl = parent->declarations.find(declarationAddress); + if (currentDecl == parent->declarations.end()) + return 0; - // Copy it into a vector. - vector> declarationKeysSorted(parent->declarations.begin(), - parent->declarations.end()); + auto nextDecl = currentDecl; + std::advance(nextDecl, 1); + if (nextDecl == parent->declarations.end()) + return rawData.size() - currentDecl->first; - // Sort the vector according to the word count in descending order. - sort(declarationKeysSorted.begin(), declarationKeysSorted.end(), - [](const auto& lhs, const auto& rhs) { return lhs.first < rhs.first; }); - - for (size_t i = 0; i < declarationKeysSorted.size(); i++) - { - if (declarationKeysSorted[i].first == declarationAddress) - { - declarationIndex = i; - break; - } - } - - if ((int32_t)declarationIndex != -1) - { - if (declarationIndex + 1 < declarationKeysSorted.size()) - return declarationKeysSorted[declarationIndex + 1].first - - declarationKeysSorted[declarationIndex].first; - else - return rawData.size() - declarationKeysSorted[declarationIndex].first; - } - - return 0; + return nextDecl->first - currentDecl->first; } size_t ZRoom::GetCommandSizeFromNeighbor(ZRoomCommand* cmd) @@ -456,22 +420,12 @@ size_t ZRoom::GetCommandSizeFromNeighbor(ZRoomCommand* cmd) return 0; } -string ZRoom::GetSourceOutputHeader(const std::string& prefix) +std::string ZRoom::GetSourceOutputHeader(const std::string& prefix) { - sourceOutput = ""; - - for (ZRoomCommand* cmd : commands) - sourceOutput += cmd->GenerateExterns(); - - sourceOutput += "\n"; - - sourceOutput += "\n" + extDefines + "\n"; - sourceOutput += "\n"; - - return sourceOutput; + return "\n" + extDefines + "\n\n"; } -string ZRoom::GetSourceOutputCode(const std::string& prefix) +std::string ZRoom::GetSourceOutputCode(const std::string& prefix) { sourceOutput = ""; @@ -483,71 +437,12 @@ string ZRoom::GetSourceOutputCode(const std::string& prefix) if (scene != nullptr) sourceOutput += scene->parent->GetHeaderInclude(); - // sourceOutput += "\n"; - ProcessCommandSets(); - // Check for texture intersections - { - string defines = ""; - if (textures.size() != 0) - { - vector> texturesSorted(textures.begin(), textures.end()); - - sort(texturesSorted.begin(), texturesSorted.end(), - [](const auto& lhs, const auto& rhs) { return lhs.first < rhs.first; }); - - for (size_t i = 0; i < texturesSorted.size() - 1; i++) - { - int32_t texSize = textures[texturesSorted[i].first]->GetRawDataSize(); - - if ((texturesSorted[i].first + texSize) > texturesSorted[i + 1].first) - { - // int32_t intersectAmt = (texturesSorted[i].first + texSize) - texturesSorted[i + - // 1].first; - - defines += StringHelper::Sprintf( - "#define %sTex_%06X ((u32)%sTex_%06X + 0x%06X)\n", prefix.c_str(), - texturesSorted[i + 1].first, prefix.c_str(), texturesSorted[i].first, - texturesSorted[i + 1].first - texturesSorted[i].first); - - parent->declarations.erase(texturesSorted[i + 1].first); - textures.erase(texturesSorted[i + 1].first); - texturesSorted.erase(texturesSorted.begin() + i + 1); - - i--; - } - } - } - - parent->defines += defines; - } - - for (pair item : textures) - { - string declaration = ""; - - declaration += item.second->GetSourceOutputCode(prefix); - - std::string outPath = item.second->GetPoolOutPath(Globals::Instance->outputPath); - - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) - printf("SAVING IMAGE TO %s\n", outPath.c_str()); - - item.second->Save(outPath); - - auto filepath = Globals::Instance->outputPath / Path::GetFileNameWithoutExtension(item.second->GetName()); - parent->AddDeclarationIncludeArray( - item.first, - StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), item.second->GetExternalExtension().c_str()), - item.second->GetRawDataSize(), "u64", - StringHelper::Sprintf("%sTex_%06X", prefix.c_str(), item.first), 0); - } - return sourceOutput; } -size_t ZRoom::GetRawDataSize() +size_t ZRoom::GetRawDataSize() const { size_t size = 0; @@ -557,107 +452,20 @@ size_t ZRoom::GetRawDataSize() return size; } -ZResourceType ZRoom::GetResourceType() +ZResourceType ZRoom::GetResourceType() const { return ZResourceType::Room; } -void ZRoom::Save(const std::string& outFolder) -{ - for (ZRoomCommand* cmd : commands) - cmd->Save(); -} - void ZRoom::PreGenSourceFiles() { for (ZRoomCommand* cmd : commands) cmd->PreGenSourceFiles(); } -Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, - size_t nSize, string nText) -{ - alignment = nAlignment; - padding = nPadding; - size = nSize; - preText = ""; - text = nText; - rightText = ""; - postText = ""; - preComment = ""; - postComment = ""; - varType = ""; - varName = ""; - isArray = false; - arrayItemCnt = 0; - includePath = ""; - isExternal = false; - references = vector(); -} +/* CommandSet */ -Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, string nVarType, - string nVarName, bool nIsArray, string nText) - : Declaration(nAlignment, DeclarationPadding::None, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; -} - -Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, - size_t nSize, string nVarType, string nVarName, bool nIsArray, - string nText) - : Declaration(nAlignment, nPadding, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; -} - -Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, string nVarType, - string nVarName, bool nIsArray, size_t nArrayItemCnt, string nText) - : Declaration(nAlignment, DeclarationPadding::None, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; - arrayItemCnt = nArrayItemCnt; -} - -Declaration::Declaration(DeclarationAlignment nAlignment, size_t nSize, std::string nVarType, - std::string nVarName, bool nIsArray, size_t nArrayItemCnt, std::string nText, - bool nIsExternal) - : Declaration(nAlignment, nSize, nVarType, nVarName, nIsArray, nArrayItemCnt, nText) -{ - isExternal = nIsExternal; -} - -Declaration::Declaration(DeclarationAlignment nAlignment, DeclarationPadding nPadding, - size_t nSize, string nVarType, string nVarName, bool nIsArray, - size_t nArrayItemCnt, string nText) - : Declaration(nAlignment, nPadding, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; - arrayItemCnt = nArrayItemCnt; -} - -Declaration::Declaration(std::string nIncludePath, size_t nSize, string nVarType, string nVarName) - : Declaration(DeclarationAlignment::None, DeclarationPadding::None, nSize, "") -{ - includePath = nIncludePath; - varType = nVarType; - varName = nVarName; -} - -CommandSet::CommandSet(int32_t nAddress) -{ - address = nAddress; - commandCount = 9999999; -} - -CommandSet::CommandSet(int32_t nAddress, uint32_t nCommandCount) +CommandSet::CommandSet(uint32_t nAddress, uint32_t nCommandCount) { address = nAddress; commandCount = nCommandCount; diff --git a/tools/ZAPD/ZAPD/ZRoom/ZRoom.h b/tools/ZAPD/ZAPD/ZRoom/ZRoom.h index b1fe869be2..3ca3fc99d2 100644 --- a/tools/ZAPD/ZAPD/ZRoom/ZRoom.h +++ b/tools/ZAPD/ZAPD/ZRoom/ZRoom.h @@ -1,14 +1,21 @@ #pragma once -#include -#include "../ZResource.h" -#include "ZRoomCommand.h" -#include "ZTexture.h" - #include #include #include +#include "ZResource.h" +#include "ZRoomCommand.h" +#include "tinyxml2.h" + +struct CommandSet +{ + uint32_t address; + uint32_t commandCount; // Only used if explicitly specified in the XML + + CommandSet(uint32_t nAddress, uint32_t nCommandCount = UINT32_MAX); +}; + class ZRoom : public ZResource { protected: @@ -21,7 +28,6 @@ protected: public: ZRoom* scene; - std::map textures; std::vector commandSets; int32_t roomCount; // Only valid for scenes @@ -31,22 +37,14 @@ public: virtual ~ZRoom(); void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + uint32_t nRawDataIndex) override; + void ParseCommands(std::vector& commandList, CommandSet commandSet); - size_t GetDeclarationSizeFromNeighbor(int32_t declarationAddress); + size_t GetDeclarationSizeFromNeighbor(uint32_t declarationAddress); size_t GetCommandSizeFromNeighbor(ZRoomCommand* cmd); ZRoomCommand* FindCommandOfType(RoomCommand cmdType); - size_t GetRawDataSize() override; - virtual ZResourceType GetResourceType() override; - virtual void Save(const std::string& outFolder) override; + + size_t GetRawDataSize() const override; + ZResourceType GetResourceType() const override; virtual void PreGenSourceFiles() override; }; - -struct CommandSet -{ - int32_t address; - uint32_t commandCount; // Only used if explicitly specified in the XML - - CommandSet(int32_t nAddress); - CommandSet(int32_t nAddress, uint32_t nCommandCount); -}; diff --git a/tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.cpp b/tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.cpp index cf70de084b..e600ca4c7d 100644 --- a/tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.cpp +++ b/tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.cpp @@ -1,60 +1,51 @@ #include "ZRoomCommand.h" + +#include "BitConverter.h" #include "StringHelper.h" +#include "ZRoom.h" -using namespace std; - -ZRoomCommand::ZRoomCommand(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex) +ZRoomCommand::ZRoomCommand(ZFile* nParent) : ZResource(nParent) +{ +} + +void ZRoomCommand::ExtractCommandFromRoom(ZRoom* nZRoom, uint32_t nRawDataIndex) { - cmdID = (RoomCommand)rawData[rawDataIndex]; - cmdAddress = rawDataIndex; zRoom = nZRoom; + rawDataIndex = nRawDataIndex; + + ParseRawData(); } -ZRoomCommand::~ZRoomCommand() +void ZRoomCommand::ParseRawData() +{ + auto& parentRawData = parent->GetRawData(); + cmdID = static_cast(parentRawData.at(rawDataIndex)); + cmdAddress = rawDataIndex; + + cmdArg1 = parentRawData.at(rawDataIndex + 1); + cmdArg2 = BitConverter::ToUInt32BE(parentRawData, rawDataIndex + 4); + segmentOffset = GETSEGOFFSET(cmdArg2); +} + +void ZRoomCommand::ParseRawDataLate() { } -string ZRoomCommand::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +void ZRoomCommand::DeclareReferencesLate(const std::string& prefix) { - return StringHelper::Sprintf("0x%02X,", (uint8_t)cmdID); } -string ZRoomCommand::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) -{ - return ""; -} - -string ZRoomCommand::GenerateSourceCodePass3(string roomName) -{ - return ""; -} - -string ZRoomCommand::GenerateExterns() -{ - return ""; -} - -std::string ZRoomCommand::Save() -{ - return std::string(); -} - -std::string ZRoomCommand::PreGenSourceFiles() -{ - return std::string(); -} - -size_t ZRoomCommand::GetRawDataSize() -{ - return 8; -} - -string ZRoomCommand::GetCommandCName() +std::string ZRoomCommand::GetCommandCName() const { return "SCmdBase"; } -RoomCommand ZRoomCommand::GetRoomCommand() +RoomCommand ZRoomCommand::GetRoomCommand() const { return RoomCommand::Error; -} \ No newline at end of file +} + +std::string ZRoomCommand::GetCommandHex() const +{ + return StringHelper::Sprintf("0x%02X", static_cast(cmdID)); +} diff --git a/tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.h b/tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.h index 82049c9289..b89c9188f3 100644 --- a/tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.h +++ b/tools/ZAPD/ZAPD/ZRoom/ZRoomCommand.h @@ -1,10 +1,13 @@ #pragma once -#include +#include "tinyxml2.h" #include #include +#include "ZFile.h" +#include "ZResource.h" + class ZRoom; enum class RoomCommand : uint8_t @@ -38,7 +41,7 @@ enum class RoomCommand : uint8_t // MM Commands SetWorldMapVisited = 0x19, - SetAnimatedTextureList = 0x1A, + SetAnimatedMaterialList = 0x1A, SetActorCutsceneList = 0x1B, SetMinimapList = 0x1C, Unused1D = 0x1D, @@ -47,28 +50,37 @@ enum class RoomCommand : uint8_t Error = 0xFF }; -class ZRoomCommand +class ZRoomCommand : public ZResource { public: - RoomCommand cmdID; int32_t cmdAddress; uint32_t cmdIndex; - int32_t cmdSet; uint32_t commandSet; - ZRoomCommand() = default; - ZRoomCommand(ZRoom* nZRoom, std::vector rawData, uint32_t rawDataIndex); - virtual ~ZRoomCommand(); - virtual std::string GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress); - virtual std::string GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress); - virtual std::string GenerateSourceCodePass3(std::string roomName); - virtual RoomCommand GetRoomCommand(); - virtual size_t GetRawDataSize(); - virtual std::string GetCommandCName(); - virtual std::string GenerateExterns(); - virtual std::string Save(); - virtual std::string PreGenSourceFiles(); + ZRoomCommand(ZFile* nParent); + virtual ~ZRoomCommand() = default; + + virtual void ExtractCommandFromRoom(ZRoom* nZRoom, uint32_t nRawDataIndex); + + void ParseRawData() override; + + virtual void ParseRawDataLate(); + virtual void DeclareReferencesLate(const std::string& prefix); + + virtual std::string GetBodySourceCode() const = 0; + + // Getters/Setters + virtual RoomCommand GetRoomCommand() const = 0; + // virtual size_t GetRawDataSize() const; + virtual std::string GetCommandCName() const; + + virtual std::string GetCommandHex() const; protected: ZRoom* zRoom; -}; \ No newline at end of file + + RoomCommand cmdID; + uint8_t cmdArg1; + segptr_t cmdArg2; + uint32_t segmentOffset; +}; diff --git a/tools/ZAPD/ZAPD/ZScalar.cpp b/tools/ZAPD/ZAPD/ZScalar.cpp index af48dc3305..d68ab83e27 100644 --- a/tools/ZAPD/ZAPD/ZScalar.cpp +++ b/tools/ZAPD/ZAPD/ZScalar.cpp @@ -10,7 +10,7 @@ REGISTER_ZFILENODE(Scalar, ZScalar); ZScalar::ZScalar(ZFile* nParent) : ZResource(nParent) { memset(&scalarData, 0, sizeof(ZScalarData)); - scalarType = ZSCALAR_NONE; + scalarType = ZScalarType::ZSCALAR_NONE; } ZScalar::ZScalar(const ZScalarType scalarType, ZFile* nParent) : ZScalar(nParent) @@ -19,9 +19,9 @@ ZScalar::ZScalar(const ZScalarType scalarType, ZFile* nParent) : ZScalar(nParent } void ZScalar::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); } void ZScalar::ParseXML(tinyxml2::XMLElement* reader) @@ -36,71 +36,71 @@ ZScalarType ZScalar::MapOutputTypeToScalarType(const std::string& type) { if (type == "s8") { - return ZSCALAR_S8; + return ZScalarType::ZSCALAR_S8; } else if (type == "u8") { - return ZSCALAR_U8; + return ZScalarType::ZSCALAR_U8; } else if (type == "s16") { - return ZSCALAR_S16; + return ZScalarType::ZSCALAR_S16; } else if (type == "u16") { - return ZSCALAR_U16; + return ZScalarType::ZSCALAR_U16; } else if (type == "s32") { - return ZSCALAR_S32; + return ZScalarType::ZSCALAR_S32; } else if (type == "u32") { - return ZSCALAR_U32; + return ZScalarType::ZSCALAR_U32; } else if (type == "s64") { - return ZSCALAR_S64; + return ZScalarType::ZSCALAR_S64; } else if (type == "u64") { - return ZSCALAR_U64; + return ZScalarType::ZSCALAR_U64; } else if (type == "f32") { - return ZSCALAR_F32; + return ZScalarType::ZSCALAR_F32; } else if (type == "f64") { - return ZSCALAR_F64; + return ZScalarType::ZSCALAR_F64; } - return ZSCALAR_NONE; + return ZScalarType::ZSCALAR_NONE; } std::string ZScalar::MapScalarTypeToOutputType(const ZScalarType scalarType) { switch (scalarType) { - case ZSCALAR_S8: + case ZScalarType::ZSCALAR_S8: return "s8"; - case ZSCALAR_U8: + case ZScalarType::ZSCALAR_U8: return "u8"; - case ZSCALAR_S16: + case ZScalarType::ZSCALAR_S16: return "s16"; - case ZSCALAR_U16: + case ZScalarType::ZSCALAR_U16: return "u16"; - case ZSCALAR_S32: + case ZScalarType::ZSCALAR_S32: return "s32"; - case ZSCALAR_U32: + case ZScalarType::ZSCALAR_U32: return "u32"; - case ZSCALAR_S64: + case ZScalarType::ZSCALAR_S64: return "s64"; - case ZSCALAR_U64: + case ZScalarType::ZSCALAR_U64: return "u64"; - case ZSCALAR_F32: + case ZScalarType::ZSCALAR_F32: return "f32"; - case ZSCALAR_F64: + case ZScalarType::ZSCALAR_F64: return "f64"; default: return ""; @@ -111,32 +111,32 @@ size_t ZScalar::MapTypeToSize(const ZScalarType scalarType) { switch (scalarType) { - case ZSCALAR_S8: + case ZScalarType::ZSCALAR_S8: return sizeof(scalarData.s8); - case ZSCALAR_U8: + case ZScalarType::ZSCALAR_U8: return sizeof(scalarData.u8); - case ZSCALAR_S16: + case ZScalarType::ZSCALAR_S16: return sizeof(scalarData.s16); - case ZSCALAR_U16: + case ZScalarType::ZSCALAR_U16: return sizeof(scalarData.u16); - case ZSCALAR_S32: + case ZScalarType::ZSCALAR_S32: return sizeof(scalarData.s32); - case ZSCALAR_U32: + case ZScalarType::ZSCALAR_U32: return sizeof(scalarData.u32); - case ZSCALAR_S64: + case ZScalarType::ZSCALAR_S64: return sizeof(scalarData.s64); - case ZSCALAR_U64: + case ZScalarType::ZSCALAR_U64: return sizeof(scalarData.u64); - case ZSCALAR_F32: + case ZScalarType::ZSCALAR_F32: return sizeof(scalarData.f32); - case ZSCALAR_F64: + case ZScalarType::ZSCALAR_F64: return sizeof(scalarData.f64); default: return 0; } } -size_t ZScalar::GetRawDataSize() +size_t ZScalar::GetRawDataSize() const { return ZScalar::MapTypeToSize(scalarType); } @@ -150,71 +150,71 @@ void ZScalar::ParseRawData(const std::vector& data, const uint32_t offs { switch (scalarType) { - case ZSCALAR_S8: + case ZScalarType::ZSCALAR_S8: scalarData.s8 = BitConverter::ToInt8BE(data, offset); break; - case ZSCALAR_U8: + case ZScalarType::ZSCALAR_U8: scalarData.u8 = BitConverter::ToUInt8BE(data, offset); break; - case ZSCALAR_S16: + case ZScalarType::ZSCALAR_S16: scalarData.s16 = BitConverter::ToInt16BE(data, offset); break; - case ZSCALAR_U16: + case ZScalarType::ZSCALAR_U16: scalarData.u16 = BitConverter::ToUInt16BE(data, offset); break; - case ZSCALAR_S32: + case ZScalarType::ZSCALAR_S32: scalarData.s32 = BitConverter::ToInt32BE(data, offset); break; - case ZSCALAR_U32: + case ZScalarType::ZSCALAR_U32: scalarData.u32 = BitConverter::ToUInt32BE(data, offset); break; - case ZSCALAR_S64: + case ZScalarType::ZSCALAR_S64: scalarData.s64 = BitConverter::ToInt64BE(data, offset); break; - case ZSCALAR_U64: + case ZScalarType::ZSCALAR_U64: scalarData.u64 = BitConverter::ToUInt64BE(data, offset); break; - case ZSCALAR_F32: + case ZScalarType::ZSCALAR_F32: scalarData.f32 = BitConverter::ToFloatBE(data, offset); break; - case ZSCALAR_F64: + case ZScalarType::ZSCALAR_F64: scalarData.f64 = BitConverter::ToDoubleBE(data, offset); break; - case ZSCALAR_NONE: + case ZScalarType::ZSCALAR_NONE: fprintf(stderr, "Warning in ZScalar: Invalid type. %d %s %d\n", (int32_t)scalarType, __FILE__, __LINE__); break; } } -std::string ZScalar::GetSourceTypeName() +std::string ZScalar::GetSourceTypeName() const { return ZScalar::MapScalarTypeToOutputType(scalarType); } -std::string ZScalar::GetSourceValue() +std::string ZScalar::GetBodySourceCode() const { switch (scalarType) { - case ZSCALAR_S8: + case ZScalarType::ZSCALAR_S8: return StringHelper::Sprintf("%hhd", scalarData.s8); - case ZSCALAR_U8: + case ZScalarType::ZSCALAR_U8: return StringHelper::Sprintf("%hhu", scalarData.u8); - case ZSCALAR_S16: + case ZScalarType::ZSCALAR_S16: return StringHelper::Sprintf("%hd", scalarData.s16); - case ZSCALAR_U16: + case ZScalarType::ZSCALAR_U16: return StringHelper::Sprintf("%hu", scalarData.u16); - case ZSCALAR_S32: + case ZScalarType::ZSCALAR_S32: return StringHelper::Sprintf("%d", scalarData.s32); - case ZSCALAR_U32: + case ZScalarType::ZSCALAR_U32: return StringHelper::Sprintf("%u", scalarData.u32); - case ZSCALAR_S64: + case ZScalarType::ZSCALAR_S64: return StringHelper::Sprintf("%lld", scalarData.s64); - case ZSCALAR_U64: + case ZScalarType::ZSCALAR_U64: return StringHelper::Sprintf("%llu", scalarData.u64); - case ZSCALAR_F32: + case ZScalarType::ZSCALAR_F32: return StringHelper::Sprintf("%f", scalarData.f32); - case ZSCALAR_F64: + case ZScalarType::ZSCALAR_F64: return StringHelper::Sprintf("%lf", scalarData.f64); default: return ""; @@ -225,17 +225,17 @@ std::string ZScalar::GetSourceOutputCode(const std::string& prefix) { if (parent != nullptr) parent->AddDeclaration(rawDataIndex, DeclarationAlignment::None, GetRawDataSize(), - GetSourceTypeName(), GetName(), GetSourceValue()); + GetSourceTypeName(), GetName(), GetBodySourceCode()); return ""; } -ZResourceType ZScalar::GetResourceType() +ZResourceType ZScalar::GetResourceType() const { return ZResourceType::Scalar; } -bool ZScalar::DoesSupportArray() +bool ZScalar::DoesSupportArray() const { return true; } diff --git a/tools/ZAPD/ZAPD/ZScalar.h b/tools/ZAPD/ZAPD/ZScalar.h index 92d6365844..b04aef4f44 100644 --- a/tools/ZAPD/ZAPD/ZScalar.h +++ b/tools/ZAPD/ZAPD/ZScalar.h @@ -6,7 +6,7 @@ #include "ZResource.h" #include "tinyxml2.h" -typedef enum ZScalarType +enum class ZScalarType { ZSCALAR_NONE, ZSCALAR_S8, @@ -19,7 +19,7 @@ typedef enum ZScalarType ZSCALAR_U64, ZSCALAR_F32, ZSCALAR_F64 -} ZScalarType; +}; typedef union ZScalarData { @@ -47,16 +47,16 @@ public: ZScalar(const ZScalarType scalarType, ZFile* nParent); void ParseXML(tinyxml2::XMLElement* reader) override; - std::string GetSourceTypeName() override; - std::string GetSourceValue(); + std::string GetSourceTypeName() const override; + std::string GetBodySourceCode() const; std::string GetSourceOutputCode(const std::string& prefix) override; - size_t GetRawDataSize() override; - ZResourceType GetResourceType() override; - bool DoesSupportArray() override; + size_t GetRawDataSize() const override; + ZResourceType GetResourceType() const override; + bool DoesSupportArray() const override; void ParseRawData() override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; static size_t MapTypeToSize(const ZScalarType scalarType); static ZScalarType MapOutputTypeToScalarType(const std::string& type); static std::string MapScalarTypeToOutputType(const ZScalarType scalarType); diff --git a/tools/ZAPD/ZAPD/ZSkeleton.cpp b/tools/ZAPD/ZAPD/ZSkeleton.cpp index a635be597d..c59fc22aa6 100644 --- a/tools/ZAPD/ZAPD/ZSkeleton.cpp +++ b/tools/ZAPD/ZAPD/ZSkeleton.cpp @@ -3,8 +3,6 @@ #include "HighLevel/HLModelIntermediette.h" #include "StringHelper.h" -using namespace std; - REGISTER_ZFILENODE(Skeleton, ZSkeleton); ZSkeleton::ZSkeleton(ZFile* nParent) : ZResource(nParent) @@ -28,7 +26,7 @@ ZSkeleton::ZSkeleton(ZSkeletonType nType, ZLimbType nLimbType, const std::string ParseRawData(); - string defaultPrefix = name; + std::string defaultPrefix = name; defaultPrefix.replace(0, 1, "s"); // replace g prefix with s for local variables uint32_t ptr = Seg2Filespace(limbsArrayAddress, parent->baseAddress); @@ -65,7 +63,7 @@ void ZSkeleton::ParseXML(tinyxml2::XMLElement* reader) } else { - string skelTypeStr(skelTypeXml); + std::string skelTypeStr(skelTypeXml); if (skelTypeStr == "Flex") type = ZSkeletonType::Flex; @@ -93,7 +91,7 @@ void ZSkeleton::ParseXML(tinyxml2::XMLElement* reader) } else { - string limbTypeStr(limbTypeXml); + std::string limbTypeStr(limbTypeXml); if (limbTypeStr == "Standard") limbType = ZLimbType::Standard; @@ -124,14 +122,14 @@ void ZSkeleton::ParseRawData() } void ZSkeleton::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align16, GetRawDataSize(), GetSourceTypeName(), name, ""); - string defaultPrefix = name; + std::string defaultPrefix = name; defaultPrefix.replace(0, 1, "s"); // replace g prefix with s for local variables uint32_t ptr = Seg2Filespace(limbsArrayAddress, parent->baseAddress); @@ -143,17 +141,13 @@ void ZSkeleton::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vectorSetLimbType(limbType); limb->SetName(StringHelper::Sprintf("%sLimb_%06X", defaultPrefix.c_str(), ptr2)); - limb->ExtractFromXML(nullptr, rawData, ptr2, nRelPath); + limb->ExtractFromXML(nullptr, rawData, ptr2); limbs.push_back(limb); ptr += 4; } } -void ZSkeleton::Save(const std::string& outFolder) -{ -} - void ZSkeleton::GenerateHLIntermediette(HLFileIntermediette& hlFile) { HLModelIntermediette* mdl = (HLModelIntermediette*)&hlFile; @@ -161,7 +155,7 @@ void ZSkeleton::GenerateHLIntermediette(HLFileIntermediette& hlFile) mdl->blocks.push_back(new HLTerminator()); } -size_t ZSkeleton::GetRawDataSize() +size_t ZSkeleton::GetRawDataSize() const { switch (type) { @@ -179,7 +173,7 @@ std::string ZSkeleton::GetSourceOutputCode(const std::string& prefix) if (parent == nullptr) return ""; - string defaultPrefix = name.c_str(); + std::string defaultPrefix = name.c_str(); defaultPrefix.replace(0, 1, "s"); // replace g prefix with s for local variables for (auto& limb : limbs) @@ -189,8 +183,8 @@ std::string ZSkeleton::GetSourceOutputCode(const std::string& prefix) if (!parent->HasDeclaration(ptr)) { // Table - string tblStr = ""; - string limbArrTypeStr = "static void*"; + std::string tblStr = ""; + std::string limbArrTypeStr = "static void*"; if (limbType == ZLimbType::Curve) { limbArrTypeStr = @@ -201,7 +195,7 @@ std::string ZSkeleton::GetSourceOutputCode(const std::string& prefix) { ZLimb* limb = limbs.at(i); - string decl = StringHelper::Sprintf( + std::string decl = StringHelper::Sprintf( " &%s,", parent->GetDeclarationName(limb->GetFileAddress()).c_str()); if (i != (limbs.size() - 1)) { @@ -216,7 +210,7 @@ std::string ZSkeleton::GetSourceOutputCode(const std::string& prefix) limbCount, tblStr); } - string headerStr; + std::string headerStr; switch (type) { case ZSkeletonType::Normal: @@ -244,7 +238,7 @@ std::string ZSkeleton::GetSourceOutputCode(const std::string& prefix) return ""; } -std::string ZSkeleton::GetSourceTypeName() +std::string ZSkeleton::GetSourceTypeName() const { switch (type) { @@ -259,7 +253,7 @@ std::string ZSkeleton::GetSourceTypeName() return "SkeletonHeader"; } -ZResourceType ZSkeleton::GetResourceType() +ZResourceType ZSkeleton::GetResourceType() const { return ZResourceType::Skeleton; } diff --git a/tools/ZAPD/ZAPD/ZSkeleton.h b/tools/ZAPD/ZAPD/ZSkeleton.h index d93014448a..8ceb23b63a 100644 --- a/tools/ZAPD/ZAPD/ZSkeleton.h +++ b/tools/ZAPD/ZAPD/ZSkeleton.h @@ -31,15 +31,14 @@ public: void ParseXML(tinyxml2::XMLElement* reader) override; void ParseRawData() override; void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; - void Save(const std::string& outFolder) override; + const uint32_t nRawDataIndex) override; void GenerateHLIntermediette(HLFileIntermediette& hlFile) override; - size_t GetRawDataSize() override; + size_t GetRawDataSize() const override; std::string GetSourceOutputCode(const std::string& prefix) override; - std::string GetSourceTypeName() override; - ZResourceType GetResourceType() override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; segptr_t GetAddress(); uint8_t GetLimbCount(); diff --git a/tools/ZAPD/ZAPD/ZString.cpp b/tools/ZAPD/ZAPD/ZString.cpp new file mode 100644 index 0000000000..24ef2d699c --- /dev/null +++ b/tools/ZAPD/ZAPD/ZString.cpp @@ -0,0 +1,62 @@ +#include "ZString.h" + +#include "File.h" +#include "StringHelper.h" +#include "ZFile.h" + +REGISTER_ZFILENODE(String, ZString); + +ZString::ZString(ZFile* nParent) : ZResource(nParent) +{ +} + +void ZString::ParseRawData() +{ + size_t size = 0; + uint8_t* rawDataArr = rawData.data(); + size_t rawDataSize = rawData.size(); + for (size_t i = rawDataIndex; i < rawDataSize; ++i) + { + ++size; + if (rawDataArr[i] == '\0') + { + break; + } + } + + auto dataStart = rawData.begin() + rawDataIndex; + strData.assign(dataStart, dataStart + size); +} + +std::string ZString::GetBodySourceCode() const +{ + return StringHelper::Sprintf("\t\"%s\"", strData.data()); +} + +std::string ZString::GetSourceOutputCode(const std::string& prefix) +{ + parent->AddDeclarationArray(rawDataIndex, DeclarationAlignment::None, GetRawDataSize(), + GetSourceTypeName(), name, 0, GetBodySourceCode()); + + return ""; +} + +std::string ZString::GetSourceOutputHeader(const std::string& prefix) +{ + return StringHelper::Sprintf("#define %s_macro \"%s\"", name.c_str(), rawData.data()); +} + +std::string ZString::GetSourceTypeName() const +{ + return "char"; +} + +ZResourceType ZString::GetResourceType() const +{ + return ZResourceType::String; +} + +size_t ZString::GetRawDataSize() const +{ + return strData.size(); +} diff --git a/tools/ZAPD/ZAPD/ZString.h b/tools/ZAPD/ZAPD/ZString.h new file mode 100644 index 0000000000..3c0c2905a1 --- /dev/null +++ b/tools/ZAPD/ZAPD/ZString.h @@ -0,0 +1,23 @@ +#pragma once + +#include "ZResource.h" +#include "tinyxml2.h" + +class ZString : public ZResource +{ +public: + ZString(ZFile* nParent); + + void ParseRawData() override; + std::string GetBodySourceCode() const; + std::string GetSourceOutputCode(const std::string& prefix) override; + + std::string GetSourceOutputHeader(const std::string& prefix) override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; + + size_t GetRawDataSize() const override; + +protected: + std::vector strData; +}; diff --git a/tools/ZAPD/ZAPD/ZSymbol.cpp b/tools/ZAPD/ZAPD/ZSymbol.cpp index 811c759dd9..56015c0400 100644 --- a/tools/ZAPD/ZAPD/ZSymbol.cpp +++ b/tools/ZAPD/ZAPD/ZSymbol.cpp @@ -9,9 +9,9 @@ ZSymbol::ZSymbol(ZFile* nParent) : ZResource(nParent) } void ZSymbol::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); } void ZSymbol::ParseXML(tinyxml2::XMLElement* reader) @@ -57,7 +57,7 @@ void ZSymbol::ParseXML(tinyxml2::XMLElement* reader) } } -size_t ZSymbol::GetRawDataSize() +size_t ZSymbol::GetRawDataSize() const { if (isArray) return count * typeSize; @@ -80,12 +80,12 @@ std::string ZSymbol::GetSourceOutputHeader(const std::string& prefix) return StringHelper::Sprintf("extern %s %s%s;\n", type.c_str(), prefix.c_str(), name.c_str()); } -std::string ZSymbol::GetSourceTypeName() +std::string ZSymbol::GetSourceTypeName() const { return type; } -ZResourceType ZSymbol::GetResourceType() +ZResourceType ZSymbol::GetResourceType() const { return ZResourceType::Symbol; } diff --git a/tools/ZAPD/ZAPD/ZSymbol.h b/tools/ZAPD/ZAPD/ZSymbol.h index 1ad906f3bf..ad818fe1a6 100644 --- a/tools/ZAPD/ZAPD/ZSymbol.h +++ b/tools/ZAPD/ZAPD/ZSymbol.h @@ -15,14 +15,14 @@ public: ZSymbol(ZFile* nParent); void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; void ParseXML(tinyxml2::XMLElement* reader) override; - size_t GetRawDataSize() override; + size_t GetRawDataSize() const override; std::string GetSourceOutputHeader(const std::string& prefix) override; - std::string GetSourceTypeName() override; - ZResourceType GetResourceType() override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; }; diff --git a/tools/ZAPD/ZAPD/ZTexture.cpp b/tools/ZAPD/ZAPD/ZTexture.cpp index 72ccf67902..f1629de449 100644 --- a/tools/ZAPD/ZAPD/ZTexture.cpp +++ b/tools/ZAPD/ZAPD/ZTexture.cpp @@ -1,166 +1,67 @@ -#define STB_IMAGE_IMPLEMENTATION -#define STB_IMAGE_WRITE_IMPLEMENTATION -#define TINYGLTF_IMPLEMENTATION - #include "ZTexture.h" + +#include #include "BitConverter.h" #include "CRC32.h" +#include "Directory.h" #include "File.h" #include "Globals.h" #include "Path.h" -#include -#include "stb_image.h" -#include "stb_image_write.h" - -using namespace std; -using namespace tinyxml2; - REGISTER_ZFILENODE(Texture, ZTexture); ZTexture::ZTexture(ZFile* nParent) : ZResource(nParent) { - bmpRgb = nullptr; - bmpRgba = nullptr; width = 0; height = 0; - type = TextureType::Error; - isPalette = false; - isRawDataFixed = false; -} - -ZTexture::~ZTexture() -{ - if (bmpRgb != nullptr) - { - stbi_image_free(bmpRgb); - bmpRgb = nullptr; - } - - if (bmpRgba != nullptr) - { - stbi_image_free(bmpRgba); - bmpRgba = nullptr; - } - - width = 0; - height = 0; - type = TextureType::Error; } void ZTexture::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ParseXML(reader); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); + + auto filepath = Globals::Instance->outputPath / fs::path(name).stem(); + + std::string incStr = + StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), GetExternalExtension().c_str()); + + parent->AddDeclarationIncludeArray(rawDataIndex, incStr, GetRawDataSize(), GetSourceTypeName(), + name, 0); +} + +void ZTexture::FromBinary(const std::vector& nRawData, uint32_t nRawDataIndex, + int32_t nWidth, int32_t nHeight, TextureType nType, bool nIsPalette) +{ + width = nWidth; + height = nHeight; + format = nType; rawDataIndex = nRawDataIndex; - rawData = vector(nRawData.data() + rawDataIndex, - nRawData.data() + rawDataIndex + GetRawDataSize()); + isPalette = nIsPalette; + name = GetDefaultName(parent->GetName()); + outName = name; - relativePath = nRelPath; + rawData.assign(nRawData.begin(), nRawData.end()); - FixRawData(); - PrepareBitmap(); + ParseRawData(); + CalcHash(); } -ZTexture* ZTexture::FromBinary(TextureType nType, std::vector nRawData, - uint32_t nRawDataIndex, std::string nName, int32_t nWidth, - int32_t nHeight, ZFile* nParent) +void ZTexture::FromPNG(const fs::path& pngFilePath, TextureType texType) { - ZTexture* tex = new ZTexture(nParent); - - tex->width = nWidth; - tex->height = nHeight; - tex->type = nType; - tex->name = nName; - tex->outName = nName; - tex->rawDataIndex = nRawDataIndex; - - size_t dataEnd = tex->rawDataIndex + tex->GetRawDataSize(); - tex->rawData = vector(nRawData.data() + tex->rawDataIndex, nRawData.data() + dataEnd); - - tex->FixRawData(); - tex->CalcHash(); - tex->PrepareBitmap(); - - return tex; + format = texType; + name = StringHelper::Split(Path::GetFileNameWithoutExtension(pngFilePath), ".")[0]; + PrepareRawDataFromFile(pngFilePath); } -// Build Source File Mode -ZTexture* ZTexture::BuildFromXML(XMLElement* reader, string inFolder, bool readFile) +void ZTexture::FromHLTexture(HLTexture* hlTex) { - ZTexture* tex = new ZTexture(nullptr); - - tex->ParseXML(reader); - - if (readFile) - tex->PrepareRawData(inFolder); - - return tex; + width = hlTex->width; + height = hlTex->height; + format = static_cast(hlTex->type); } -ZTexture* ZTexture::FromPNG(string pngFilePath, TextureType texType) -{ - int32_t comp; - ZTexture* tex = new ZTexture(nullptr); - tex->type = texType; - tex->name = StringHelper::Split(Path::GetFileNameWithoutExtension(pngFilePath), ".")[0]; - - tex->bmpRgb = (uint8_t*)stbi_load((pngFilePath).c_str(), (int*)&tex->width, (int*)&tex->height, - &comp, STBI_rgb); - stbi_image_free(tex->bmpRgb); - tex->bmpRgb = nullptr; - tex->rawData = vector(tex->GetRawDataSize()); - - switch (texType) - { - case TextureType::RGBA16bpp: - tex->PrepareRawDataRGBA16(pngFilePath); - break; - case TextureType::RGBA32bpp: - tex->PrepareRawDataRGBA32(pngFilePath); - break; - case TextureType::Grayscale4bpp: - tex->PrepareRawDataGrayscale4(pngFilePath); - break; - case TextureType::Grayscale8bpp: - tex->PrepareRawDataGrayscale8(pngFilePath); - break; - case TextureType::GrayscaleAlpha4bpp: - tex->PrepareRawDataGrayscaleAlpha4(pngFilePath); - break; - case TextureType::GrayscaleAlpha8bpp: - tex->PrepareRawDataGrayscaleAlpha8(pngFilePath); - break; - case TextureType::GrayscaleAlpha16bpp: - tex->PrepareRawDataGrayscaleAlpha16(pngFilePath); - break; - case TextureType::Palette4bpp: - tex->PrepareRawDataPalette4(pngFilePath); - break; - case TextureType::Palette8bpp: - tex->PrepareRawDataPalette8(pngFilePath); - break; - default: - throw std::runtime_error("Format is not supported!"); - } - - tex->FixRawData(); - - return tex; -} - -ZTexture* ZTexture::FromHLTexture(HLTexture* hlTex) -{ - ZTexture* tex = new ZTexture(nullptr); - - tex->width = hlTex->width; - tex->height = hlTex->height; - tex->type = (TextureType)hlTex->type; - - return tex; -} - -void ZTexture::ParseXML(XMLElement* reader) +void ZTexture::ParseXML(tinyxml2::XMLElement* reader) { ZResource::ParseXML(reader); @@ -170,7 +71,8 @@ void ZTexture::ParseXML(XMLElement* reader) } else { - throw std::runtime_error("Width == nullptr for asset " + (string)reader->Attribute("Name")); + throw std::runtime_error("Width == nullptr for asset " + + std::string(reader->Attribute("Name"))); } if (reader->Attribute("Height") != nullptr) @@ -180,58 +82,39 @@ void ZTexture::ParseXML(XMLElement* reader) else { throw std::runtime_error("Height == nullptr for asset " + - (string)reader->Attribute("Name")); + std::string(reader->Attribute("Name"))); } - string formatStr = reader->Attribute("Format"); + std::string formatStr = reader->Attribute("Format"); - type = GetTextureTypeFromString(formatStr); + format = GetTextureTypeFromString(formatStr); - if (type == TextureType::Error) + if (format == TextureType::Error) throw std::runtime_error("Format " + formatStr + " is not supported!"); -} -void ZTexture::FixRawData() -{ - if (type == TextureType::RGBA32bpp) + auto tlutOffsetXml = reader->Attribute("TlutOffset"); + if (tlutOffsetXml != nullptr) { - for (size_t i = 0; i < rawData.size(); i += 4) + switch (format) { - uint8_t tmp = rawData[i]; - rawData[i] = rawData[i + 2]; - rawData[i + 2] = tmp; + case TextureType::Palette4bpp: + case TextureType::Palette8bpp: + tlutOffset = StringHelper::StrToL(std::string(tlutOffsetXml), 16); + break; + + default: + throw std::runtime_error(StringHelper::Sprintf( + "ZTexture::ParseXML: Error in %s\n" + "\t 'TlutOffset' declared in non color-indexed (ci4 or ci8) texture.\n", + name.c_str())); + break; } } - else if (type == TextureType::RGBA16bpp) // || type == TextureType::GrayscaleAlpha16bpp) - { - for (size_t i = 0; i < rawData.size(); i += 2) - { - uint8_t tmp = rawData[i]; - rawData[i] = rawData[i + 1]; - rawData[i + 1] = tmp; - } - } - - isRawDataFixed = !isRawDataFixed; } -void ZTexture::PrepareBitmap() +void ZTexture::ParseRawData() { - switch (type) - { - case TextureType::RGBA16bpp: - case TextureType::RGBA32bpp: - case TextureType::GrayscaleAlpha4bpp: - case TextureType::GrayscaleAlpha8bpp: - case TextureType::GrayscaleAlpha16bpp: - bmpRgba = new uint8_t[width * height * 4]; - break; - default: - bmpRgb = new uint8_t[width * height * 3]; - break; - } - - switch (type) + switch (format) { case TextureType::RGBA16bpp: PrepareBitmapRGBA16(); @@ -267,60 +150,62 @@ void ZTexture::PrepareBitmap() void ZTexture::PrepareBitmapRGBA16() { - for (int32_t y = 0; y < height; y++) + textureData.InitEmptyRGBImage(width, height, true); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (int32_t x = 0; x < width; x++) + for (size_t x = 0; x < width; x++) { - int32_t pos = ((y * width) + x) * 2; - short data = (short)((rawData[pos + 1] << 8) + rawData[pos]); - uint8_t r = (uint8_t)((data & 0xF800) >> 11); - uint8_t g = (uint8_t)((data & 0x07C0) >> 6); - uint8_t b = (uint8_t)((data & 0x003E) >> 1); - uint8_t alpha = (uint8_t)(data & 0x01); + int32_t pos = rawDataIndex + ((y * width) + x) * 2; + uint16_t data = parentRawData.at(pos + 1) | (parentRawData.at(pos) << 8); + uint8_t r = (data & 0xF800) >> 11; + uint8_t g = (data & 0x07C0) >> 6; + uint8_t b = (data & 0x003E) >> 1; + uint8_t alpha = data & 0x01; - bmpRgba[(((y * width) + x) * 4) + 0] = r * 8; - bmpRgba[(((y * width) + x) * 4) + 1] = g * 8; - bmpRgba[(((y * width) + x) * 4) + 2] = b * 8; - bmpRgba[(((y * width) + x) * 4) + 3] = alpha * 255; + textureData.SetRGBPixel(y, x, r * 8, g * 8, b * 8, alpha * 255); } } } void ZTexture::PrepareBitmapRGBA32() { - for (uint16_t y = 0; y < height; y++) + textureData.InitEmptyRGBImage(width, height, true); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (uint16_t x = 0; x < width; x++) + for (size_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 4; + size_t pos = rawDataIndex + ((y * width) + x) * 4; + uint8_t r = parentRawData.at(pos + 0); + uint8_t g = parentRawData.at(pos + 1); + uint8_t b = parentRawData.at(pos + 2); + uint8_t alpha = parentRawData.at(pos + 3); - bmpRgba[(((y * width) + x) * 4) + 0] = rawData[pos + 2]; - bmpRgba[(((y * width) + x) * 4) + 1] = rawData[pos + 1]; - bmpRgba[(((y * width) + x) * 4) + 2] = rawData[pos + 0]; - bmpRgba[(((y * width) + x) * 4) + 3] = rawData[pos + 3]; + textureData.SetRGBPixel(y, x, r, g, b, alpha); } } } void ZTexture::PrepareBitmapGrayscale4() { - for (uint16_t y = 0; y < height; y++) + textureData.InitEmptyRGBImage(width, height, false); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (uint16_t x = 0; x < width; x += 2) + for (size_t x = 0; x < width; x += 2) { for (uint8_t i = 0; i < 2; i++) { - uint16_t pos = ((y * width) + x) / 2; + size_t pos = rawDataIndex + ((y * width) + x) / 2; uint8_t grayscale = 0; if (i == 0) - grayscale = rawData[pos] & 0xF0; + grayscale = parentRawData.at(pos) & 0xF0; else - grayscale = (rawData[pos] & 0x0F) << 4; + grayscale = (parentRawData.at(pos) & 0x0F) << 4; - bmpRgb[(((y * width) + x + i) * 3) + 0] = grayscale; - bmpRgb[(((y * width) + x + i) * 3) + 1] = grayscale; - bmpRgb[(((y * width) + x + i) * 3) + 2] = grayscale; + textureData.SetGrayscalePixel(y, x + i, grayscale); } } } @@ -328,42 +213,41 @@ void ZTexture::PrepareBitmapGrayscale4() void ZTexture::PrepareBitmapGrayscale8() { - for (uint16_t y = 0; y < height; y++) + textureData.InitEmptyRGBImage(width, height, false); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (uint16_t x = 0; x < width; x++) + for (size_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 1; + size_t pos = rawDataIndex + ((y * width) + x) * 1; - bmpRgb[(((y * width) + x) * 3) + 0] = rawData[pos]; - bmpRgb[(((y * width) + x) * 3) + 1] = rawData[pos]; - bmpRgb[(((y * width) + x) * 3) + 2] = rawData[pos]; + textureData.SetGrayscalePixel(y, x, parentRawData.at(pos)); } } } void ZTexture::PrepareBitmapGrayscaleAlpha4() { - for (uint16_t y = 0; y < height; y++) + textureData.InitEmptyRGBImage(width, height, true); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (uint16_t x = 0; x < width; x += 2) + for (size_t x = 0; x < width; x += 2) { for (uint16_t i = 0; i < 2; i++) { - uint16_t pos = ((y * width) + x) / 2; + size_t pos = rawDataIndex + ((y * width) + x) / 2; uint8_t data = 0; if (i == 0) - data = (rawData[pos] & 0xF0) >> 4; + data = (parentRawData.at(pos) & 0xF0) >> 4; else - data = rawData[pos] & 0x0F; + data = parentRawData.at(pos) & 0x0F; uint8_t grayscale = ((data & 0x0E) >> 1) * 32; uint8_t alpha = (data & 0x01) * 255; - bmpRgba[(((y * width) + x + i) * 4) + 0] = grayscale; - bmpRgba[(((y * width) + x + i) * 4) + 1] = grayscale; - bmpRgba[(((y * width) + x + i) * 4) + 2] = grayscale; - bmpRgba[(((y * width) + x + i) * 4) + 3] = alpha; + textureData.SetGrayscalePixel(y, x + i, grayscale, alpha); } } } @@ -371,59 +255,57 @@ void ZTexture::PrepareBitmapGrayscaleAlpha4() void ZTexture::PrepareBitmapGrayscaleAlpha8() { - for (uint16_t y = 0; y < height; y++) + textureData.InitEmptyRGBImage(width, height, true); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (uint16_t x = 0; x < width; x++) + for (size_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 1; - uint8_t grayscale = rawData[pos] & 0xF0; - uint8_t alpha = (rawData[pos] & 0x0F) << 4; + size_t pos = rawDataIndex + ((y * width) + x) * 1; + uint8_t grayscale = parentRawData.at(pos) & 0xF0; + uint8_t alpha = (parentRawData.at(pos) & 0x0F) << 4; - bmpRgba[(((y * width) + x) * 4) + 0] = grayscale; - bmpRgba[(((y * width) + x) * 4) + 1] = grayscale; - bmpRgba[(((y * width) + x) * 4) + 2] = grayscale; - bmpRgba[(((y * width) + x) * 4) + 3] = alpha; + textureData.SetGrayscalePixel(y, x, grayscale, alpha); } } } void ZTexture::PrepareBitmapGrayscaleAlpha16() { - for (uint16_t y = 0; y < height; y++) + textureData.InitEmptyRGBImage(width, height, true); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (uint16_t x = 0; x < width; x++) + for (size_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 2; - uint8_t grayscale = rawData[pos + 0]; - uint8_t alpha = rawData[pos + 1]; + size_t pos = rawDataIndex + ((y * width) + x) * 2; + uint8_t grayscale = parentRawData.at(pos + 0); + uint8_t alpha = parentRawData.at(pos + 1); - bmpRgba[(((y * width) + x) * 4) + 0] = grayscale; - bmpRgba[(((y * width) + x) * 4) + 1] = grayscale; - bmpRgba[(((y * width) + x) * 4) + 2] = grayscale; - bmpRgba[(((y * width) + x) * 4) + 3] = alpha; + textureData.SetGrayscalePixel(y, x, grayscale, alpha); } } } void ZTexture::PrepareBitmapPalette4() { - for (uint16_t y = 0; y < height; y++) + textureData.InitEmptyPaletteImage(width, height); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (uint16_t x = 0; x < width; x += 2) + for (size_t x = 0; x < width; x += 2) { for (uint16_t i = 0; i < 2; i++) { - uint16_t pos = ((y * width) + x) / 2; + size_t pos = rawDataIndex + ((y * width) + x) / 2; uint8_t paletteIndex = 0; if (i == 0) - paletteIndex = (rawData[pos] & 0xF0) >> 4; + paletteIndex = (parentRawData.at(pos) & 0xF0) >> 4; else - paletteIndex = (rawData[pos] & 0x0F); + paletteIndex = (parentRawData.at(pos) & 0x0F); - bmpRgb[(((y * width) + x + i) * 3) + 0] = paletteIndex * 16; - bmpRgb[(((y * width) + x + i) * 3) + 1] = paletteIndex * 16; - bmpRgb[(((y * width) + x + i) * 3) + 2] = paletteIndex * 16; + textureData.SetIndexedPixel(y, x + i, paletteIndex, paletteIndex * 16); } } } @@ -431,267 +313,310 @@ void ZTexture::PrepareBitmapPalette4() void ZTexture::PrepareBitmapPalette8() { - for (uint16_t y = 0; y < height; y++) + textureData.InitEmptyPaletteImage(width, height); + auto parentRawData = parent->GetRawData(); + for (size_t y = 0; y < height; y++) { - for (uint16_t x = 0; x < width; x++) + for (size_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 1; + size_t pos = rawDataIndex + ((y * width) + x) * 1; + uint8_t grayscale = parentRawData.at(pos); - bmpRgb[(((y * width) + x) * 3) + 0] = rawData[pos]; - bmpRgb[(((y * width) + x) * 3) + 1] = rawData[pos]; - bmpRgb[(((y * width) + x) * 3) + 2] = rawData[pos]; + textureData.SetIndexedPixel(y, x, grayscale, grayscale); } } } -void ZTexture::PrepareRawData(string inFolder) +void ZTexture::DeclareReferences(const std::string& prefix) { - rawData = vector(GetRawDataSize()); - - switch (type) + if (tlutOffset != static_cast(-1)) { - case TextureType::RGBA16bpp: - PrepareRawDataRGBA16(inFolder + "/" + outName + ".rgba5a1.png"); - break; - case TextureType::RGBA32bpp: - PrepareRawDataRGBA32(inFolder + "/" + outName + ".rgba32.png"); - break; - case TextureType::Grayscale4bpp: - PrepareRawDataGrayscale4(inFolder + "/" + outName + ".i4.png"); - break; - case TextureType::Grayscale8bpp: - PrepareRawDataGrayscale8(inFolder + "/" + outName + ".i8.png"); - break; - case TextureType::GrayscaleAlpha4bpp: - PrepareRawDataGrayscaleAlpha4(inFolder + "/" + outName + ".ia4.png"); - break; - case TextureType::GrayscaleAlpha8bpp: - PrepareRawDataGrayscaleAlpha8(inFolder + "/" + outName + ".ia8.png"); - break; - case TextureType::GrayscaleAlpha16bpp: - PrepareRawDataGrayscaleAlpha16(inFolder + "/" + outName + ".ia16.png"); - break; - case TextureType::Palette4bpp: - PrepareRawDataPalette4(inFolder + "/" + outName + ".ci4.png"); - break; - case TextureType::Palette8bpp: - PrepareRawDataPalette8(inFolder + "/" + outName + ".ci8.png"); - break; - default: - throw std::runtime_error("Build Mode: Format is not supported!"); + tlut = parent->GetTextureResource(tlutOffset); + if (tlut == nullptr) + { + int32_t tlutDim = 16; + if (format == TextureType::Palette4bpp) + tlutDim = 4; + + auto filepath = Globals::Instance->outputPath / fs::path(name).stem(); + std::string incStr = StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), + GetExternalExtension().c_str()); + + tlut = new ZTexture(parent); + tlut->FromBinary(rawData, tlutOffset, tlutDim, tlutDim, TextureType::RGBA16bpp, true); + parent->AddTextureResource(tlutOffset, tlut); + parent->AddDeclarationIncludeArray(tlutOffset, incStr, tlut->GetRawDataSize(), + tlut->GetSourceTypeName(), tlut->GetName(), 0); + } + else + { + tlut->isPalette = true; + } + SetTlut(tlut); } } -void ZTexture::PrepareRawDataRGBA16(string rgbaPath) +void ZTexture::PrepareRawDataFromFile(const fs::path& pngFilePath) { - int32_t width; - int32_t height; - int32_t comp; + switch (format) + { + case TextureType::RGBA16bpp: + PrepareRawDataRGBA16(pngFilePath); + break; + case TextureType::RGBA32bpp: + PrepareRawDataRGBA32(pngFilePath); + break; + case TextureType::Grayscale4bpp: + PrepareRawDataGrayscale4(pngFilePath); + break; + case TextureType::Grayscale8bpp: + PrepareRawDataGrayscale8(pngFilePath); + break; + case TextureType::GrayscaleAlpha4bpp: + PrepareRawDataGrayscaleAlpha4(pngFilePath); + break; + case TextureType::GrayscaleAlpha8bpp: + PrepareRawDataGrayscaleAlpha8(pngFilePath); + break; + case TextureType::GrayscaleAlpha16bpp: + PrepareRawDataGrayscaleAlpha16(pngFilePath); + break; + case TextureType::Palette4bpp: + PrepareRawDataPalette4(pngFilePath); + break; + case TextureType::Palette8bpp: + PrepareRawDataPalette8(pngFilePath); + break; + default: + throw std::runtime_error("Format is not supported!"); + } +} - bmpRgba = (uint8_t*)stbi_load(rgbaPath.c_str(), &width, &height, &comp, STBI_rgb_alpha); +void ZTexture::PrepareRawDataRGBA16(const fs::path& rgbaPath) +{ + textureData.ReadPng(rgbaPath); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 2; + size_t pos = ((y * width) + x) * 2; + RGBAPixel pixel = textureData.GetPixel(y, x); - uint8_t r = bmpRgba[(((y * width) + x) * 4) + 0] / 8; - uint8_t g = bmpRgba[(((y * width) + x) * 4) + 1] / 8; - uint8_t b = bmpRgba[(((y * width) + x) * 4) + 2] / 8; + uint8_t r = pixel.r / 8; + uint8_t g = pixel.g / 8; + uint8_t b = pixel.b / 8; - uint8_t alphaBit = bmpRgba[(((y * width) + x) * 4) + 3] != 0; + uint8_t alphaBit = pixel.a != 0; uint16_t data = (r << 11) + (g << 6) + (b << 1) + alphaBit; - rawData[pos + 0] = (data & 0xFF00) >> 8; - rawData[pos + 1] = (data & 0x00FF); + textureDataRaw[pos + 0] = (data & 0xFF00) >> 8; + textureDataRaw[pos + 1] = (data & 0x00FF); } } } -void ZTexture::PrepareRawDataRGBA32(string rgbaPath) +void ZTexture::PrepareRawDataRGBA32(const fs::path& rgbaPath) { - int32_t width; - int32_t height; - int32_t comp; + textureData.ReadPng(rgbaPath); - bmpRgba = (uint8_t*)stbi_load(rgbaPath.c_str(), &width, &height, &comp, STBI_rgb_alpha); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 4; + size_t pos = ((y * width) + x) * 4; + RGBAPixel pixel = textureData.GetPixel(y, x); - rawData[pos + 0] = bmpRgba[(((y * width) + x) * 4) + 0]; - rawData[pos + 1] = bmpRgba[(((y * width) + x) * 4) + 1]; - rawData[pos + 2] = bmpRgba[(((y * width) + x) * 4) + 2]; - rawData[pos + 3] = bmpRgba[(((y * width) + x) * 4) + 3]; + textureDataRaw[pos + 0] = pixel.r; + textureDataRaw[pos + 1] = pixel.g; + textureDataRaw[pos + 2] = pixel.b; + textureDataRaw[pos + 3] = pixel.a; } } } -void ZTexture::PrepareRawDataGrayscale4(string grayPath) +void ZTexture::PrepareRawDataGrayscale4(const fs::path& grayPath) { - int32_t width; - int32_t height; - int32_t comp; + textureData.ReadPng(grayPath); - bmpRgb = (uint8_t*)stbi_load(grayPath.c_str(), &width, &height, &comp, STBI_rgb); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x += 2) { - uint16_t pos = ((y * width) + x) / 2; - uint8_t r1 = bmpRgb[(((y * width) + x) * 3) + 0]; - uint8_t r2 = bmpRgb[(((y * width) + x + 1) * 3) + 0]; + size_t pos = ((y * width) + x) / 2; + uint8_t r1 = textureData.GetPixel(y, x).r; + uint8_t r2 = textureData.GetPixel(y, x + 1).r; - rawData[pos] = (uint8_t)(((r1 / 16) << 4) + (r2 / 16)); + textureDataRaw[pos] = (uint8_t)(((r1 / 16) << 4) + (r2 / 16)); } } } -void ZTexture::PrepareRawDataGrayscale8(string grayPath) +void ZTexture::PrepareRawDataGrayscale8(const fs::path& grayPath) { - int32_t width; - int32_t height; - int32_t comp; + textureData.ReadPng(grayPath); - bmpRgb = (uint8_t*)stbi_load(grayPath.c_str(), &width, &height, &comp, STBI_rgb); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x++) { - uint16_t pos = (y * width) + x; - rawData[pos] = bmpRgb[(((y * width) + x) * 3) + 0]; + size_t pos = (y * width) + x; + RGBAPixel pixel = textureData.GetPixel(y, x); + textureDataRaw[pos] = pixel.r; } } } -void ZTexture::PrepareRawDataGrayscaleAlpha4(string grayAlphaPath) +void ZTexture::PrepareRawDataGrayscaleAlpha4(const fs::path& grayAlphaPath) { - int32_t width; - int32_t height; - int32_t comp; + textureData.ReadPng(grayAlphaPath); - bmpRgba = (uint8_t*)stbi_load(grayAlphaPath.c_str(), &width, &height, &comp, STBI_rgb_alpha); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x += 2) { - uint16_t pos = ((y * width) + x) / 2; + size_t pos = ((y * width) + x) / 2; uint8_t data = 0; for (uint16_t i = 0; i < 2; i++) { - uint8_t cR = bmpRgba[(((y * width) + x + i) * 4) + 0]; - uint8_t alphaBit = bmpRgba[(((y * width) + x + i) * 4) + 3] != 0; + RGBAPixel pixel = textureData.GetPixel(y, x + i); + uint8_t cR = pixel.r; + uint8_t alphaBit = pixel.a != 0; if (i == 0) - data += (((cR / 32) << 1) + alphaBit) << 4; + data |= (((cR / 32) << 1) + alphaBit) << 4; else - data += ((cR / 32) << 1) + alphaBit; + data |= ((cR / 32) << 1) + alphaBit; } - rawData[pos] = data; + textureDataRaw[pos] = data; } } } -void ZTexture::PrepareRawDataGrayscaleAlpha8(string grayAlphaPath) +void ZTexture::PrepareRawDataGrayscaleAlpha8(const fs::path& grayAlphaPath) { - int32_t width; - int32_t height; - int32_t comp; + textureData.ReadPng(grayAlphaPath); - bmpRgba = (uint8_t*)stbi_load(grayAlphaPath.c_str(), &width, &height, &comp, STBI_rgb_alpha); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 1; + size_t pos = ((y * width) + x) * 1; + RGBAPixel pixel = textureData.GetPixel(y, x); - uint8_t r = bmpRgba[(((y * width) + x) * 4) + 0]; - uint8_t a = bmpRgba[(((y * width) + x) * 4) + 3]; + uint8_t r = pixel.r; + uint8_t a = pixel.a; - rawData[pos] = ((r / 16) << 4) + (a / 16); + textureDataRaw[pos] = ((r / 16) << 4) + (a / 16); } } } -void ZTexture::PrepareRawDataGrayscaleAlpha16(string grayAlphaPath) +void ZTexture::PrepareRawDataGrayscaleAlpha16(const fs::path& grayAlphaPath) { - int32_t width; - int32_t height; - int32_t comp; + textureData.ReadPng(grayAlphaPath); - bmpRgba = (uint8_t*)stbi_load(grayAlphaPath.c_str(), &width, &height, &comp, STBI_rgb_alpha); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x) * 2; + size_t pos = ((y * width) + x) * 2; + RGBAPixel pixel = textureData.GetPixel(y, x); - uint8_t cR = bmpRgba[(((y * width) + x) * 4) + 0]; - uint8_t aR = bmpRgba[(((y * width) + x) * 4) + 3]; + uint8_t cR = pixel.r; + uint8_t aR = pixel.a; - rawData[pos + 0] = cR; - rawData[pos + 1] = aR; + textureDataRaw[pos + 0] = cR; + textureDataRaw[pos + 1] = aR; } } } -void ZTexture::PrepareRawDataPalette4(string palPath) +void ZTexture::PrepareRawDataPalette4(const fs::path& palPath) { - int32_t width; - int32_t height; - int32_t comp; + textureData.ReadPng(palPath); - bmpRgb = (uint8_t*)stbi_load(palPath.c_str(), &width, &height, &comp, STBI_rgb); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x += 2) { - uint16_t pos = ((y * width) + x) / 2; + size_t pos = ((y * width) + x) / 2; - uint8_t cR1 = bmpRgb[(((y * width) + x) * 3) + 0]; - uint8_t cR2 = bmpRgb[(((y * width) + x + 1) * 3) + 0]; + uint8_t cR1 = textureData.GetIndexedPixel(y, x); + uint8_t cR2 = textureData.GetIndexedPixel(y, x + 1); - rawData[pos] = ((cR1 / 16) << 4) + (cR2 / 16); + textureDataRaw[pos] = (cR1 << 4) | (cR2); } } } -void ZTexture::PrepareRawDataPalette8(string palPath) +void ZTexture::PrepareRawDataPalette8(const fs::path& palPath) { - int32_t width; - int32_t height; - int32_t comp; + textureData.ReadPng(palPath); - bmpRgb = (uint8_t*)stbi_load(palPath.c_str(), &width, &height, &comp, STBI_rgb); + width = textureData.GetWidth(); + height = textureData.GetHeight(); + textureDataRaw.clear(); + textureDataRaw.resize(GetRawDataSize()); for (uint16_t y = 0; y < height; y++) { for (uint16_t x = 0; x < width; x++) { - uint16_t pos = ((y * width) + x); + size_t pos = ((y * width) + x); + uint8_t cR = textureData.GetIndexedPixel(y, x); - uint8_t cR = bmpRgb[(((y * width) + x) * 3) + 0]; - rawData[pos] = cR; + textureDataRaw[pos] = cR; } } } -float ZTexture::GetPixelMultiplyer() +float ZTexture::GetPixelMultiplyer() const { - switch (type) + switch (format) { case TextureType::Grayscale4bpp: case TextureType::GrayscaleAlpha4bpp: @@ -711,14 +636,14 @@ float ZTexture::GetPixelMultiplyer() } } -size_t ZTexture::GetRawDataSize() +size_t ZTexture::GetRawDataSize() const { return (width * height * GetPixelMultiplyer()); } std::string ZTexture::GetIMFmtFromType() { - switch (type) + switch (format) { case TextureType::RGBA32bpp: case TextureType::RGBA16bpp: @@ -740,7 +665,7 @@ std::string ZTexture::GetIMFmtFromType() std::string ZTexture::GetIMSizFromType() { - switch (type) + switch (format) { case TextureType::Grayscale4bpp: case TextureType::Palette4bpp: @@ -759,100 +684,78 @@ std::string ZTexture::GetIMSizFromType() } } -uint16_t ZTexture::GetWidth() +std::string ZTexture::GetDefaultName(const std::string& prefix) +{ + const char* suffix = "Tex"; + if (isPalette) + suffix = "TLUT"; + return StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), suffix, rawDataIndex); +} + +uint32_t ZTexture::GetWidth() const { return width; } -uint16_t ZTexture::GetHeight() +uint32_t ZTexture::GetHeight() const { return height; } -void ZTexture::SetWidth(uint16_t nWidth) +void ZTexture::SetDimensions(uint32_t nWidth, uint32_t nHeight) { width = nWidth; -} - -void ZTexture::SetHeight(uint16_t nHeight) -{ height = nHeight; + ParseRawData(); } -TextureType ZTexture::GetTextureType() +TextureType ZTexture::GetTextureType() const { - return type; + return format; } -void ZTexture::Save(const std::string& outFolder) +void ZTexture::Save(const fs::path& outFolder) { // Optionally generate text file containing CRC information. This is going to be a one time // process for generating the Texture Pool XML. - if (Globals::Instance->testMode) + if (Globals::Instance->outputCrc) { - if (hash != 0) - { - File::WriteAllText(StringHelper::Sprintf("%s/%s.txt", - Globals::Instance->outputPath.c_str(), - outName.c_str()), - StringHelper::Sprintf("%08lX", hash)); - hash = 0; - } + File::WriteAllText(Globals::Instance->outputPath / (outName + ".txt"), + StringHelper::Sprintf("%08lX", hash)); } - std::string outPath = GetPoolOutPath(outFolder); + auto outPath = GetPoolOutPath(outFolder); if (!Directory::Exists(outPath)) Directory::CreateDirectory(outPath); - if (type == TextureType::RGBA32bpp) - stbi_write_png((outPath + "/" + outName + ".rgba32.png").c_str(), width, height, 4, bmpRgba, - width * 4); - else if (type == TextureType::RGBA16bpp) - stbi_write_png((outPath + "/" + outName + ".rgb5a1.png").c_str(), width, height, 4, bmpRgba, - width * 4); - else if (type == TextureType::Grayscale8bpp) - stbi_write_png((outPath + "/" + outName + ".i8.png").c_str(), width, height, 3, bmpRgb, - width * 3); - else if (type == TextureType::Grayscale4bpp) - stbi_write_png((outPath + "/" + outName + ".i4.png").c_str(), width, height, 3, bmpRgb, - width * 3); - else if (type == TextureType::GrayscaleAlpha16bpp) - stbi_write_png((outPath + "/" + outName + ".ia16.png").c_str(), width, height, 4, bmpRgba, - width * 4); - else if (type == TextureType::GrayscaleAlpha8bpp) - stbi_write_png((outPath + "/" + outName + ".ia8.png").c_str(), width, height, 4, bmpRgba, - width * 4); - else if (type == TextureType::GrayscaleAlpha4bpp) - stbi_write_png((outPath + "/" + outName + ".ia4.png").c_str(), width, height, 4, bmpRgba, - width * 4); - else if (type == TextureType::Palette4bpp) - stbi_write_png((outPath + "/" + outName + ".ci4.png").c_str(), width, height, 3, bmpRgb, - width * 3); - else if (type == TextureType::Palette8bpp) - stbi_write_png((outPath + "/" + outName + ".ci8.png").c_str(), width, height, 3, bmpRgb, - width * 3); + auto outFileName = outPath / (outName + "." + GetExternalExtension() + ".png"); - // if (outName != name && outName != "") - // File::WriteAllText(outFolder + "/" + outName + ".cfg", name.c_str()); +#ifdef TEXTURE_DEBUG + printf("Saving PNG: %s\n", outFileName.c_str()); + printf("\t Var name: %s\n", name.c_str()); + if (tlut != nullptr) + printf("\t TLUT name: %s\n", tlut->name.c_str()); +#endif + + textureData.WritePng(outFileName); + +#ifdef TEXTURE_DEBUG + printf("\n"); +#endif } -string ZTexture::GetSourceOutputCode(const std::string& prefix) +std::string ZTexture::GetBodySourceCode() const { - sourceOutput = ""; + std::string sourceOutput = ""; - relativePath = "build/assets/" + relativePath; - FixRawData(); - - uint8_t* rawDataArr = rawData.data(); - - for (size_t i = 0; i < rawData.size(); i += 8) + for (size_t i = 0; i < textureDataRaw.size(); i += 8) { if (i % 32 == 0) sourceOutput += " "; sourceOutput += - StringHelper::Sprintf("0x%016llX, ", BitConverter::ToUInt64BE(rawDataArr, i)); + StringHelper::Sprintf("0x%016llX, ", BitConverter::ToUInt64BE(textureDataRaw, i)); if (i % 32 == 24) sourceOutput += StringHelper::Sprintf(" // 0x%06X \n", rawDataIndex + ((i / 32) * 32)); @@ -866,38 +769,30 @@ string ZTexture::GetSourceOutputCode(const std::string& prefix) return sourceOutput; } -bool ZTexture::IsExternalResource() +bool ZTexture::IsExternalResource() const { return true; } -ZResourceType ZTexture::GetResourceType() +ZResourceType ZTexture::GetResourceType() const { return ZResourceType::Texture; } -std::string ZTexture::GetSourceTypeName() +std::string ZTexture::GetSourceTypeName() const { return "u64"; } void ZTexture::CalcHash() { - // Make sure raw data is fixed before we calc the hash... - bool fixFlag = !isRawDataFixed; - - if (fixFlag) - FixRawData(); - - hash = CRC32B(rawData.data(), GetRawDataSize()); - - if (fixFlag) - FixRawData(); + auto parentRawData = parent->GetRawData(); + hash = CRC32B(parentRawData.data() + rawDataIndex, GetRawDataSize()); } -std::string ZTexture::GetExternalExtension() +std::string ZTexture::GetExternalExtension() const { - switch (type) + switch (format) { case TextureType::RGBA32bpp: return "rgba32"; @@ -922,20 +817,15 @@ std::string ZTexture::GetExternalExtension() } } -std::string ZTexture::GetPoolOutPath(std::string defaultValue) +fs::path ZTexture::GetPoolOutPath(const fs::path& defaultValue) { if (Globals::Instance->cfg.texturePool.find(hash) != Globals::Instance->cfg.texturePool.end()) - return Path::GetDirectoryName(Globals::Instance->cfg.texturePool[hash].path); + return Path::GetDirectoryName(Globals::Instance->cfg.texturePool[hash].path.string()); return defaultValue; } -string ZTexture::GetSourceOutputHeader(const std::string& prefix) -{ - return ""; -} - -TextureType ZTexture::GetTextureTypeFromString(string str) +TextureType ZTexture::GetTextureTypeFromString(std::string str) { TextureType texType = TextureType::Error; @@ -958,6 +848,33 @@ TextureType ZTexture::GetTextureTypeFromString(string str) else if (str == "ci8") texType = TextureType::Palette8bpp; else - fprintf(stderr, "Encountered Unknown Texture Type %s \n", str.c_str()); + fprintf(stderr, "Encountered Unknown Texture format %s \n", str.c_str()); return texType; } + +bool ZTexture::IsColorIndexed() const +{ + switch (format) + { + case TextureType::Palette4bpp: + case TextureType::Palette8bpp: + return true; + + default: + return false; + } +} + +void ZTexture::SetTlut(ZTexture* nTlut) +{ + assert(IsColorIndexed()); + assert(nTlut->isPalette); + tlut = nTlut; + + textureData.SetPalette(tlut->textureData); +} + +bool ZTexture::HasTlut() const +{ + return tlut != nullptr; +} diff --git a/tools/ZAPD/ZAPD/ZTexture.h b/tools/ZAPD/ZAPD/ZTexture.h index b0a5a85949..06424d6fe0 100644 --- a/tools/ZAPD/ZAPD/ZTexture.h +++ b/tools/ZAPD/ZAPD/ZTexture.h @@ -1,13 +1,15 @@ #pragma once -#include "HighLevel/HLTexture.h" -#include "ZResource.h" -#include "tinyxml2.h" - #include +#include "HighLevel/HLTexture.h" +#include "ImageBackend.h" +#include "ZResource.h" +#include "tinyxml2.h" + enum class TextureType { + Error, RGBA32bpp, RGBA16bpp, Palette4bpp, @@ -17,26 +19,19 @@ enum class TextureType GrayscaleAlpha4bpp, GrayscaleAlpha8bpp, GrayscaleAlpha16bpp, - Error }; class ZTexture : public ZResource { protected: - TextureType type; - uint16_t width, height; + TextureType format = TextureType::Error; + uint32_t width, height; - uint8_t* bmpRgb; - uint8_t* bmpRgba; - bool isRawDataFixed; + ImageBackend textureData; + std::vector textureDataRaw; // When reading from a PNG file. + uint32_t tlutOffset = static_cast(-1); + ZTexture* tlut = nullptr; - void ParseXML(tinyxml2::XMLElement* reader) override; - void FixRawData(); - void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, - const std::string& nRelPath) override; // Extract Mode - - void PrepareBitmap(); void PrepareBitmapRGBA16(); void PrepareBitmapRGBA32(); void PrepareBitmapGrayscale8(); @@ -46,52 +41,54 @@ protected: void PrepareBitmapGrayscaleAlpha16(); void PrepareBitmapPalette4(); void PrepareBitmapPalette8(); - void PrepareRawData(std::string inFolder); - void PrepareRawDataRGBA16(std::string rgbaPath); - void PrepareRawDataRGBA32(std::string rgbaPath); - void PrepareRawDataGrayscale4(std::string grayPath); - void PrepareRawDataGrayscale8(std::string grayPath); - void PrepareRawDataGrayscaleAlpha4(std::string grayAlphaPath); - void PrepareRawDataGrayscaleAlpha8(std::string grayAlphaPath); - void PrepareRawDataGrayscaleAlpha16(std::string grayAlphaPath); - void PrepareRawDataPalette4(std::string palPath); - void PrepareRawDataPalette8(std::string palPath); - float GetPixelMultiplyer(); + + void PrepareRawDataFromFile(const fs::path& inFolder); + void PrepareRawDataRGBA16(const fs::path& rgbaPath); + void PrepareRawDataRGBA32(const fs::path& rgbaPath); + void PrepareRawDataGrayscale4(const fs::path& grayPath); + void PrepareRawDataGrayscale8(const fs::path& grayPath); + void PrepareRawDataGrayscaleAlpha4(const fs::path& grayAlphaPath); + void PrepareRawDataGrayscaleAlpha8(const fs::path& grayAlphaPath); + void PrepareRawDataGrayscaleAlpha16(const fs::path& grayAlphaPath); + void PrepareRawDataPalette4(const fs::path& palPath); + void PrepareRawDataPalette8(const fs::path& palPath); public: ZTexture(ZFile* nParent); - ~ZTexture(); - bool isPalette; + bool isPalette = false; - static ZTexture* BuildFromXML(tinyxml2::XMLElement* reader, std::string inFolder, - bool readFile); - // static ZTexture* ExtractFromXML(tinyxml2::XMLElement* reader, std::vector nRawData, - // uint32_t rawDataIndex, std::string nRelPath, ZFile* nParent); - static ZTexture* FromBinary(TextureType nType, std::vector nRawData, - uint32_t rawDataIndex, std::string nName, int32_t nWidth, - int32_t nHeight, ZFile* nParent); - static ZTexture* FromPNG(std::string pngFilePath, TextureType texType); - static ZTexture* FromHLTexture(HLTexture* hlTex); + void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, + const uint32_t nRawDataIndex) override; + void FromBinary(const std::vector& nRawData, uint32_t nRawDataIndex, int32_t nWidth, + int32_t nHeight, TextureType nType, bool nIsPalette); + void FromPNG(const fs::path& pngFilePath, TextureType texType); + void FromHLTexture(HLTexture* hlTex); static TextureType GetTextureTypeFromString(std::string str); - std::string GetSourceOutputCode(const std::string& prefix) override; - std::string GetSourceOutputHeader(const std::string& prefix) override; + void ParseXML(tinyxml2::XMLElement* reader) override; + void ParseRawData() override; + void DeclareReferences(const std::string& prefix) override; + std::string GetBodySourceCode() const; + void CalcHash() override; + void Save(const fs::path& outFolder) override; - size_t GetRawDataSize() override; + bool IsExternalResource() const override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; + std::string GetExternalExtension() const override; + + size_t GetRawDataSize() const override; std::string GetIMFmtFromType(); std::string GetIMSizFromType(); - uint16_t GetWidth(); - uint16_t GetHeight(); - void SetWidth(uint16_t nWidth); - void SetHeight(uint16_t nHeight); - TextureType GetTextureType(); - void Save(const std::string& outFolder) override; - std::string GetExternalExtension() override; - std::string GetPoolOutPath(std::string defaultValue); - void CalcHash() override; - - bool IsExternalResource() override; - std::string GetSourceTypeName() override; - ZResourceType GetResourceType() override; + std::string GetDefaultName(const std::string& prefix); + uint32_t GetWidth() const; + uint32_t GetHeight() const; + void SetDimensions(uint32_t nWidth, uint32_t nHeight); + float GetPixelMultiplyer() const; + TextureType GetTextureType() const; + fs::path GetPoolOutPath(const fs::path& defaultValue); + bool IsColorIndexed() const; + void SetTlut(ZTexture* nTlut); + bool HasTlut() const; }; diff --git a/tools/ZAPD/ZAPD/ZVector.cpp b/tools/ZAPD/ZAPD/ZVector.cpp index 160d2aa80d..51c84528b2 100644 --- a/tools/ZAPD/ZAPD/ZVector.cpp +++ b/tools/ZAPD/ZAPD/ZVector.cpp @@ -10,28 +10,14 @@ REGISTER_ZFILENODE(Vector, ZVector); ZVector::ZVector(ZFile* nParent) : ZResource(nParent) { - scalars = std::vector(); - this->scalarType = ZSCALAR_NONE; - this->dimensions = 0; -} - -ZVector::~ZVector() -{ - ClearScalars(); -} - -void ZVector::ClearScalars() -{ - for (auto s : scalars) - delete s; - - scalars.clear(); + scalarType = ZScalarType::ZSCALAR_NONE; + dimensions = 0; } void ZVector::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); } void ZVector::ParseXML(tinyxml2::XMLElement* reader) @@ -47,47 +33,47 @@ void ZVector::ParseXML(tinyxml2::XMLElement* reader) void ZVector::ParseRawData() { - int32_t currentRawDataIndex = this->rawDataIndex; + int32_t currentRawDataIndex = rawDataIndex; + // TODO: this shouldn't be necessary. + scalars.clear(); - ClearScalars(); - - for (uint32_t i = 0; i < this->dimensions; i++) + for (uint32_t i = 0; i < dimensions; i++) { - ZScalar* scalar = new ZScalar(this->scalarType, this->parent); - scalar->rawDataIndex = currentRawDataIndex; - scalar->rawData = this->rawData; - scalar->ParseRawData(); - currentRawDataIndex += scalar->GetRawDataSize(); + ZScalar scalar(scalarType, parent); + scalar.rawDataIndex = currentRawDataIndex; + scalar.rawData = rawData; + scalar.ParseRawData(); + currentRawDataIndex += scalar.GetRawDataSize(); - this->scalars.push_back(scalar); + scalars.push_back(scalar); } // Ensure the scalars vector has the same number of elements as the vector dimension. - assert(this->scalars.size() == this->dimensions); + assert(scalars.size() == dimensions); } -size_t ZVector::GetRawDataSize() +size_t ZVector::GetRawDataSize() const { size_t size = 0; for (size_t i = 0; i < this->scalars.size(); i++) - size += this->scalars[i]->GetRawDataSize(); + size += this->scalars[i].GetRawDataSize(); return size; } -bool ZVector::DoesSupportArray() +bool ZVector::DoesSupportArray() const { return true; } -std::string ZVector::GetSourceTypeName() +std::string ZVector::GetSourceTypeName() const { - if (dimensions == 3 && scalarType == ZSCALAR_F32) + if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_F32) return "Vec3f"; - else if (dimensions == 3 && scalarType == ZSCALAR_S16) + else if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_S16) return "Vec3s"; - else if (dimensions == 3 && scalarType == ZSCALAR_S32) + else if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_S32) return "Vec3i"; else { @@ -95,33 +81,43 @@ std::string ZVector::GetSourceTypeName() "Encountered unsupported vector type: %d dimensions, %s type", dimensions, ZScalar::MapScalarTypeToOutputType(scalarType).c_str()); - if (Globals::Instance->verbosity >= VERBOSITY_DEBUG) + if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) printf("%s\n", output.c_str()); throw std::runtime_error(output); } } -std::string ZVector::GetSourceValue() +std::string ZVector::GetBodySourceCode() const { - std::vector strings = std::vector(); + std::string body = ""; for (size_t i = 0; i < this->scalars.size(); i++) - strings.push_back(scalars[i]->GetSourceValue()); + body += StringHelper::Sprintf("%6s, ", scalars[i].GetBodySourceCode().c_str()); - return "{ " + StringHelper::Implode(strings, ", ") + " }"; + return "{ " + body + "}"; } std::string ZVector::GetSourceOutputCode(const std::string& prefix) { if (parent != nullptr) parent->AddDeclaration(rawDataIndex, DeclarationAlignment::None, GetRawDataSize(), - GetSourceTypeName(), GetName(), GetSourceValue()); + GetSourceTypeName(), GetName(), GetBodySourceCode()); return ""; } -ZResourceType ZVector::GetResourceType() +ZResourceType ZVector::GetResourceType() const { return ZResourceType::Vector; -} \ No newline at end of file +} + +void ZVector::SetScalarType(ZScalarType type) +{ + scalarType = type; +} + +void ZVector::SetDimensions(uint32_t dim) +{ + dimensions = dim; +} diff --git a/tools/ZAPD/ZAPD/ZVector.h b/tools/ZAPD/ZAPD/ZVector.h index 50dd4784c0..e9921b1358 100644 --- a/tools/ZAPD/ZAPD/ZVector.h +++ b/tools/ZAPD/ZAPD/ZVector.h @@ -10,25 +10,25 @@ class ZVector : public ZResource { public: - std::vector scalars; - ZScalarType scalarType; - uint32_t dimensions; - ZVector(ZFile* nParent); - ~ZVector(); void ParseXML(tinyxml2::XMLElement* reader) override; - std::string GetSourceTypeName() override; - std::string GetSourceValue(); + std::string GetSourceTypeName() const override; + std::string GetBodySourceCode() const; std::string GetSourceOutputCode(const std::string& prefix) override; void ParseRawData() override; - size_t GetRawDataSize() override; - bool DoesSupportArray() override; - ZResourceType GetResourceType() override; + size_t GetRawDataSize() const override; + bool DoesSupportArray() const override; + ZResourceType GetResourceType() const override; + + void SetScalarType(ZScalarType type); + void SetDimensions(uint32_t dim); void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; -private: - void ClearScalars(); -}; \ No newline at end of file +protected: + std::vector scalars; + ZScalarType scalarType; + uint32_t dimensions; +}; diff --git a/tools/ZAPD/ZAPD/ZVtx.cpp b/tools/ZAPD/ZAPD/ZVtx.cpp index b48015d2d1..96e6552d0b 100644 --- a/tools/ZAPD/ZAPD/ZVtx.cpp +++ b/tools/ZAPD/ZAPD/ZVtx.cpp @@ -19,19 +19,34 @@ ZVtx::ZVtx(ZFile* nParent) : ZResource(nParent) a = 0; } -void ZVtx::ParseXML(tinyxml2::XMLElement* reader) +void ZVtx::ParseRawData() { + x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); + y = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); + z = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); + flag = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); + s = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); + t = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); + r = rawData[rawDataIndex + 12]; + g = rawData[rawDataIndex + 13]; + b = rawData[rawDataIndex + 14]; + a = rawData[rawDataIndex + 15]; } -std::string ZVtx::GetSourceTypeName() +std::string ZVtx::GetBodySourceCode() const +{ + return StringHelper::Sprintf("VTX(%i, %i, %i, %i, %i, %i, %i, %i, %i)", x, y, z, s, t, r, g, b, + a); +} + +std::string ZVtx::GetSourceTypeName() const { return "Vtx"; } std::string ZVtx::GetSourceOutputCode(const std::string& prefix) { - std::string output = - StringHelper::Sprintf("VTX(%i, %i, %i, %i, %i, %i, %i, %i, %i)", x, y, z, s, t, r, g, b, a); + std::string output = GetBodySourceCode(); if (parent != nullptr) { @@ -44,49 +59,33 @@ std::string ZVtx::GetSourceOutputCode(const std::string& prefix) return ""; } -void ZVtx::ParseRawData() -{ - const uint8_t* data = rawData.data(); - - x = BitConverter::ToInt16BE(data, rawDataIndex + 0); - y = BitConverter::ToInt16BE(data, rawDataIndex + 2); - z = BitConverter::ToInt16BE(data, rawDataIndex + 4); - flag = BitConverter::ToInt16BE(data, rawDataIndex + 6); - s = BitConverter::ToInt16BE(data, rawDataIndex + 8); - t = BitConverter::ToInt16BE(data, rawDataIndex + 10); - r = data[rawDataIndex + 12]; - g = data[rawDataIndex + 13]; - b = data[rawDataIndex + 14]; - a = data[rawDataIndex + 15]; -} - -size_t ZVtx::GetRawDataSize() +size_t ZVtx::GetRawDataSize() const { return 16; } -bool ZVtx::DoesSupportArray() +bool ZVtx::DoesSupportArray() const { return true; } -ZResourceType ZVtx::GetResourceType() +ZResourceType ZVtx::GetResourceType() const { return ZResourceType::Vertex; } -bool ZVtx::IsExternalResource() +bool ZVtx::IsExternalResource() const { return true; } -std::string ZVtx::GetExternalExtension() +std::string ZVtx::GetExternalExtension() const { return "vtx"; } void ZVtx::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex) { - ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); + ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex); } diff --git a/tools/ZAPD/ZAPD/ZVtx.h b/tools/ZAPD/ZAPD/ZVtx.h index dadf838020..9100105901 100644 --- a/tools/ZAPD/ZAPD/ZVtx.h +++ b/tools/ZAPD/ZAPD/ZVtx.h @@ -17,18 +17,20 @@ public: ZVtx(ZFile* nParent); - void ParseXML(tinyxml2::XMLElement* reader) override; - std::string GetSourceTypeName() override; - std::string GetSourceOutputCode(const std::string& prefix) override; - void ParseRawData() override; - size_t GetRawDataSize() override; - bool DoesSupportArray() override; - ZResourceType GetResourceType() override; - bool IsExternalResource() override; - virtual std::string GetExternalExtension() override; - void ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector& nRawData, - const uint32_t nRawDataIndex, const std::string& nRelPath) override; + const uint32_t nRawDataIndex) override; + + void ParseRawData() override; + std::string GetBodySourceCode() const; + std::string GetSourceOutputCode(const std::string& prefix) override; + + bool IsExternalResource() const override; + bool DoesSupportArray() const override; + std::string GetSourceTypeName() const override; + ZResourceType GetResourceType() const override; + virtual std::string GetExternalExtension() const override; + + size_t GetRawDataSize() const override; protected: }; \ No newline at end of file diff --git a/tools/ZAPD/docs/zapd_extraction_xml_reference.md b/tools/ZAPD/docs/zapd_extraction_xml_reference.md index 86e64fb4c9..d8782e8118 100644 --- a/tools/ZAPD/docs/zapd_extraction_xml_reference.md +++ b/tools/ZAPD/docs/zapd_extraction_xml_reference.md @@ -27,6 +27,7 @@ This document aims to be a small reference of how to create a compatible xml fil - [Mtx](#mtx) - [Cutscene](#cutscene) - [Array](#array) + - [Path](#path) ## Basic XML @@ -110,6 +111,7 @@ u64 gCraterSmokeConeTex[] = { - `Format`: Required. The format of the image. Valid values: `rgba32`, `rgb5a1`, `i4`, `i8`, `ia4`, `ia8`, `ia16`, `ci4` and `ci8`. - `Width`: Required. Width in pixels of the image. - `Height`: Required. Height in pixels of the image. + - `TlutOffset`: Optional. Specifies the tlut's offset used by this texture. This attribute is only valid if `Format` is either `ci4` or `ci8`, otherwise an exception would be thrown. The following is a list of the texture formats the Nintendo 64 supports, with their gfxdis names and ZAPD format names. @@ -461,3 +463,20 @@ Currently, only [`Scalar`](#scalar), [`Vector`](#vector) and [`Vtx`](#vtx) suppo - `Count`: Required. Amount of elements. Integer. ------------------------- + +------------------------- + +### Path + +- Example: + +```xml + +``` + +- Attributes: + + - `Name`: Required. Suxffixed by `Path`. + - `NumPaths`: Optional. The amount of paths contained in the array. It must be a positive integer. + +------------------------- diff --git a/tools/ZAPD/lib/stb/stb_image.h b/tools/ZAPD/lib/stb/stb_image.h deleted file mode 100644 index a6202a31fb..0000000000 --- a/tools/ZAPD/lib/stb/stb_image.h +++ /dev/null @@ -1,7547 +0,0 @@ -/* stb_image - v2.22 - public domain image loader - http://nothings.org/stb - no warranty implied; use at your own risk - - Do this: - #define STB_IMAGE_IMPLEMENTATION - before you include this file in *one* C or C++ file to create the implementation. - - // i.e. it should look like this: - #include ... - #include ... - #include ... - #define STB_IMAGE_IMPLEMENTATION - #include "stb_image.h" - - You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. - And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free - - - QUICK NOTES: - Primarily of interest to game developers and other people who can - avoid problematic images and only need the trivial interface - - JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) - PNG 1/2/4/8/16-bit-per-channel - - TGA (not sure what subset, if a subset) - BMP non-1bpp, non-RLE - PSD (composited view only, no extra channels, 8/16 bit-per-channel) - - GIF (*comp always reports as 4-channel) - HDR (radiance rgbE format) - PIC (Softimage PIC) - PNM (PPM and PGM binary only) - - Animated GIF still needs a proper API, but here's one way to do it: - http://gist.github.com/urraka/685d9a6340b26b830d49 - - - decode from memory or through FILE (define STBI_NO_STDIO to remove code) - - decode from arbitrary I/O callbacks - - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) - - Full documentation under "DOCUMENTATION" below. - - -LICENSE - - See end of file for license information. - -RECENT REVISION HISTORY: - - 2.22 (2019-03-04) gif fixes, fix warnings - 2.21 (2019-02-25) fix typo in comment - 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs - 2.19 (2018-02-11) fix warning - 2.18 (2018-01-30) fix warnings - 2.17 (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings - 2.16 (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes - 2.15 (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC - 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs - 2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes - 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes - 2.11 (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64 - RGB-format JPEG; remove white matting in PSD; - allocate large structures on the stack; - correct channel count for PNG & BMP - 2.10 (2016-01-22) avoid warning introduced in 2.09 - 2.09 (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED - - See end of file for full revision history. - - - ============================ Contributors ========================= - - Image formats Extensions, features - Sean Barrett (jpeg, png, bmp) Jetro Lauha (stbi_info) - Nicolas Schulz (hdr, psd) Martin "SpartanJ" Golini (stbi_info) - Jonathan Dummer (tga) James "moose2000" Brown (iPhone PNG) - Jean-Marc Lienher (gif) Ben "Disch" Wenger (io callbacks) - Tom Seddon (pic) Omar Cornut (1/2/4-bit PNG) - Thatcher Ulrich (psd) Nicolas Guillemot (vertical flip) - Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD) - github:urraka (animated gif) Junggon Kim (PNM comments) - Christopher Forseth (animated gif) Daniel Gibson (16-bit TGA) - socks-the-fox (16-bit PNG) - Jeremy Sawicki (handle all ImageNet JPGs) - Optimizations & bugfixes Mikhail Morozov (1-bit BMP) - Fabian "ryg" Giesen Anael Seghezzi (is-16-bit query) - Arseny Kapoulkine - John-Mark Allen - Carmelo J Fdez-Aguera - - Bug & warning fixes - Marc LeBlanc David Woo Guillaume George Martins Mozeiko - Christpher Lloyd Jerry Jansson Joseph Thomson Phil Jordan - Dave Moore Roy Eltham Hayaki Saito Nathan Reed - Won Chun Luke Graham Johan Duparc Nick Verigakis - the Horde3D community Thomas Ruf Ronny Chevalier github:rlyeh - Janez Zemva John Bartholomew Michal Cichon github:romigrou - Jonathan Blow Ken Hamada Tero Hanninen github:svdijk - Laurent Gomila Cort Stratton Sergio Gonzalez github:snagar - Aruelien Pocheville Thibault Reuille Cass Everitt github:Zelex - Ryamond Barbiero Paul Du Bois Engin Manap github:grim210 - Aldo Culquicondor Philipp Wiesemann Dale Weiler github:sammyhw - Oriol Ferrer Mesia Josh Tobin Matthew Gregan github:phprus - Julian Raschke Gregory Mullen Baldur Karlsson github:poppolopoppo - Christian Floisand Kevin Schmidt JR Smith github:darealshinji - Blazej Dariusz Roszkowski github:Michaelangel007 -*/ - -#ifndef STBI_INCLUDE_STB_IMAGE_H -#define STBI_INCLUDE_STB_IMAGE_H - -// DOCUMENTATION -// -// Limitations: -// - no 12-bit-per-channel JPEG -// - no JPEGs with arithmetic coding -// - GIF always returns *comp=4 -// -// Basic usage (see HDR discussion below for HDR usage): -// int x,y,n; -// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); -// // ... process data if not NULL ... -// // ... x = width, y = height, n = # 8-bit components per pixel ... -// // ... replace '0' with '1'..'4' to force that many components per pixel -// // ... but 'n' will always be the number that it would have been if you said 0 -// stbi_image_free(data) -// -// Standard parameters: -// int *x -- outputs image width in pixels -// int *y -- outputs image height in pixels -// int *channels_in_file -- outputs # of image components in image file -// int desired_channels -- if non-zero, # of image components requested in result -// -// The return value from an image loader is an 'unsigned char *' which points -// to the pixel data, or NULL on an allocation failure or if the image is -// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, -// with each pixel consisting of N interleaved 8-bit components; the first -// pixel pointed to is top-left-most in the image. There is no padding between -// image scanlines or between pixels, regardless of format. The number of -// components N is 'desired_channels' if desired_channels is non-zero, or -// *channels_in_file otherwise. If desired_channels is non-zero, -// *channels_in_file has the number of components that _would_ have been -// output otherwise. E.g. if you set desired_channels to 4, you will always -// get RGBA output, but you can check *channels_in_file to see if it's trivially -// opaque because e.g. there were only 3 channels in the source image. -// -// An output image with N components has the following components interleaved -// in this order in each pixel: -// -// N=#comp components -// 1 grey -// 2 grey, alpha -// 3 red, green, blue -// 4 red, green, blue, alpha -// -// If image loading fails for any reason, the return value will be NULL, -// and *x, *y, *channels_in_file will be unchanged. The function -// stbi_failure_reason() can be queried for an extremely brief, end-user -// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS -// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly -// more user-friendly ones. -// -// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. -// -// =========================================================================== -// -// UNICODE: -// -// If compiling for Windows and you wish to use Unicode filenames, compile -// with -// #define STBI_WINDOWS_UTF8 -// and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert -// Windows wchar_t filenames to utf8. -// -// =========================================================================== -// -// Philosophy -// -// stb libraries are designed with the following priorities: -// -// 1. easy to use -// 2. easy to maintain -// 3. good performance -// -// Sometimes I let "good performance" creep up in priority over "easy to maintain", -// and for best performance I may provide less-easy-to-use APIs that give higher -// performance, in addition to the easy-to-use ones. Nevertheless, it's important -// to keep in mind that from the standpoint of you, a client of this library, -// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all. -// -// Some secondary priorities arise directly from the first two, some of which -// provide more explicit reasons why performance can't be emphasized. -// -// - Portable ("ease of use") -// - Small source code footprint ("easy to maintain") -// - No dependencies ("ease of use") -// -// =========================================================================== -// -// I/O callbacks -// -// I/O callbacks allow you to read from arbitrary sources, like packaged -// files or some other source. Data read from callbacks are processed -// through a small internal buffer (currently 128 bytes) to try to reduce -// overhead. -// -// The three functions you must define are "read" (reads some bytes of data), -// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). -// -// =========================================================================== -// -// SIMD support -// -// The JPEG decoder will try to automatically use SIMD kernels on x86 when -// supported by the compiler. For ARM Neon support, you must explicitly -// request it. -// -// (The old do-it-yourself SIMD API is no longer supported in the current -// code.) -// -// On x86, SSE2 will automatically be used when available based on a run-time -// test; if not, the generic C versions are used as a fall-back. On ARM targets, -// the typical path is to have separate builds for NEON and non-NEON devices -// (at least this is true for iOS and Android). Therefore, the NEON support is -// toggled by a build flag: define STBI_NEON to get NEON loops. -// -// If for some reason you do not want to use any of SIMD code, or if -// you have issues compiling it, you can disable it entirely by -// defining STBI_NO_SIMD. -// -// =========================================================================== -// -// HDR image support (disable by defining STBI_NO_HDR) -// -// stb_image supports loading HDR images in general, and currently the Radiance -// .HDR file format specifically. You can still load any file through the existing -// interface; if you attempt to load an HDR file, it will be automatically remapped -// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; -// both of these constants can be reconfigured through this interface: -// -// stbi_hdr_to_ldr_gamma(2.2f); -// stbi_hdr_to_ldr_scale(1.0f); -// -// (note, do not use _inverse_ constants; stbi_image will invert them -// appropriately). -// -// Additionally, there is a new, parallel interface for loading files as -// (linear) floats to preserve the full dynamic range: -// -// float *data = stbi_loadf(filename, &x, &y, &n, 0); -// -// If you load LDR images through this interface, those images will -// be promoted to floating point values, run through the inverse of -// constants corresponding to the above: -// -// stbi_ldr_to_hdr_scale(1.0f); -// stbi_ldr_to_hdr_gamma(2.2f); -// -// Finally, given a filename (or an open file or memory block--see header -// file for details) containing image data, you can query for the "most -// appropriate" interface to use (that is, whether the image is HDR or -// not), using: -// -// stbi_is_hdr(char *filename); -// -// =========================================================================== -// -// iPhone PNG support: -// -// By default we convert iphone-formatted PNGs back to RGB, even though -// they are internally encoded differently. You can disable this conversion -// by calling stbi_convert_iphone_png_to_rgb(0), in which case -// you will always just get the native iphone "format" through (which -// is BGR stored in RGB). -// -// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per -// pixel to remove any premultiplied alpha *only* if the image file explicitly -// says there's premultiplied data (currently only happens in iPhone images, -// and only if iPhone convert-to-rgb processing is on). -// -// =========================================================================== -// -// ADDITIONAL CONFIGURATION -// -// - You can suppress implementation of any of the decoders to reduce -// your code footprint by #defining one or more of the following -// symbols before creating the implementation. -// -// STBI_NO_JPEG -// STBI_NO_PNG -// STBI_NO_BMP -// STBI_NO_PSD -// STBI_NO_TGA -// STBI_NO_GIF -// STBI_NO_HDR -// STBI_NO_PIC -// STBI_NO_PNM (.ppm and .pgm) -// -// - You can request *only* certain decoders and suppress all other ones -// (this will be more forward-compatible, as addition of new decoders -// doesn't require you to disable them explicitly): -// -// STBI_ONLY_JPEG -// STBI_ONLY_PNG -// STBI_ONLY_BMP -// STBI_ONLY_PSD -// STBI_ONLY_TGA -// STBI_ONLY_GIF -// STBI_ONLY_HDR -// STBI_ONLY_PIC -// STBI_ONLY_PNM (.ppm and .pgm) -// -// - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still -// want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB -// - - -#ifndef STBI_NO_STDIO -#include -#endif // STBI_NO_STDIO - -#define STBI_VERSION 1 - -enum -{ - STBI_default = 0, // only used for desired_channels - - STBI_grey = 1, - STBI_grey_alpha = 2, - STBI_rgb = 3, - STBI_rgb_alpha = 4 -}; - -#include -typedef unsigned char stbi_uc; -typedef unsigned short stbi_us; - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef STBIDEF -#ifdef STB_IMAGE_STATIC -#define STBIDEF static -#else -#define STBIDEF extern -#endif -#endif - -////////////////////////////////////////////////////////////////////////////// -// -// PRIMARY API - works on images of any type -// - -// -// load image by filename, open file, or memory buffer -// - -typedef struct -{ - int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read - void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative - int (*eof) (void *user); // returns nonzero if we are at end of file/data -} stbi_io_callbacks; - -//////////////////////////////////// -// -// 8-bits-per-channel interface -// - -STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *channels_in_file, int desired_channels); -STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *channels_in_file, int desired_channels); - -#ifndef STBI_NO_STDIO -STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); -STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); -// for stbi_load_from_file, file pointer is left pointing immediately after image -#endif - -#ifndef STBI_NO_GIF -STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp); -#endif - -#ifdef STBI_WINDOWS_UTF8 -STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input); -#endif - -//////////////////////////////////// -// -// 16-bits-per-channel interface -// - -STBIDEF stbi_us *stbi_load_16_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); -STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); - -#ifndef STBI_NO_STDIO -STBIDEF stbi_us *stbi_load_16 (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); -STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); -#endif - -//////////////////////////////////// -// -// float-per-channel interface -// -#ifndef STBI_NO_LINEAR - STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels); - - #ifndef STBI_NO_STDIO - STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels); - STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels); - #endif -#endif - -#ifndef STBI_NO_HDR - STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); - STBIDEF void stbi_hdr_to_ldr_scale(float scale); -#endif // STBI_NO_HDR - -#ifndef STBI_NO_LINEAR - STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); - STBIDEF void stbi_ldr_to_hdr_scale(float scale); -#endif // STBI_NO_LINEAR - -// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR -STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); -STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); -#ifndef STBI_NO_STDIO -STBIDEF int stbi_is_hdr (char const *filename); -STBIDEF int stbi_is_hdr_from_file(FILE *f); -#endif // STBI_NO_STDIO - - -// get a VERY brief reason for failure -// NOT THREADSAFE -STBIDEF const char *stbi_failure_reason (void); - -// free the loaded image -- this is just free() -STBIDEF void stbi_image_free (void *retval_from_stbi_load); - -// get image dimensions & components without fully decoding -STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); -STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); -STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len); -STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user); - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); -STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); -STBIDEF int stbi_is_16_bit (char const *filename); -STBIDEF int stbi_is_16_bit_from_file(FILE *f); -#endif - - - -// for image formats that explicitly notate that they have premultiplied alpha, -// we just return the colors as stored in the file. set this flag to force -// unpremultiplication. results are undefined if the unpremultiply overflow. -STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); - -// indicate whether we should process iphone images back to canonical format, -// or just pass them through "as-is" -STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); - -// flip the image vertically, so the first pixel in the output array is the bottom left -STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); - -// ZLIB client - used by PNG, available for other purposes - -STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); -STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); -STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); -STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); - -STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); -STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); - - -#ifdef __cplusplus -} -#endif - -// -// -//// end header file ///////////////////////////////////////////////////// -#endif // STBI_INCLUDE_STB_IMAGE_H - -#ifdef STB_IMAGE_IMPLEMENTATION - -#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ - || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ - || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ - || defined(STBI_ONLY_ZLIB) - #ifndef STBI_ONLY_JPEG - #define STBI_NO_JPEG - #endif - #ifndef STBI_ONLY_PNG - #define STBI_NO_PNG - #endif - #ifndef STBI_ONLY_BMP - #define STBI_NO_BMP - #endif - #ifndef STBI_ONLY_PSD - #define STBI_NO_PSD - #endif - #ifndef STBI_ONLY_TGA - #define STBI_NO_TGA - #endif - #ifndef STBI_ONLY_GIF - #define STBI_NO_GIF - #endif - #ifndef STBI_ONLY_HDR - #define STBI_NO_HDR - #endif - #ifndef STBI_ONLY_PIC - #define STBI_NO_PIC - #endif - #ifndef STBI_ONLY_PNM - #define STBI_NO_PNM - #endif -#endif - -#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) -#define STBI_NO_ZLIB -#endif - - -#include -#include // ptrdiff_t on osx -#include -#include -#include - -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) -#include // ldexp, pow -#endif - -#ifndef STBI_NO_STDIO -#include -#endif - -#ifndef STBI_ASSERT -#include -#define STBI_ASSERT(x) assert(x) -#endif - -#ifdef __cplusplus -#define STBI_EXTERN extern "C" -#else -#define STBI_EXTERN extern -#endif - - -#ifndef _MSC_VER - #ifdef __cplusplus - #define stbi_inline inline - #else - #define stbi_inline - #endif -#else - #define stbi_inline __forceinline -#endif - - -#ifdef _MSC_VER -typedef unsigned short stbi__uint16; -typedef signed short stbi__int16; -typedef unsigned int stbi__uint32; -typedef signed int stbi__int32; -#else -#include -typedef uint16_t stbi__uint16; -typedef int16_t stbi__int16; -typedef uint32_t stbi__uint32; -typedef int32_t stbi__int32; -#endif - -// should produce compiler error if size is wrong -typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; - -#ifdef _MSC_VER -#define STBI_NOTUSED(v) (void)(v) -#else -#define STBI_NOTUSED(v) (void)sizeof(v) -#endif - -#ifdef _MSC_VER -#define STBI_HAS_LROTL -#endif - -#ifdef STBI_HAS_LROTL - #define stbi_lrot(x,y) _lrotl(x,y) -#else - #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (32 - (y)))) -#endif - -#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED)) -// ok -#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED) -// ok -#else -#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)." -#endif - -#ifndef STBI_MALLOC -#define STBI_MALLOC(sz) malloc(sz) -#define STBI_REALLOC(p,newsz) realloc(p,newsz) -#define STBI_FREE(p) free(p) -#endif - -#ifndef STBI_REALLOC_SIZED -#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz) -#endif - -// x86/x64 detection -#if defined(__x86_64__) || defined(_M_X64) -#define STBI__X64_TARGET -#elif defined(__i386) || defined(_M_IX86) -#define STBI__X86_TARGET -#endif - -#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) -// gcc doesn't support sse2 intrinsics unless you compile with -msse2, -// which in turn means it gets to use SSE2 everywhere. This is unfortunate, -// but previous attempts to provide the SSE2 functions with runtime -// detection caused numerous issues. The way architecture extensions are -// exposed in GCC/Clang is, sadly, not really suited for one-file libs. -// New behavior: if compiled with -msse2, we use SSE2 without any -// detection; if not, we don't use it at all. -#define STBI_NO_SIMD -#endif - -#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) -// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET -// -// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the -// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. -// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not -// simultaneously enabling "-mstackrealign". -// -// See https://github.com/nothings/stb/issues/81 for more information. -// -// So default to no SSE2 on 32-bit MinGW. If you've read this far and added -// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. -#define STBI_NO_SIMD -#endif - -#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) -#define STBI_SSE2 -#include - -#ifdef _MSC_VER - -#if _MSC_VER >= 1400 // not VC6 -#include // __cpuid -static int stbi__cpuid3(void) -{ - int info[4]; - __cpuid(info,1); - return info[3]; -} -#else -static int stbi__cpuid3(void) -{ - int res; - __asm { - mov eax,1 - cpuid - mov res,edx - } - return res; -} -#endif - -#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name - -#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) -static int stbi__sse2_available(void) -{ - int info3 = stbi__cpuid3(); - return ((info3 >> 26) & 1) != 0; -} -#endif - -#else // assume GCC-style if not VC++ -#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) - -#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2) -static int stbi__sse2_available(void) -{ - // If we're even attempting to compile this on GCC/Clang, that means - // -msse2 is on, which means the compiler is allowed to use SSE2 - // instructions at will, and so are we. - return 1; -} -#endif - -#endif -#endif - -// ARM NEON -#if defined(STBI_NO_SIMD) && defined(STBI_NEON) -#undef STBI_NEON -#endif - -#ifdef STBI_NEON -#include -// assume GCC or Clang on ARM targets -#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) -#endif - -#ifndef STBI_SIMD_ALIGN -#define STBI_SIMD_ALIGN(type, name) type name -#endif - -/////////////////////////////////////////////// -// -// stbi__context struct and start_xxx functions - -// stbi__context structure is our basic context used by all images, so it -// contains all the IO context, plus some basic image information -typedef struct -{ - stbi__uint32 img_x, img_y; - int img_n, img_out_n; - - stbi_io_callbacks io; - void *io_user_data; - - int read_from_callbacks; - int buflen; - stbi_uc buffer_start[128]; - - stbi_uc *img_buffer, *img_buffer_end; - stbi_uc *img_buffer_original, *img_buffer_original_end; -} stbi__context; - - -static void stbi__refill_buffer(stbi__context *s); - -// initialize a memory-decode context -static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) -{ - s->io.read = NULL; - s->read_from_callbacks = 0; - s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; - s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; -} - -// initialize a callback-based context -static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) -{ - s->io = *c; - s->io_user_data = user; - s->buflen = sizeof(s->buffer_start); - s->read_from_callbacks = 1; - s->img_buffer_original = s->buffer_start; - stbi__refill_buffer(s); - s->img_buffer_original_end = s->img_buffer_end; -} - -#ifndef STBI_NO_STDIO - -static int stbi__stdio_read(void *user, char *data, int size) -{ - return (int) fread(data,1,size,(FILE*) user); -} - -static void stbi__stdio_skip(void *user, int n) -{ - fseek((FILE*) user, n, SEEK_CUR); -} - -static int stbi__stdio_eof(void *user) -{ - return feof((FILE*) user); -} - -static stbi_io_callbacks stbi__stdio_callbacks = -{ - stbi__stdio_read, - stbi__stdio_skip, - stbi__stdio_eof, -}; - -static void stbi__start_file(stbi__context *s, FILE *f) -{ - stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); -} - -//static void stop_file(stbi__context *s) { } - -#endif // !STBI_NO_STDIO - -static void stbi__rewind(stbi__context *s) -{ - // conceptually rewind SHOULD rewind to the beginning of the stream, - // but we just rewind to the beginning of the initial buffer, because - // we only use it after doing 'test', which only ever looks at at most 92 bytes - s->img_buffer = s->img_buffer_original; - s->img_buffer_end = s->img_buffer_original_end; -} - -enum -{ - STBI_ORDER_RGB, - STBI_ORDER_BGR -}; - -typedef struct -{ - int bits_per_channel; - int num_channels; - int channel_order; -} stbi__result_info; - -#ifndef STBI_NO_JPEG -static int stbi__jpeg_test(stbi__context *s); -static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PNG -static int stbi__png_test(stbi__context *s); -static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); -static int stbi__png_is16(stbi__context *s); -#endif - -#ifndef STBI_NO_BMP -static int stbi__bmp_test(stbi__context *s); -static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_TGA -static int stbi__tga_test(stbi__context *s); -static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PSD -static int stbi__psd_test(stbi__context *s); -static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc); -static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); -static int stbi__psd_is16(stbi__context *s); -#endif - -#ifndef STBI_NO_HDR -static int stbi__hdr_test(stbi__context *s); -static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PIC -static int stbi__pic_test(stbi__context *s); -static void *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_GIF -static int stbi__gif_test(stbi__context *s); -static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp); -static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PNM -static int stbi__pnm_test(stbi__context *s); -static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri); -static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -// this is not threadsafe -static const char *stbi__g_failure_reason; - -STBIDEF const char *stbi_failure_reason(void) -{ - return stbi__g_failure_reason; -} - -static int stbi__err(const char *str) -{ - stbi__g_failure_reason = str; - return 0; -} - -static void *stbi__malloc(size_t size) -{ - return STBI_MALLOC(size); -} - -// stb_image uses ints pervasively, including for offset calculations. -// therefore the largest decoded image size we can support with the -// current code, even on 64-bit targets, is INT_MAX. this is not a -// significant limitation for the intended use case. -// -// we do, however, need to make sure our size calculations don't -// overflow. hence a few helper functions for size calculations that -// multiply integers together, making sure that they're non-negative -// and no overflow occurs. - -// return 1 if the sum is valid, 0 on overflow. -// negative terms are considered invalid. -static int stbi__addsizes_valid(int a, int b) -{ - if (b < 0) return 0; - // now 0 <= b <= INT_MAX, hence also - // 0 <= INT_MAX - b <= INTMAX. - // And "a + b <= INT_MAX" (which might overflow) is the - // same as a <= INT_MAX - b (no overflow) - return a <= INT_MAX - b; -} - -// returns 1 if the product is valid, 0 on overflow. -// negative factors are considered invalid. -static int stbi__mul2sizes_valid(int a, int b) -{ - if (a < 0 || b < 0) return 0; - if (b == 0) return 1; // mul-by-0 is always safe - // portable way to check for no overflows in a*b - return a <= INT_MAX/b; -} - -// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow -static int stbi__mad2sizes_valid(int a, int b, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add); -} - -// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow -static int stbi__mad3sizes_valid(int a, int b, int c, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && - stbi__addsizes_valid(a*b*c, add); -} - -// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) -static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add) -{ - return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) && - stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add); -} -#endif - -// mallocs with size overflow checking -static void *stbi__malloc_mad2(int a, int b, int add) -{ - if (!stbi__mad2sizes_valid(a, b, add)) return NULL; - return stbi__malloc(a*b + add); -} - -static void *stbi__malloc_mad3(int a, int b, int c, int add) -{ - if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL; - return stbi__malloc(a*b*c + add); -} - -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) -static void *stbi__malloc_mad4(int a, int b, int c, int d, int add) -{ - if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL; - return stbi__malloc(a*b*c*d + add); -} -#endif - -// stbi__err - error -// stbi__errpf - error returning pointer to float -// stbi__errpuc - error returning pointer to unsigned char - -#ifdef STBI_NO_FAILURE_STRINGS - #define stbi__err(x,y) 0 -#elif defined(STBI_FAILURE_USERMSG) - #define stbi__err(x,y) stbi__err(y) -#else - #define stbi__err(x,y) stbi__err(x) -#endif - -#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) -#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) - -STBIDEF void stbi_image_free(void *retval_from_stbi_load) -{ - STBI_FREE(retval_from_stbi_load); -} - -#ifndef STBI_NO_LINEAR -static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); -#endif - -#ifndef STBI_NO_HDR -static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); -#endif - -static int stbi__vertically_flip_on_load = 0; - -STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) -{ - stbi__vertically_flip_on_load = flag_true_if_should_flip; -} - -static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) -{ - memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields - ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed - ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order - ri->num_channels = 0; - - #ifndef STBI_NO_JPEG - if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_PNG - if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_BMP - if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_GIF - if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_PSD - if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc); - #endif - #ifndef STBI_NO_PIC - if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri); - #endif - #ifndef STBI_NO_PNM - if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp, ri); - #endif - - #ifndef STBI_NO_HDR - if (stbi__hdr_test(s)) { - float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri); - return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); - } - #endif - - #ifndef STBI_NO_TGA - // test tga last because it's a crappy test! - if (stbi__tga_test(s)) - return stbi__tga_load(s,x,y,comp,req_comp, ri); - #endif - - return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); -} - -static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels) -{ - int i; - int img_len = w * h * channels; - stbi_uc *reduced; - - reduced = (stbi_uc *) stbi__malloc(img_len); - if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory"); - - for (i = 0; i < img_len; ++i) - reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling - - STBI_FREE(orig); - return reduced; -} - -static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels) -{ - int i; - int img_len = w * h * channels; - stbi__uint16 *enlarged; - - enlarged = (stbi__uint16 *) stbi__malloc(img_len*2); - if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); - - for (i = 0; i < img_len; ++i) - enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff - - STBI_FREE(orig); - return enlarged; -} - -static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel) -{ - int row; - size_t bytes_per_row = (size_t)w * bytes_per_pixel; - stbi_uc temp[2048]; - stbi_uc *bytes = (stbi_uc *)image; - - for (row = 0; row < (h>>1); row++) { - stbi_uc *row0 = bytes + row*bytes_per_row; - stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row; - // swap row0 with row1 - size_t bytes_left = bytes_per_row; - while (bytes_left) { - size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp); - memcpy(temp, row0, bytes_copy); - memcpy(row0, row1, bytes_copy); - memcpy(row1, temp, bytes_copy); - row0 += bytes_copy; - row1 += bytes_copy; - bytes_left -= bytes_copy; - } - } -} - -#ifndef STBI_NO_GIF -static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel) -{ - int slice; - int slice_size = w * h * bytes_per_pixel; - - stbi_uc *bytes = (stbi_uc *)image; - for (slice = 0; slice < z; ++slice) { - stbi__vertical_flip(bytes, w, h, bytes_per_pixel); - bytes += slice_size; - } -} -#endif - -static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi__result_info ri; - void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8); - - if (result == NULL) - return NULL; - - if (ri.bits_per_channel != 8) { - STBI_ASSERT(ri.bits_per_channel == 16); - result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp); - ri.bits_per_channel = 8; - } - - // @TODO: move stbi__convert_format to here - - if (stbi__vertically_flip_on_load) { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc)); - } - - return (unsigned char *) result; -} - -static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi__result_info ri; - void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16); - - if (result == NULL) - return NULL; - - if (ri.bits_per_channel != 16) { - STBI_ASSERT(ri.bits_per_channel == 8); - result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp); - ri.bits_per_channel = 16; - } - - // @TODO: move stbi__convert_format16 to here - // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision - - if (stbi__vertically_flip_on_load) { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16)); - } - - return (stbi__uint16 *) result; -} - -#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR) -static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) -{ - if (stbi__vertically_flip_on_load && result != NULL) { - int channels = req_comp ? req_comp : *comp; - stbi__vertical_flip(result, *x, *y, channels * sizeof(float)); - } -} -#endif - -#ifndef STBI_NO_STDIO - -#if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8) -STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); -STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); -#endif - -#if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8) -STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) -{ - return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); -} -#endif - -static FILE *stbi__fopen(char const *filename, char const *mode) -{ - FILE *f; -#if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8) - wchar_t wMode[64]; - wchar_t wFilename[1024]; - if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename))) - return 0; - - if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode))) - return 0; - -#if _MSC_VER >= 1400 - if (0 != _wfopen_s(&f, wFilename, wMode)) - f = 0; -#else - f = _wfopen(wFilename, wMode); -#endif - -#elif defined(_MSC_VER) && _MSC_VER >= 1400 - if (0 != fopen_s(&f, filename, mode)) - f=0; -#else - f = fopen(filename, mode); -#endif - return f; -} - - -STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - unsigned char *result; - if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); - result = stbi_load_from_file(f,x,y,comp,req_comp); - fclose(f); - return result; -} - -STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *result; - stbi__context s; - stbi__start_file(&s,f); - result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); - if (result) { - // need to 'unget' all the characters in the IO buffer - fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); - } - return result; -} - -STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - stbi__uint16 *result; - stbi__context s; - stbi__start_file(&s,f); - result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp); - if (result) { - // need to 'unget' all the characters in the IO buffer - fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); - } - return result; -} - -STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - stbi__uint16 *result; - if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file"); - result = stbi_load_from_file_16(f,x,y,comp,req_comp); - fclose(f); - return result; -} - - -#endif //!STBI_NO_STDIO - -STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); -} - -STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user); - return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels); -} - -STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); -} - -STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp); -} - -#ifndef STBI_NO_GIF -STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp) -{ - unsigned char *result; - stbi__context s; - stbi__start_mem(&s,buffer,len); - - result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp); - if (stbi__vertically_flip_on_load) { - stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); - } - - return result; -} -#endif - -#ifndef STBI_NO_LINEAR -static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *data; - #ifndef STBI_NO_HDR - if (stbi__hdr_test(s)) { - stbi__result_info ri; - float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri); - if (hdr_data) - stbi__float_postprocess(hdr_data,x,y,comp,req_comp); - return hdr_data; - } - #endif - data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp); - if (data) - return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); - return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); -} - -STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} - -STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} - -#ifndef STBI_NO_STDIO -STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - float *result; - FILE *f = stbi__fopen(filename, "rb"); - if (!f) return stbi__errpf("can't fopen", "Unable to open file"); - result = stbi_loadf_from_file(f,x,y,comp,req_comp); - fclose(f); - return result; -} - -STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_file(&s,f); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} -#endif // !STBI_NO_STDIO - -#endif // !STBI_NO_LINEAR - -// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is -// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always -// reports false! - -STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) -{ - #ifndef STBI_NO_HDR - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__hdr_test(&s); - #else - STBI_NOTUSED(buffer); - STBI_NOTUSED(len); - return 0; - #endif -} - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_is_hdr (char const *filename) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result=0; - if (f) { - result = stbi_is_hdr_from_file(f); - fclose(f); - } - return result; -} - -STBIDEF int stbi_is_hdr_from_file(FILE *f) -{ - #ifndef STBI_NO_HDR - long pos = ftell(f); - int res; - stbi__context s; - stbi__start_file(&s,f); - res = stbi__hdr_test(&s); - fseek(f, pos, SEEK_SET); - return res; - #else - STBI_NOTUSED(f); - return 0; - #endif -} -#endif // !STBI_NO_STDIO - -STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) -{ - #ifndef STBI_NO_HDR - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__hdr_test(&s); - #else - STBI_NOTUSED(clbk); - STBI_NOTUSED(user); - return 0; - #endif -} - -#ifndef STBI_NO_LINEAR -static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; - -STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } -STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } -#endif - -static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; - -STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } -STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } - - -////////////////////////////////////////////////////////////////////////////// -// -// Common code used by all image loaders -// - -enum -{ - STBI__SCAN_load=0, - STBI__SCAN_type, - STBI__SCAN_header -}; - -static void stbi__refill_buffer(stbi__context *s) -{ - int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); - if (n == 0) { - // at end of file, treat same as if from memory, but need to handle case - // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file - s->read_from_callbacks = 0; - s->img_buffer = s->buffer_start; - s->img_buffer_end = s->buffer_start+1; - *s->img_buffer = 0; - } else { - s->img_buffer = s->buffer_start; - s->img_buffer_end = s->buffer_start + n; - } -} - -stbi_inline static stbi_uc stbi__get8(stbi__context *s) -{ - if (s->img_buffer < s->img_buffer_end) - return *s->img_buffer++; - if (s->read_from_callbacks) { - stbi__refill_buffer(s); - return *s->img_buffer++; - } - return 0; -} - -stbi_inline static int stbi__at_eof(stbi__context *s) -{ - if (s->io.read) { - if (!(s->io.eof)(s->io_user_data)) return 0; - // if feof() is true, check if buffer = end - // special case: we've only got the special 0 character at the end - if (s->read_from_callbacks == 0) return 1; - } - - return s->img_buffer >= s->img_buffer_end; -} - -static void stbi__skip(stbi__context *s, int n) -{ - if (n < 0) { - s->img_buffer = s->img_buffer_end; - return; - } - if (s->io.read) { - int blen = (int) (s->img_buffer_end - s->img_buffer); - if (blen < n) { - s->img_buffer = s->img_buffer_end; - (s->io.skip)(s->io_user_data, n - blen); - return; - } - } - s->img_buffer += n; -} - -static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) -{ - if (s->io.read) { - int blen = (int) (s->img_buffer_end - s->img_buffer); - if (blen < n) { - int res, count; - - memcpy(buffer, s->img_buffer, blen); - - count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); - res = (count == (n-blen)); - s->img_buffer = s->img_buffer_end; - return res; - } - } - - if (s->img_buffer+n <= s->img_buffer_end) { - memcpy(buffer, s->img_buffer, n); - s->img_buffer += n; - return 1; - } else - return 0; -} - -static int stbi__get16be(stbi__context *s) -{ - int z = stbi__get8(s); - return (z << 8) + stbi__get8(s); -} - -static stbi__uint32 stbi__get32be(stbi__context *s) -{ - stbi__uint32 z = stbi__get16be(s); - return (z << 16) + stbi__get16be(s); -} - -#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) -// nothing -#else -static int stbi__get16le(stbi__context *s) -{ - int z = stbi__get8(s); - return z + (stbi__get8(s) << 8); -} -#endif - -#ifndef STBI_NO_BMP -static stbi__uint32 stbi__get32le(stbi__context *s) -{ - stbi__uint32 z = stbi__get16le(s); - return z + (stbi__get16le(s) << 16); -} -#endif - -#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings - - -////////////////////////////////////////////////////////////////////////////// -// -// generic converter from built-in img_n to req_comp -// individual types do this automatically as much as possible (e.g. jpeg -// does all cases internally since it needs to colorspace convert anyway, -// and it never has alpha, so very few cases ). png can automatically -// interleave an alpha=255 channel, but falls back to this for other cases -// -// assume data buffer is malloced, so malloc a new one and free that one -// only failure mode is malloc failing - -static stbi_uc stbi__compute_y(int r, int g, int b) -{ - return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); -} - -static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) -{ - int i,j; - unsigned char *good; - - if (req_comp == img_n) return data; - STBI_ASSERT(req_comp >= 1 && req_comp <= 4); - - good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0); - if (good == NULL) { - STBI_FREE(data); - return stbi__errpuc("outofmem", "Out of memory"); - } - - for (j=0; j < (int) y; ++j) { - unsigned char *src = data + j * x * img_n ; - unsigned char *dest = good + j * x * req_comp; - - #define STBI__COMBO(a,b) ((a)*8+(b)) - #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) - // convert source image with img_n components to one with req_comp components; - // avoid switch per pixel, so use switch per scanline and massive macros - switch (STBI__COMBO(img_n, req_comp)) { - STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=255; } break; - STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; - STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=255; } break; - STBI__CASE(2,1) { dest[0]=src[0]; } break; - STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; - STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; - STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=255; } break; - STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; - STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = 255; } break; - STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); } break; - STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break; - STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; - default: STBI_ASSERT(0); - } - #undef STBI__CASE - } - - STBI_FREE(data); - return good; -} - -static stbi__uint16 stbi__compute_y_16(int r, int g, int b) -{ - return (stbi__uint16) (((r*77) + (g*150) + (29*b)) >> 8); -} - -static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y) -{ - int i,j; - stbi__uint16 *good; - - if (req_comp == img_n) return data; - STBI_ASSERT(req_comp >= 1 && req_comp <= 4); - - good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2); - if (good == NULL) { - STBI_FREE(data); - return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory"); - } - - for (j=0; j < (int) y; ++j) { - stbi__uint16 *src = data + j * x * img_n ; - stbi__uint16 *dest = good + j * x * req_comp; - - #define STBI__COMBO(a,b) ((a)*8+(b)) - #define STBI__CASE(a,b) case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) - // convert source image with img_n components to one with req_comp components; - // avoid switch per pixel, so use switch per scanline and massive macros - switch (STBI__COMBO(img_n, req_comp)) { - STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=0xffff; } break; - STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; - STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=0xffff; } break; - STBI__CASE(2,1) { dest[0]=src[0]; } break; - STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0]; } break; - STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1]; } break; - STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=0xffff; } break; - STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; - STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = 0xffff; } break; - STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); } break; - STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break; - STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2]; } break; - default: STBI_ASSERT(0); - } - #undef STBI__CASE - } - - STBI_FREE(data); - return good; -} - -#ifndef STBI_NO_LINEAR -static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) -{ - int i,k,n; - float *output; - if (!data) return NULL; - output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0); - if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } - // compute number of non-alpha components - if (comp & 1) n = comp; else n = comp-1; - for (i=0; i < x*y; ++i) { - for (k=0; k < n; ++k) { - output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); - } - } - if (n < comp) { - for (i=0; i < x*y; ++i) { - output[i*comp + n] = data[i*comp + n]/255.0f; - } - } - STBI_FREE(data); - return output; -} -#endif - -#ifndef STBI_NO_HDR -#define stbi__float2int(x) ((int) (x)) -static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) -{ - int i,k,n; - stbi_uc *output; - if (!data) return NULL; - output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0); - if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } - // compute number of non-alpha components - if (comp & 1) n = comp; else n = comp-1; - for (i=0; i < x*y; ++i) { - for (k=0; k < n; ++k) { - float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; - if (z < 0) z = 0; - if (z > 255) z = 255; - output[i*comp + k] = (stbi_uc) stbi__float2int(z); - } - if (k < comp) { - float z = data[i*comp+k] * 255 + 0.5f; - if (z < 0) z = 0; - if (z > 255) z = 255; - output[i*comp + k] = (stbi_uc) stbi__float2int(z); - } - } - STBI_FREE(data); - return output; -} -#endif - -////////////////////////////////////////////////////////////////////////////// -// -// "baseline" JPEG/JFIF decoder -// -// simple implementation -// - doesn't support delayed output of y-dimension -// - simple interface (only one output format: 8-bit interleaved RGB) -// - doesn't try to recover corrupt jpegs -// - doesn't allow partial loading, loading multiple at once -// - still fast on x86 (copying globals into locals doesn't help x86) -// - allocates lots of intermediate memory (full size of all components) -// - non-interleaved case requires this anyway -// - allows good upsampling (see next) -// high-quality -// - upsampled channels are bilinearly interpolated, even across blocks -// - quality integer IDCT derived from IJG's 'slow' -// performance -// - fast huffman; reasonable integer IDCT -// - some SIMD kernels for common paths on targets with SSE2/NEON -// - uses a lot of intermediate memory, could cache poorly - -#ifndef STBI_NO_JPEG - -// huffman decoding acceleration -#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache - -typedef struct -{ - stbi_uc fast[1 << FAST_BITS]; - // weirdly, repacking this into AoS is a 10% speed loss, instead of a win - stbi__uint16 code[256]; - stbi_uc values[256]; - stbi_uc size[257]; - unsigned int maxcode[18]; - int delta[17]; // old 'firstsymbol' - old 'firstcode' -} stbi__huffman; - -typedef struct -{ - stbi__context *s; - stbi__huffman huff_dc[4]; - stbi__huffman huff_ac[4]; - stbi__uint16 dequant[4][64]; - stbi__int16 fast_ac[4][1 << FAST_BITS]; - -// sizes for components, interleaved MCUs - int img_h_max, img_v_max; - int img_mcu_x, img_mcu_y; - int img_mcu_w, img_mcu_h; - -// definition of jpeg image component - struct - { - int id; - int h,v; - int tq; - int hd,ha; - int dc_pred; - - int x,y,w2,h2; - stbi_uc *data; - void *raw_data, *raw_coeff; - stbi_uc *linebuf; - short *coeff; // progressive only - int coeff_w, coeff_h; // number of 8x8 coefficient blocks - } img_comp[4]; - - stbi__uint32 code_buffer; // jpeg entropy-coded buffer - int code_bits; // number of valid bits - unsigned char marker; // marker seen while filling entropy buffer - int nomore; // flag if we saw a marker so must stop - - int progressive; - int spec_start; - int spec_end; - int succ_high; - int succ_low; - int eob_run; - int jfif; - int app14_color_transform; // Adobe APP14 tag - int rgb; - - int scan_n, order[4]; - int restart_interval, todo; - -// kernels - void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); - void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); - stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); -} stbi__jpeg; - -static int stbi__build_huffman(stbi__huffman *h, int *count) -{ - int i,j,k=0; - unsigned int code; - // build size list for each symbol (from JPEG spec) - for (i=0; i < 16; ++i) - for (j=0; j < count[i]; ++j) - h->size[k++] = (stbi_uc) (i+1); - h->size[k] = 0; - - // compute actual symbols (from jpeg spec) - code = 0; - k = 0; - for(j=1; j <= 16; ++j) { - // compute delta to add to code to compute symbol id - h->delta[j] = k - code; - if (h->size[k] == j) { - while (h->size[k] == j) - h->code[k++] = (stbi__uint16) (code++); - if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG"); - } - // compute largest code + 1 for this size, preshifted as needed later - h->maxcode[j] = code << (16-j); - code <<= 1; - } - h->maxcode[j] = 0xffffffff; - - // build non-spec acceleration table; 255 is flag for not-accelerated - memset(h->fast, 255, 1 << FAST_BITS); - for (i=0; i < k; ++i) { - int s = h->size[i]; - if (s <= FAST_BITS) { - int c = h->code[i] << (FAST_BITS-s); - int m = 1 << (FAST_BITS-s); - for (j=0; j < m; ++j) { - h->fast[c+j] = (stbi_uc) i; - } - } - } - return 1; -} - -// build a table that decodes both magnitude and value of small ACs in -// one go. -static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) -{ - int i; - for (i=0; i < (1 << FAST_BITS); ++i) { - stbi_uc fast = h->fast[i]; - fast_ac[i] = 0; - if (fast < 255) { - int rs = h->values[fast]; - int run = (rs >> 4) & 15; - int magbits = rs & 15; - int len = h->size[fast]; - - if (magbits && len + magbits <= FAST_BITS) { - // magnitude code followed by receive_extend code - int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); - int m = 1 << (magbits - 1); - if (k < m) k += (~0U << magbits) + 1; - // if the result is small enough, we can fit it in fast_ac table - if (k >= -128 && k <= 127) - fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits)); - } - } - } -} - -static void stbi__grow_buffer_unsafe(stbi__jpeg *j) -{ - do { - unsigned int b = j->nomore ? 0 : stbi__get8(j->s); - if (b == 0xff) { - int c = stbi__get8(j->s); - while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes - if (c != 0) { - j->marker = (unsigned char) c; - j->nomore = 1; - return; - } - } - j->code_buffer |= b << (24 - j->code_bits); - j->code_bits += 8; - } while (j->code_bits <= 24); -} - -// (1 << n) - 1 -static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; - -// decode a jpeg huffman value from the bitstream -stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) -{ - unsigned int temp; - int c,k; - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - - // look at the top FAST_BITS and determine what symbol ID it is, - // if the code is <= FAST_BITS - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - k = h->fast[c]; - if (k < 255) { - int s = h->size[k]; - if (s > j->code_bits) - return -1; - j->code_buffer <<= s; - j->code_bits -= s; - return h->values[k]; - } - - // naive test is to shift the code_buffer down so k bits are - // valid, then test against maxcode. To speed this up, we've - // preshifted maxcode left so that it has (16-k) 0s at the - // end; in other words, regardless of the number of bits, it - // wants to be compared against something shifted to have 16; - // that way we don't need to shift inside the loop. - temp = j->code_buffer >> 16; - for (k=FAST_BITS+1 ; ; ++k) - if (temp < h->maxcode[k]) - break; - if (k == 17) { - // error! code not found - j->code_bits -= 16; - return -1; - } - - if (k > j->code_bits) - return -1; - - // convert the huffman code to the symbol id - c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; - STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); - - // convert the id to a symbol - j->code_bits -= k; - j->code_buffer <<= k; - return h->values[c]; -} - -// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); - - sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB - k = stbi_lrot(j->code_buffer, n); - STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask))); - j->code_buffer = k & ~stbi__bmask[n]; - k &= stbi__bmask[n]; - j->code_bits -= n; - return k + (stbi__jbias[n] & ~sgn); -} - -// get some unsigned bits -stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) -{ - unsigned int k; - if (j->code_bits < n) stbi__grow_buffer_unsafe(j); - k = stbi_lrot(j->code_buffer, n); - j->code_buffer = k & ~stbi__bmask[n]; - k &= stbi__bmask[n]; - j->code_bits -= n; - return k; -} - -stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) -{ - unsigned int k; - if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); - k = j->code_buffer; - j->code_buffer <<= 1; - --j->code_bits; - return k & 0x80000000; -} - -// given a value that's at position X in the zigzag stream, -// where does it appear in the 8x8 matrix coded as row-major? -static const stbi_uc stbi__jpeg_dezigzag[64+15] = -{ - 0, 1, 8, 16, 9, 2, 3, 10, - 17, 24, 32, 25, 18, 11, 4, 5, - 12, 19, 26, 33, 40, 48, 41, 34, - 27, 20, 13, 6, 7, 14, 21, 28, - 35, 42, 49, 56, 57, 50, 43, 36, - 29, 22, 15, 23, 30, 37, 44, 51, - 58, 59, 52, 45, 38, 31, 39, 46, - 53, 60, 61, 54, 47, 55, 62, 63, - // let corrupt input sample past end - 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63 -}; - -// decode one 64-entry block-- -static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant) -{ - int diff,dc,k; - int t; - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - t = stbi__jpeg_huff_decode(j, hdc); - if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - - // 0 all the ac values now so we can do it 32-bits at a time - memset(data,0,64*sizeof(data[0])); - - diff = t ? stbi__extend_receive(j, t) : 0; - dc = j->img_comp[b].dc_pred + diff; - j->img_comp[b].dc_pred = dc; - data[0] = (short) (dc * dequant[0]); - - // decode AC components, see JPEG spec - k = 1; - do { - unsigned int zig; - int c,r,s; - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - r = fac[c]; - if (r) { // fast-AC path - k += (r >> 4) & 15; // run - s = r & 15; // combined length - j->code_buffer <<= s; - j->code_bits -= s; - // decode into unzigzag'd location - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) ((r >> 8) * dequant[zig]); - } else { - int rs = stbi__jpeg_huff_decode(j, hac); - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (rs != 0xf0) break; // end block - k += 16; - } else { - k += r; - // decode into unzigzag'd location - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); - } - } - } while (k < 64); - return 1; -} - -static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) -{ - int diff,dc; - int t; - if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - - if (j->succ_high == 0) { - // first scan for DC coefficient, must be first - memset(data,0,64*sizeof(data[0])); // 0 all the ac values now - t = stbi__jpeg_huff_decode(j, hdc); - diff = t ? stbi__extend_receive(j, t) : 0; - - dc = j->img_comp[b].dc_pred + diff; - j->img_comp[b].dc_pred = dc; - data[0] = (short) (dc << j->succ_low); - } else { - // refinement scan for DC coefficient - if (stbi__jpeg_get_bit(j)) - data[0] += (short) (1 << j->succ_low); - } - return 1; -} - -// @OPTIMIZE: store non-zigzagged during the decode passes, -// and only de-zigzag when dequantizing -static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) -{ - int k; - if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - - if (j->succ_high == 0) { - int shift = j->succ_low; - - if (j->eob_run) { - --j->eob_run; - return 1; - } - - k = j->spec_start; - do { - unsigned int zig; - int c,r,s; - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - r = fac[c]; - if (r) { // fast-AC path - k += (r >> 4) & 15; // run - s = r & 15; // combined length - j->code_buffer <<= s; - j->code_bits -= s; - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) ((r >> 8) << shift); - } else { - int rs = stbi__jpeg_huff_decode(j, hac); - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (r < 15) { - j->eob_run = (1 << r); - if (r) - j->eob_run += stbi__jpeg_get_bits(j, r); - --j->eob_run; - break; - } - k += 16; - } else { - k += r; - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) (stbi__extend_receive(j,s) << shift); - } - } - } while (k <= j->spec_end); - } else { - // refinement scan for these AC coefficients - - short bit = (short) (1 << j->succ_low); - - if (j->eob_run) { - --j->eob_run; - for (k = j->spec_start; k <= j->spec_end; ++k) { - short *p = &data[stbi__jpeg_dezigzag[k]]; - if (*p != 0) - if (stbi__jpeg_get_bit(j)) - if ((*p & bit)==0) { - if (*p > 0) - *p += bit; - else - *p -= bit; - } - } - } else { - k = j->spec_start; - do { - int r,s; - int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (r < 15) { - j->eob_run = (1 << r) - 1; - if (r) - j->eob_run += stbi__jpeg_get_bits(j, r); - r = 64; // force end of block - } else { - // r=15 s=0 should write 16 0s, so we just do - // a run of 15 0s and then write s (which is 0), - // so we don't have to do anything special here - } - } else { - if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); - // sign bit - if (stbi__jpeg_get_bit(j)) - s = bit; - else - s = -bit; - } - - // advance by r - while (k <= j->spec_end) { - short *p = &data[stbi__jpeg_dezigzag[k++]]; - if (*p != 0) { - if (stbi__jpeg_get_bit(j)) - if ((*p & bit)==0) { - if (*p > 0) - *p += bit; - else - *p -= bit; - } - } else { - if (r == 0) { - *p = (short) s; - break; - } - --r; - } - } - } while (k <= j->spec_end); - } - } - return 1; -} - -// take a -128..127 value and stbi__clamp it and convert to 0..255 -stbi_inline static stbi_uc stbi__clamp(int x) -{ - // trick to use a single test to catch both cases - if ((unsigned int) x > 255) { - if (x < 0) return 0; - if (x > 255) return 255; - } - return (stbi_uc) x; -} - -#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) -#define stbi__fsh(x) ((x) * 4096) - -// derived from jidctint -- DCT_ISLOW -#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ - int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ - p2 = s2; \ - p3 = s6; \ - p1 = (p2+p3) * stbi__f2f(0.5411961f); \ - t2 = p1 + p3*stbi__f2f(-1.847759065f); \ - t3 = p1 + p2*stbi__f2f( 0.765366865f); \ - p2 = s0; \ - p3 = s4; \ - t0 = stbi__fsh(p2+p3); \ - t1 = stbi__fsh(p2-p3); \ - x0 = t0+t3; \ - x3 = t0-t3; \ - x1 = t1+t2; \ - x2 = t1-t2; \ - t0 = s7; \ - t1 = s5; \ - t2 = s3; \ - t3 = s1; \ - p3 = t0+t2; \ - p4 = t1+t3; \ - p1 = t0+t3; \ - p2 = t1+t2; \ - p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ - t0 = t0*stbi__f2f( 0.298631336f); \ - t1 = t1*stbi__f2f( 2.053119869f); \ - t2 = t2*stbi__f2f( 3.072711026f); \ - t3 = t3*stbi__f2f( 1.501321110f); \ - p1 = p5 + p1*stbi__f2f(-0.899976223f); \ - p2 = p5 + p2*stbi__f2f(-2.562915447f); \ - p3 = p3*stbi__f2f(-1.961570560f); \ - p4 = p4*stbi__f2f(-0.390180644f); \ - t3 += p1+p4; \ - t2 += p2+p3; \ - t1 += p2+p4; \ - t0 += p1+p3; - -static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) -{ - int i,val[64],*v=val; - stbi_uc *o; - short *d = data; - - // columns - for (i=0; i < 8; ++i,++d, ++v) { - // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing - if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 - && d[40]==0 && d[48]==0 && d[56]==0) { - // no shortcut 0 seconds - // (1|2|3|4|5|6|7)==0 0 seconds - // all separate -0.047 seconds - // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds - int dcterm = d[0]*4; - v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; - } else { - STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) - // constants scaled things up by 1<<12; let's bring them back - // down, but keep 2 extra bits of precision - x0 += 512; x1 += 512; x2 += 512; x3 += 512; - v[ 0] = (x0+t3) >> 10; - v[56] = (x0-t3) >> 10; - v[ 8] = (x1+t2) >> 10; - v[48] = (x1-t2) >> 10; - v[16] = (x2+t1) >> 10; - v[40] = (x2-t1) >> 10; - v[24] = (x3+t0) >> 10; - v[32] = (x3-t0) >> 10; - } - } - - for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { - // no fast case since the first 1D IDCT spread components out - STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) - // constants scaled things up by 1<<12, plus we had 1<<2 from first - // loop, plus horizontal and vertical each scale by sqrt(8) so together - // we've got an extra 1<<3, so 1<<17 total we need to remove. - // so we want to round that, which means adding 0.5 * 1<<17, - // aka 65536. Also, we'll end up with -128 to 127 that we want - // to encode as 0..255 by adding 128, so we'll add that before the shift - x0 += 65536 + (128<<17); - x1 += 65536 + (128<<17); - x2 += 65536 + (128<<17); - x3 += 65536 + (128<<17); - // tried computing the shifts into temps, or'ing the temps to see - // if any were out of range, but that was slower - o[0] = stbi__clamp((x0+t3) >> 17); - o[7] = stbi__clamp((x0-t3) >> 17); - o[1] = stbi__clamp((x1+t2) >> 17); - o[6] = stbi__clamp((x1-t2) >> 17); - o[2] = stbi__clamp((x2+t1) >> 17); - o[5] = stbi__clamp((x2-t1) >> 17); - o[3] = stbi__clamp((x3+t0) >> 17); - o[4] = stbi__clamp((x3-t0) >> 17); - } -} - -#ifdef STBI_SSE2 -// sse2 integer IDCT. not the fastest possible implementation but it -// produces bit-identical results to the generic C version so it's -// fully "transparent". -static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) -{ - // This is constructed to match our regular (generic) integer IDCT exactly. - __m128i row0, row1, row2, row3, row4, row5, row6, row7; - __m128i tmp; - - // dot product constant: even elems=x, odd elems=y - #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) - - // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) - // out(1) = c1[even]*x + c1[odd]*y - #define dct_rot(out0,out1, x,y,c0,c1) \ - __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ - __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ - __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ - __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ - __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ - __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) - - // out = in << 12 (in 16-bit, out 32-bit) - #define dct_widen(out, in) \ - __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ - __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) - - // wide add - #define dct_wadd(out, a, b) \ - __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ - __m128i out##_h = _mm_add_epi32(a##_h, b##_h) - - // wide sub - #define dct_wsub(out, a, b) \ - __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ - __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) - - // butterfly a/b, add bias, then shift by "s" and pack - #define dct_bfly32o(out0, out1, a,b,bias,s) \ - { \ - __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ - __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ - dct_wadd(sum, abiased, b); \ - dct_wsub(dif, abiased, b); \ - out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ - out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ - } - - // 8-bit interleave step (for transposes) - #define dct_interleave8(a, b) \ - tmp = a; \ - a = _mm_unpacklo_epi8(a, b); \ - b = _mm_unpackhi_epi8(tmp, b) - - // 16-bit interleave step (for transposes) - #define dct_interleave16(a, b) \ - tmp = a; \ - a = _mm_unpacklo_epi16(a, b); \ - b = _mm_unpackhi_epi16(tmp, b) - - #define dct_pass(bias,shift) \ - { \ - /* even part */ \ - dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ - __m128i sum04 = _mm_add_epi16(row0, row4); \ - __m128i dif04 = _mm_sub_epi16(row0, row4); \ - dct_widen(t0e, sum04); \ - dct_widen(t1e, dif04); \ - dct_wadd(x0, t0e, t3e); \ - dct_wsub(x3, t0e, t3e); \ - dct_wadd(x1, t1e, t2e); \ - dct_wsub(x2, t1e, t2e); \ - /* odd part */ \ - dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ - dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ - __m128i sum17 = _mm_add_epi16(row1, row7); \ - __m128i sum35 = _mm_add_epi16(row3, row5); \ - dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ - dct_wadd(x4, y0o, y4o); \ - dct_wadd(x5, y1o, y5o); \ - dct_wadd(x6, y2o, y5o); \ - dct_wadd(x7, y3o, y4o); \ - dct_bfly32o(row0,row7, x0,x7,bias,shift); \ - dct_bfly32o(row1,row6, x1,x6,bias,shift); \ - dct_bfly32o(row2,row5, x2,x5,bias,shift); \ - dct_bfly32o(row3,row4, x3,x4,bias,shift); \ - } - - __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); - __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); - __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); - __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); - __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); - __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); - __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); - __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); - - // rounding biases in column/row passes, see stbi__idct_block for explanation. - __m128i bias_0 = _mm_set1_epi32(512); - __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); - - // load - row0 = _mm_load_si128((const __m128i *) (data + 0*8)); - row1 = _mm_load_si128((const __m128i *) (data + 1*8)); - row2 = _mm_load_si128((const __m128i *) (data + 2*8)); - row3 = _mm_load_si128((const __m128i *) (data + 3*8)); - row4 = _mm_load_si128((const __m128i *) (data + 4*8)); - row5 = _mm_load_si128((const __m128i *) (data + 5*8)); - row6 = _mm_load_si128((const __m128i *) (data + 6*8)); - row7 = _mm_load_si128((const __m128i *) (data + 7*8)); - - // column pass - dct_pass(bias_0, 10); - - { - // 16bit 8x8 transpose pass 1 - dct_interleave16(row0, row4); - dct_interleave16(row1, row5); - dct_interleave16(row2, row6); - dct_interleave16(row3, row7); - - // transpose pass 2 - dct_interleave16(row0, row2); - dct_interleave16(row1, row3); - dct_interleave16(row4, row6); - dct_interleave16(row5, row7); - - // transpose pass 3 - dct_interleave16(row0, row1); - dct_interleave16(row2, row3); - dct_interleave16(row4, row5); - dct_interleave16(row6, row7); - } - - // row pass - dct_pass(bias_1, 17); - - { - // pack - __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 - __m128i p1 = _mm_packus_epi16(row2, row3); - __m128i p2 = _mm_packus_epi16(row4, row5); - __m128i p3 = _mm_packus_epi16(row6, row7); - - // 8bit 8x8 transpose pass 1 - dct_interleave8(p0, p2); // a0e0a1e1... - dct_interleave8(p1, p3); // c0g0c1g1... - - // transpose pass 2 - dct_interleave8(p0, p1); // a0c0e0g0... - dct_interleave8(p2, p3); // b0d0f0h0... - - // transpose pass 3 - dct_interleave8(p0, p2); // a0b0c0d0... - dct_interleave8(p1, p3); // a4b4c4d4... - - // store - _mm_storel_epi64((__m128i *) out, p0); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p2); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p1); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p3); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); - } - -#undef dct_const -#undef dct_rot -#undef dct_widen -#undef dct_wadd -#undef dct_wsub -#undef dct_bfly32o -#undef dct_interleave8 -#undef dct_interleave16 -#undef dct_pass -} - -#endif // STBI_SSE2 - -#ifdef STBI_NEON - -// NEON integer IDCT. should produce bit-identical -// results to the generic C version. -static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) -{ - int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; - - int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); - int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); - int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); - int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); - int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); - int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); - int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); - int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); - int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); - int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); - int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); - int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); - -#define dct_long_mul(out, inq, coeff) \ - int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ - int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) - -#define dct_long_mac(out, acc, inq, coeff) \ - int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ - int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) - -#define dct_widen(out, inq) \ - int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ - int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) - -// wide add -#define dct_wadd(out, a, b) \ - int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ - int32x4_t out##_h = vaddq_s32(a##_h, b##_h) - -// wide sub -#define dct_wsub(out, a, b) \ - int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ - int32x4_t out##_h = vsubq_s32(a##_h, b##_h) - -// butterfly a/b, then shift using "shiftop" by "s" and pack -#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ - { \ - dct_wadd(sum, a, b); \ - dct_wsub(dif, a, b); \ - out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ - out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ - } - -#define dct_pass(shiftop, shift) \ - { \ - /* even part */ \ - int16x8_t sum26 = vaddq_s16(row2, row6); \ - dct_long_mul(p1e, sum26, rot0_0); \ - dct_long_mac(t2e, p1e, row6, rot0_1); \ - dct_long_mac(t3e, p1e, row2, rot0_2); \ - int16x8_t sum04 = vaddq_s16(row0, row4); \ - int16x8_t dif04 = vsubq_s16(row0, row4); \ - dct_widen(t0e, sum04); \ - dct_widen(t1e, dif04); \ - dct_wadd(x0, t0e, t3e); \ - dct_wsub(x3, t0e, t3e); \ - dct_wadd(x1, t1e, t2e); \ - dct_wsub(x2, t1e, t2e); \ - /* odd part */ \ - int16x8_t sum15 = vaddq_s16(row1, row5); \ - int16x8_t sum17 = vaddq_s16(row1, row7); \ - int16x8_t sum35 = vaddq_s16(row3, row5); \ - int16x8_t sum37 = vaddq_s16(row3, row7); \ - int16x8_t sumodd = vaddq_s16(sum17, sum35); \ - dct_long_mul(p5o, sumodd, rot1_0); \ - dct_long_mac(p1o, p5o, sum17, rot1_1); \ - dct_long_mac(p2o, p5o, sum35, rot1_2); \ - dct_long_mul(p3o, sum37, rot2_0); \ - dct_long_mul(p4o, sum15, rot2_1); \ - dct_wadd(sump13o, p1o, p3o); \ - dct_wadd(sump24o, p2o, p4o); \ - dct_wadd(sump23o, p2o, p3o); \ - dct_wadd(sump14o, p1o, p4o); \ - dct_long_mac(x4, sump13o, row7, rot3_0); \ - dct_long_mac(x5, sump24o, row5, rot3_1); \ - dct_long_mac(x6, sump23o, row3, rot3_2); \ - dct_long_mac(x7, sump14o, row1, rot3_3); \ - dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ - dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ - dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ - dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ - } - - // load - row0 = vld1q_s16(data + 0*8); - row1 = vld1q_s16(data + 1*8); - row2 = vld1q_s16(data + 2*8); - row3 = vld1q_s16(data + 3*8); - row4 = vld1q_s16(data + 4*8); - row5 = vld1q_s16(data + 5*8); - row6 = vld1q_s16(data + 6*8); - row7 = vld1q_s16(data + 7*8); - - // add DC bias - row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); - - // column pass - dct_pass(vrshrn_n_s32, 10); - - // 16bit 8x8 transpose - { -// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. -// whether compilers actually get this is another story, sadly. -#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } -#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } -#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } - - // pass 1 - dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 - dct_trn16(row2, row3); - dct_trn16(row4, row5); - dct_trn16(row6, row7); - - // pass 2 - dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 - dct_trn32(row1, row3); - dct_trn32(row4, row6); - dct_trn32(row5, row7); - - // pass 3 - dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 - dct_trn64(row1, row5); - dct_trn64(row2, row6); - dct_trn64(row3, row7); - -#undef dct_trn16 -#undef dct_trn32 -#undef dct_trn64 - } - - // row pass - // vrshrn_n_s32 only supports shifts up to 16, we need - // 17. so do a non-rounding shift of 16 first then follow - // up with a rounding shift by 1. - dct_pass(vshrn_n_s32, 16); - - { - // pack and round - uint8x8_t p0 = vqrshrun_n_s16(row0, 1); - uint8x8_t p1 = vqrshrun_n_s16(row1, 1); - uint8x8_t p2 = vqrshrun_n_s16(row2, 1); - uint8x8_t p3 = vqrshrun_n_s16(row3, 1); - uint8x8_t p4 = vqrshrun_n_s16(row4, 1); - uint8x8_t p5 = vqrshrun_n_s16(row5, 1); - uint8x8_t p6 = vqrshrun_n_s16(row6, 1); - uint8x8_t p7 = vqrshrun_n_s16(row7, 1); - - // again, these can translate into one instruction, but often don't. -#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } -#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } -#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } - - // sadly can't use interleaved stores here since we only write - // 8 bytes to each scan line! - - // 8x8 8-bit transpose pass 1 - dct_trn8_8(p0, p1); - dct_trn8_8(p2, p3); - dct_trn8_8(p4, p5); - dct_trn8_8(p6, p7); - - // pass 2 - dct_trn8_16(p0, p2); - dct_trn8_16(p1, p3); - dct_trn8_16(p4, p6); - dct_trn8_16(p5, p7); - - // pass 3 - dct_trn8_32(p0, p4); - dct_trn8_32(p1, p5); - dct_trn8_32(p2, p6); - dct_trn8_32(p3, p7); - - // store - vst1_u8(out, p0); out += out_stride; - vst1_u8(out, p1); out += out_stride; - vst1_u8(out, p2); out += out_stride; - vst1_u8(out, p3); out += out_stride; - vst1_u8(out, p4); out += out_stride; - vst1_u8(out, p5); out += out_stride; - vst1_u8(out, p6); out += out_stride; - vst1_u8(out, p7); - -#undef dct_trn8_8 -#undef dct_trn8_16 -#undef dct_trn8_32 - } - -#undef dct_long_mul -#undef dct_long_mac -#undef dct_widen -#undef dct_wadd -#undef dct_wsub -#undef dct_bfly32o -#undef dct_pass -} - -#endif // STBI_NEON - -#define STBI__MARKER_none 0xff -// if there's a pending marker from the entropy stream, return that -// otherwise, fetch from the stream and get a marker. if there's no -// marker, return 0xff, which is never a valid marker value -static stbi_uc stbi__get_marker(stbi__jpeg *j) -{ - stbi_uc x; - if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } - x = stbi__get8(j->s); - if (x != 0xff) return STBI__MARKER_none; - while (x == 0xff) - x = stbi__get8(j->s); // consume repeated 0xff fill bytes - return x; -} - -// in each scan, we'll have scan_n components, and the order -// of the components is specified by order[] -#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) - -// after a restart interval, stbi__jpeg_reset the entropy decoder and -// the dc prediction -static void stbi__jpeg_reset(stbi__jpeg *j) -{ - j->code_bits = 0; - j->code_buffer = 0; - j->nomore = 0; - j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0; - j->marker = STBI__MARKER_none; - j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; - j->eob_run = 0; - // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, - // since we don't even allow 1<<30 pixels -} - -static int stbi__parse_entropy_coded_data(stbi__jpeg *z) -{ - stbi__jpeg_reset(z); - if (!z->progressive) { - if (z->scan_n == 1) { - int i,j; - STBI_SIMD_ALIGN(short, data[64]); - int n = z->order[0]; - // non-interleaved data, we just need to process one block at a time, - // in trivial scanline order - // number of blocks to do just depends on how many actual "pixels" this - // component has, independent of interleaved MCU blocking and such - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); - // every data block is an MCU, so countdown the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - // if it's NOT a restart, then just bail, so we get corrupt data - // rather than no data - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } else { // interleaved - int i,j,k,x,y; - STBI_SIMD_ALIGN(short, data[64]); - for (j=0; j < z->img_mcu_y; ++j) { - for (i=0; i < z->img_mcu_x; ++i) { - // scan an interleaved mcu... process scan_n components in order - for (k=0; k < z->scan_n; ++k) { - int n = z->order[k]; - // scan out an mcu's worth of this component; that's just determined - // by the basic H and V specified for the component - for (y=0; y < z->img_comp[n].v; ++y) { - for (x=0; x < z->img_comp[n].h; ++x) { - int x2 = (i*z->img_comp[n].h + x)*8; - int y2 = (j*z->img_comp[n].v + y)*8; - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); - } - } - } - // after all interleaved components, that's an interleaved MCU, - // so now count down the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - } else { - if (z->scan_n == 1) { - int i,j; - int n = z->order[0]; - // non-interleaved data, we just need to process one block at a time, - // in trivial scanline order - // number of blocks to do just depends on how many actual "pixels" this - // component has, independent of interleaved MCU blocking and such - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); - if (z->spec_start == 0) { - if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) - return 0; - } else { - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) - return 0; - } - // every data block is an MCU, so countdown the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } else { // interleaved - int i,j,k,x,y; - for (j=0; j < z->img_mcu_y; ++j) { - for (i=0; i < z->img_mcu_x; ++i) { - // scan an interleaved mcu... process scan_n components in order - for (k=0; k < z->scan_n; ++k) { - int n = z->order[k]; - // scan out an mcu's worth of this component; that's just determined - // by the basic H and V specified for the component - for (y=0; y < z->img_comp[n].v; ++y) { - for (x=0; x < z->img_comp[n].h; ++x) { - int x2 = (i*z->img_comp[n].h + x); - int y2 = (j*z->img_comp[n].v + y); - short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); - if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) - return 0; - } - } - } - // after all interleaved components, that's an interleaved MCU, - // so now count down the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - } -} - -static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant) -{ - int i; - for (i=0; i < 64; ++i) - data[i] *= dequant[i]; -} - -static void stbi__jpeg_finish(stbi__jpeg *z) -{ - if (z->progressive) { - // dequantize and idct the data - int i,j,n; - for (n=0; n < z->s->img_n; ++n) { - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); - stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); - } - } - } - } -} - -static int stbi__process_marker(stbi__jpeg *z, int m) -{ - int L; - switch (m) { - case STBI__MARKER_none: // no marker found - return stbi__err("expected marker","Corrupt JPEG"); - - case 0xDD: // DRI - specify restart interval - if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); - z->restart_interval = stbi__get16be(z->s); - return 1; - - case 0xDB: // DQT - define quantization table - L = stbi__get16be(z->s)-2; - while (L > 0) { - int q = stbi__get8(z->s); - int p = q >> 4, sixteen = (p != 0); - int t = q & 15,i; - if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG"); - if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); - - for (i=0; i < 64; ++i) - z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s)); - L -= (sixteen ? 129 : 65); - } - return L==0; - - case 0xC4: // DHT - define huffman table - L = stbi__get16be(z->s)-2; - while (L > 0) { - stbi_uc *v; - int sizes[16],i,n=0; - int q = stbi__get8(z->s); - int tc = q >> 4; - int th = q & 15; - if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); - for (i=0; i < 16; ++i) { - sizes[i] = stbi__get8(z->s); - n += sizes[i]; - } - L -= 17; - if (tc == 0) { - if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; - v = z->huff_dc[th].values; - } else { - if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; - v = z->huff_ac[th].values; - } - for (i=0; i < n; ++i) - v[i] = stbi__get8(z->s); - if (tc != 0) - stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); - L -= n; - } - return L==0; - } - - // check for comment block or APP blocks - if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { - L = stbi__get16be(z->s); - if (L < 2) { - if (m == 0xFE) - return stbi__err("bad COM len","Corrupt JPEG"); - else - return stbi__err("bad APP len","Corrupt JPEG"); - } - L -= 2; - - if (m == 0xE0 && L >= 5) { // JFIF APP0 segment - static const unsigned char tag[5] = {'J','F','I','F','\0'}; - int ok = 1; - int i; - for (i=0; i < 5; ++i) - if (stbi__get8(z->s) != tag[i]) - ok = 0; - L -= 5; - if (ok) - z->jfif = 1; - } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment - static const unsigned char tag[6] = {'A','d','o','b','e','\0'}; - int ok = 1; - int i; - for (i=0; i < 6; ++i) - if (stbi__get8(z->s) != tag[i]) - ok = 0; - L -= 6; - if (ok) { - stbi__get8(z->s); // version - stbi__get16be(z->s); // flags0 - stbi__get16be(z->s); // flags1 - z->app14_color_transform = stbi__get8(z->s); // color transform - L -= 6; - } - } - - stbi__skip(z->s, L); - return 1; - } - - return stbi__err("unknown marker","Corrupt JPEG"); -} - -// after we see SOS -static int stbi__process_scan_header(stbi__jpeg *z) -{ - int i; - int Ls = stbi__get16be(z->s); - z->scan_n = stbi__get8(z->s); - if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); - if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); - for (i=0; i < z->scan_n; ++i) { - int id = stbi__get8(z->s), which; - int q = stbi__get8(z->s); - for (which = 0; which < z->s->img_n; ++which) - if (z->img_comp[which].id == id) - break; - if (which == z->s->img_n) return 0; // no match - z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); - z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); - z->order[i] = which; - } - - { - int aa; - z->spec_start = stbi__get8(z->s); - z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 - aa = stbi__get8(z->s); - z->succ_high = (aa >> 4); - z->succ_low = (aa & 15); - if (z->progressive) { - if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) - return stbi__err("bad SOS", "Corrupt JPEG"); - } else { - if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); - if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); - z->spec_end = 63; - } - } - - return 1; -} - -static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why) -{ - int i; - for (i=0; i < ncomp; ++i) { - if (z->img_comp[i].raw_data) { - STBI_FREE(z->img_comp[i].raw_data); - z->img_comp[i].raw_data = NULL; - z->img_comp[i].data = NULL; - } - if (z->img_comp[i].raw_coeff) { - STBI_FREE(z->img_comp[i].raw_coeff); - z->img_comp[i].raw_coeff = 0; - z->img_comp[i].coeff = 0; - } - if (z->img_comp[i].linebuf) { - STBI_FREE(z->img_comp[i].linebuf); - z->img_comp[i].linebuf = NULL; - } - } - return why; -} - -static int stbi__process_frame_header(stbi__jpeg *z, int scan) -{ - stbi__context *s = z->s; - int Lf,p,i,q, h_max=1,v_max=1,c; - Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG - p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline - s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG - s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires - c = stbi__get8(s); - if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG"); - s->img_n = c; - for (i=0; i < c; ++i) { - z->img_comp[i].data = NULL; - z->img_comp[i].linebuf = NULL; - } - - if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); - - z->rgb = 0; - for (i=0; i < s->img_n; ++i) { - static const unsigned char rgb[3] = { 'R', 'G', 'B' }; - z->img_comp[i].id = stbi__get8(s); - if (s->img_n == 3 && z->img_comp[i].id == rgb[i]) - ++z->rgb; - q = stbi__get8(s); - z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); - z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); - z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); - } - - if (scan != STBI__SCAN_load) return 1; - - if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode"); - - for (i=0; i < s->img_n; ++i) { - if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; - if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; - } - - // compute interleaved mcu info - z->img_h_max = h_max; - z->img_v_max = v_max; - z->img_mcu_w = h_max * 8; - z->img_mcu_h = v_max * 8; - // these sizes can't be more than 17 bits - z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; - z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; - - for (i=0; i < s->img_n; ++i) { - // number of effective pixels (e.g. for non-interleaved MCU) - z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; - z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; - // to simplify generation, we'll allocate enough memory to decode - // the bogus oversized data from using interleaved MCUs and their - // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't - // discard the extra data until colorspace conversion - // - // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier) - // so these muls can't overflow with 32-bit ints (which we require) - z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; - z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; - z->img_comp[i].coeff = 0; - z->img_comp[i].raw_coeff = 0; - z->img_comp[i].linebuf = NULL; - z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15); - if (z->img_comp[i].raw_data == NULL) - return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); - // align blocks for idct using mmx/sse - z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); - if (z->progressive) { - // w2, h2 are multiples of 8 (see above) - z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8; - z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8; - z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15); - if (z->img_comp[i].raw_coeff == NULL) - return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory")); - z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); - } - } - - return 1; -} - -// use comparisons since in some cases we handle more than one case (e.g. SOF) -#define stbi__DNL(x) ((x) == 0xdc) -#define stbi__SOI(x) ((x) == 0xd8) -#define stbi__EOI(x) ((x) == 0xd9) -#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) -#define stbi__SOS(x) ((x) == 0xda) - -#define stbi__SOF_progressive(x) ((x) == 0xc2) - -static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) -{ - int m; - z->jfif = 0; - z->app14_color_transform = -1; // valid values are 0,1,2 - z->marker = STBI__MARKER_none; // initialize cached marker to empty - m = stbi__get_marker(z); - if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); - if (scan == STBI__SCAN_type) return 1; - m = stbi__get_marker(z); - while (!stbi__SOF(m)) { - if (!stbi__process_marker(z,m)) return 0; - m = stbi__get_marker(z); - while (m == STBI__MARKER_none) { - // some files have extra padding after their blocks, so ok, we'll scan - if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); - m = stbi__get_marker(z); - } - } - z->progressive = stbi__SOF_progressive(m); - if (!stbi__process_frame_header(z, scan)) return 0; - return 1; -} - -// decode image to YCbCr format -static int stbi__decode_jpeg_image(stbi__jpeg *j) -{ - int m; - for (m = 0; m < 4; m++) { - j->img_comp[m].raw_data = NULL; - j->img_comp[m].raw_coeff = NULL; - } - j->restart_interval = 0; - if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; - m = stbi__get_marker(j); - while (!stbi__EOI(m)) { - if (stbi__SOS(m)) { - if (!stbi__process_scan_header(j)) return 0; - if (!stbi__parse_entropy_coded_data(j)) return 0; - if (j->marker == STBI__MARKER_none ) { - // handle 0s at the end of image data from IP Kamera 9060 - while (!stbi__at_eof(j->s)) { - int x = stbi__get8(j->s); - if (x == 255) { - j->marker = stbi__get8(j->s); - break; - } - } - // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 - } - } else if (stbi__DNL(m)) { - int Ld = stbi__get16be(j->s); - stbi__uint32 NL = stbi__get16be(j->s); - if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG"); - if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG"); - } else { - if (!stbi__process_marker(j, m)) return 0; - } - m = stbi__get_marker(j); - } - if (j->progressive) - stbi__jpeg_finish(j); - return 1; -} - -// static jfif-centered resampling (across block boundaries) - -typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, - int w, int hs); - -#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) - -static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - STBI_NOTUSED(out); - STBI_NOTUSED(in_far); - STBI_NOTUSED(w); - STBI_NOTUSED(hs); - return in_near; -} - -static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate two samples vertically for every one in input - int i; - STBI_NOTUSED(hs); - for (i=0; i < w; ++i) - out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); - return out; -} - -static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate two samples horizontally for every one in input - int i; - stbi_uc *input = in_near; - - if (w == 1) { - // if only one sample, can't do any interpolation - out[0] = out[1] = input[0]; - return out; - } - - out[0] = input[0]; - out[1] = stbi__div4(input[0]*3 + input[1] + 2); - for (i=1; i < w-1; ++i) { - int n = 3*input[i]+2; - out[i*2+0] = stbi__div4(n+input[i-1]); - out[i*2+1] = stbi__div4(n+input[i+1]); - } - out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); - out[i*2+1] = input[w-1]; - - STBI_NOTUSED(in_far); - STBI_NOTUSED(hs); - - return out; -} - -#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) - -static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate 2x2 samples for every one in input - int i,t0,t1; - if (w == 1) { - out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); - return out; - } - - t1 = 3*in_near[0] + in_far[0]; - out[0] = stbi__div4(t1+2); - for (i=1; i < w; ++i) { - t0 = t1; - t1 = 3*in_near[i]+in_far[i]; - out[i*2-1] = stbi__div16(3*t0 + t1 + 8); - out[i*2 ] = stbi__div16(3*t1 + t0 + 8); - } - out[w*2-1] = stbi__div4(t1+2); - - STBI_NOTUSED(hs); - - return out; -} - -#if defined(STBI_SSE2) || defined(STBI_NEON) -static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate 2x2 samples for every one in input - int i=0,t0,t1; - - if (w == 1) { - out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); - return out; - } - - t1 = 3*in_near[0] + in_far[0]; - // process groups of 8 pixels for as long as we can. - // note we can't handle the last pixel in a row in this loop - // because we need to handle the filter boundary conditions. - for (; i < ((w-1) & ~7); i += 8) { -#if defined(STBI_SSE2) - // load and perform the vertical filtering pass - // this uses 3*x + y = 4*x + (y - x) - __m128i zero = _mm_setzero_si128(); - __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); - __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); - __m128i farw = _mm_unpacklo_epi8(farb, zero); - __m128i nearw = _mm_unpacklo_epi8(nearb, zero); - __m128i diff = _mm_sub_epi16(farw, nearw); - __m128i nears = _mm_slli_epi16(nearw, 2); - __m128i curr = _mm_add_epi16(nears, diff); // current row - - // horizontal filter works the same based on shifted vers of current - // row. "prev" is current row shifted right by 1 pixel; we need to - // insert the previous pixel value (from t1). - // "next" is current row shifted left by 1 pixel, with first pixel - // of next block of 8 pixels added in. - __m128i prv0 = _mm_slli_si128(curr, 2); - __m128i nxt0 = _mm_srli_si128(curr, 2); - __m128i prev = _mm_insert_epi16(prv0, t1, 0); - __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); - - // horizontal filter, polyphase implementation since it's convenient: - // even pixels = 3*cur + prev = cur*4 + (prev - cur) - // odd pixels = 3*cur + next = cur*4 + (next - cur) - // note the shared term. - __m128i bias = _mm_set1_epi16(8); - __m128i curs = _mm_slli_epi16(curr, 2); - __m128i prvd = _mm_sub_epi16(prev, curr); - __m128i nxtd = _mm_sub_epi16(next, curr); - __m128i curb = _mm_add_epi16(curs, bias); - __m128i even = _mm_add_epi16(prvd, curb); - __m128i odd = _mm_add_epi16(nxtd, curb); - - // interleave even and odd pixels, then undo scaling. - __m128i int0 = _mm_unpacklo_epi16(even, odd); - __m128i int1 = _mm_unpackhi_epi16(even, odd); - __m128i de0 = _mm_srli_epi16(int0, 4); - __m128i de1 = _mm_srli_epi16(int1, 4); - - // pack and write output - __m128i outv = _mm_packus_epi16(de0, de1); - _mm_storeu_si128((__m128i *) (out + i*2), outv); -#elif defined(STBI_NEON) - // load and perform the vertical filtering pass - // this uses 3*x + y = 4*x + (y - x) - uint8x8_t farb = vld1_u8(in_far + i); - uint8x8_t nearb = vld1_u8(in_near + i); - int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); - int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); - int16x8_t curr = vaddq_s16(nears, diff); // current row - - // horizontal filter works the same based on shifted vers of current - // row. "prev" is current row shifted right by 1 pixel; we need to - // insert the previous pixel value (from t1). - // "next" is current row shifted left by 1 pixel, with first pixel - // of next block of 8 pixels added in. - int16x8_t prv0 = vextq_s16(curr, curr, 7); - int16x8_t nxt0 = vextq_s16(curr, curr, 1); - int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); - int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); - - // horizontal filter, polyphase implementation since it's convenient: - // even pixels = 3*cur + prev = cur*4 + (prev - cur) - // odd pixels = 3*cur + next = cur*4 + (next - cur) - // note the shared term. - int16x8_t curs = vshlq_n_s16(curr, 2); - int16x8_t prvd = vsubq_s16(prev, curr); - int16x8_t nxtd = vsubq_s16(next, curr); - int16x8_t even = vaddq_s16(curs, prvd); - int16x8_t odd = vaddq_s16(curs, nxtd); - - // undo scaling and round, then store with even/odd phases interleaved - uint8x8x2_t o; - o.val[0] = vqrshrun_n_s16(even, 4); - o.val[1] = vqrshrun_n_s16(odd, 4); - vst2_u8(out + i*2, o); -#endif - - // "previous" value for next iter - t1 = 3*in_near[i+7] + in_far[i+7]; - } - - t0 = t1; - t1 = 3*in_near[i] + in_far[i]; - out[i*2] = stbi__div16(3*t1 + t0 + 8); - - for (++i; i < w; ++i) { - t0 = t1; - t1 = 3*in_near[i]+in_far[i]; - out[i*2-1] = stbi__div16(3*t0 + t1 + 8); - out[i*2 ] = stbi__div16(3*t1 + t0 + 8); - } - out[w*2-1] = stbi__div4(t1+2); - - STBI_NOTUSED(hs); - - return out; -} -#endif - -static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // resample with nearest-neighbor - int i,j; - STBI_NOTUSED(in_far); - for (i=0; i < w; ++i) - for (j=0; j < hs; ++j) - out[i*hs+j] = in_near[i]; - return out; -} - -// this is a reduced-precision calculation of YCbCr-to-RGB introduced -// to make sure the code produces the same results in both SIMD and scalar -#define stbi__float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) -static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) -{ - int i; - for (i=0; i < count; ++i) { - int y_fixed = (y[i] << 20) + (1<<19); // rounding - int r,g,b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr* stbi__float2fixed(1.40200f); - g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); - b = y_fixed + cb* stbi__float2fixed(1.77200f); - r >>= 20; - g >>= 20; - b >>= 20; - if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } - if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } - if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} - -#if defined(STBI_SSE2) || defined(STBI_NEON) -static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) -{ - int i = 0; - -#ifdef STBI_SSE2 - // step == 3 is pretty ugly on the final interleave, and i'm not convinced - // it's useful in practice (you wouldn't use it for textures, for example). - // so just accelerate step == 4 case. - if (step == 4) { - // this is a fairly straightforward implementation and not super-optimized. - __m128i signflip = _mm_set1_epi8(-0x80); - __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); - __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); - __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); - __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); - __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); - __m128i xw = _mm_set1_epi16(255); // alpha channel - - for (; i+7 < count; i += 8) { - // load - __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); - __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); - __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); - __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 - __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 - - // unpack to short (and left-shift cr, cb by 8) - __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); - __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); - __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); - - // color transform - __m128i yws = _mm_srli_epi16(yw, 4); - __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); - __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); - __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); - __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); - __m128i rws = _mm_add_epi16(cr0, yws); - __m128i gwt = _mm_add_epi16(cb0, yws); - __m128i bws = _mm_add_epi16(yws, cb1); - __m128i gws = _mm_add_epi16(gwt, cr1); - - // descale - __m128i rw = _mm_srai_epi16(rws, 4); - __m128i bw = _mm_srai_epi16(bws, 4); - __m128i gw = _mm_srai_epi16(gws, 4); - - // back to byte, set up for transpose - __m128i brb = _mm_packus_epi16(rw, bw); - __m128i gxb = _mm_packus_epi16(gw, xw); - - // transpose to interleave channels - __m128i t0 = _mm_unpacklo_epi8(brb, gxb); - __m128i t1 = _mm_unpackhi_epi8(brb, gxb); - __m128i o0 = _mm_unpacklo_epi16(t0, t1); - __m128i o1 = _mm_unpackhi_epi16(t0, t1); - - // store - _mm_storeu_si128((__m128i *) (out + 0), o0); - _mm_storeu_si128((__m128i *) (out + 16), o1); - out += 32; - } - } -#endif - -#ifdef STBI_NEON - // in this version, step=3 support would be easy to add. but is there demand? - if (step == 4) { - // this is a fairly straightforward implementation and not super-optimized. - uint8x8_t signflip = vdup_n_u8(0x80); - int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); - int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); - int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); - int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); - - for (; i+7 < count; i += 8) { - // load - uint8x8_t y_bytes = vld1_u8(y + i); - uint8x8_t cr_bytes = vld1_u8(pcr + i); - uint8x8_t cb_bytes = vld1_u8(pcb + i); - int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); - int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); - - // expand to s16 - int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); - int16x8_t crw = vshll_n_s8(cr_biased, 7); - int16x8_t cbw = vshll_n_s8(cb_biased, 7); - - // color transform - int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); - int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); - int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); - int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); - int16x8_t rws = vaddq_s16(yws, cr0); - int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); - int16x8_t bws = vaddq_s16(yws, cb1); - - // undo scaling, round, convert to byte - uint8x8x4_t o; - o.val[0] = vqrshrun_n_s16(rws, 4); - o.val[1] = vqrshrun_n_s16(gws, 4); - o.val[2] = vqrshrun_n_s16(bws, 4); - o.val[3] = vdup_n_u8(255); - - // store, interleaving r/g/b/a - vst4_u8(out, o); - out += 8*4; - } - } -#endif - - for (; i < count; ++i) { - int y_fixed = (y[i] << 20) + (1<<19); // rounding - int r,g,b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr* stbi__float2fixed(1.40200f); - g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000); - b = y_fixed + cb* stbi__float2fixed(1.77200f); - r >>= 20; - g >>= 20; - b >>= 20; - if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } - if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } - if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} -#endif - -// set up the kernels -static void stbi__setup_jpeg(stbi__jpeg *j) -{ - j->idct_block_kernel = stbi__idct_block; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; - -#ifdef STBI_SSE2 - if (stbi__sse2_available()) { - j->idct_block_kernel = stbi__idct_simd; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; - } -#endif - -#ifdef STBI_NEON - j->idct_block_kernel = stbi__idct_simd; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; -#endif -} - -// clean up the temporary component buffers -static void stbi__cleanup_jpeg(stbi__jpeg *j) -{ - stbi__free_jpeg_components(j, j->s->img_n, 0); -} - -typedef struct -{ - resample_row_func resample; - stbi_uc *line0,*line1; - int hs,vs; // expansion factor in each axis - int w_lores; // horizontal pixels pre-expansion - int ystep; // how far through vertical expansion we are - int ypos; // which pre-expansion row we're on -} stbi__resample; - -// fast 0..255 * 0..255 => 0..255 rounded multiplication -static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y) -{ - unsigned int t = x*y + 128; - return (stbi_uc) ((t + (t >>8)) >> 8); -} - -static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) -{ - int n, decode_n, is_rgb; - z->s->img_n = 0; // make stbi__cleanup_jpeg safe - - // validate req_comp - if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); - - // load a jpeg image from whichever source, but leave in YCbCr format - if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } - - // determine actual number of components to generate - n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1; - - is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif)); - - if (z->s->img_n == 3 && n < 3 && !is_rgb) - decode_n = 1; - else - decode_n = z->s->img_n; - - // resample and color-convert - { - int k; - unsigned int i,j; - stbi_uc *output; - stbi_uc *coutput[4] = { NULL, NULL, NULL, NULL }; - - stbi__resample res_comp[4]; - - for (k=0; k < decode_n; ++k) { - stbi__resample *r = &res_comp[k]; - - // allocate line buffer big enough for upsampling off the edges - // with upsample factor of 4 - z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); - if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } - - r->hs = z->img_h_max / z->img_comp[k].h; - r->vs = z->img_v_max / z->img_comp[k].v; - r->ystep = r->vs >> 1; - r->w_lores = (z->s->img_x + r->hs-1) / r->hs; - r->ypos = 0; - r->line0 = r->line1 = z->img_comp[k].data; - - if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; - else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; - else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; - else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; - else r->resample = stbi__resample_row_generic; - } - - // can't error after this so, this is safe - output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1); - if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } - - // now go ahead and resample - for (j=0; j < z->s->img_y; ++j) { - stbi_uc *out = output + n * z->s->img_x * j; - for (k=0; k < decode_n; ++k) { - stbi__resample *r = &res_comp[k]; - int y_bot = r->ystep >= (r->vs >> 1); - coutput[k] = r->resample(z->img_comp[k].linebuf, - y_bot ? r->line1 : r->line0, - y_bot ? r->line0 : r->line1, - r->w_lores, r->hs); - if (++r->ystep >= r->vs) { - r->ystep = 0; - r->line0 = r->line1; - if (++r->ypos < z->img_comp[k].y) - r->line1 += z->img_comp[k].w2; - } - } - if (n >= 3) { - stbi_uc *y = coutput[0]; - if (z->s->img_n == 3) { - if (is_rgb) { - for (i=0; i < z->s->img_x; ++i) { - out[0] = y[i]; - out[1] = coutput[1][i]; - out[2] = coutput[2][i]; - out[3] = 255; - out += n; - } - } else { - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - } - } else if (z->s->img_n == 4) { - if (z->app14_color_transform == 0) { // CMYK - for (i=0; i < z->s->img_x; ++i) { - stbi_uc m = coutput[3][i]; - out[0] = stbi__blinn_8x8(coutput[0][i], m); - out[1] = stbi__blinn_8x8(coutput[1][i], m); - out[2] = stbi__blinn_8x8(coutput[2][i], m); - out[3] = 255; - out += n; - } - } else if (z->app14_color_transform == 2) { // YCCK - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - for (i=0; i < z->s->img_x; ++i) { - stbi_uc m = coutput[3][i]; - out[0] = stbi__blinn_8x8(255 - out[0], m); - out[1] = stbi__blinn_8x8(255 - out[1], m); - out[2] = stbi__blinn_8x8(255 - out[2], m); - out += n; - } - } else { // YCbCr + alpha? Ignore the fourth channel for now - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - } - } else - for (i=0; i < z->s->img_x; ++i) { - out[0] = out[1] = out[2] = y[i]; - out[3] = 255; // not used if n==3 - out += n; - } - } else { - if (is_rgb) { - if (n == 1) - for (i=0; i < z->s->img_x; ++i) - *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); - else { - for (i=0; i < z->s->img_x; ++i, out += 2) { - out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]); - out[1] = 255; - } - } - } else if (z->s->img_n == 4 && z->app14_color_transform == 0) { - for (i=0; i < z->s->img_x; ++i) { - stbi_uc m = coutput[3][i]; - stbi_uc r = stbi__blinn_8x8(coutput[0][i], m); - stbi_uc g = stbi__blinn_8x8(coutput[1][i], m); - stbi_uc b = stbi__blinn_8x8(coutput[2][i], m); - out[0] = stbi__compute_y(r, g, b); - out[1] = 255; - out += n; - } - } else if (z->s->img_n == 4 && z->app14_color_transform == 2) { - for (i=0; i < z->s->img_x; ++i) { - out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]); - out[1] = 255; - out += n; - } - } else { - stbi_uc *y = coutput[0]; - if (n == 1) - for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; - else - for (i=0; i < z->s->img_x; ++i) { *out++ = y[i]; *out++ = 255; } - } - } - } - stbi__cleanup_jpeg(z); - *out_x = z->s->img_x; - *out_y = z->s->img_y; - if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output - return output; - } -} - -static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - unsigned char* result; - stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg)); - STBI_NOTUSED(ri); - j->s = s; - stbi__setup_jpeg(j); - result = load_jpeg_image(j, x,y,comp,req_comp); - STBI_FREE(j); - return result; -} - -static int stbi__jpeg_test(stbi__context *s) -{ - int r; - stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg)); - j->s = s; - stbi__setup_jpeg(j); - r = stbi__decode_jpeg_header(j, STBI__SCAN_type); - stbi__rewind(s); - STBI_FREE(j); - return r; -} - -static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) -{ - if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { - stbi__rewind( j->s ); - return 0; - } - if (x) *x = j->s->img_x; - if (y) *y = j->s->img_y; - if (comp) *comp = j->s->img_n >= 3 ? 3 : 1; - return 1; -} - -static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) -{ - int result; - stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg))); - j->s = s; - result = stbi__jpeg_info_raw(j, x, y, comp); - STBI_FREE(j); - return result; -} -#endif - -// public domain zlib decode v0.2 Sean Barrett 2006-11-18 -// simple implementation -// - all input must be provided in an upfront buffer -// - all output is written to a single output buffer (can malloc/realloc) -// performance -// - fast huffman - -#ifndef STBI_NO_ZLIB - -// fast-way is faster to check than jpeg huffman, but slow way is slower -#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables -#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) - -// zlib-style huffman encoding -// (jpegs packs from left, zlib from right, so can't share code) -typedef struct -{ - stbi__uint16 fast[1 << STBI__ZFAST_BITS]; - stbi__uint16 firstcode[16]; - int maxcode[17]; - stbi__uint16 firstsymbol[16]; - stbi_uc size[288]; - stbi__uint16 value[288]; -} stbi__zhuffman; - -stbi_inline static int stbi__bitreverse16(int n) -{ - n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); - n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); - n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); - n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); - return n; -} - -stbi_inline static int stbi__bit_reverse(int v, int bits) -{ - STBI_ASSERT(bits <= 16); - // to bit reverse n bits, reverse 16 and shift - // e.g. 11 bits, bit reverse and shift away 5 - return stbi__bitreverse16(v) >> (16-bits); -} - -static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num) -{ - int i,k=0; - int code, next_code[16], sizes[17]; - - // DEFLATE spec for generating codes - memset(sizes, 0, sizeof(sizes)); - memset(z->fast, 0, sizeof(z->fast)); - for (i=0; i < num; ++i) - ++sizes[sizelist[i]]; - sizes[0] = 0; - for (i=1; i < 16; ++i) - if (sizes[i] > (1 << i)) - return stbi__err("bad sizes", "Corrupt PNG"); - code = 0; - for (i=1; i < 16; ++i) { - next_code[i] = code; - z->firstcode[i] = (stbi__uint16) code; - z->firstsymbol[i] = (stbi__uint16) k; - code = (code + sizes[i]); - if (sizes[i]) - if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); - z->maxcode[i] = code << (16-i); // preshift for inner loop - code <<= 1; - k += sizes[i]; - } - z->maxcode[16] = 0x10000; // sentinel - for (i=0; i < num; ++i) { - int s = sizelist[i]; - if (s) { - int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; - stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); - z->size [c] = (stbi_uc ) s; - z->value[c] = (stbi__uint16) i; - if (s <= STBI__ZFAST_BITS) { - int j = stbi__bit_reverse(next_code[s],s); - while (j < (1 << STBI__ZFAST_BITS)) { - z->fast[j] = fastv; - j += (1 << s); - } - } - ++next_code[s]; - } - } - return 1; -} - -// zlib-from-memory implementation for PNG reading -// because PNG allows splitting the zlib stream arbitrarily, -// and it's annoying structurally to have PNG call ZLIB call PNG, -// we require PNG read all the IDATs and combine them into a single -// memory buffer - -typedef struct -{ - stbi_uc *zbuffer, *zbuffer_end; - int num_bits; - stbi__uint32 code_buffer; - - char *zout; - char *zout_start; - char *zout_end; - int z_expandable; - - stbi__zhuffman z_length, z_distance; -} stbi__zbuf; - -stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) -{ - if (z->zbuffer >= z->zbuffer_end) return 0; - return *z->zbuffer++; -} - -static void stbi__fill_bits(stbi__zbuf *z) -{ - do { - STBI_ASSERT(z->code_buffer < (1U << z->num_bits)); - z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; - z->num_bits += 8; - } while (z->num_bits <= 24); -} - -stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) -{ - unsigned int k; - if (z->num_bits < n) stbi__fill_bits(z); - k = z->code_buffer & ((1 << n) - 1); - z->code_buffer >>= n; - z->num_bits -= n; - return k; -} - -static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) -{ - int b,s,k; - // not resolved by fast table, so compute it the slow way - // use jpeg approach, which requires MSbits at top - k = stbi__bit_reverse(a->code_buffer, 16); - for (s=STBI__ZFAST_BITS+1; ; ++s) - if (k < z->maxcode[s]) - break; - if (s == 16) return -1; // invalid code! - // code size is s, so: - b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; - STBI_ASSERT(z->size[b] == s); - a->code_buffer >>= s; - a->num_bits -= s; - return z->value[b]; -} - -stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) -{ - int b,s; - if (a->num_bits < 16) stbi__fill_bits(a); - b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; - if (b) { - s = b >> 9; - a->code_buffer >>= s; - a->num_bits -= s; - return b & 511; - } - return stbi__zhuffman_decode_slowpath(a, z); -} - -static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes -{ - char *q; - int cur, limit, old_limit; - z->zout = zout; - if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); - cur = (int) (z->zout - z->zout_start); - limit = old_limit = (int) (z->zout_end - z->zout_start); - while (cur + n > limit) - limit *= 2; - q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit); - STBI_NOTUSED(old_limit); - if (q == NULL) return stbi__err("outofmem", "Out of memory"); - z->zout_start = q; - z->zout = q + cur; - z->zout_end = q + limit; - return 1; -} - -static const int stbi__zlength_base[31] = { - 3,4,5,6,7,8,9,10,11,13, - 15,17,19,23,27,31,35,43,51,59, - 67,83,99,115,131,163,195,227,258,0,0 }; - -static const int stbi__zlength_extra[31]= -{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; - -static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, -257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; - -static const int stbi__zdist_extra[32] = -{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; - -static int stbi__parse_huffman_block(stbi__zbuf *a) -{ - char *zout = a->zout; - for(;;) { - int z = stbi__zhuffman_decode(a, &a->z_length); - if (z < 256) { - if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes - if (zout >= a->zout_end) { - if (!stbi__zexpand(a, zout, 1)) return 0; - zout = a->zout; - } - *zout++ = (char) z; - } else { - stbi_uc *p; - int len,dist; - if (z == 256) { - a->zout = zout; - return 1; - } - z -= 257; - len = stbi__zlength_base[z]; - if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); - z = stbi__zhuffman_decode(a, &a->z_distance); - if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); - dist = stbi__zdist_base[z]; - if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); - if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); - if (zout + len > a->zout_end) { - if (!stbi__zexpand(a, zout, len)) return 0; - zout = a->zout; - } - p = (stbi_uc *) (zout - dist); - if (dist == 1) { // run of one byte; common in images. - stbi_uc v = *p; - if (len) { do *zout++ = v; while (--len); } - } else { - if (len) { do *zout++ = *p++; while (--len); } - } - } - } -} - -static int stbi__compute_huffman_codes(stbi__zbuf *a) -{ - static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; - stbi__zhuffman z_codelength; - stbi_uc lencodes[286+32+137];//padding for maximum single op - stbi_uc codelength_sizes[19]; - int i,n; - - int hlit = stbi__zreceive(a,5) + 257; - int hdist = stbi__zreceive(a,5) + 1; - int hclen = stbi__zreceive(a,4) + 4; - int ntot = hlit + hdist; - - memset(codelength_sizes, 0, sizeof(codelength_sizes)); - for (i=0; i < hclen; ++i) { - int s = stbi__zreceive(a,3); - codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; - } - if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; - - n = 0; - while (n < ntot) { - int c = stbi__zhuffman_decode(a, &z_codelength); - if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); - if (c < 16) - lencodes[n++] = (stbi_uc) c; - else { - stbi_uc fill = 0; - if (c == 16) { - c = stbi__zreceive(a,2)+3; - if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG"); - fill = lencodes[n-1]; - } else if (c == 17) - c = stbi__zreceive(a,3)+3; - else { - STBI_ASSERT(c == 18); - c = stbi__zreceive(a,7)+11; - } - if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG"); - memset(lencodes+n, fill, c); - n += c; - } - } - if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG"); - if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; - if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; - return 1; -} - -static int stbi__parse_uncompressed_block(stbi__zbuf *a) -{ - stbi_uc header[4]; - int len,nlen,k; - if (a->num_bits & 7) - stbi__zreceive(a, a->num_bits & 7); // discard - // drain the bit-packed data into header - k = 0; - while (a->num_bits > 0) { - header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check - a->code_buffer >>= 8; - a->num_bits -= 8; - } - STBI_ASSERT(a->num_bits == 0); - // now fill header the normal way - while (k < 4) - header[k++] = stbi__zget8(a); - len = header[1] * 256 + header[0]; - nlen = header[3] * 256 + header[2]; - if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); - if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); - if (a->zout + len > a->zout_end) - if (!stbi__zexpand(a, a->zout, len)) return 0; - memcpy(a->zout, a->zbuffer, len); - a->zbuffer += len; - a->zout += len; - return 1; -} - -static int stbi__parse_zlib_header(stbi__zbuf *a) -{ - int cmf = stbi__zget8(a); - int cm = cmf & 15; - /* int cinfo = cmf >> 4; */ - int flg = stbi__zget8(a); - if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec - if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png - if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png - // window = 1 << (8 + cinfo)... but who cares, we fully buffer output - return 1; -} - -static const stbi_uc stbi__zdefault_length[288] = -{ - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8 -}; -static const stbi_uc stbi__zdefault_distance[32] = -{ - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -}; -/* -Init algorithm: -{ - int i; // use <= to match clearly with spec - for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; - for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; - for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; - for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; - - for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; -} -*/ - -static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) -{ - int final, type; - if (parse_header) - if (!stbi__parse_zlib_header(a)) return 0; - a->num_bits = 0; - a->code_buffer = 0; - do { - final = stbi__zreceive(a,1); - type = stbi__zreceive(a,2); - if (type == 0) { - if (!stbi__parse_uncompressed_block(a)) return 0; - } else if (type == 3) { - return 0; - } else { - if (type == 1) { - // use fixed code lengths - if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , 288)) return 0; - if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; - } else { - if (!stbi__compute_huffman_codes(a)) return 0; - } - if (!stbi__parse_huffman_block(a)) return 0; - } - } while (!final); - return 1; -} - -static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) -{ - a->zout_start = obuf; - a->zout = obuf; - a->zout_end = obuf + olen; - a->z_expandable = exp; - - return stbi__parse_zlib(a, parse_header); -} - -STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(initial_size); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer + len; - if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) -{ - return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); -} - -STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(initial_size); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer + len; - if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) -{ - stbi__zbuf a; - a.zbuffer = (stbi_uc *) ibuffer; - a.zbuffer_end = (stbi_uc *) ibuffer + ilen; - if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) - return (int) (a.zout - a.zout_start); - else - return -1; -} - -STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(16384); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer+len; - if (stbi__do_zlib(&a, p, 16384, 1, 0)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) -{ - stbi__zbuf a; - a.zbuffer = (stbi_uc *) ibuffer; - a.zbuffer_end = (stbi_uc *) ibuffer + ilen; - if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) - return (int) (a.zout - a.zout_start); - else - return -1; -} -#endif - -// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 -// simple implementation -// - only 8-bit samples -// - no CRC checking -// - allocates lots of intermediate memory -// - avoids problem of streaming data between subsystems -// - avoids explicit window management -// performance -// - uses stb_zlib, a PD zlib implementation with fast huffman decoding - -#ifndef STBI_NO_PNG -typedef struct -{ - stbi__uint32 length; - stbi__uint32 type; -} stbi__pngchunk; - -static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) -{ - stbi__pngchunk c; - c.length = stbi__get32be(s); - c.type = stbi__get32be(s); - return c; -} - -static int stbi__check_png_header(stbi__context *s) -{ - static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; - int i; - for (i=0; i < 8; ++i) - if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); - return 1; -} - -typedef struct -{ - stbi__context *s; - stbi_uc *idata, *expanded, *out; - int depth; -} stbi__png; - - -enum { - STBI__F_none=0, - STBI__F_sub=1, - STBI__F_up=2, - STBI__F_avg=3, - STBI__F_paeth=4, - // synthetic filters used for first scanline to avoid needing a dummy row of 0s - STBI__F_avg_first, - STBI__F_paeth_first -}; - -static stbi_uc first_row_filter[5] = -{ - STBI__F_none, - STBI__F_sub, - STBI__F_none, - STBI__F_avg_first, - STBI__F_paeth_first -}; - -static int stbi__paeth(int a, int b, int c) -{ - int p = a + b - c; - int pa = abs(p-a); - int pb = abs(p-b); - int pc = abs(p-c); - if (pa <= pb && pa <= pc) return a; - if (pb <= pc) return b; - return c; -} - -static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; - -// create the png data from post-deflated data -static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) -{ - int bytes = (depth == 16? 2 : 1); - stbi__context *s = a->s; - stbi__uint32 i,j,stride = x*out_n*bytes; - stbi__uint32 img_len, img_width_bytes; - int k; - int img_n = s->img_n; // copy it into a local for later - - int output_bytes = out_n*bytes; - int filter_bytes = img_n*bytes; - int width = x; - - STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); - a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into - if (!a->out) return stbi__err("outofmem", "Out of memory"); - - if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG"); - img_width_bytes = (((img_n * x * depth) + 7) >> 3); - img_len = (img_width_bytes + 1) * y; - - // we used to check for exact match between raw_len and img_len on non-interlaced PNGs, - // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros), - // so just check for raw_len < img_len always. - if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); - - for (j=0; j < y; ++j) { - stbi_uc *cur = a->out + stride*j; - stbi_uc *prior; - int filter = *raw++; - - if (filter > 4) - return stbi__err("invalid filter","Corrupt PNG"); - - if (depth < 8) { - STBI_ASSERT(img_width_bytes <= x); - cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place - filter_bytes = 1; - width = img_width_bytes; - } - prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above - - // if first row, use special filter that doesn't sample previous row - if (j == 0) filter = first_row_filter[filter]; - - // handle first byte explicitly - for (k=0; k < filter_bytes; ++k) { - switch (filter) { - case STBI__F_none : cur[k] = raw[k]; break; - case STBI__F_sub : cur[k] = raw[k]; break; - case STBI__F_up : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; - case STBI__F_avg : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break; - case STBI__F_paeth : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break; - case STBI__F_avg_first : cur[k] = raw[k]; break; - case STBI__F_paeth_first: cur[k] = raw[k]; break; - } - } - - if (depth == 8) { - if (img_n != out_n) - cur[img_n] = 255; // first pixel - raw += img_n; - cur += out_n; - prior += out_n; - } else if (depth == 16) { - if (img_n != out_n) { - cur[filter_bytes] = 255; // first pixel top byte - cur[filter_bytes+1] = 255; // first pixel bottom byte - } - raw += filter_bytes; - cur += output_bytes; - prior += output_bytes; - } else { - raw += 1; - cur += 1; - prior += 1; - } - - // this is a little gross, so that we don't switch per-pixel or per-component - if (depth < 8 || img_n == out_n) { - int nk = (width - 1)*filter_bytes; - #define STBI__CASE(f) \ - case f: \ - for (k=0; k < nk; ++k) - switch (filter) { - // "none" filter turns into a memcpy here; make that explicit. - case STBI__F_none: memcpy(cur, raw, nk); break; - STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break; - STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break; - STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break; - STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break; - STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break; - STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break; - } - #undef STBI__CASE - raw += nk; - } else { - STBI_ASSERT(img_n+1 == out_n); - #define STBI__CASE(f) \ - case f: \ - for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \ - for (k=0; k < filter_bytes; ++k) - switch (filter) { - STBI__CASE(STBI__F_none) { cur[k] = raw[k]; } break; - STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break; - STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break; - STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break; - STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break; - STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break; - STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break; - } - #undef STBI__CASE - - // the loop above sets the high byte of the pixels' alpha, but for - // 16 bit png files we also need the low byte set. we'll do that here. - if (depth == 16) { - cur = a->out + stride*j; // start at the beginning of the row again - for (i=0; i < x; ++i,cur+=output_bytes) { - cur[filter_bytes+1] = 255; - } - } - } - } - - // we make a separate pass to expand bits to pixels; for performance, - // this could run two scanlines behind the above code, so it won't - // intefere with filtering but will still be in the cache. - if (depth < 8) { - for (j=0; j < y; ++j) { - stbi_uc *cur = a->out + stride*j; - stbi_uc *in = a->out + stride*j + x*out_n - img_width_bytes; - // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit - // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop - stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range - - // note that the final byte might overshoot and write more data than desired. - // we can allocate enough data that this never writes out of memory, but it - // could also overwrite the next scanline. can it overwrite non-empty data - // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel. - // so we need to explicitly clamp the final ones - - if (depth == 4) { - for (k=x*img_n; k >= 2; k-=2, ++in) { - *cur++ = scale * ((*in >> 4) ); - *cur++ = scale * ((*in ) & 0x0f); - } - if (k > 0) *cur++ = scale * ((*in >> 4) ); - } else if (depth == 2) { - for (k=x*img_n; k >= 4; k-=4, ++in) { - *cur++ = scale * ((*in >> 6) ); - *cur++ = scale * ((*in >> 4) & 0x03); - *cur++ = scale * ((*in >> 2) & 0x03); - *cur++ = scale * ((*in ) & 0x03); - } - if (k > 0) *cur++ = scale * ((*in >> 6) ); - if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03); - if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03); - } else if (depth == 1) { - for (k=x*img_n; k >= 8; k-=8, ++in) { - *cur++ = scale * ((*in >> 7) ); - *cur++ = scale * ((*in >> 6) & 0x01); - *cur++ = scale * ((*in >> 5) & 0x01); - *cur++ = scale * ((*in >> 4) & 0x01); - *cur++ = scale * ((*in >> 3) & 0x01); - *cur++ = scale * ((*in >> 2) & 0x01); - *cur++ = scale * ((*in >> 1) & 0x01); - *cur++ = scale * ((*in ) & 0x01); - } - if (k > 0) *cur++ = scale * ((*in >> 7) ); - if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01); - if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01); - if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01); - if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01); - if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01); - if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01); - } - if (img_n != out_n) { - int q; - // insert alpha = 255 - cur = a->out + stride*j; - if (img_n == 1) { - for (q=x-1; q >= 0; --q) { - cur[q*2+1] = 255; - cur[q*2+0] = cur[q]; - } - } else { - STBI_ASSERT(img_n == 3); - for (q=x-1; q >= 0; --q) { - cur[q*4+3] = 255; - cur[q*4+2] = cur[q*3+2]; - cur[q*4+1] = cur[q*3+1]; - cur[q*4+0] = cur[q*3+0]; - } - } - } - } - } else if (depth == 16) { - // force the image data from big-endian to platform-native. - // this is done in a separate pass due to the decoding relying - // on the data being untouched, but could probably be done - // per-line during decode if care is taken. - stbi_uc *cur = a->out; - stbi__uint16 *cur16 = (stbi__uint16*)cur; - - for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) { - *cur16 = (cur[0] << 8) | cur[1]; - } - } - - return 1; -} - -static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) -{ - int bytes = (depth == 16 ? 2 : 1); - int out_bytes = out_n * bytes; - stbi_uc *final; - int p; - if (!interlaced) - return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); - - // de-interlacing - final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0); - for (p=0; p < 7; ++p) { - int xorig[] = { 0,4,0,2,0,1,0 }; - int yorig[] = { 0,0,4,0,2,0,1 }; - int xspc[] = { 8,8,4,4,2,2,1 }; - int yspc[] = { 8,8,8,4,4,2,2 }; - int i,j,x,y; - // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 - x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; - y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; - if (x && y) { - stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; - if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { - STBI_FREE(final); - return 0; - } - for (j=0; j < y; ++j) { - for (i=0; i < x; ++i) { - int out_y = j*yspc[p]+yorig[p]; - int out_x = i*xspc[p]+xorig[p]; - memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes, - a->out + (j*x+i)*out_bytes, out_bytes); - } - } - STBI_FREE(a->out); - image_data += img_len; - image_data_len -= img_len; - } - } - a->out = final; - - return 1; -} - -static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi_uc *p = z->out; - - // compute color-based transparency, assuming we've - // already got 255 as the alpha value in the output - STBI_ASSERT(out_n == 2 || out_n == 4); - - if (out_n == 2) { - for (i=0; i < pixel_count; ++i) { - p[1] = (p[0] == tc[0] ? 0 : 255); - p += 2; - } - } else { - for (i=0; i < pixel_count; ++i) { - if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) - p[3] = 0; - p += 4; - } - } - return 1; -} - -static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi__uint16 *p = (stbi__uint16*) z->out; - - // compute color-based transparency, assuming we've - // already got 65535 as the alpha value in the output - STBI_ASSERT(out_n == 2 || out_n == 4); - - if (out_n == 2) { - for (i = 0; i < pixel_count; ++i) { - p[1] = (p[0] == tc[0] ? 0 : 65535); - p += 2; - } - } else { - for (i = 0; i < pixel_count; ++i) { - if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) - p[3] = 0; - p += 4; - } - } - return 1; -} - -static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) -{ - stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; - stbi_uc *p, *temp_out, *orig = a->out; - - p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0); - if (p == NULL) return stbi__err("outofmem", "Out of memory"); - - // between here and free(out) below, exitting would leak - temp_out = p; - - if (pal_img_n == 3) { - for (i=0; i < pixel_count; ++i) { - int n = orig[i]*4; - p[0] = palette[n ]; - p[1] = palette[n+1]; - p[2] = palette[n+2]; - p += 3; - } - } else { - for (i=0; i < pixel_count; ++i) { - int n = orig[i]*4; - p[0] = palette[n ]; - p[1] = palette[n+1]; - p[2] = palette[n+2]; - p[3] = palette[n+3]; - p += 4; - } - } - STBI_FREE(a->out); - a->out = temp_out; - - STBI_NOTUSED(len); - - return 1; -} - -static int stbi__unpremultiply_on_load = 0; -static int stbi__de_iphone_flag = 0; - -STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) -{ - stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply; -} - -STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) -{ - stbi__de_iphone_flag = flag_true_if_should_convert; -} - -static void stbi__de_iphone(stbi__png *z) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi_uc *p = z->out; - - if (s->img_out_n == 3) { // convert bgr to rgb - for (i=0; i < pixel_count; ++i) { - stbi_uc t = p[0]; - p[0] = p[2]; - p[2] = t; - p += 3; - } - } else { - STBI_ASSERT(s->img_out_n == 4); - if (stbi__unpremultiply_on_load) { - // convert bgr to rgb and unpremultiply - for (i=0; i < pixel_count; ++i) { - stbi_uc a = p[3]; - stbi_uc t = p[0]; - if (a) { - stbi_uc half = a / 2; - p[0] = (p[2] * 255 + half) / a; - p[1] = (p[1] * 255 + half) / a; - p[2] = ( t * 255 + half) / a; - } else { - p[0] = p[2]; - p[2] = t; - } - p += 4; - } - } else { - // convert bgr to rgb - for (i=0; i < pixel_count; ++i) { - stbi_uc t = p[0]; - p[0] = p[2]; - p[2] = t; - p += 4; - } - } - } -} - -#define STBI__PNG_TYPE(a,b,c,d) (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d)) - -static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) -{ - stbi_uc palette[1024], pal_img_n=0; - stbi_uc has_trans=0, tc[3]={0}; - stbi__uint16 tc16[3]; - stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; - int first=1,k,interlace=0, color=0, is_iphone=0; - stbi__context *s = z->s; - - z->expanded = NULL; - z->idata = NULL; - z->out = NULL; - - if (!stbi__check_png_header(s)) return 0; - - if (scan == STBI__SCAN_type) return 1; - - for (;;) { - stbi__pngchunk c = stbi__get_chunk_header(s); - switch (c.type) { - case STBI__PNG_TYPE('C','g','B','I'): - is_iphone = 1; - stbi__skip(s, c.length); - break; - case STBI__PNG_TYPE('I','H','D','R'): { - int comp,filter; - if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); - first = 0; - if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); - s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); - s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); - z->depth = stbi__get8(s); if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only"); - color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); - if (color == 3 && z->depth == 16) return stbi__err("bad ctype","Corrupt PNG"); - if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); - comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); - filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); - interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); - if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); - if (!pal_img_n) { - s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); - if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); - if (scan == STBI__SCAN_header) return 1; - } else { - // if paletted, then pal_n is our final components, and - // img_n is # components to decompress/filter. - s->img_n = 1; - if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); - // if SCAN_header, have to scan to see if we have a tRNS - } - break; - } - - case STBI__PNG_TYPE('P','L','T','E'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); - pal_len = c.length / 3; - if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); - for (i=0; i < pal_len; ++i) { - palette[i*4+0] = stbi__get8(s); - palette[i*4+1] = stbi__get8(s); - palette[i*4+2] = stbi__get8(s); - palette[i*4+3] = 255; - } - break; - } - - case STBI__PNG_TYPE('t','R','N','S'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); - if (pal_img_n) { - if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } - if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); - if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); - pal_img_n = 4; - for (i=0; i < c.length; ++i) - palette[i*4+3] = stbi__get8(s); - } else { - if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); - if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); - has_trans = 1; - if (z->depth == 16) { - for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is - } else { - for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger - } - } - break; - } - - case STBI__PNG_TYPE('I','D','A','T'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); - if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; } - if ((int)(ioff + c.length) < (int)ioff) return 0; - if (ioff + c.length > idata_limit) { - stbi__uint32 idata_limit_old = idata_limit; - stbi_uc *p; - if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; - while (ioff + c.length > idata_limit) - idata_limit *= 2; - STBI_NOTUSED(idata_limit_old); - p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); - z->idata = p; - } - if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); - ioff += c.length; - break; - } - - case STBI__PNG_TYPE('I','E','N','D'): { - stbi__uint32 raw_len, bpl; - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (scan != STBI__SCAN_load) return 1; - if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); - // initial guess for decoded data size to avoid unnecessary reallocs - bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component - raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; - z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); - if (z->expanded == NULL) return 0; // zlib should set error - STBI_FREE(z->idata); z->idata = NULL; - if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) - s->img_out_n = s->img_n+1; - else - s->img_out_n = s->img_n; - if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0; - if (has_trans) { - if (z->depth == 16) { - if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0; - } else { - if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; - } - } - if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) - stbi__de_iphone(z); - if (pal_img_n) { - // pal_img_n == 3 or 4 - s->img_n = pal_img_n; // record the actual colors we had - s->img_out_n = pal_img_n; - if (req_comp >= 3) s->img_out_n = req_comp; - if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) - return 0; - } else if (has_trans) { - // non-paletted image with tRNS -> source image has (constant) alpha - ++s->img_n; - } - STBI_FREE(z->expanded); z->expanded = NULL; - return 1; - } - - default: - // if critical, fail - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if ((c.type & (1 << 29)) == 0) { - #ifndef STBI_NO_FAILURE_STRINGS - // not threadsafe - static char invalid_chunk[] = "XXXX PNG chunk not known"; - invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); - invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); - invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); - invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); - #endif - return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); - } - stbi__skip(s, c.length); - break; - } - // end of PNG chunk, read and skip CRC - stbi__get32be(s); - } -} - -static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri) -{ - void *result=NULL; - if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); - if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { - if (p->depth < 8) - ri->bits_per_channel = 8; - else - ri->bits_per_channel = p->depth; - result = p->out; - p->out = NULL; - if (req_comp && req_comp != p->s->img_out_n) { - if (ri->bits_per_channel == 8) - result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); - else - result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); - p->s->img_out_n = req_comp; - if (result == NULL) return result; - } - *x = p->s->img_x; - *y = p->s->img_y; - if (n) *n = p->s->img_n; - } - STBI_FREE(p->out); p->out = NULL; - STBI_FREE(p->expanded); p->expanded = NULL; - STBI_FREE(p->idata); p->idata = NULL; - - return result; -} - -static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi__png p; - p.s = s; - return stbi__do_png(&p, x,y,comp,req_comp, ri); -} - -static int stbi__png_test(stbi__context *s) -{ - int r; - r = stbi__check_png_header(s); - stbi__rewind(s); - return r; -} - -static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) -{ - if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { - stbi__rewind( p->s ); - return 0; - } - if (x) *x = p->s->img_x; - if (y) *y = p->s->img_y; - if (comp) *comp = p->s->img_n; - return 1; -} - -static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__png p; - p.s = s; - return stbi__png_info_raw(&p, x, y, comp); -} - -static int stbi__png_is16(stbi__context *s) -{ - stbi__png p; - p.s = s; - if (!stbi__png_info_raw(&p, NULL, NULL, NULL)) - return 0; - if (p.depth != 16) { - stbi__rewind(p.s); - return 0; - } - return 1; -} -#endif - -// Microsoft/Windows BMP image - -#ifndef STBI_NO_BMP -static int stbi__bmp_test_raw(stbi__context *s) -{ - int r; - int sz; - if (stbi__get8(s) != 'B') return 0; - if (stbi__get8(s) != 'M') return 0; - stbi__get32le(s); // discard filesize - stbi__get16le(s); // discard reserved - stbi__get16le(s); // discard reserved - stbi__get32le(s); // discard data offset - sz = stbi__get32le(s); - r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); - return r; -} - -static int stbi__bmp_test(stbi__context *s) -{ - int r = stbi__bmp_test_raw(s); - stbi__rewind(s); - return r; -} - - -// returns 0..31 for the highest set bit -static int stbi__high_bit(unsigned int z) -{ - int n=0; - if (z == 0) return -1; - if (z >= 0x10000) { n += 16; z >>= 16; } - if (z >= 0x00100) { n += 8; z >>= 8; } - if (z >= 0x00010) { n += 4; z >>= 4; } - if (z >= 0x00004) { n += 2; z >>= 2; } - if (z >= 0x00002) { n += 1; z >>= 1; } - return n; -} - -static int stbi__bitcount(unsigned int a) -{ - a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 - a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 - a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits - a = (a + (a >> 8)); // max 16 per 8 bits - a = (a + (a >> 16)); // max 32 per 8 bits - return a & 0xff; -} - -// extract an arbitrarily-aligned N-bit value (N=bits) -// from v, and then make it 8-bits long and fractionally -// extend it to full full range. -static int stbi__shiftsigned(unsigned int v, int shift, int bits) -{ - static unsigned int mul_table[9] = { - 0, - 0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/, - 0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/, - }; - static unsigned int shift_table[9] = { - 0, 0,0,1,0,2,4,6,0, - }; - if (shift < 0) - v <<= -shift; - else - v >>= shift; - STBI_ASSERT(v >= 0 && v < 256); - v >>= (8-bits); - STBI_ASSERT(bits >= 0 && bits <= 8); - return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits]; -} - -typedef struct -{ - int bpp, offset, hsz; - unsigned int mr,mg,mb,ma, all_a; -} stbi__bmp_data; - -static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info) -{ - int hsz; - if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); - stbi__get32le(s); // discard filesize - stbi__get16le(s); // discard reserved - stbi__get16le(s); // discard reserved - info->offset = stbi__get32le(s); - info->hsz = hsz = stbi__get32le(s); - info->mr = info->mg = info->mb = info->ma = 0; - - if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); - if (hsz == 12) { - s->img_x = stbi__get16le(s); - s->img_y = stbi__get16le(s); - } else { - s->img_x = stbi__get32le(s); - s->img_y = stbi__get32le(s); - } - if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); - info->bpp = stbi__get16le(s); - if (hsz != 12) { - int compress = stbi__get32le(s); - if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); - stbi__get32le(s); // discard sizeof - stbi__get32le(s); // discard hres - stbi__get32le(s); // discard vres - stbi__get32le(s); // discard colorsused - stbi__get32le(s); // discard max important - if (hsz == 40 || hsz == 56) { - if (hsz == 56) { - stbi__get32le(s); - stbi__get32le(s); - stbi__get32le(s); - stbi__get32le(s); - } - if (info->bpp == 16 || info->bpp == 32) { - if (compress == 0) { - if (info->bpp == 32) { - info->mr = 0xffu << 16; - info->mg = 0xffu << 8; - info->mb = 0xffu << 0; - info->ma = 0xffu << 24; - info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 - } else { - info->mr = 31u << 10; - info->mg = 31u << 5; - info->mb = 31u << 0; - } - } else if (compress == 3) { - info->mr = stbi__get32le(s); - info->mg = stbi__get32le(s); - info->mb = stbi__get32le(s); - // not documented, but generated by photoshop and handled by mspaint - if (info->mr == info->mg && info->mg == info->mb) { - // ?!?!? - return stbi__errpuc("bad BMP", "bad BMP"); - } - } else - return stbi__errpuc("bad BMP", "bad BMP"); - } - } else { - int i; - if (hsz != 108 && hsz != 124) - return stbi__errpuc("bad BMP", "bad BMP"); - info->mr = stbi__get32le(s); - info->mg = stbi__get32le(s); - info->mb = stbi__get32le(s); - info->ma = stbi__get32le(s); - stbi__get32le(s); // discard color space - for (i=0; i < 12; ++i) - stbi__get32le(s); // discard color space parameters - if (hsz == 124) { - stbi__get32le(s); // discard rendering intent - stbi__get32le(s); // discard offset of profile data - stbi__get32le(s); // discard size of profile data - stbi__get32le(s); // discard reserved - } - } - } - return (void *) 1; -} - - -static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *out; - unsigned int mr=0,mg=0,mb=0,ma=0, all_a; - stbi_uc pal[256][4]; - int psize=0,i,j,width; - int flip_vertically, pad, target; - stbi__bmp_data info; - STBI_NOTUSED(ri); - - info.all_a = 255; - if (stbi__bmp_parse_header(s, &info) == NULL) - return NULL; // error code already set - - flip_vertically = ((int) s->img_y) > 0; - s->img_y = abs((int) s->img_y); - - mr = info.mr; - mg = info.mg; - mb = info.mb; - ma = info.ma; - all_a = info.all_a; - - if (info.hsz == 12) { - if (info.bpp < 24) - psize = (info.offset - 14 - 24) / 3; - } else { - if (info.bpp < 16) - psize = (info.offset - 14 - info.hsz) >> 2; - } - - s->img_n = ma ? 4 : 3; - if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 - target = req_comp; - else - target = s->img_n; // if they want monochrome, we'll post-convert - - // sanity-check size - if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0)) - return stbi__errpuc("too large", "Corrupt BMP"); - - out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0); - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - if (info.bpp < 16) { - int z=0; - if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } - for (i=0; i < psize; ++i) { - pal[i][2] = stbi__get8(s); - pal[i][1] = stbi__get8(s); - pal[i][0] = stbi__get8(s); - if (info.hsz != 12) stbi__get8(s); - pal[i][3] = 255; - } - stbi__skip(s, info.offset - 14 - info.hsz - psize * (info.hsz == 12 ? 3 : 4)); - if (info.bpp == 1) width = (s->img_x + 7) >> 3; - else if (info.bpp == 4) width = (s->img_x + 1) >> 1; - else if (info.bpp == 8) width = s->img_x; - else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } - pad = (-width)&3; - if (info.bpp == 1) { - for (j=0; j < (int) s->img_y; ++j) { - int bit_offset = 7, v = stbi__get8(s); - for (i=0; i < (int) s->img_x; ++i) { - int color = (v>>bit_offset)&0x1; - out[z++] = pal[color][0]; - out[z++] = pal[color][1]; - out[z++] = pal[color][2]; - if (target == 4) out[z++] = 255; - if (i+1 == (int) s->img_x) break; - if((--bit_offset) < 0) { - bit_offset = 7; - v = stbi__get8(s); - } - } - stbi__skip(s, pad); - } - } else { - for (j=0; j < (int) s->img_y; ++j) { - for (i=0; i < (int) s->img_x; i += 2) { - int v=stbi__get8(s),v2=0; - if (info.bpp == 4) { - v2 = v & 15; - v >>= 4; - } - out[z++] = pal[v][0]; - out[z++] = pal[v][1]; - out[z++] = pal[v][2]; - if (target == 4) out[z++] = 255; - if (i+1 == (int) s->img_x) break; - v = (info.bpp == 8) ? stbi__get8(s) : v2; - out[z++] = pal[v][0]; - out[z++] = pal[v][1]; - out[z++] = pal[v][2]; - if (target == 4) out[z++] = 255; - } - stbi__skip(s, pad); - } - } - } else { - int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; - int z = 0; - int easy=0; - stbi__skip(s, info.offset - 14 - info.hsz); - if (info.bpp == 24) width = 3 * s->img_x; - else if (info.bpp == 16) width = 2*s->img_x; - else /* bpp = 32 and pad = 0 */ width=0; - pad = (-width) & 3; - if (info.bpp == 24) { - easy = 1; - } else if (info.bpp == 32) { - if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) - easy = 2; - } - if (!easy) { - if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } - // right shift amt to put high bit in position #7 - rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); - gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); - bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); - ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); - } - for (j=0; j < (int) s->img_y; ++j) { - if (easy) { - for (i=0; i < (int) s->img_x; ++i) { - unsigned char a; - out[z+2] = stbi__get8(s); - out[z+1] = stbi__get8(s); - out[z+0] = stbi__get8(s); - z += 3; - a = (easy == 2 ? stbi__get8(s) : 255); - all_a |= a; - if (target == 4) out[z++] = a; - } - } else { - int bpp = info.bpp; - for (i=0; i < (int) s->img_x; ++i) { - stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); - unsigned int a; - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); - a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); - all_a |= a; - if (target == 4) out[z++] = STBI__BYTECAST(a); - } - } - stbi__skip(s, pad); - } - } - - // if alpha channel is all 0s, replace with all 255s - if (target == 4 && all_a == 0) - for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) - out[i] = 255; - - if (flip_vertically) { - stbi_uc t; - for (j=0; j < (int) s->img_y>>1; ++j) { - stbi_uc *p1 = out + j *s->img_x*target; - stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; - for (i=0; i < (int) s->img_x*target; ++i) { - t = p1[i]; p1[i] = p2[i]; p2[i] = t; - } - } - } - - if (req_comp && req_comp != target) { - out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - - *x = s->img_x; - *y = s->img_y; - if (comp) *comp = s->img_n; - return out; -} -#endif - -// Targa Truevision - TGA -// by Jonathan Dummer -#ifndef STBI_NO_TGA -// returns STBI_rgb or whatever, 0 on error -static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16) -{ - // only RGB or RGBA (incl. 16bit) or grey allowed - if (is_rgb16) *is_rgb16 = 0; - switch(bits_per_pixel) { - case 8: return STBI_grey; - case 16: if(is_grey) return STBI_grey_alpha; - // fallthrough - case 15: if(is_rgb16) *is_rgb16 = 1; - return STBI_rgb; - case 24: // fallthrough - case 32: return bits_per_pixel/8; - default: return 0; - } -} - -static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) -{ - int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp; - int sz, tga_colormap_type; - stbi__get8(s); // discard Offset - tga_colormap_type = stbi__get8(s); // colormap type - if( tga_colormap_type > 1 ) { - stbi__rewind(s); - return 0; // only RGB or indexed allowed - } - tga_image_type = stbi__get8(s); // image type - if ( tga_colormap_type == 1 ) { // colormapped (paletted) image - if (tga_image_type != 1 && tga_image_type != 9) { - stbi__rewind(s); - return 0; - } - stbi__skip(s,4); // skip index of first colormap entry and number of entries - sz = stbi__get8(s); // check bits per palette color entry - if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) { - stbi__rewind(s); - return 0; - } - stbi__skip(s,4); // skip image x and y origin - tga_colormap_bpp = sz; - } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE - if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) { - stbi__rewind(s); - return 0; // only RGB or grey allowed, +/- RLE - } - stbi__skip(s,9); // skip colormap specification and image x/y origin - tga_colormap_bpp = 0; - } - tga_w = stbi__get16le(s); - if( tga_w < 1 ) { - stbi__rewind(s); - return 0; // test width - } - tga_h = stbi__get16le(s); - if( tga_h < 1 ) { - stbi__rewind(s); - return 0; // test height - } - tga_bits_per_pixel = stbi__get8(s); // bits per pixel - stbi__get8(s); // ignore alpha bits - if (tga_colormap_bpp != 0) { - if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) { - // when using a colormap, tga_bits_per_pixel is the size of the indexes - // I don't think anything but 8 or 16bit indexes makes sense - stbi__rewind(s); - return 0; - } - tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL); - } else { - tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL); - } - if(!tga_comp) { - stbi__rewind(s); - return 0; - } - if (x) *x = tga_w; - if (y) *y = tga_h; - if (comp) *comp = tga_comp; - return 1; // seems to have passed everything -} - -static int stbi__tga_test(stbi__context *s) -{ - int res = 0; - int sz, tga_color_type; - stbi__get8(s); // discard Offset - tga_color_type = stbi__get8(s); // color type - if ( tga_color_type > 1 ) goto errorEnd; // only RGB or indexed allowed - sz = stbi__get8(s); // image type - if ( tga_color_type == 1 ) { // colormapped (paletted) image - if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9 - stbi__skip(s,4); // skip index of first colormap entry and number of entries - sz = stbi__get8(s); // check bits per palette color entry - if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; - stbi__skip(s,4); // skip image x and y origin - } else { // "normal" image w/o colormap - if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE - stbi__skip(s,9); // skip colormap specification and image x/y origin - } - if ( stbi__get16le(s) < 1 ) goto errorEnd; // test width - if ( stbi__get16le(s) < 1 ) goto errorEnd; // test height - sz = stbi__get8(s); // bits per pixel - if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index - if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd; - - res = 1; // if we got this far, everything's good and we can return 1 instead of 0 - -errorEnd: - stbi__rewind(s); - return res; -} - -// read 16bit value and convert to 24bit RGB -static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out) -{ - stbi__uint16 px = (stbi__uint16)stbi__get16le(s); - stbi__uint16 fiveBitMask = 31; - // we have 3 channels with 5bits each - int r = (px >> 10) & fiveBitMask; - int g = (px >> 5) & fiveBitMask; - int b = px & fiveBitMask; - // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later - out[0] = (stbi_uc)((r * 255)/31); - out[1] = (stbi_uc)((g * 255)/31); - out[2] = (stbi_uc)((b * 255)/31); - - // some people claim that the most significant bit might be used for alpha - // (possibly if an alpha-bit is set in the "image descriptor byte") - // but that only made 16bit test images completely translucent.. - // so let's treat all 15 and 16bit TGAs as RGB with no alpha. -} - -static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - // read in the TGA header stuff - int tga_offset = stbi__get8(s); - int tga_indexed = stbi__get8(s); - int tga_image_type = stbi__get8(s); - int tga_is_RLE = 0; - int tga_palette_start = stbi__get16le(s); - int tga_palette_len = stbi__get16le(s); - int tga_palette_bits = stbi__get8(s); - int tga_x_origin = stbi__get16le(s); - int tga_y_origin = stbi__get16le(s); - int tga_width = stbi__get16le(s); - int tga_height = stbi__get16le(s); - int tga_bits_per_pixel = stbi__get8(s); - int tga_comp, tga_rgb16=0; - int tga_inverted = stbi__get8(s); - // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?) - // image data - unsigned char *tga_data; - unsigned char *tga_palette = NULL; - int i, j; - unsigned char raw_data[4] = {0}; - int RLE_count = 0; - int RLE_repeating = 0; - int read_next_pixel = 1; - STBI_NOTUSED(ri); - - // do a tiny bit of precessing - if ( tga_image_type >= 8 ) - { - tga_image_type -= 8; - tga_is_RLE = 1; - } - tga_inverted = 1 - ((tga_inverted >> 5) & 1); - - // If I'm paletted, then I'll use the number of bits from the palette - if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16); - else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16); - - if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency - return stbi__errpuc("bad format", "Can't find out TGA pixelformat"); - - // tga info - *x = tga_width; - *y = tga_height; - if (comp) *comp = tga_comp; - - if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0)) - return stbi__errpuc("too large", "Corrupt TGA"); - - tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0); - if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); - - // skip to the data's starting position (offset usually = 0) - stbi__skip(s, tga_offset ); - - if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) { - for (i=0; i < tga_height; ++i) { - int row = tga_inverted ? tga_height -i - 1 : i; - stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; - stbi__getn(s, tga_row, tga_width * tga_comp); - } - } else { - // do I need to load a palette? - if ( tga_indexed) - { - // any data to skip? (offset usually = 0) - stbi__skip(s, tga_palette_start ); - // load the palette - tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0); - if (!tga_palette) { - STBI_FREE(tga_data); - return stbi__errpuc("outofmem", "Out of memory"); - } - if (tga_rgb16) { - stbi_uc *pal_entry = tga_palette; - STBI_ASSERT(tga_comp == STBI_rgb); - for (i=0; i < tga_palette_len; ++i) { - stbi__tga_read_rgb16(s, pal_entry); - pal_entry += tga_comp; - } - } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) { - STBI_FREE(tga_data); - STBI_FREE(tga_palette); - return stbi__errpuc("bad palette", "Corrupt TGA"); - } - } - // load the data - for (i=0; i < tga_width * tga_height; ++i) - { - // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? - if ( tga_is_RLE ) - { - if ( RLE_count == 0 ) - { - // yep, get the next byte as a RLE command - int RLE_cmd = stbi__get8(s); - RLE_count = 1 + (RLE_cmd & 127); - RLE_repeating = RLE_cmd >> 7; - read_next_pixel = 1; - } else if ( !RLE_repeating ) - { - read_next_pixel = 1; - } - } else - { - read_next_pixel = 1; - } - // OK, if I need to read a pixel, do it now - if ( read_next_pixel ) - { - // load however much data we did have - if ( tga_indexed ) - { - // read in index, then perform the lookup - int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s); - if ( pal_idx >= tga_palette_len ) { - // invalid index - pal_idx = 0; - } - pal_idx *= tga_comp; - for (j = 0; j < tga_comp; ++j) { - raw_data[j] = tga_palette[pal_idx+j]; - } - } else if(tga_rgb16) { - STBI_ASSERT(tga_comp == STBI_rgb); - stbi__tga_read_rgb16(s, raw_data); - } else { - // read in the data raw - for (j = 0; j < tga_comp; ++j) { - raw_data[j] = stbi__get8(s); - } - } - // clear the reading flag for the next pixel - read_next_pixel = 0; - } // end of reading a pixel - - // copy data - for (j = 0; j < tga_comp; ++j) - tga_data[i*tga_comp+j] = raw_data[j]; - - // in case we're in RLE mode, keep counting down - --RLE_count; - } - // do I need to invert the image? - if ( tga_inverted ) - { - for (j = 0; j*2 < tga_height; ++j) - { - int index1 = j * tga_width * tga_comp; - int index2 = (tga_height - 1 - j) * tga_width * tga_comp; - for (i = tga_width * tga_comp; i > 0; --i) - { - unsigned char temp = tga_data[index1]; - tga_data[index1] = tga_data[index2]; - tga_data[index2] = temp; - ++index1; - ++index2; - } - } - } - // clear my palette, if I had one - if ( tga_palette != NULL ) - { - STBI_FREE( tga_palette ); - } - } - - // swap RGB - if the source data was RGB16, it already is in the right order - if (tga_comp >= 3 && !tga_rgb16) - { - unsigned char* tga_pixel = tga_data; - for (i=0; i < tga_width * tga_height; ++i) - { - unsigned char temp = tga_pixel[0]; - tga_pixel[0] = tga_pixel[2]; - tga_pixel[2] = temp; - tga_pixel += tga_comp; - } - } - - // convert to target component count - if (req_comp && req_comp != tga_comp) - tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); - - // the things I do to get rid of an error message, and yet keep - // Microsoft's C compilers happy... [8^( - tga_palette_start = tga_palette_len = tga_palette_bits = - tga_x_origin = tga_y_origin = 0; - // OK, done - return tga_data; -} -#endif - -// ************************************************************************************************* -// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB - -#ifndef STBI_NO_PSD -static int stbi__psd_test(stbi__context *s) -{ - int r = (stbi__get32be(s) == 0x38425053); - stbi__rewind(s); - return r; -} - -static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount) -{ - int count, nleft, len; - - count = 0; - while ((nleft = pixelCount - count) > 0) { - len = stbi__get8(s); - if (len == 128) { - // No-op. - } else if (len < 128) { - // Copy next len+1 bytes literally. - len++; - if (len > nleft) return 0; // corrupt data - count += len; - while (len) { - *p = stbi__get8(s); - p += 4; - len--; - } - } else if (len > 128) { - stbi_uc val; - // Next -len+1 bytes in the dest are replicated from next source byte. - // (Interpret len as a negative 8-bit int.) - len = 257 - len; - if (len > nleft) return 0; // corrupt data - val = stbi__get8(s); - count += len; - while (len) { - *p = val; - p += 4; - len--; - } - } - } - - return 1; -} - -static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) -{ - int pixelCount; - int channelCount, compression; - int channel, i; - int bitdepth; - int w,h; - stbi_uc *out; - STBI_NOTUSED(ri); - - // Check identifier - if (stbi__get32be(s) != 0x38425053) // "8BPS" - return stbi__errpuc("not PSD", "Corrupt PSD image"); - - // Check file type version. - if (stbi__get16be(s) != 1) - return stbi__errpuc("wrong version", "Unsupported version of PSD image"); - - // Skip 6 reserved bytes. - stbi__skip(s, 6 ); - - // Read the number of channels (R, G, B, A, etc). - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) - return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); - - // Read the rows and columns of the image. - h = stbi__get32be(s); - w = stbi__get32be(s); - - // Make sure the depth is 8 bits. - bitdepth = stbi__get16be(s); - if (bitdepth != 8 && bitdepth != 16) - return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); - - // Make sure the color mode is RGB. - // Valid options are: - // 0: Bitmap - // 1: Grayscale - // 2: Indexed color - // 3: RGB color - // 4: CMYK color - // 7: Multichannel - // 8: Duotone - // 9: Lab color - if (stbi__get16be(s) != 3) - return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); - - // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) - stbi__skip(s,stbi__get32be(s) ); - - // Skip the image resources. (resolution, pen tool paths, etc) - stbi__skip(s, stbi__get32be(s) ); - - // Skip the reserved data. - stbi__skip(s, stbi__get32be(s) ); - - // Find out if the data is compressed. - // Known values: - // 0: no compression - // 1: RLE compressed - compression = stbi__get16be(s); - if (compression > 1) - return stbi__errpuc("bad compression", "PSD has an unknown compression format"); - - // Check size - if (!stbi__mad3sizes_valid(4, w, h, 0)) - return stbi__errpuc("too large", "Corrupt PSD"); - - // Create the destination image. - - if (!compression && bitdepth == 16 && bpc == 16) { - out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0); - ri->bits_per_channel = 16; - } else - out = (stbi_uc *) stbi__malloc(4 * w*h); - - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - pixelCount = w*h; - - // Initialize the data to zero. - //memset( out, 0, pixelCount * 4 ); - - // Finally, the image data. - if (compression) { - // RLE as used by .PSD and .TIFF - // Loop until you get the number of unpacked bytes you are expecting: - // Read the next source byte into n. - // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. - // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. - // Else if n is 128, noop. - // Endloop - - // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, - // which we're going to just skip. - stbi__skip(s, h * channelCount * 2 ); - - // Read the RLE data by channel. - for (channel = 0; channel < 4; channel++) { - stbi_uc *p; - - p = out+channel; - if (channel >= channelCount) { - // Fill this channel with default data. - for (i = 0; i < pixelCount; i++, p += 4) - *p = (channel == 3 ? 255 : 0); - } else { - // Read the RLE data. - if (!stbi__psd_decode_rle(s, p, pixelCount)) { - STBI_FREE(out); - return stbi__errpuc("corrupt", "bad RLE data"); - } - } - } - - } else { - // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) - // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image. - - // Read the data by channel. - for (channel = 0; channel < 4; channel++) { - if (channel >= channelCount) { - // Fill this channel with default data. - if (bitdepth == 16 && bpc == 16) { - stbi__uint16 *q = ((stbi__uint16 *) out) + channel; - stbi__uint16 val = channel == 3 ? 65535 : 0; - for (i = 0; i < pixelCount; i++, q += 4) - *q = val; - } else { - stbi_uc *p = out+channel; - stbi_uc val = channel == 3 ? 255 : 0; - for (i = 0; i < pixelCount; i++, p += 4) - *p = val; - } - } else { - if (ri->bits_per_channel == 16) { // output bpc - stbi__uint16 *q = ((stbi__uint16 *) out) + channel; - for (i = 0; i < pixelCount; i++, q += 4) - *q = (stbi__uint16) stbi__get16be(s); - } else { - stbi_uc *p = out+channel; - if (bitdepth == 16) { // input bpc - for (i = 0; i < pixelCount; i++, p += 4) - *p = (stbi_uc) (stbi__get16be(s) >> 8); - } else { - for (i = 0; i < pixelCount; i++, p += 4) - *p = stbi__get8(s); - } - } - } - } - } - - // remove weird white matte from PSD - if (channelCount >= 4) { - if (ri->bits_per_channel == 16) { - for (i=0; i < w*h; ++i) { - stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i; - if (pixel[3] != 0 && pixel[3] != 65535) { - float a = pixel[3] / 65535.0f; - float ra = 1.0f / a; - float inv_a = 65535.0f * (1 - ra); - pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a); - pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a); - pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a); - } - } - } else { - for (i=0; i < w*h; ++i) { - unsigned char *pixel = out + 4*i; - if (pixel[3] != 0 && pixel[3] != 255) { - float a = pixel[3] / 255.0f; - float ra = 1.0f / a; - float inv_a = 255.0f * (1 - ra); - pixel[0] = (unsigned char) (pixel[0]*ra + inv_a); - pixel[1] = (unsigned char) (pixel[1]*ra + inv_a); - pixel[2] = (unsigned char) (pixel[2]*ra + inv_a); - } - } - } - } - - // convert to desired output format - if (req_comp && req_comp != 4) { - if (ri->bits_per_channel == 16) - out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h); - else - out = stbi__convert_format(out, 4, req_comp, w, h); - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - - if (comp) *comp = 4; - *y = h; - *x = w; - - return out; -} -#endif - -// ************************************************************************************************* -// Softimage PIC loader -// by Tom Seddon -// -// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format -// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ - -#ifndef STBI_NO_PIC -static int stbi__pic_is4(stbi__context *s,const char *str) -{ - int i; - for (i=0; i<4; ++i) - if (stbi__get8(s) != (stbi_uc)str[i]) - return 0; - - return 1; -} - -static int stbi__pic_test_core(stbi__context *s) -{ - int i; - - if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) - return 0; - - for(i=0;i<84;++i) - stbi__get8(s); - - if (!stbi__pic_is4(s,"PICT")) - return 0; - - return 1; -} - -typedef struct -{ - stbi_uc size,type,channel; -} stbi__pic_packet; - -static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) -{ - int mask=0x80, i; - - for (i=0; i<4; ++i, mask>>=1) { - if (channel & mask) { - if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); - dest[i]=stbi__get8(s); - } - } - - return dest; -} - -static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) -{ - int mask=0x80,i; - - for (i=0;i<4; ++i, mask>>=1) - if (channel&mask) - dest[i]=src[i]; -} - -static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) -{ - int act_comp=0,num_packets=0,y,chained; - stbi__pic_packet packets[10]; - - // this will (should...) cater for even some bizarre stuff like having data - // for the same channel in multiple packets. - do { - stbi__pic_packet *packet; - - if (num_packets==sizeof(packets)/sizeof(packets[0])) - return stbi__errpuc("bad format","too many packets"); - - packet = &packets[num_packets++]; - - chained = stbi__get8(s); - packet->size = stbi__get8(s); - packet->type = stbi__get8(s); - packet->channel = stbi__get8(s); - - act_comp |= packet->channel; - - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); - if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); - } while (chained); - - *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? - - for(y=0; ytype) { - default: - return stbi__errpuc("bad format","packet has bad compression type"); - - case 0: {//uncompressed - int x; - - for(x=0;xchannel,dest)) - return 0; - break; - } - - case 1://Pure RLE - { - int left=width, i; - - while (left>0) { - stbi_uc count,value[4]; - - count=stbi__get8(s); - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); - - if (count > left) - count = (stbi_uc) left; - - if (!stbi__readval(s,packet->channel,value)) return 0; - - for(i=0; ichannel,dest,value); - left -= count; - } - } - break; - - case 2: {//Mixed RLE - int left=width; - while (left>0) { - int count = stbi__get8(s), i; - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); - - if (count >= 128) { // Repeated - stbi_uc value[4]; - - if (count==128) - count = stbi__get16be(s); - else - count -= 127; - if (count > left) - return stbi__errpuc("bad file","scanline overrun"); - - if (!stbi__readval(s,packet->channel,value)) - return 0; - - for(i=0;ichannel,dest,value); - } else { // Raw - ++count; - if (count>left) return stbi__errpuc("bad file","scanline overrun"); - - for(i=0;ichannel,dest)) - return 0; - } - left-=count; - } - break; - } - } - } - } - - return result; -} - -static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri) -{ - stbi_uc *result; - int i, x,y, internal_comp; - STBI_NOTUSED(ri); - - if (!comp) comp = &internal_comp; - - for (i=0; i<92; ++i) - stbi__get8(s); - - x = stbi__get16be(s); - y = stbi__get16be(s); - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); - if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode"); - - stbi__get32be(s); //skip `ratio' - stbi__get16be(s); //skip `fields' - stbi__get16be(s); //skip `pad' - - // intermediate buffer is RGBA - result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0); - memset(result, 0xff, x*y*4); - - if (!stbi__pic_load_core(s,x,y,comp, result)) { - STBI_FREE(result); - result=0; - } - *px = x; - *py = y; - if (req_comp == 0) req_comp = *comp; - result=stbi__convert_format(result,4,req_comp,x,y); - - return result; -} - -static int stbi__pic_test(stbi__context *s) -{ - int r = stbi__pic_test_core(s); - stbi__rewind(s); - return r; -} -#endif - -// ************************************************************************************************* -// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb - -#ifndef STBI_NO_GIF -typedef struct -{ - stbi__int16 prefix; - stbi_uc first; - stbi_uc suffix; -} stbi__gif_lzw; - -typedef struct -{ - int w,h; - stbi_uc *out; // output buffer (always 4 components) - stbi_uc *background; // The current "background" as far as a gif is concerned - stbi_uc *history; - int flags, bgindex, ratio, transparent, eflags; - stbi_uc pal[256][4]; - stbi_uc lpal[256][4]; - stbi__gif_lzw codes[8192]; - stbi_uc *color_table; - int parse, step; - int lflags; - int start_x, start_y; - int max_x, max_y; - int cur_x, cur_y; - int line_size; - int delay; -} stbi__gif; - -static int stbi__gif_test_raw(stbi__context *s) -{ - int sz; - if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; - sz = stbi__get8(s); - if (sz != '9' && sz != '7') return 0; - if (stbi__get8(s) != 'a') return 0; - return 1; -} - -static int stbi__gif_test(stbi__context *s) -{ - int r = stbi__gif_test_raw(s); - stbi__rewind(s); - return r; -} - -static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) -{ - int i; - for (i=0; i < num_entries; ++i) { - pal[i][2] = stbi__get8(s); - pal[i][1] = stbi__get8(s); - pal[i][0] = stbi__get8(s); - pal[i][3] = transp == i ? 0 : 255; - } -} - -static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) -{ - stbi_uc version; - if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') - return stbi__err("not GIF", "Corrupt GIF"); - - version = stbi__get8(s); - if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); - if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); - - stbi__g_failure_reason = ""; - g->w = stbi__get16le(s); - g->h = stbi__get16le(s); - g->flags = stbi__get8(s); - g->bgindex = stbi__get8(s); - g->ratio = stbi__get8(s); - g->transparent = -1; - - if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments - - if (is_info) return 1; - - if (g->flags & 0x80) - stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); - - return 1; -} - -static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif)); - if (!stbi__gif_header(s, g, comp, 1)) { - STBI_FREE(g); - stbi__rewind( s ); - return 0; - } - if (x) *x = g->w; - if (y) *y = g->h; - STBI_FREE(g); - return 1; -} - -static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) -{ - stbi_uc *p, *c; - int idx; - - // recurse to decode the prefixes, since the linked-list is backwards, - // and working backwards through an interleaved image would be nasty - if (g->codes[code].prefix >= 0) - stbi__out_gif_code(g, g->codes[code].prefix); - - if (g->cur_y >= g->max_y) return; - - idx = g->cur_x + g->cur_y; - p = &g->out[idx]; - g->history[idx / 4] = 1; - - c = &g->color_table[g->codes[code].suffix * 4]; - if (c[3] > 128) { // don't render transparent pixels; - p[0] = c[2]; - p[1] = c[1]; - p[2] = c[0]; - p[3] = c[3]; - } - g->cur_x += 4; - - if (g->cur_x >= g->max_x) { - g->cur_x = g->start_x; - g->cur_y += g->step; - - while (g->cur_y >= g->max_y && g->parse > 0) { - g->step = (1 << g->parse) * g->line_size; - g->cur_y = g->start_y + (g->step >> 1); - --g->parse; - } - } -} - -static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) -{ - stbi_uc lzw_cs; - stbi__int32 len, init_code; - stbi__uint32 first; - stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; - stbi__gif_lzw *p; - - lzw_cs = stbi__get8(s); - if (lzw_cs > 12) return NULL; - clear = 1 << lzw_cs; - first = 1; - codesize = lzw_cs + 1; - codemask = (1 << codesize) - 1; - bits = 0; - valid_bits = 0; - for (init_code = 0; init_code < clear; init_code++) { - g->codes[init_code].prefix = -1; - g->codes[init_code].first = (stbi_uc) init_code; - g->codes[init_code].suffix = (stbi_uc) init_code; - } - - // support no starting clear code - avail = clear+2; - oldcode = -1; - - len = 0; - for(;;) { - if (valid_bits < codesize) { - if (len == 0) { - len = stbi__get8(s); // start new block - if (len == 0) - return g->out; - } - --len; - bits |= (stbi__int32) stbi__get8(s) << valid_bits; - valid_bits += 8; - } else { - stbi__int32 code = bits & codemask; - bits >>= codesize; - valid_bits -= codesize; - // @OPTIMIZE: is there some way we can accelerate the non-clear path? - if (code == clear) { // clear code - codesize = lzw_cs + 1; - codemask = (1 << codesize) - 1; - avail = clear + 2; - oldcode = -1; - first = 0; - } else if (code == clear + 1) { // end of stream code - stbi__skip(s, len); - while ((len = stbi__get8(s)) > 0) - stbi__skip(s,len); - return g->out; - } else if (code <= avail) { - if (first) { - return stbi__errpuc("no clear code", "Corrupt GIF"); - } - - if (oldcode >= 0) { - p = &g->codes[avail++]; - if (avail > 8192) { - return stbi__errpuc("too many codes", "Corrupt GIF"); - } - - p->prefix = (stbi__int16) oldcode; - p->first = g->codes[oldcode].first; - p->suffix = (code == avail) ? p->first : g->codes[code].first; - } else if (code == avail) - return stbi__errpuc("illegal code in raster", "Corrupt GIF"); - - stbi__out_gif_code(g, (stbi__uint16) code); - - if ((avail & codemask) == 0 && avail <= 0x0FFF) { - codesize++; - codemask = (1 << codesize) - 1; - } - - oldcode = code; - } else { - return stbi__errpuc("illegal code in raster", "Corrupt GIF"); - } - } - } -} - -// this function is designed to support animated gifs, although stb_image doesn't support it -// two back is the image from two frames ago, used for a very specific disposal format -static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back) -{ - int dispose; - int first_frame; - int pi; - int pcount; - STBI_NOTUSED(req_comp); - - // on first frame, any non-written pixels get the background colour (non-transparent) - first_frame = 0; - if (g->out == 0) { - if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header - if (!stbi__mad3sizes_valid(4, g->w, g->h, 0)) - return stbi__errpuc("too large", "GIF image is too large"); - pcount = g->w * g->h; - g->out = (stbi_uc *) stbi__malloc(4 * pcount); - g->background = (stbi_uc *) stbi__malloc(4 * pcount); - g->history = (stbi_uc *) stbi__malloc(pcount); - if (!g->out || !g->background || !g->history) - return stbi__errpuc("outofmem", "Out of memory"); - - // image is treated as "transparent" at the start - ie, nothing overwrites the current background; - // background colour is only used for pixels that are not rendered first frame, after that "background" - // color refers to the color that was there the previous frame. - memset(g->out, 0x00, 4 * pcount); - memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent) - memset(g->history, 0x00, pcount); // pixels that were affected previous frame - first_frame = 1; - } else { - // second frame - how do we dispoase of the previous one? - dispose = (g->eflags & 0x1C) >> 2; - pcount = g->w * g->h; - - if ((dispose == 3) && (two_back == 0)) { - dispose = 2; // if I don't have an image to revert back to, default to the old background - } - - if (dispose == 3) { // use previous graphic - for (pi = 0; pi < pcount; ++pi) { - if (g->history[pi]) { - memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); - } - } - } else if (dispose == 2) { - // restore what was changed last frame to background before that frame; - for (pi = 0; pi < pcount; ++pi) { - if (g->history[pi]) { - memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); - } - } - } else { - // This is a non-disposal case eithe way, so just - // leave the pixels as is, and they will become the new background - // 1: do not dispose - // 0: not specified. - } - - // background is what out is after the undoing of the previou frame; - memcpy( g->background, g->out, 4 * g->w * g->h ); - } - - // clear my history; - memset( g->history, 0x00, g->w * g->h ); // pixels that were affected previous frame - - for (;;) { - int tag = stbi__get8(s); - switch (tag) { - case 0x2C: /* Image Descriptor */ - { - stbi__int32 x, y, w, h; - stbi_uc *o; - - x = stbi__get16le(s); - y = stbi__get16le(s); - w = stbi__get16le(s); - h = stbi__get16le(s); - if (((x + w) > (g->w)) || ((y + h) > (g->h))) - return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); - - g->line_size = g->w * 4; - g->start_x = x * 4; - g->start_y = y * g->line_size; - g->max_x = g->start_x + w * 4; - g->max_y = g->start_y + h * g->line_size; - g->cur_x = g->start_x; - g->cur_y = g->start_y; - - // if the width of the specified rectangle is 0, that means - // we may not see *any* pixels or the image is malformed; - // to make sure this is caught, move the current y down to - // max_y (which is what out_gif_code checks). - if (w == 0) - g->cur_y = g->max_y; - - g->lflags = stbi__get8(s); - - if (g->lflags & 0x40) { - g->step = 8 * g->line_size; // first interlaced spacing - g->parse = 3; - } else { - g->step = g->line_size; - g->parse = 0; - } - - if (g->lflags & 0x80) { - stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); - g->color_table = (stbi_uc *) g->lpal; - } else if (g->flags & 0x80) { - g->color_table = (stbi_uc *) g->pal; - } else - return stbi__errpuc("missing color table", "Corrupt GIF"); - - o = stbi__process_gif_raster(s, g); - if (!o) return NULL; - - // if this was the first frame, - pcount = g->w * g->h; - if (first_frame && (g->bgindex > 0)) { - // if first frame, any pixel not drawn to gets the background color - for (pi = 0; pi < pcount; ++pi) { - if (g->history[pi] == 0) { - g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; - memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); - } - } - } - - return o; - } - - case 0x21: // Comment Extension. - { - int len; - int ext = stbi__get8(s); - if (ext == 0xF9) { // Graphic Control Extension. - len = stbi__get8(s); - if (len == 4) { - g->eflags = stbi__get8(s); - g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths. - - // unset old transparent - if (g->transparent >= 0) { - g->pal[g->transparent][3] = 255; - } - if (g->eflags & 0x01) { - g->transparent = stbi__get8(s); - if (g->transparent >= 0) { - g->pal[g->transparent][3] = 0; - } - } else { - // don't need transparent - stbi__skip(s, 1); - g->transparent = -1; - } - } else { - stbi__skip(s, len); - break; - } - } - while ((len = stbi__get8(s)) != 0) { - stbi__skip(s, len); - } - break; - } - - case 0x3B: // gif stream termination code - return (stbi_uc *) s; // using '1' causes warning on some compilers - - default: - return stbi__errpuc("unknown code", "Corrupt GIF"); - } - } -} - -static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp) -{ - if (stbi__gif_test(s)) { - int layers = 0; - stbi_uc *u = 0; - stbi_uc *out = 0; - stbi_uc *two_back = 0; - stbi__gif g; - int stride; - memset(&g, 0, sizeof(g)); - if (delays) { - *delays = 0; - } - - do { - u = stbi__gif_load_next(s, &g, comp, req_comp, two_back); - if (u == (stbi_uc *) s) u = 0; // end of animated gif marker - - if (u) { - *x = g.w; - *y = g.h; - ++layers; - stride = g.w * g.h * 4; - - if (out) { - out = (stbi_uc*) STBI_REALLOC( out, layers * stride ); - if (delays) { - *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers ); - } - } else { - out = (stbi_uc*)stbi__malloc( layers * stride ); - if (delays) { - *delays = (int*) stbi__malloc( layers * sizeof(int) ); - } - } - memcpy( out + ((layers - 1) * stride), u, stride ); - if (layers >= 2) { - two_back = out - 2 * stride; - } - - if (delays) { - (*delays)[layers - 1U] = g.delay; - } - } - } while (u != 0); - - // free temp buffer; - STBI_FREE(g.out); - STBI_FREE(g.history); - STBI_FREE(g.background); - - // do the final conversion after loading everything; - if (req_comp && req_comp != 4) - out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h); - - *z = layers; - return out; - } else { - return stbi__errpuc("not GIF", "Image was not as a gif type."); - } -} - -static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *u = 0; - stbi__gif g; - memset(&g, 0, sizeof(g)); - STBI_NOTUSED(ri); - - u = stbi__gif_load_next(s, &g, comp, req_comp, 0); - if (u == (stbi_uc *) s) u = 0; // end of animated gif marker - if (u) { - *x = g.w; - *y = g.h; - - // moved conversion to after successful load so that the same - // can be done for multiple frames. - if (req_comp && req_comp != 4) - u = stbi__convert_format(u, 4, req_comp, g.w, g.h); - } else if (g.out) { - // if there was an error and we allocated an image buffer, free it! - STBI_FREE(g.out); - } - - // free buffers needed for multiple frame loading; - STBI_FREE(g.history); - STBI_FREE(g.background); - - return u; -} - -static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) -{ - return stbi__gif_info_raw(s,x,y,comp); -} -#endif - -// ************************************************************************************************* -// Radiance RGBE HDR loader -// originally by Nicolas Schulz -#ifndef STBI_NO_HDR -static int stbi__hdr_test_core(stbi__context *s, const char *signature) -{ - int i; - for (i=0; signature[i]; ++i) - if (stbi__get8(s) != signature[i]) - return 0; - stbi__rewind(s); - return 1; -} - -static int stbi__hdr_test(stbi__context* s) -{ - int r = stbi__hdr_test_core(s, "#?RADIANCE\n"); - stbi__rewind(s); - if(!r) { - r = stbi__hdr_test_core(s, "#?RGBE\n"); - stbi__rewind(s); - } - return r; -} - -#define STBI__HDR_BUFLEN 1024 -static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) -{ - int len=0; - char c = '\0'; - - c = (char) stbi__get8(z); - - while (!stbi__at_eof(z) && c != '\n') { - buffer[len++] = c; - if (len == STBI__HDR_BUFLEN-1) { - // flush to end of line - while (!stbi__at_eof(z) && stbi__get8(z) != '\n') - ; - break; - } - c = (char) stbi__get8(z); - } - - buffer[len] = 0; - return buffer; -} - -static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) -{ - if ( input[3] != 0 ) { - float f1; - // Exponent - f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); - if (req_comp <= 2) - output[0] = (input[0] + input[1] + input[2]) * f1 / 3; - else { - output[0] = input[0] * f1; - output[1] = input[1] * f1; - output[2] = input[2] * f1; - } - if (req_comp == 2) output[1] = 1; - if (req_comp == 4) output[3] = 1; - } else { - switch (req_comp) { - case 4: output[3] = 1; /* fallthrough */ - case 3: output[0] = output[1] = output[2] = 0; - break; - case 2: output[1] = 1; /* fallthrough */ - case 1: output[0] = 0; - break; - } - } -} - -static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - char buffer[STBI__HDR_BUFLEN]; - char *token; - int valid = 0; - int width, height; - stbi_uc *scanline; - float *hdr_data; - int len; - unsigned char count, value; - int i, j, k, c1,c2, z; - const char *headerToken; - STBI_NOTUSED(ri); - - // Check identifier - headerToken = stbi__hdr_gettoken(s,buffer); - if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0) - return stbi__errpf("not HDR", "Corrupt HDR image"); - - // Parse header - for(;;) { - token = stbi__hdr_gettoken(s,buffer); - if (token[0] == 0) break; - if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; - } - - if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); - - // Parse width and height - // can't use sscanf() if we're not using stdio! - token = stbi__hdr_gettoken(s,buffer); - if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); - token += 3; - height = (int) strtol(token, &token, 10); - while (*token == ' ') ++token; - if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); - token += 3; - width = (int) strtol(token, NULL, 10); - - *x = width; - *y = height; - - if (comp) *comp = 3; - if (req_comp == 0) req_comp = 3; - - if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0)) - return stbi__errpf("too large", "HDR image is too large"); - - // Read data - hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0); - if (!hdr_data) - return stbi__errpf("outofmem", "Out of memory"); - - // Load image data - // image data is stored as some number of sca - if ( width < 8 || width >= 32768) { - // Read flat data - for (j=0; j < height; ++j) { - for (i=0; i < width; ++i) { - stbi_uc rgbe[4]; - main_decode_loop: - stbi__getn(s, rgbe, 4); - stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); - } - } - } else { - // Read RLE-encoded data - scanline = NULL; - - for (j = 0; j < height; ++j) { - c1 = stbi__get8(s); - c2 = stbi__get8(s); - len = stbi__get8(s); - if (c1 != 2 || c2 != 2 || (len & 0x80)) { - // not run-length encoded, so we have to actually use THIS data as a decoded - // pixel (note this can't be a valid pixel--one of RGB must be >= 128) - stbi_uc rgbe[4]; - rgbe[0] = (stbi_uc) c1; - rgbe[1] = (stbi_uc) c2; - rgbe[2] = (stbi_uc) len; - rgbe[3] = (stbi_uc) stbi__get8(s); - stbi__hdr_convert(hdr_data, rgbe, req_comp); - i = 1; - j = 0; - STBI_FREE(scanline); - goto main_decode_loop; // yes, this makes no sense - } - len <<= 8; - len |= stbi__get8(s); - if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } - if (scanline == NULL) { - scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0); - if (!scanline) { - STBI_FREE(hdr_data); - return stbi__errpf("outofmem", "Out of memory"); - } - } - - for (k = 0; k < 4; ++k) { - int nleft; - i = 0; - while ((nleft = width - i) > 0) { - count = stbi__get8(s); - if (count > 128) { - // Run - value = stbi__get8(s); - count -= 128; - if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } - for (z = 0; z < count; ++z) - scanline[i++ * 4 + k] = value; - } else { - // Dump - if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); } - for (z = 0; z < count; ++z) - scanline[i++ * 4 + k] = stbi__get8(s); - } - } - } - for (i=0; i < width; ++i) - stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); - } - if (scanline) - STBI_FREE(scanline); - } - - return hdr_data; -} - -static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) -{ - char buffer[STBI__HDR_BUFLEN]; - char *token; - int valid = 0; - int dummy; - - if (!x) x = &dummy; - if (!y) y = &dummy; - if (!comp) comp = &dummy; - - if (stbi__hdr_test(s) == 0) { - stbi__rewind( s ); - return 0; - } - - for(;;) { - token = stbi__hdr_gettoken(s,buffer); - if (token[0] == 0) break; - if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; - } - - if (!valid) { - stbi__rewind( s ); - return 0; - } - token = stbi__hdr_gettoken(s,buffer); - if (strncmp(token, "-Y ", 3)) { - stbi__rewind( s ); - return 0; - } - token += 3; - *y = (int) strtol(token, &token, 10); - while (*token == ' ') ++token; - if (strncmp(token, "+X ", 3)) { - stbi__rewind( s ); - return 0; - } - token += 3; - *x = (int) strtol(token, NULL, 10); - *comp = 3; - return 1; -} -#endif // STBI_NO_HDR - -#ifndef STBI_NO_BMP -static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) -{ - void *p; - stbi__bmp_data info; - - info.all_a = 255; - p = stbi__bmp_parse_header(s, &info); - stbi__rewind( s ); - if (p == NULL) - return 0; - if (x) *x = s->img_x; - if (y) *y = s->img_y; - if (comp) *comp = info.ma ? 4 : 3; - return 1; -} -#endif - -#ifndef STBI_NO_PSD -static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) -{ - int channelCount, dummy, depth; - if (!x) x = &dummy; - if (!y) y = &dummy; - if (!comp) comp = &dummy; - if (stbi__get32be(s) != 0x38425053) { - stbi__rewind( s ); - return 0; - } - if (stbi__get16be(s) != 1) { - stbi__rewind( s ); - return 0; - } - stbi__skip(s, 6); - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) { - stbi__rewind( s ); - return 0; - } - *y = stbi__get32be(s); - *x = stbi__get32be(s); - depth = stbi__get16be(s); - if (depth != 8 && depth != 16) { - stbi__rewind( s ); - return 0; - } - if (stbi__get16be(s) != 3) { - stbi__rewind( s ); - return 0; - } - *comp = 4; - return 1; -} - -static int stbi__psd_is16(stbi__context *s) -{ - int channelCount, depth; - if (stbi__get32be(s) != 0x38425053) { - stbi__rewind( s ); - return 0; - } - if (stbi__get16be(s) != 1) { - stbi__rewind( s ); - return 0; - } - stbi__skip(s, 6); - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) { - stbi__rewind( s ); - return 0; - } - (void) stbi__get32be(s); - (void) stbi__get32be(s); - depth = stbi__get16be(s); - if (depth != 16) { - stbi__rewind( s ); - return 0; - } - return 1; -} -#endif - -#ifndef STBI_NO_PIC -static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) -{ - int act_comp=0,num_packets=0,chained,dummy; - stbi__pic_packet packets[10]; - - if (!x) x = &dummy; - if (!y) y = &dummy; - if (!comp) comp = &dummy; - - if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { - stbi__rewind(s); - return 0; - } - - stbi__skip(s, 88); - - *x = stbi__get16be(s); - *y = stbi__get16be(s); - if (stbi__at_eof(s)) { - stbi__rewind( s); - return 0; - } - if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { - stbi__rewind( s ); - return 0; - } - - stbi__skip(s, 8); - - do { - stbi__pic_packet *packet; - - if (num_packets==sizeof(packets)/sizeof(packets[0])) - return 0; - - packet = &packets[num_packets++]; - chained = stbi__get8(s); - packet->size = stbi__get8(s); - packet->type = stbi__get8(s); - packet->channel = stbi__get8(s); - act_comp |= packet->channel; - - if (stbi__at_eof(s)) { - stbi__rewind( s ); - return 0; - } - if (packet->size != 8) { - stbi__rewind( s ); - return 0; - } - } while (chained); - - *comp = (act_comp & 0x10 ? 4 : 3); - - return 1; -} -#endif - -// ************************************************************************************************* -// Portable Gray Map and Portable Pixel Map loader -// by Ken Miller -// -// PGM: http://netpbm.sourceforge.net/doc/pgm.html -// PPM: http://netpbm.sourceforge.net/doc/ppm.html -// -// Known limitations: -// Does not support comments in the header section -// Does not support ASCII image data (formats P2 and P3) -// Does not support 16-bit-per-channel - -#ifndef STBI_NO_PNM - -static int stbi__pnm_test(stbi__context *s) -{ - char p, t; - p = (char) stbi__get8(s); - t = (char) stbi__get8(s); - if (p != 'P' || (t != '5' && t != '6')) { - stbi__rewind( s ); - return 0; - } - return 1; -} - -static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri) -{ - stbi_uc *out; - STBI_NOTUSED(ri); - - if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n)) - return 0; - - *x = s->img_x; - *y = s->img_y; - if (comp) *comp = s->img_n; - - if (!stbi__mad3sizes_valid(s->img_n, s->img_x, s->img_y, 0)) - return stbi__errpuc("too large", "PNM too large"); - - out = (stbi_uc *) stbi__malloc_mad3(s->img_n, s->img_x, s->img_y, 0); - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - stbi__getn(s, out, s->img_n * s->img_x * s->img_y); - - if (req_comp && req_comp != s->img_n) { - out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - return out; -} - -static int stbi__pnm_isspace(char c) -{ - return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; -} - -static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) -{ - for (;;) { - while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) - *c = (char) stbi__get8(s); - - if (stbi__at_eof(s) || *c != '#') - break; - - while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' ) - *c = (char) stbi__get8(s); - } -} - -static int stbi__pnm_isdigit(char c) -{ - return c >= '0' && c <= '9'; -} - -static int stbi__pnm_getinteger(stbi__context *s, char *c) -{ - int value = 0; - - while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { - value = value*10 + (*c - '0'); - *c = (char) stbi__get8(s); - } - - return value; -} - -static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) -{ - int maxv, dummy; - char c, p, t; - - if (!x) x = &dummy; - if (!y) y = &dummy; - if (!comp) comp = &dummy; - - stbi__rewind(s); - - // Get identifier - p = (char) stbi__get8(s); - t = (char) stbi__get8(s); - if (p != 'P' || (t != '5' && t != '6')) { - stbi__rewind(s); - return 0; - } - - *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm - - c = (char) stbi__get8(s); - stbi__pnm_skip_whitespace(s, &c); - - *x = stbi__pnm_getinteger(s, &c); // read width - stbi__pnm_skip_whitespace(s, &c); - - *y = stbi__pnm_getinteger(s, &c); // read height - stbi__pnm_skip_whitespace(s, &c); - - maxv = stbi__pnm_getinteger(s, &c); // read max value - - if (maxv > 255) - return stbi__err("max value > 255", "PPM image not 8-bit"); - else - return 1; -} -#endif - -static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) -{ - #ifndef STBI_NO_JPEG - if (stbi__jpeg_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PNG - if (stbi__png_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_GIF - if (stbi__gif_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_BMP - if (stbi__bmp_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PSD - if (stbi__psd_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PIC - if (stbi__pic_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PNM - if (stbi__pnm_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_HDR - if (stbi__hdr_info(s, x, y, comp)) return 1; - #endif - - // test tga last because it's a crappy test! - #ifndef STBI_NO_TGA - if (stbi__tga_info(s, x, y, comp)) - return 1; - #endif - return stbi__err("unknown image type", "Image not of any known type, or corrupt"); -} - -static int stbi__is_16_main(stbi__context *s) -{ - #ifndef STBI_NO_PNG - if (stbi__png_is16(s)) return 1; - #endif - - #ifndef STBI_NO_PSD - if (stbi__psd_is16(s)) return 1; - #endif - - return 0; -} - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result; - if (!f) return stbi__err("can't fopen", "Unable to open file"); - result = stbi_info_from_file(f, x, y, comp); - fclose(f); - return result; -} - -STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) -{ - int r; - stbi__context s; - long pos = ftell(f); - stbi__start_file(&s, f); - r = stbi__info_main(&s,x,y,comp); - fseek(f,pos,SEEK_SET); - return r; -} - -STBIDEF int stbi_is_16_bit(char const *filename) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result; - if (!f) return stbi__err("can't fopen", "Unable to open file"); - result = stbi_is_16_bit_from_file(f); - fclose(f); - return result; -} - -STBIDEF int stbi_is_16_bit_from_file(FILE *f) -{ - int r; - stbi__context s; - long pos = ftell(f); - stbi__start_file(&s, f); - r = stbi__is_16_main(&s); - fseek(f,pos,SEEK_SET); - return r; -} -#endif // !STBI_NO_STDIO - -STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__info_main(&s,x,y,comp); -} - -STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); - return stbi__info_main(&s,x,y,comp); -} - -STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__is_16_main(&s); -} - -STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); - return stbi__is_16_main(&s); -} - -#endif // STB_IMAGE_IMPLEMENTATION - -/* - revision history: - 2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs - 2.19 (2018-02-11) fix warning - 2.18 (2018-01-30) fix warnings - 2.17 (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug - 1-bit BMP - *_is_16_bit api - avoid warnings - 2.16 (2017-07-23) all functions have 16-bit variants; - STBI_NO_STDIO works again; - compilation fixes; - fix rounding in unpremultiply; - optimize vertical flip; - disable raw_len validation; - documentation fixes - 2.15 (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode; - warning fixes; disable run-time SSE detection on gcc; - uniform handling of optional "return" values; - thread-safe initialization of zlib tables - 2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs - 2.13 (2016-11-29) add 16-bit API, only supported for PNG right now - 2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes - 2.11 (2016-04-02) allocate large structures on the stack - remove white matting for transparent PSD - fix reported channel count for PNG & BMP - re-enable SSE2 in non-gcc 64-bit - support RGB-formatted JPEG - read 16-bit PNGs (only as 8-bit) - 2.10 (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED - 2.09 (2016-01-16) allow comments in PNM files - 16-bit-per-pixel TGA (not bit-per-component) - info() for TGA could break due to .hdr handling - info() for BMP to shares code instead of sloppy parse - can use STBI_REALLOC_SIZED if allocator doesn't support realloc - code cleanup - 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA - 2.07 (2015-09-13) fix compiler warnings - partial animated GIF support - limited 16-bpc PSD support - #ifdef unused functions - bug with < 92 byte PIC,PNM,HDR,TGA - 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value - 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning - 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit - 2.03 (2015-04-12) extra corruption checking (mmozeiko) - stbi_set_flip_vertically_on_load (nguillemot) - fix NEON support; fix mingw support - 2.02 (2015-01-19) fix incorrect assert, fix warning - 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 - 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG - 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) - progressive JPEG (stb) - PGM/PPM support (Ken Miller) - STBI_MALLOC,STBI_REALLOC,STBI_FREE - GIF bugfix -- seemingly never worked - STBI_NO_*, STBI_ONLY_* - 1.48 (2014-12-14) fix incorrectly-named assert() - 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) - optimize PNG (ryg) - fix bug in interlaced PNG with user-specified channel count (stb) - 1.46 (2014-08-26) - fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG - 1.45 (2014-08-16) - fix MSVC-ARM internal compiler error by wrapping malloc - 1.44 (2014-08-07) - various warning fixes from Ronny Chevalier - 1.43 (2014-07-15) - fix MSVC-only compiler problem in code changed in 1.42 - 1.42 (2014-07-09) - don't define _CRT_SECURE_NO_WARNINGS (affects user code) - fixes to stbi__cleanup_jpeg path - added STBI_ASSERT to avoid requiring assert.h - 1.41 (2014-06-25) - fix search&replace from 1.36 that messed up comments/error messages - 1.40 (2014-06-22) - fix gcc struct-initialization warning - 1.39 (2014-06-15) - fix to TGA optimization when req_comp != number of components in TGA; - fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) - add support for BMP version 5 (more ignored fields) - 1.38 (2014-06-06) - suppress MSVC warnings on integer casts truncating values - fix accidental rename of 'skip' field of I/O - 1.37 (2014-06-04) - remove duplicate typedef - 1.36 (2014-06-03) - convert to header file single-file library - if de-iphone isn't set, load iphone images color-swapped instead of returning NULL - 1.35 (2014-05-27) - various warnings - fix broken STBI_SIMD path - fix bug where stbi_load_from_file no longer left file pointer in correct place - fix broken non-easy path for 32-bit BMP (possibly never used) - TGA optimization by Arseny Kapoulkine - 1.34 (unknown) - use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case - 1.33 (2011-07-14) - make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements - 1.32 (2011-07-13) - support for "info" function for all supported filetypes (SpartanJ) - 1.31 (2011-06-20) - a few more leak fixes, bug in PNG handling (SpartanJ) - 1.30 (2011-06-11) - added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) - removed deprecated format-specific test/load functions - removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway - error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) - fix inefficiency in decoding 32-bit BMP (David Woo) - 1.29 (2010-08-16) - various warning fixes from Aurelien Pocheville - 1.28 (2010-08-01) - fix bug in GIF palette transparency (SpartanJ) - 1.27 (2010-08-01) - cast-to-stbi_uc to fix warnings - 1.26 (2010-07-24) - fix bug in file buffering for PNG reported by SpartanJ - 1.25 (2010-07-17) - refix trans_data warning (Won Chun) - 1.24 (2010-07-12) - perf improvements reading from files on platforms with lock-heavy fgetc() - minor perf improvements for jpeg - deprecated type-specific functions so we'll get feedback if they're needed - attempt to fix trans_data warning (Won Chun) - 1.23 fixed bug in iPhone support - 1.22 (2010-07-10) - removed image *writing* support - stbi_info support from Jetro Lauha - GIF support from Jean-Marc Lienher - iPhone PNG-extensions from James Brown - warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) - 1.21 fix use of 'stbi_uc' in header (reported by jon blow) - 1.20 added support for Softimage PIC, by Tom Seddon - 1.19 bug in interlaced PNG corruption check (found by ryg) - 1.18 (2008-08-02) - fix a threading bug (local mutable static) - 1.17 support interlaced PNG - 1.16 major bugfix - stbi__convert_format converted one too many pixels - 1.15 initialize some fields for thread safety - 1.14 fix threadsafe conversion bug - header-file-only version (#define STBI_HEADER_FILE_ONLY before including) - 1.13 threadsafe - 1.12 const qualifiers in the API - 1.11 Support installable IDCT, colorspace conversion routines - 1.10 Fixes for 64-bit (don't use "unsigned long") - optimized upsampling by Fabian "ryg" Giesen - 1.09 Fix format-conversion for PSD code (bad global variables!) - 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz - 1.07 attempt to fix C++ warning/errors again - 1.06 attempt to fix C++ warning/errors again - 1.05 fix TGA loading to return correct *comp and use good luminance calc - 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free - 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR - 1.02 support for (subset of) HDR files, float interface for preferred access to them - 1.01 fix bug: possible bug in handling right-side up bmps... not sure - fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all - 1.00 interface to zlib that skips zlib header - 0.99 correct handling of alpha in palette - 0.98 TGA loader by lonesock; dynamically add loaders (untested) - 0.97 jpeg errors on too large a file; also catch another malloc failure - 0.96 fix detection of invalid v value - particleman@mollyrocket forum - 0.95 during header scan, seek to markers in case of padding - 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same - 0.93 handle jpegtran output; verbose errors - 0.92 read 4,8,16,24,32-bit BMP files of several formats - 0.91 output 24-bit Windows 3.0 BMP files - 0.90 fix a few more warnings; bump version number to approach 1.0 - 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd - 0.60 fix compiling as c++ - 0.59 fix warnings: merge Dave Moore's -Wall fixes - 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian - 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available - 0.56 fix bug: zlib uncompressed mode len vs. nlen - 0.55 fix bug: restart_interval not initialized to 0 - 0.54 allow NULL for 'int *comp' - 0.53 fix bug in png 3->4; speedup png decoding - 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments - 0.51 obey req_comp requests, 1-component jpegs return as 1-component, - on 'test' only check type, not whether we support this variant - 0.50 (2006-11-19) - first released version -*/ - - -/* ------------------------------------------------------------------------------- -This software is available under 2 licenses -- choose whichever you prefer. ------------------------------------------------------------------------------- -ALTERNATIVE A - MIT License -Copyright (c) 2017 Sean Barrett -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. ------------------------------------------------------------------------------- -ALTERNATIVE B - Public Domain (www.unlicense.org) -This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this -software, either in source code form or as a compiled binary, for any purpose, -commercial or non-commercial, and by any means. -In jurisdictions that recognize copyright laws, the author or authors of this -software dedicate any and all copyright interest in the software to the public -domain. We make this dedication for the benefit of the public at large and to -the detriment of our heirs and successors. We intend this dedication to be an -overt act of relinquishment in perpetuity of all present and future rights to -this software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------- -*/ diff --git a/tools/ZAPD/lib/stb/stb_image_write.h b/tools/ZAPD/lib/stb/stb_image_write.h deleted file mode 100644 index a19b548ae9..0000000000 --- a/tools/ZAPD/lib/stb/stb_image_write.h +++ /dev/null @@ -1,1622 +0,0 @@ -/* stb_image_write - v1.13 - public domain - http://nothings.org/stb/stb_image_write.h - writes out PNG/BMP/TGA/JPEG/HDR images to C stdio - Sean Barrett 2010-2015 - no warranty implied; use at your own risk - - Before #including, - - #define STB_IMAGE_WRITE_IMPLEMENTATION - - in the file that you want to have the implementation. - - Will probably not work correctly with strict-aliasing optimizations. - - If using a modern Microsoft Compiler, non-safe versions of CRT calls may cause - compilation warnings or even errors. To avoid this, also before #including, - - #define STBI_MSC_SECURE_CRT - -ABOUT: - - This header file is a library for writing images to C stdio or a callback. - - The PNG output is not optimal; it is 20-50% larger than the file - written by a decent optimizing implementation; though providing a custom - zlib compress function (see STBIW_ZLIB_COMPRESS) can mitigate that. - This library is designed for source code compactness and simplicity, - not optimal image file size or run-time performance. - -BUILDING: - - You can #define STBIW_ASSERT(x) before the #include to avoid using assert.h. - You can #define STBIW_MALLOC(), STBIW_REALLOC(), and STBIW_FREE() to replace - malloc,realloc,free. - You can #define STBIW_MEMMOVE() to replace memmove() - You can #define STBIW_ZLIB_COMPRESS to use a custom zlib-style compress function - for PNG compression (instead of the builtin one), it must have the following signature: - unsigned char * my_compress(unsigned char *data, int data_len, int *out_len, int quality); - The returned data will be freed with STBIW_FREE() (free() by default), - so it must be heap allocated with STBIW_MALLOC() (malloc() by default), - -UNICODE: - - If compiling for Windows and you wish to use Unicode filenames, compile - with - #define STBIW_WINDOWS_UTF8 - and pass utf8-encoded filenames. Call stbiw_convert_wchar_to_utf8 to convert - Windows wchar_t filenames to utf8. - -USAGE: - - There are five functions, one for each image file format: - - int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes); - int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data); - int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data); - int stbi_write_jpg(char const *filename, int w, int h, int comp, const void *data, int quality); - int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data); - - void stbi_flip_vertically_on_write(int flag); // flag is non-zero to flip data vertically - - There are also five equivalent functions that use an arbitrary write function. You are - expected to open/close your file-equivalent before and after calling these: - - int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes); - int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); - int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); - int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data); - int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality); - - where the callback is: - void stbi_write_func(void *context, void *data, int size); - - You can configure it with these global variables: - int stbi_write_tga_with_rle; // defaults to true; set to 0 to disable RLE - int stbi_write_png_compression_level; // defaults to 8; set to higher for more compression - int stbi_write_force_png_filter; // defaults to -1; set to 0..5 to force a filter mode - - - You can define STBI_WRITE_NO_STDIO to disable the file variant of these - functions, so the library will not use stdio.h at all. However, this will - also disable HDR writing, because it requires stdio for formatted output. - - Each function returns 0 on failure and non-0 on success. - - The functions create an image file defined by the parameters. The image - is a rectangle of pixels stored from left-to-right, top-to-bottom. - Each pixel contains 'comp' channels of data stored interleaved with 8-bits - per channel, in the following order: 1=Y, 2=YA, 3=RGB, 4=RGBA. (Y is - monochrome color.) The rectangle is 'w' pixels wide and 'h' pixels tall. - The *data pointer points to the first byte of the top-left-most pixel. - For PNG, "stride_in_bytes" is the distance in bytes from the first byte of - a row of pixels to the first byte of the next row of pixels. - - PNG creates output files with the same number of components as the input. - The BMP format expands Y to RGB in the file format and does not - output alpha. - - PNG supports writing rectangles of data even when the bytes storing rows of - data are not consecutive in memory (e.g. sub-rectangles of a larger image), - by supplying the stride between the beginning of adjacent rows. The other - formats do not. (Thus you cannot write a native-format BMP through the BMP - writer, both because it is in BGR order and because it may have padding - at the end of the line.) - - PNG allows you to set the deflate compression level by setting the global - variable 'stbi_write_png_compression_level' (it defaults to 8). - - HDR expects linear float data. Since the format is always 32-bit rgb(e) - data, alpha (if provided) is discarded, and for monochrome data it is - replicated across all three channels. - - TGA supports RLE or non-RLE compressed data. To use non-RLE-compressed - data, set the global variable 'stbi_write_tga_with_rle' to 0. - - JPEG does ignore alpha channels in input data; quality is between 1 and 100. - Higher quality looks better but results in a bigger image. - JPEG baseline (no JPEG progressive). - -CREDITS: - - - Sean Barrett - PNG/BMP/TGA - Baldur Karlsson - HDR - Jean-Sebastien Guay - TGA monochrome - Tim Kelsey - misc enhancements - Alan Hickman - TGA RLE - Emmanuel Julien - initial file IO callback implementation - Jon Olick - original jo_jpeg.cpp code - Daniel Gibson - integrate JPEG, allow external zlib - Aarni Koskela - allow choosing PNG filter - - bugfixes: - github:Chribba - Guillaume Chereau - github:jry2 - github:romigrou - Sergio Gonzalez - Jonas Karlsson - Filip Wasil - Thatcher Ulrich - github:poppolopoppo - Patrick Boettcher - github:xeekworx - Cap Petschulat - Simon Rodriguez - Ivan Tikhonov - github:ignotion - Adam Schackart - -LICENSE - - See end of file for license information. - -*/ - -#ifndef INCLUDE_STB_IMAGE_WRITE_H -#define INCLUDE_STB_IMAGE_WRITE_H - -#include - -// if STB_IMAGE_WRITE_STATIC causes problems, try defining STBIWDEF to 'inline' or 'static inline' -#ifndef STBIWDEF -#ifdef STB_IMAGE_WRITE_STATIC -#define STBIWDEF static -#else -#ifdef __cplusplus -#define STBIWDEF extern "C" -#else -#define STBIWDEF extern -#endif -#endif -#endif - -#ifndef STB_IMAGE_WRITE_STATIC // C++ forbids static forward declarations -extern int stbi_write_tga_with_rle; -extern int stbi_write_png_compression_level; -extern int stbi_write_force_png_filter; -#endif - -#ifndef STBI_WRITE_NO_STDIO -STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes); -STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data); -STBIWDEF int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data); -STBIWDEF int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data); -STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality); - -#ifdef STBI_WINDOWS_UTF8 -STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input); -#endif -#endif - -typedef void stbi_write_func(void *context, void *data, int size); - -STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes); -STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); -STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data); -STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data); -STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality); - -STBIWDEF void stbi_flip_vertically_on_write(int flip_boolean); - -#endif//INCLUDE_STB_IMAGE_WRITE_H - -#ifdef STB_IMAGE_WRITE_IMPLEMENTATION - -#ifdef _WIN32 - #ifndef _CRT_SECURE_NO_WARNINGS - #define _CRT_SECURE_NO_WARNINGS - #endif - #ifndef _CRT_NONSTDC_NO_DEPRECATE - #define _CRT_NONSTDC_NO_DEPRECATE - #endif -#endif - -#ifndef STBI_WRITE_NO_STDIO -#include -#endif // STBI_WRITE_NO_STDIO - -#include -#include -#include -#include - -#if defined(STBIW_MALLOC) && defined(STBIW_FREE) && (defined(STBIW_REALLOC) || defined(STBIW_REALLOC_SIZED)) -// ok -#elif !defined(STBIW_MALLOC) && !defined(STBIW_FREE) && !defined(STBIW_REALLOC) && !defined(STBIW_REALLOC_SIZED) -// ok -#else -#error "Must define all or none of STBIW_MALLOC, STBIW_FREE, and STBIW_REALLOC (or STBIW_REALLOC_SIZED)." -#endif - -#ifndef STBIW_MALLOC -#define STBIW_MALLOC(sz) malloc(sz) -#define STBIW_REALLOC(p,newsz) realloc(p,newsz) -#define STBIW_FREE(p) free(p) -#endif - -#ifndef STBIW_REALLOC_SIZED -#define STBIW_REALLOC_SIZED(p,oldsz,newsz) STBIW_REALLOC(p,newsz) -#endif - - -#ifndef STBIW_MEMMOVE -#define STBIW_MEMMOVE(a,b,sz) memmove(a,b,sz) -#endif - - -#ifndef STBIW_ASSERT -#include -#define STBIW_ASSERT(x) assert(x) -#endif - -#define STBIW_UCHAR(x) (unsigned char) ((x) & 0xff) - -#ifdef STB_IMAGE_WRITE_STATIC -static int stbi__flip_vertically_on_write=0; -static int stbi_write_png_compression_level = 8; -static int stbi_write_tga_with_rle = 1; -static int stbi_write_force_png_filter = -1; -#else -int stbi_write_png_compression_level = 8; -int stbi__flip_vertically_on_write=0; -int stbi_write_tga_with_rle = 1; -int stbi_write_force_png_filter = -1; -#endif - -STBIWDEF void stbi_flip_vertically_on_write(int flag) -{ - stbi__flip_vertically_on_write = flag; -} - -typedef struct -{ - stbi_write_func *func; - void *context; -} stbi__write_context; - -// initialize a callback-based context -static void stbi__start_write_callbacks(stbi__write_context *s, stbi_write_func *c, void *context) -{ - s->func = c; - s->context = context; -} - -#ifndef STBI_WRITE_NO_STDIO - -static void stbi__stdio_write(void *context, void *data, int size) -{ - fwrite(data,1,size,(FILE*) context); -} - -#if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8) -#ifdef __cplusplus -#define STBIW_EXTERN extern "C" -#else -#define STBIW_EXTERN extern -#endif -STBIW_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide); -STBIW_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); - -STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) -{ - return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); -} -#endif - -static FILE *stbiw__fopen(char const *filename, char const *mode) -{ - FILE *f; -#if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8) - wchar_t wMode[64]; - wchar_t wFilename[1024]; - if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename))) - return 0; - - if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode))) - return 0; - -#if _MSC_VER >= 1400 - if (0 != _wfopen_s(&f, wFilename, wMode)) - f = 0; -#else - f = _wfopen(wFilename, wMode); -#endif - -#elif defined(_MSC_VER) && _MSC_VER >= 1400 - if (0 != fopen_s(&f, filename, mode)) - f=0; -#else - f = fopen(filename, mode); -#endif - return f; -} - -static int stbi__start_write_file(stbi__write_context *s, const char *filename) -{ - FILE *f = stbiw__fopen(filename, "wb"); - stbi__start_write_callbacks(s, stbi__stdio_write, (void *) f); - return f != NULL; -} - -static void stbi__end_write_file(stbi__write_context *s) -{ - fclose((FILE *)s->context); -} - -#endif // !STBI_WRITE_NO_STDIO - -typedef unsigned int stbiw_uint32; -typedef int stb_image_write_test[sizeof(stbiw_uint32)==4 ? 1 : -1]; - -static void stbiw__writefv(stbi__write_context *s, const char *fmt, va_list v) -{ - while (*fmt) { - switch (*fmt++) { - case ' ': break; - case '1': { unsigned char x = STBIW_UCHAR(va_arg(v, int)); - s->func(s->context,&x,1); - break; } - case '2': { int x = va_arg(v,int); - unsigned char b[2]; - b[0] = STBIW_UCHAR(x); - b[1] = STBIW_UCHAR(x>>8); - s->func(s->context,b,2); - break; } - case '4': { stbiw_uint32 x = va_arg(v,int); - unsigned char b[4]; - b[0]=STBIW_UCHAR(x); - b[1]=STBIW_UCHAR(x>>8); - b[2]=STBIW_UCHAR(x>>16); - b[3]=STBIW_UCHAR(x>>24); - s->func(s->context,b,4); - break; } - default: - STBIW_ASSERT(0); - return; - } - } -} - -static void stbiw__writef(stbi__write_context *s, const char *fmt, ...) -{ - va_list v; - va_start(v, fmt); - stbiw__writefv(s, fmt, v); - va_end(v); -} - -static void stbiw__putc(stbi__write_context *s, unsigned char c) -{ - s->func(s->context, &c, 1); -} - -static void stbiw__write3(stbi__write_context *s, unsigned char a, unsigned char b, unsigned char c) -{ - unsigned char arr[3]; - arr[0] = a; arr[1] = b; arr[2] = c; - s->func(s->context, arr, 3); -} - -static void stbiw__write_pixel(stbi__write_context *s, int rgb_dir, int comp, int write_alpha, int expand_mono, unsigned char *d) -{ - unsigned char bg[3] = { 255, 0, 255}, px[3]; - int k; - - if (write_alpha < 0) - s->func(s->context, &d[comp - 1], 1); - - switch (comp) { - case 2: // 2 pixels = mono + alpha, alpha is written separately, so same as 1-channel case - case 1: - if (expand_mono) - stbiw__write3(s, d[0], d[0], d[0]); // monochrome bmp - else - s->func(s->context, d, 1); // monochrome TGA - break; - case 4: - if (!write_alpha) { - // composite against pink background - for (k = 0; k < 3; ++k) - px[k] = bg[k] + ((d[k] - bg[k]) * d[3]) / 255; - stbiw__write3(s, px[1 - rgb_dir], px[1], px[1 + rgb_dir]); - break; - } - /* FALLTHROUGH */ - case 3: - stbiw__write3(s, d[1 - rgb_dir], d[1], d[1 + rgb_dir]); - break; - } - if (write_alpha > 0) - s->func(s->context, &d[comp - 1], 1); -} - -static void stbiw__write_pixels(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad, int expand_mono) -{ - stbiw_uint32 zero = 0; - int i,j, j_end; - - if (y <= 0) - return; - - if (stbi__flip_vertically_on_write) - vdir *= -1; - - if (vdir < 0) { - j_end = -1; j = y-1; - } else { - j_end = y; j = 0; - } - - for (; j != j_end; j += vdir) { - for (i=0; i < x; ++i) { - unsigned char *d = (unsigned char *) data + (j*x+i)*comp; - stbiw__write_pixel(s, rgb_dir, comp, write_alpha, expand_mono, d); - } - s->func(s->context, &zero, scanline_pad); - } -} - -static int stbiw__outfile(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, int expand_mono, void *data, int alpha, int pad, const char *fmt, ...) -{ - if (y < 0 || x < 0) { - return 0; - } else { - va_list v; - va_start(v, fmt); - stbiw__writefv(s, fmt, v); - va_end(v); - stbiw__write_pixels(s,rgb_dir,vdir,x,y,comp,data,alpha,pad, expand_mono); - return 1; - } -} - -static int stbi_write_bmp_core(stbi__write_context *s, int x, int y, int comp, const void *data) -{ - int pad = (-x*3) & 3; - return stbiw__outfile(s,-1,-1,x,y,comp,1,(void *) data,0,pad, - "11 4 22 4" "4 44 22 444444", - 'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40, // file header - 40, x,y, 1,24, 0,0,0,0,0,0); // bitmap header -} - -STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data) -{ - stbi__write_context s; - stbi__start_write_callbacks(&s, func, context); - return stbi_write_bmp_core(&s, x, y, comp, data); -} - -#ifndef STBI_WRITE_NO_STDIO -STBIWDEF int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data) -{ - stbi__write_context s; - if (stbi__start_write_file(&s,filename)) { - int r = stbi_write_bmp_core(&s, x, y, comp, data); - stbi__end_write_file(&s); - return r; - } else - return 0; -} -#endif //!STBI_WRITE_NO_STDIO - -static int stbi_write_tga_core(stbi__write_context *s, int x, int y, int comp, void *data) -{ - int has_alpha = (comp == 2 || comp == 4); - int colorbytes = has_alpha ? comp-1 : comp; - int format = colorbytes < 2 ? 3 : 2; // 3 color channels (RGB/RGBA) = 2, 1 color channel (Y/YA) = 3 - - if (y < 0 || x < 0) - return 0; - - if (!stbi_write_tga_with_rle) { - return stbiw__outfile(s, -1, -1, x, y, comp, 0, (void *) data, has_alpha, 0, - "111 221 2222 11", 0, 0, format, 0, 0, 0, 0, 0, x, y, (colorbytes + has_alpha) * 8, has_alpha * 8); - } else { - int i,j,k; - int jend, jdir; - - stbiw__writef(s, "111 221 2222 11", 0,0,format+8, 0,0,0, 0,0,x,y, (colorbytes + has_alpha) * 8, has_alpha * 8); - - if (stbi__flip_vertically_on_write) { - j = 0; - jend = y; - jdir = 1; - } else { - j = y-1; - jend = -1; - jdir = -1; - } - for (; j != jend; j += jdir) { - unsigned char *row = (unsigned char *) data + j * x * comp; - int len; - - for (i = 0; i < x; i += len) { - unsigned char *begin = row + i * comp; - int diff = 1; - len = 1; - - if (i < x - 1) { - ++len; - diff = memcmp(begin, row + (i + 1) * comp, comp); - if (diff) { - const unsigned char *prev = begin; - for (k = i + 2; k < x && len < 128; ++k) { - if (memcmp(prev, row + k * comp, comp)) { - prev += comp; - ++len; - } else { - --len; - break; - } - } - } else { - for (k = i + 2; k < x && len < 128; ++k) { - if (!memcmp(begin, row + k * comp, comp)) { - ++len; - } else { - break; - } - } - } - } - - if (diff) { - unsigned char header = STBIW_UCHAR(len - 1); - s->func(s->context, &header, 1); - for (k = 0; k < len; ++k) { - stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin + k * comp); - } - } else { - unsigned char header = STBIW_UCHAR(len - 129); - s->func(s->context, &header, 1); - stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin); - } - } - } - } - return 1; -} - -STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data) -{ - stbi__write_context s; - stbi__start_write_callbacks(&s, func, context); - return stbi_write_tga_core(&s, x, y, comp, (void *) data); -} - -#ifndef STBI_WRITE_NO_STDIO -STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data) -{ - stbi__write_context s; - if (stbi__start_write_file(&s,filename)) { - int r = stbi_write_tga_core(&s, x, y, comp, (void *) data); - stbi__end_write_file(&s); - return r; - } else - return 0; -} -#endif - -// ************************************************************************************************* -// Radiance RGBE HDR writer -// by Baldur Karlsson - -#define stbiw__max(a, b) ((a) > (b) ? (a) : (b)) - -static void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear) -{ - int exponent; - float maxcomp = stbiw__max(linear[0], stbiw__max(linear[1], linear[2])); - - if (maxcomp < 1e-32f) { - rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0; - } else { - float normalize = (float) frexp(maxcomp, &exponent) * 256.0f/maxcomp; - - rgbe[0] = (unsigned char)(linear[0] * normalize); - rgbe[1] = (unsigned char)(linear[1] * normalize); - rgbe[2] = (unsigned char)(linear[2] * normalize); - rgbe[3] = (unsigned char)(exponent + 128); - } -} - -static void stbiw__write_run_data(stbi__write_context *s, int length, unsigned char databyte) -{ - unsigned char lengthbyte = STBIW_UCHAR(length+128); - STBIW_ASSERT(length+128 <= 255); - s->func(s->context, &lengthbyte, 1); - s->func(s->context, &databyte, 1); -} - -static void stbiw__write_dump_data(stbi__write_context *s, int length, unsigned char *data) -{ - unsigned char lengthbyte = STBIW_UCHAR(length); - STBIW_ASSERT(length <= 128); // inconsistent with spec but consistent with official code - s->func(s->context, &lengthbyte, 1); - s->func(s->context, data, length); -} - -static void stbiw__write_hdr_scanline(stbi__write_context *s, int width, int ncomp, unsigned char *scratch, float *scanline) -{ - unsigned char scanlineheader[4] = { 2, 2, 0, 0 }; - unsigned char rgbe[4]; - float linear[3]; - int x; - - scanlineheader[2] = (width&0xff00)>>8; - scanlineheader[3] = (width&0x00ff); - - /* skip RLE for images too small or large */ - if (width < 8 || width >= 32768) { - for (x=0; x < width; x++) { - switch (ncomp) { - case 4: /* fallthrough */ - case 3: linear[2] = scanline[x*ncomp + 2]; - linear[1] = scanline[x*ncomp + 1]; - linear[0] = scanline[x*ncomp + 0]; - break; - default: - linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0]; - break; - } - stbiw__linear_to_rgbe(rgbe, linear); - s->func(s->context, rgbe, 4); - } - } else { - int c,r; - /* encode into scratch buffer */ - for (x=0; x < width; x++) { - switch(ncomp) { - case 4: /* fallthrough */ - case 3: linear[2] = scanline[x*ncomp + 2]; - linear[1] = scanline[x*ncomp + 1]; - linear[0] = scanline[x*ncomp + 0]; - break; - default: - linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0]; - break; - } - stbiw__linear_to_rgbe(rgbe, linear); - scratch[x + width*0] = rgbe[0]; - scratch[x + width*1] = rgbe[1]; - scratch[x + width*2] = rgbe[2]; - scratch[x + width*3] = rgbe[3]; - } - - s->func(s->context, scanlineheader, 4); - - /* RLE each component separately */ - for (c=0; c < 4; c++) { - unsigned char *comp = &scratch[width*c]; - - x = 0; - while (x < width) { - // find first run - r = x; - while (r+2 < width) { - if (comp[r] == comp[r+1] && comp[r] == comp[r+2]) - break; - ++r; - } - if (r+2 >= width) - r = width; - // dump up to first run - while (x < r) { - int len = r-x; - if (len > 128) len = 128; - stbiw__write_dump_data(s, len, &comp[x]); - x += len; - } - // if there's a run, output it - if (r+2 < width) { // same test as what we break out of in search loop, so only true if we break'd - // find next byte after run - while (r < width && comp[r] == comp[x]) - ++r; - // output run up to r - while (x < r) { - int len = r-x; - if (len > 127) len = 127; - stbiw__write_run_data(s, len, comp[x]); - x += len; - } - } - } - } - } -} - -static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp, float *data) -{ - if (y <= 0 || x <= 0 || data == NULL) - return 0; - else { - // Each component is stored separately. Allocate scratch space for full output scanline. - unsigned char *scratch = (unsigned char *) STBIW_MALLOC(x*4); - int i, len; - char buffer[128]; - char header[] = "#?RADIANCE\n# Written by stb_image_write.h\nFORMAT=32-bit_rle_rgbe\n"; - s->func(s->context, header, sizeof(header)-1); - -#ifdef __STDC_WANT_SECURE_LIB__ - len = sprintf_s(buffer, sizeof(buffer), "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x); -#else - len = sprintf(buffer, "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x); -#endif - s->func(s->context, buffer, len); - - for(i=0; i < y; i++) - stbiw__write_hdr_scanline(s, x, comp, scratch, data + comp*x*(stbi__flip_vertically_on_write ? y-1-i : i)); - STBIW_FREE(scratch); - return 1; - } -} - -STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const float *data) -{ - stbi__write_context s; - stbi__start_write_callbacks(&s, func, context); - return stbi_write_hdr_core(&s, x, y, comp, (float *) data); -} - -#ifndef STBI_WRITE_NO_STDIO -STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp, const float *data) -{ - stbi__write_context s; - if (stbi__start_write_file(&s,filename)) { - int r = stbi_write_hdr_core(&s, x, y, comp, (float *) data); - stbi__end_write_file(&s); - return r; - } else - return 0; -} -#endif // STBI_WRITE_NO_STDIO - - -////////////////////////////////////////////////////////////////////////////// -// -// PNG writer -// - -#ifndef STBIW_ZLIB_COMPRESS -// stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount() == vector<>::size() -#define stbiw__sbraw(a) ((int *) (a) - 2) -#define stbiw__sbm(a) stbiw__sbraw(a)[0] -#define stbiw__sbn(a) stbiw__sbraw(a)[1] - -#define stbiw__sbneedgrow(a,n) ((a)==0 || stbiw__sbn(a)+n >= stbiw__sbm(a)) -#define stbiw__sbmaybegrow(a,n) (stbiw__sbneedgrow(a,(n)) ? stbiw__sbgrow(a,n) : 0) -#define stbiw__sbgrow(a,n) stbiw__sbgrowf((void **) &(a), (n), sizeof(*(a))) - -#define stbiw__sbpush(a, v) (stbiw__sbmaybegrow(a,1), (a)[stbiw__sbn(a)++] = (v)) -#define stbiw__sbcount(a) ((a) ? stbiw__sbn(a) : 0) -#define stbiw__sbfree(a) ((a) ? STBIW_FREE(stbiw__sbraw(a)),0 : 0) - -static void *stbiw__sbgrowf(void **arr, int increment, int itemsize) -{ - int m = *arr ? 2*stbiw__sbm(*arr)+increment : increment+1; - void *p = STBIW_REALLOC_SIZED(*arr ? stbiw__sbraw(*arr) : 0, *arr ? (stbiw__sbm(*arr)*itemsize + sizeof(int)*2) : 0, itemsize * m + sizeof(int)*2); - STBIW_ASSERT(p); - if (p) { - if (!*arr) ((int *) p)[1] = 0; - *arr = (void *) ((int *) p + 2); - stbiw__sbm(*arr) = m; - } - return *arr; -} - -static unsigned char *stbiw__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount) -{ - while (*bitcount >= 8) { - stbiw__sbpush(data, STBIW_UCHAR(*bitbuffer)); - *bitbuffer >>= 8; - *bitcount -= 8; - } - return data; -} - -static int stbiw__zlib_bitrev(int code, int codebits) -{ - int res=0; - while (codebits--) { - res = (res << 1) | (code & 1); - code >>= 1; - } - return res; -} - -static unsigned int stbiw__zlib_countm(unsigned char *a, unsigned char *b, int limit) -{ - int i; - for (i=0; i < limit && i < 258; ++i) - if (a[i] != b[i]) break; - return i; -} - -static unsigned int stbiw__zhash(unsigned char *data) -{ - stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16); - hash ^= hash << 3; - hash += hash >> 5; - hash ^= hash << 4; - hash += hash >> 17; - hash ^= hash << 25; - hash += hash >> 6; - return hash; -} - -#define stbiw__zlib_flush() (out = stbiw__zlib_flushf(out, &bitbuf, &bitcount)) -#define stbiw__zlib_add(code,codebits) \ - (bitbuf |= (code) << bitcount, bitcount += (codebits), stbiw__zlib_flush()) -#define stbiw__zlib_huffa(b,c) stbiw__zlib_add(stbiw__zlib_bitrev(b,c),c) -// default huffman tables -#define stbiw__zlib_huff1(n) stbiw__zlib_huffa(0x30 + (n), 8) -#define stbiw__zlib_huff2(n) stbiw__zlib_huffa(0x190 + (n)-144, 9) -#define stbiw__zlib_huff3(n) stbiw__zlib_huffa(0 + (n)-256,7) -#define stbiw__zlib_huff4(n) stbiw__zlib_huffa(0xc0 + (n)-280,8) -#define stbiw__zlib_huff(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : (n) <= 255 ? stbiw__zlib_huff2(n) : (n) <= 279 ? stbiw__zlib_huff3(n) : stbiw__zlib_huff4(n)) -#define stbiw__zlib_huffb(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : stbiw__zlib_huff2(n)) - -#define stbiw__ZHASH 16384 - -#endif // STBIW_ZLIB_COMPRESS - -STBIWDEF unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality) -{ -#ifdef STBIW_ZLIB_COMPRESS - // user provided a zlib compress implementation, use that - return STBIW_ZLIB_COMPRESS(data, data_len, out_len, quality); -#else // use builtin - static unsigned short lengthc[] = { 3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258, 259 }; - static unsigned char lengtheb[]= { 0,0,0,0,0,0,0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0 }; - static unsigned short distc[] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577, 32768 }; - static unsigned char disteb[] = { 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13 }; - unsigned int bitbuf=0; - int i,j, bitcount=0; - unsigned char *out = NULL; - unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(char**)); - if (hash_table == NULL) - return NULL; - if (quality < 5) quality = 5; - - stbiw__sbpush(out, 0x78); // DEFLATE 32K window - stbiw__sbpush(out, 0x5e); // FLEVEL = 1 - stbiw__zlib_add(1,1); // BFINAL = 1 - stbiw__zlib_add(1,2); // BTYPE = 1 -- fixed huffman - - for (i=0; i < stbiw__ZHASH; ++i) - hash_table[i] = NULL; - - i=0; - while (i < data_len-3) { - // hash next 3 bytes of data to be compressed - int h = stbiw__zhash(data+i)&(stbiw__ZHASH-1), best=3; - unsigned char *bestloc = 0; - unsigned char **hlist = hash_table[h]; - int n = stbiw__sbcount(hlist); - for (j=0; j < n; ++j) { - if (hlist[j]-data > i-32768) { // if entry lies within window - int d = stbiw__zlib_countm(hlist[j], data+i, data_len-i); - if (d >= best) { best=d; bestloc=hlist[j]; } - } - } - // when hash table entry is too long, delete half the entries - if (hash_table[h] && stbiw__sbn(hash_table[h]) == 2*quality) { - STBIW_MEMMOVE(hash_table[h], hash_table[h]+quality, sizeof(hash_table[h][0])*quality); - stbiw__sbn(hash_table[h]) = quality; - } - stbiw__sbpush(hash_table[h],data+i); - - if (bestloc) { - // "lazy matching" - check match at *next* byte, and if it's better, do cur byte as literal - h = stbiw__zhash(data+i+1)&(stbiw__ZHASH-1); - hlist = hash_table[h]; - n = stbiw__sbcount(hlist); - for (j=0; j < n; ++j) { - if (hlist[j]-data > i-32767) { - int e = stbiw__zlib_countm(hlist[j], data+i+1, data_len-i-1); - if (e > best) { // if next match is better, bail on current match - bestloc = NULL; - break; - } - } - } - } - - if (bestloc) { - int d = (int) (data+i - bestloc); // distance back - STBIW_ASSERT(d <= 32767 && best <= 258); - for (j=0; best > lengthc[j+1]-1; ++j); - stbiw__zlib_huff(j+257); - if (lengtheb[j]) stbiw__zlib_add(best - lengthc[j], lengtheb[j]); - for (j=0; d > distc[j+1]-1; ++j); - stbiw__zlib_add(stbiw__zlib_bitrev(j,5),5); - if (disteb[j]) stbiw__zlib_add(d - distc[j], disteb[j]); - i += best; - } else { - stbiw__zlib_huffb(data[i]); - ++i; - } - } - // write out final bytes - for (;i < data_len; ++i) - stbiw__zlib_huffb(data[i]); - stbiw__zlib_huff(256); // end of block - // pad with 0 bits to byte boundary - while (bitcount) - stbiw__zlib_add(0,1); - - for (i=0; i < stbiw__ZHASH; ++i) - (void) stbiw__sbfree(hash_table[i]); - STBIW_FREE(hash_table); - - { - // compute adler32 on input - unsigned int s1=1, s2=0; - int blocklen = (int) (data_len % 5552); - j=0; - while (j < data_len) { - for (i=0; i < blocklen; ++i) { s1 += data[j+i]; s2 += s1; } - s1 %= 65521; s2 %= 65521; - j += blocklen; - blocklen = 5552; - } - stbiw__sbpush(out, STBIW_UCHAR(s2 >> 8)); - stbiw__sbpush(out, STBIW_UCHAR(s2)); - stbiw__sbpush(out, STBIW_UCHAR(s1 >> 8)); - stbiw__sbpush(out, STBIW_UCHAR(s1)); - } - *out_len = stbiw__sbn(out); - // make returned pointer freeable - STBIW_MEMMOVE(stbiw__sbraw(out), out, *out_len); - return (unsigned char *) stbiw__sbraw(out); -#endif // STBIW_ZLIB_COMPRESS -} - -static unsigned int stbiw__crc32(unsigned char *buffer, int len) -{ -#ifdef STBIW_CRC32 - return STBIW_CRC32(buffer, len); -#else - static unsigned int crc_table[256] = - { - 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, - 0x0eDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, - 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, - 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, - 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, - 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, - 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, - 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, - 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, - 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, - 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, - 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, - 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, - 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, - 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, - 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, - 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, - 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, - 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, - 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, - 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, - 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, - 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, - 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, - 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, - 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, - 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, - 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, - 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, - 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, - 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, - 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D - }; - - unsigned int crc = ~0u; - int i; - for (i=0; i < len; ++i) - crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)]; - return ~crc; -#endif -} - -#define stbiw__wpng4(o,a,b,c,d) ((o)[0]=STBIW_UCHAR(a),(o)[1]=STBIW_UCHAR(b),(o)[2]=STBIW_UCHAR(c),(o)[3]=STBIW_UCHAR(d),(o)+=4) -#define stbiw__wp32(data,v) stbiw__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v)); -#define stbiw__wptag(data,s) stbiw__wpng4(data, s[0],s[1],s[2],s[3]) - -static void stbiw__wpcrc(unsigned char **data, int len) -{ - unsigned int crc = stbiw__crc32(*data - len - 4, len+4); - stbiw__wp32(*data, crc); -} - -static unsigned char stbiw__paeth(int a, int b, int c) -{ - int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c); - if (pa <= pb && pa <= pc) return STBIW_UCHAR(a); - if (pb <= pc) return STBIW_UCHAR(b); - return STBIW_UCHAR(c); -} - -// @OPTIMIZE: provide an option that always forces left-predict or paeth predict -static void stbiw__encode_png_line(unsigned char *pixels, int stride_bytes, int width, int height, int y, int n, int filter_type, signed char *line_buffer) -{ - static int mapping[] = { 0,1,2,3,4 }; - static int firstmap[] = { 0,1,0,5,6 }; - int *mymap = (y != 0) ? mapping : firstmap; - int i; - int type = mymap[filter_type]; - unsigned char *z = pixels + stride_bytes * (stbi__flip_vertically_on_write ? height-1-y : y); - int signed_stride = stbi__flip_vertically_on_write ? -stride_bytes : stride_bytes; - - if (type==0) { - memcpy(line_buffer, z, width*n); - return; - } - - // first loop isn't optimized since it's just one pixel - for (i = 0; i < n; ++i) { - switch (type) { - case 1: line_buffer[i] = z[i]; break; - case 2: line_buffer[i] = z[i] - z[i-signed_stride]; break; - case 3: line_buffer[i] = z[i] - (z[i-signed_stride]>>1); break; - case 4: line_buffer[i] = (signed char) (z[i] - stbiw__paeth(0,z[i-signed_stride],0)); break; - case 5: line_buffer[i] = z[i]; break; - case 6: line_buffer[i] = z[i]; break; - } - } - switch (type) { - case 1: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-n]; break; - case 2: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-signed_stride]; break; - case 3: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - ((z[i-n] + z[i-signed_stride])>>1); break; - case 4: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], z[i-signed_stride], z[i-signed_stride-n]); break; - case 5: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - (z[i-n]>>1); break; - case 6: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], 0,0); break; - } -} - -STBIWDEF unsigned char *stbi_write_png_to_mem(const unsigned char *pixels, int stride_bytes, int x, int y, int n, int *out_len) -{ - int force_filter = stbi_write_force_png_filter; - int ctype[5] = { -1, 0, 4, 2, 6 }; - unsigned char sig[8] = { 137,80,78,71,13,10,26,10 }; - unsigned char *out,*o, *filt, *zlib; - signed char *line_buffer; - int j,zlen; - - if (stride_bytes == 0) - stride_bytes = x * n; - - if (force_filter >= 5) { - force_filter = -1; - } - - filt = (unsigned char *) STBIW_MALLOC((x*n+1) * y); if (!filt) return 0; - line_buffer = (signed char *) STBIW_MALLOC(x * n); if (!line_buffer) { STBIW_FREE(filt); return 0; } - for (j=0; j < y; ++j) { - int filter_type; - if (force_filter > -1) { - filter_type = force_filter; - stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, force_filter, line_buffer); - } else { // Estimate the best filter by running through all of them: - int best_filter = 0, best_filter_val = 0x7fffffff, est, i; - for (filter_type = 0; filter_type < 5; filter_type++) { - stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, filter_type, line_buffer); - - // Estimate the entropy of the line using this filter; the less, the better. - est = 0; - for (i = 0; i < x*n; ++i) { - est += abs((signed char) line_buffer[i]); - } - if (est < best_filter_val) { - best_filter_val = est; - best_filter = filter_type; - } - } - if (filter_type != best_filter) { // If the last iteration already got us the best filter, don't redo it - stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, best_filter, line_buffer); - filter_type = best_filter; - } - } - // when we get here, filter_type contains the filter type, and line_buffer contains the data - filt[j*(x*n+1)] = (unsigned char) filter_type; - STBIW_MEMMOVE(filt+j*(x*n+1)+1, line_buffer, x*n); - } - STBIW_FREE(line_buffer); - zlib = stbi_zlib_compress(filt, y*( x*n+1), &zlen, stbi_write_png_compression_level); - STBIW_FREE(filt); - if (!zlib) return 0; - - // each tag requires 12 bytes of overhead - out = (unsigned char *) STBIW_MALLOC(8 + 12+13 + 12+zlen + 12); - if (!out) return 0; - *out_len = 8 + 12+13 + 12+zlen + 12; - - o=out; - STBIW_MEMMOVE(o,sig,8); o+= 8; - stbiw__wp32(o, 13); // header length - stbiw__wptag(o, "IHDR"); - stbiw__wp32(o, x); - stbiw__wp32(o, y); - *o++ = 8; - *o++ = STBIW_UCHAR(ctype[n]); - *o++ = 0; - *o++ = 0; - *o++ = 0; - stbiw__wpcrc(&o,13); - - stbiw__wp32(o, zlen); - stbiw__wptag(o, "IDAT"); - STBIW_MEMMOVE(o, zlib, zlen); - o += zlen; - STBIW_FREE(zlib); - stbiw__wpcrc(&o, zlen); - - stbiw__wp32(o,0); - stbiw__wptag(o, "IEND"); - stbiw__wpcrc(&o,0); - - STBIW_ASSERT(o == out + *out_len); - - return out; -} - -#ifndef STBI_WRITE_NO_STDIO -STBIWDEF int stbi_write_png(char const *filename, int x, int y, int comp, const void *data, int stride_bytes) -{ - FILE *f; - int len; - unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len); - if (png == NULL) return 0; - - f = stbiw__fopen(filename, "wb"); - if (!f) { STBIW_FREE(png); return 0; } - fwrite(png, 1, len, f); - fclose(f); - STBIW_FREE(png); - return 1; -} -#endif - -STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int stride_bytes) -{ - int len; - unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len); - if (png == NULL) return 0; - func(context, png, len); - STBIW_FREE(png); - return 1; -} - - -/* *************************************************************************** - * - * JPEG writer - * - * This is based on Jon Olick's jo_jpeg.cpp: - * public domain Simple, Minimalistic JPEG writer - http://www.jonolick.com/code.html - */ - -static const unsigned char stbiw__jpg_ZigZag[] = { 0,1,5,6,14,15,27,28,2,4,7,13,16,26,29,42,3,8,12,17,25,30,41,43,9,11,18, - 24,31,40,44,53,10,19,23,32,39,45,52,54,20,22,33,38,46,51,55,60,21,34,37,47,50,56,59,61,35,36,48,49,57,58,62,63 }; - -static void stbiw__jpg_writeBits(stbi__write_context *s, int *bitBufP, int *bitCntP, const unsigned short *bs) { - int bitBuf = *bitBufP, bitCnt = *bitCntP; - bitCnt += bs[1]; - bitBuf |= bs[0] << (24 - bitCnt); - while(bitCnt >= 8) { - unsigned char c = (bitBuf >> 16) & 255; - stbiw__putc(s, c); - if(c == 255) { - stbiw__putc(s, 0); - } - bitBuf <<= 8; - bitCnt -= 8; - } - *bitBufP = bitBuf; - *bitCntP = bitCnt; -} - -static void stbiw__jpg_DCT(float *d0p, float *d1p, float *d2p, float *d3p, float *d4p, float *d5p, float *d6p, float *d7p) { - float d0 = *d0p, d1 = *d1p, d2 = *d2p, d3 = *d3p, d4 = *d4p, d5 = *d5p, d6 = *d6p, d7 = *d7p; - float z1, z2, z3, z4, z5, z11, z13; - - float tmp0 = d0 + d7; - float tmp7 = d0 - d7; - float tmp1 = d1 + d6; - float tmp6 = d1 - d6; - float tmp2 = d2 + d5; - float tmp5 = d2 - d5; - float tmp3 = d3 + d4; - float tmp4 = d3 - d4; - - // Even part - float tmp10 = tmp0 + tmp3; // phase 2 - float tmp13 = tmp0 - tmp3; - float tmp11 = tmp1 + tmp2; - float tmp12 = tmp1 - tmp2; - - d0 = tmp10 + tmp11; // phase 3 - d4 = tmp10 - tmp11; - - z1 = (tmp12 + tmp13) * 0.707106781f; // c4 - d2 = tmp13 + z1; // phase 5 - d6 = tmp13 - z1; - - // Odd part - tmp10 = tmp4 + tmp5; // phase 2 - tmp11 = tmp5 + tmp6; - tmp12 = tmp6 + tmp7; - - // The rotator is modified from fig 4-8 to avoid extra negations. - z5 = (tmp10 - tmp12) * 0.382683433f; // c6 - z2 = tmp10 * 0.541196100f + z5; // c2-c6 - z4 = tmp12 * 1.306562965f + z5; // c2+c6 - z3 = tmp11 * 0.707106781f; // c4 - - z11 = tmp7 + z3; // phase 5 - z13 = tmp7 - z3; - - *d5p = z13 + z2; // phase 6 - *d3p = z13 - z2; - *d1p = z11 + z4; - *d7p = z11 - z4; - - *d0p = d0; *d2p = d2; *d4p = d4; *d6p = d6; -} - -static void stbiw__jpg_calcBits(int val, unsigned short bits[2]) { - int tmp1 = val < 0 ? -val : val; - val = val < 0 ? val-1 : val; - bits[1] = 1; - while(tmp1 >>= 1) { - ++bits[1]; - } - bits[0] = val & ((1<0)&&(DU[end0pos]==0); --end0pos) { - } - // end0pos = first element in reverse order !=0 - if(end0pos == 0) { - stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB); - return DU[0]; - } - for(i = 1; i <= end0pos; ++i) { - int startpos = i; - int nrzeroes; - unsigned short bits[2]; - for (; DU[i]==0 && i<=end0pos; ++i) { - } - nrzeroes = i-startpos; - if ( nrzeroes >= 16 ) { - int lng = nrzeroes>>4; - int nrmarker; - for (nrmarker=1; nrmarker <= lng; ++nrmarker) - stbiw__jpg_writeBits(s, bitBuf, bitCnt, M16zeroes); - nrzeroes &= 15; - } - stbiw__jpg_calcBits(DU[i], bits); - stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTAC[(nrzeroes<<4)+bits[1]]); - stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits); - } - if(end0pos != 63) { - stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB); - } - return DU[0]; -} - -static int stbi_write_jpg_core(stbi__write_context *s, int width, int height, int comp, const void* data, int quality) { - // Constants that don't pollute global namespace - static const unsigned char std_dc_luminance_nrcodes[] = {0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0}; - static const unsigned char std_dc_luminance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11}; - static const unsigned char std_ac_luminance_nrcodes[] = {0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d}; - static const unsigned char std_ac_luminance_values[] = { - 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08, - 0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28, - 0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59, - 0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89, - 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6, - 0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2, - 0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa - }; - static const unsigned char std_dc_chrominance_nrcodes[] = {0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0}; - static const unsigned char std_dc_chrominance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11}; - static const unsigned char std_ac_chrominance_nrcodes[] = {0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77}; - static const unsigned char std_ac_chrominance_values[] = { - 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91, - 0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26, - 0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58, - 0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87, - 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4, - 0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda, - 0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa - }; - // Huffman tables - static const unsigned short YDC_HT[256][2] = { {0,2},{2,3},{3,3},{4,3},{5,3},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9}}; - static const unsigned short UVDC_HT[256][2] = { {0,2},{1,2},{2,2},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9},{1022,10},{2046,11}}; - static const unsigned short YAC_HT[256][2] = { - {10,4},{0,2},{1,2},{4,3},{11,4},{26,5},{120,7},{248,8},{1014,10},{65410,16},{65411,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {12,4},{27,5},{121,7},{502,9},{2038,11},{65412,16},{65413,16},{65414,16},{65415,16},{65416,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {28,5},{249,8},{1015,10},{4084,12},{65417,16},{65418,16},{65419,16},{65420,16},{65421,16},{65422,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {58,6},{503,9},{4085,12},{65423,16},{65424,16},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {59,6},{1016,10},{65430,16},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {122,7},{2039,11},{65438,16},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {123,7},{4086,12},{65446,16},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {250,8},{4087,12},{65454,16},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {504,9},{32704,15},{65462,16},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {505,9},{65470,16},{65471,16},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {506,9},{65479,16},{65480,16},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {1017,10},{65488,16},{65489,16},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {1018,10},{65497,16},{65498,16},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {2040,11},{65506,16},{65507,16},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {65515,16},{65516,16},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{0,0},{0,0},{0,0},{0,0},{0,0}, - {2041,11},{65525,16},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0} - }; - static const unsigned short UVAC_HT[256][2] = { - {0,2},{1,2},{4,3},{10,4},{24,5},{25,5},{56,6},{120,7},{500,9},{1014,10},{4084,12},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {11,4},{57,6},{246,8},{501,9},{2038,11},{4085,12},{65416,16},{65417,16},{65418,16},{65419,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {26,5},{247,8},{1015,10},{4086,12},{32706,15},{65420,16},{65421,16},{65422,16},{65423,16},{65424,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {27,5},{248,8},{1016,10},{4087,12},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{65430,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {58,6},{502,9},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{65438,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {59,6},{1017,10},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{65446,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {121,7},{2039,11},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{65454,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {122,7},{2040,11},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{65462,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {249,8},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{65470,16},{65471,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {503,9},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{65479,16},{65480,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {504,9},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{65488,16},{65489,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {505,9},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{65497,16},{65498,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {506,9},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{65506,16},{65507,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {2041,11},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{65515,16},{65516,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}, - {16352,14},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{65525,16},{0,0},{0,0},{0,0},{0,0},{0,0}, - {1018,10},{32707,15},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0} - }; - static const int YQT[] = {16,11,10,16,24,40,51,61,12,12,14,19,26,58,60,55,14,13,16,24,40,57,69,56,14,17,22,29,51,87,80,62,18,22, - 37,56,68,109,103,77,24,35,55,64,81,104,113,92,49,64,78,87,103,121,120,101,72,92,95,98,112,100,103,99}; - static const int UVQT[] = {17,18,24,47,99,99,99,99,18,21,26,66,99,99,99,99,24,26,56,99,99,99,99,99,47,66,99,99,99,99,99,99, - 99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99}; - static const float aasf[] = { 1.0f * 2.828427125f, 1.387039845f * 2.828427125f, 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f, - 1.0f * 2.828427125f, 0.785694958f * 2.828427125f, 0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f }; - - int row, col, i, k; - float fdtbl_Y[64], fdtbl_UV[64]; - unsigned char YTable[64], UVTable[64]; - - if(!data || !width || !height || comp > 4 || comp < 1) { - return 0; - } - - quality = quality ? quality : 90; - quality = quality < 1 ? 1 : quality > 100 ? 100 : quality; - quality = quality < 50 ? 5000 / quality : 200 - quality * 2; - - for(i = 0; i < 64; ++i) { - int uvti, yti = (YQT[i]*quality+50)/100; - YTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (yti < 1 ? 1 : yti > 255 ? 255 : yti); - uvti = (UVQT[i]*quality+50)/100; - UVTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (uvti < 1 ? 1 : uvti > 255 ? 255 : uvti); - } - - for(row = 0, k = 0; row < 8; ++row) { - for(col = 0; col < 8; ++col, ++k) { - fdtbl_Y[k] = 1 / (YTable [stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]); - fdtbl_UV[k] = 1 / (UVTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]); - } - } - - // Write Headers - { - static const unsigned char head0[] = { 0xFF,0xD8,0xFF,0xE0,0,0x10,'J','F','I','F',0,1,1,0,0,1,0,1,0,0,0xFF,0xDB,0,0x84,0 }; - static const unsigned char head2[] = { 0xFF,0xDA,0,0xC,3,1,0,2,0x11,3,0x11,0,0x3F,0 }; - const unsigned char head1[] = { 0xFF,0xC0,0,0x11,8,(unsigned char)(height>>8),STBIW_UCHAR(height),(unsigned char)(width>>8),STBIW_UCHAR(width), - 3,1,0x11,0,2,0x11,1,3,0x11,1,0xFF,0xC4,0x01,0xA2,0 }; - s->func(s->context, (void*)head0, sizeof(head0)); - s->func(s->context, (void*)YTable, sizeof(YTable)); - stbiw__putc(s, 1); - s->func(s->context, UVTable, sizeof(UVTable)); - s->func(s->context, (void*)head1, sizeof(head1)); - s->func(s->context, (void*)(std_dc_luminance_nrcodes+1), sizeof(std_dc_luminance_nrcodes)-1); - s->func(s->context, (void*)std_dc_luminance_values, sizeof(std_dc_luminance_values)); - stbiw__putc(s, 0x10); // HTYACinfo - s->func(s->context, (void*)(std_ac_luminance_nrcodes+1), sizeof(std_ac_luminance_nrcodes)-1); - s->func(s->context, (void*)std_ac_luminance_values, sizeof(std_ac_luminance_values)); - stbiw__putc(s, 1); // HTUDCinfo - s->func(s->context, (void*)(std_dc_chrominance_nrcodes+1), sizeof(std_dc_chrominance_nrcodes)-1); - s->func(s->context, (void*)std_dc_chrominance_values, sizeof(std_dc_chrominance_values)); - stbiw__putc(s, 0x11); // HTUACinfo - s->func(s->context, (void*)(std_ac_chrominance_nrcodes+1), sizeof(std_ac_chrominance_nrcodes)-1); - s->func(s->context, (void*)std_ac_chrominance_values, sizeof(std_ac_chrominance_values)); - s->func(s->context, (void*)head2, sizeof(head2)); - } - - // Encode 8x8 macroblocks - { - static const unsigned short fillBits[] = {0x7F, 7}; - const unsigned char *imageData = (const unsigned char *)data; - int DCY=0, DCU=0, DCV=0; - int bitBuf=0, bitCnt=0; - // comp == 2 is grey+alpha (alpha is ignored) - int ofsG = comp > 2 ? 1 : 0, ofsB = comp > 2 ? 2 : 0; - int x, y, pos; - for(y = 0; y < height; y += 8) { - for(x = 0; x < width; x += 8) { - float YDU[64], UDU[64], VDU[64]; - for(row = y, pos = 0; row < y+8; ++row) { - // row >= height => use last input row - int clamped_row = (row < height) ? row : height - 1; - int base_p = (stbi__flip_vertically_on_write ? (height-1-clamped_row) : clamped_row)*width*comp; - for(col = x; col < x+8; ++col, ++pos) { - float r, g, b; - // if col >= width => use pixel from last input column - int p = base_p + ((col < width) ? col : (width-1))*comp; - - r = imageData[p+0]; - g = imageData[p+ofsG]; - b = imageData[p+ofsB]; - YDU[pos]=+0.29900f*r+0.58700f*g+0.11400f*b-128; - UDU[pos]=-0.16874f*r-0.33126f*g+0.50000f*b; - VDU[pos]=+0.50000f*r-0.41869f*g-0.08131f*b; - } - } - - DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, YDU, fdtbl_Y, DCY, YDC_HT, YAC_HT); - DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, UDU, fdtbl_UV, DCU, UVDC_HT, UVAC_HT); - DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, VDU, fdtbl_UV, DCV, UVDC_HT, UVAC_HT); - } - } - - // Do the bit alignment of the EOI marker - stbiw__jpg_writeBits(s, &bitBuf, &bitCnt, fillBits); - } - - // EOI - stbiw__putc(s, 0xFF); - stbiw__putc(s, 0xD9); - - return 1; -} - -STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality) -{ - stbi__write_context s; - stbi__start_write_callbacks(&s, func, context); - return stbi_write_jpg_core(&s, x, y, comp, (void *) data, quality); -} - - -#ifndef STBI_WRITE_NO_STDIO -STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality) -{ - stbi__write_context s; - if (stbi__start_write_file(&s,filename)) { - int r = stbi_write_jpg_core(&s, x, y, comp, data, quality); - stbi__end_write_file(&s); - return r; - } else - return 0; -} -#endif - -#endif // STB_IMAGE_WRITE_IMPLEMENTATION - -/* Revision history - 1.10 (2019-02-07) - support utf8 filenames in Windows; fix warnings and platform ifdefs - 1.09 (2018-02-11) - fix typo in zlib quality API, improve STB_I_W_STATIC in C++ - 1.08 (2018-01-29) - add stbi__flip_vertically_on_write, external zlib, zlib quality, choose PNG filter - 1.07 (2017-07-24) - doc fix - 1.06 (2017-07-23) - writing JPEG (using Jon Olick's code) - 1.05 ??? - 1.04 (2017-03-03) - monochrome BMP expansion - 1.03 ??? - 1.02 (2016-04-02) - avoid allocating large structures on the stack - 1.01 (2016-01-16) - STBIW_REALLOC_SIZED: support allocators with no realloc support - avoid race-condition in crc initialization - minor compile issues - 1.00 (2015-09-14) - installable file IO function - 0.99 (2015-09-13) - warning fixes; TGA rle support - 0.98 (2015-04-08) - added STBIW_MALLOC, STBIW_ASSERT etc - 0.97 (2015-01-18) - fixed HDR asserts, rewrote HDR rle logic - 0.96 (2015-01-17) - add HDR output - fix monochrome BMP - 0.95 (2014-08-17) - add monochrome TGA output - 0.94 (2014-05-31) - rename private functions to avoid conflicts with stb_image.h - 0.93 (2014-05-27) - warning fixes - 0.92 (2010-08-01) - casts to unsigned char to fix warnings - 0.91 (2010-07-17) - first public release - 0.90 first internal release -*/ - -/* ------------------------------------------------------------------------------- -This software is available under 2 licenses -- choose whichever you prefer. ------------------------------------------------------------------------------- -ALTERNATIVE A - MIT License -Copyright (c) 2017 Sean Barrett -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. ------------------------------------------------------------------------------- -ALTERNATIVE B - Public Domain (www.unlicense.org) -This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this -software, either in source code form or as a compiled binary, for any purpose, -commercial or non-commercial, and by any means. -In jurisdictions that recognize copyright laws, the author or authors of this -software dedicate any and all copyright interest in the software to the public -domain. We make this dedication for the benefit of the public at large and to -the detriment of our heirs and successors. We intend this dedication to be an -overt act of relinquishment in perpetuity of all present and future rights to -this software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------- -*/