diff options
| author | Nicholas Estelami <NEstelami@users.noreply.github.com> | 2021-08-05 05:11:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-05 05:11:24 -0400 |
| commit | 82bd27604a4c8f8c1f01f9c2f54c87fab103c39f (patch) | |
| tree | 282b189bd2d6113bf134a8b34d7ddc518369f3bb /ZAPD/ZDisplayList.cpp | |
| parent | 469285b3e1f7885b42905fbfb9b4448f51ea20b3 (diff) | |
Exporter Support Added (#127)
* Initial exporter implementation
* Updated to use static library.
* minor cleanup
* Cleaned things up a bit
* Fixed merge issues
* Minor commenting
* Added Begin and End functions, and removed HL stuff (to be turned into an exporter at a later date)
* Cleaned some stuff up
* Additional cleanup
* Removed some commented out code
* Fixed compilation issues
* Cleanup
* Fixed merge issues
* Got rid of unused windows.h includes
* Cleanup
* Fixed warning
* Removed additional redundancies
* Cleanup
* Fixed merge issues
* Fixed some compiler issues, added makefile for exportertest.
* Removed redundancies and clang formatted
* Made sure exportertest compiles with C++17
* Moved certain files into new "Utils" folder.
* GetExporterMap uses a reference now
* Minor fixes and updates.
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
Diffstat (limited to 'ZAPD/ZDisplayList.cpp')
| -rw-r--r-- | ZAPD/ZDisplayList.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp index 9d9cca3..8af7731 100644 --- a/ZAPD/ZDisplayList.cpp +++ b/ZAPD/ZDisplayList.cpp @@ -1,16 +1,15 @@ #include "ZDisplayList.h" -#include <File.h> -#include <Path.h> +#include <Utils/File.h> +#include <Utils/Path.h> #include <algorithm> #include <cassert> #include <chrono> #include <math.h> -#include "BitConverter.h" +#include "Utils/BitConverter.h" #include "Globals.h" -#include "HighLevel/HLModelIntermediette.h" #include "OutputFormatter.h" -#include "StringHelper.h" +#include "Utils/StringHelper.h" #include "gfxd.h" using namespace tinyxml2; @@ -2092,6 +2091,7 @@ bool ZDisplayList::TextureGenCheck(ZRoom* scene, ZFile* parent, std::string pref if (scene->parent->GetDeclaration(texAddr) == nullptr) { ZTexture* tex = scene->parent->GetTextureResource(texAddr); + if (tex != nullptr) tex->isPalette = texIsPalette; else @@ -2166,13 +2166,6 @@ TextureType ZDisplayList::TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSize return TextureType::RGBA16bpp; } -void ZDisplayList::GenerateHLIntermediette(HLFileIntermediette& hlFile) -{ - HLModelIntermediette* mdl = (HLModelIntermediette*)&hlFile; - HLModelIntermediette::FromZDisplayList(mdl, this); - mdl->blocks.push_back(new HLTerminator()); -} - bool ZDisplayList::IsExternalResource() const { return false; |