From 2d745752676d06e39bf73d6b3022a86f139c5e5e Mon Sep 17 00:00:00 2001 From: Luke Street Date: Wed, 21 Oct 2020 00:56:09 -0400 Subject: [PATCH] DataSpec: Fix CMDL compilation with GCC --- DataSpec/DNACommon/CMDL.cpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/DataSpec/DNACommon/CMDL.cpp b/DataSpec/DNACommon/CMDL.cpp index 0e1f41c6f..be1bc83e4 100644 --- a/DataSpec/DNACommon/CMDL.cpp +++ b/DataSpec/DNACommon/CMDL.cpp @@ -1009,6 +1009,36 @@ atUint32 ReadGeomSectionsToBlender(hecl::blender::PyOutStream& os, athena::io::I return lastDlSec; } +template atUint32 +ReadGeomSectionsToBlender, DNAMP1::MaterialSet, + std::pair, std::pair>, + DNACMDL::SurfaceHeader_1>( + hecl::blender::PyOutStream& os, athena::io::IStreamReader& reader, PAKRouter& pakRouter, + const typename PAKRouter::EntryType& entry, + const std::pair, std::pair>& rp, bool shortNormals, + bool shortUVs, std::vector& vertAttribs, int meshIdx, atUint32 secCount, atUint32 matSetCount, + const atUint32* secSizes, atUint32 surfaceCount); + +template atUint32 +ReadGeomSectionsToBlender, DNAMP2::MaterialSet, + std::pair, std::pair>, + DNACMDL::SurfaceHeader_2>( + hecl::blender::PyOutStream& os, athena::io::IStreamReader& reader, PAKRouter& pakRouter, + const typename PAKRouter::EntryType& entry, + const std::pair, std::pair>& rp, bool shortNormals, + bool shortUVs, std::vector& vertAttribs, int meshIdx, atUint32 secCount, atUint32 matSetCount, + const atUint32* secSizes, atUint32 surfaceCount); + +template atUint32 +ReadGeomSectionsToBlender, DNAMP3::MaterialSet, + std::pair, std::pair>, + DNACMDL::SurfaceHeader_3>( + hecl::blender::PyOutStream& os, athena::io::IStreamReader& reader, PAKRouter& pakRouter, + const typename PAKRouter::EntryType& entry, + const std::pair, std::pair>& rp, bool shortNormals, + bool shortUVs, std::vector& vertAttribs, int meshIdx, atUint32 secCount, atUint32 matSetCount, + const atUint32* secSizes, atUint32 surfaceCount); + template bool ReadCMDLToBlender(hecl::blender::Connection& conn, athena::io::IStreamReader& reader, PAKRouter& pakRouter, const typename PAKRouter::EntryType& entry, const SpecBase& dataspec, const RigPair& rp) {