AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows fixes

This commit is contained in:
Jack Andersen 2016-03-08 10:29:59 -10:00
parent 9203b69647
commit 2f14331d5d
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataSpec/DNACommon/CMDL.cpp
View File

@ -127,7 +127,7 @@ template void ReadMaterialSetToBlender_3<PAKRouter<DNAMP3::PAKBridge>, DNAMP3::M
(hecl::BlenderConnection::PyOutStream& os, (hecl::BlenderConnection::PyOutStream& os,
const DNAMP3::MaterialSet& matSet, const DNAMP3::MaterialSet& matSet,
const PAKRouter<DNAMP3::PAKBridge>& pakRouter, const PAKRouter<DNAMP3::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP3::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP3::PAKBridge>::EntryType& entry,
unsigned setIdx); unsigned setIdx);
class DLReader class DLReader
@ -1104,7 +1104,7 @@ template bool ReadCMDLToBlender<PAKRouter<DNAMP1::PAKBridge>, DNAMP1::MaterialSe
(hecl::BlenderConnection& conn, (hecl::BlenderConnection& conn,
athena::io::IStreamReader& reader, athena::io::IStreamReader& reader,
PAKRouter<DNAMP1::PAKBridge>& pakRouter, PAKRouter<DNAMP1::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP1::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP1::PAKBridge>::EntryType& entry,
const SpecBase& dataspec, const SpecBase& dataspec,
const std::pair<DNAMP1::CSKR*,DNAMP1::CINF*>& rp); const std::pair<DNAMP1::CSKR*,DNAMP1::CINF*>& rp);
@ -1113,7 +1113,7 @@ template bool ReadCMDLToBlender<PAKRouter<DNAMP2::PAKBridge>, DNAMP2::MaterialSe
(hecl::BlenderConnection& conn, (hecl::BlenderConnection& conn,
athena::io::IStreamReader& reader, athena::io::IStreamReader& reader,
PAKRouter<DNAMP2::PAKBridge>& pakRouter, PAKRouter<DNAMP2::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP2::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP2::PAKBridge>::EntryType& entry,
const SpecBase& dataspec, const SpecBase& dataspec,
const std::pair<DNAMP2::CSKR*,DNAMP2::CINF*>& rp); const std::pair<DNAMP2::CSKR*,DNAMP2::CINF*>& rp);
@ -1122,7 +1122,7 @@ template bool ReadCMDLToBlender<PAKRouter<DNAMP3::PAKBridge>, DNAMP3::MaterialSe
(hecl::BlenderConnection& conn, (hecl::BlenderConnection& conn,
athena::io::IStreamReader& reader, athena::io::IStreamReader& reader,
PAKRouter<DNAMP3::PAKBridge>& pakRouter, PAKRouter<DNAMP3::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP3::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP3::PAKBridge>::EntryType& entry,
const SpecBase& dataspec, const SpecBase& dataspec,
const std::pair<DNAMP3::CSKR*,DNAMP3::CINF*>& rp); const std::pair<DNAMP3::CSKR*,DNAMP3::CINF*>& rp);
@ -1131,7 +1131,7 @@ template bool ReadCMDLToBlender<PAKRouter<DNAMP3::PAKBridge>, DNAMP3::MaterialSe
(hecl::BlenderConnection& conn, (hecl::BlenderConnection& conn,
athena::io::IStreamReader& reader, athena::io::IStreamReader& reader,
PAKRouter<DNAMP3::PAKBridge>& pakRouter, PAKRouter<DNAMP3::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP3::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP3::PAKBridge>::EntryType& entry,
const SpecBase& dataspec, const SpecBase& dataspec,
const std::pair<DNAMP3::CSKR*,DNAMP3::CINF*>& rp); const std::pair<DNAMP3::CSKR*,DNAMP3::CINF*>& rp);
@ -1168,7 +1168,7 @@ void NameCMDL(athena::io::IStreamReader& reader,
template void NameCMDL<PAKRouter<DNAMP1::PAKBridge>, DNAMP1::MaterialSet> template void NameCMDL<PAKRouter<DNAMP1::PAKBridge>, DNAMP1::MaterialSet>
(athena::io::IStreamReader& reader, (athena::io::IStreamReader& reader,
PAKRouter<DNAMP1::PAKBridge>& pakRouter, PAKRouter<DNAMP1::PAKBridge>& pakRouter,
typename PAKRouter<DNAMP1::PAKBridge>::EntryType& entry, PAKRouter<DNAMP1::PAKBridge>::EntryType& entry,
const SpecBase& dataspec); const SpecBase& dataspec);
static void WriteDLVal(athena::io::FileWriter& writer, GX::AttrType type, atUint32 val) static void WriteDLVal(athena::io::FileWriter& writer, GX::AttrType type, atUint32 val)

6
DataSpec/DNACommon/MAPA.cpp
View File

@ -298,7 +298,7 @@ template bool ReadMAPAToBlender<PAKRouter<DNAMP1::PAKBridge>>
const MAPA& mapa, const MAPA& mapa,
const hecl::ProjectPath& outPath, const hecl::ProjectPath& outPath,
PAKRouter<DNAMP1::PAKBridge>& pakRouter, PAKRouter<DNAMP1::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP1::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP1::PAKBridge>::EntryType& entry,
bool force); bool force);
template bool ReadMAPAToBlender<PAKRouter<DNAMP2::PAKBridge>> template bool ReadMAPAToBlender<PAKRouter<DNAMP2::PAKBridge>>
@ -306,7 +306,7 @@ template bool ReadMAPAToBlender<PAKRouter<DNAMP2::PAKBridge>>
const MAPA& mapa, const MAPA& mapa,
const hecl::ProjectPath& outPath, const hecl::ProjectPath& outPath,
PAKRouter<DNAMP2::PAKBridge>& pakRouter, PAKRouter<DNAMP2::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP2::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP2::PAKBridge>::EntryType& entry,
bool force); bool force);
template bool ReadMAPAToBlender<PAKRouter<DNAMP3::PAKBridge>> template bool ReadMAPAToBlender<PAKRouter<DNAMP3::PAKBridge>>
@ -314,7 +314,7 @@ template bool ReadMAPAToBlender<PAKRouter<DNAMP3::PAKBridge>>
const MAPA& mapa, const MAPA& mapa,
const hecl::ProjectPath& outPath, const hecl::ProjectPath& outPath,
PAKRouter<DNAMP3::PAKBridge>& pakRouter, PAKRouter<DNAMP3::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP3::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP3::PAKBridge>::EntryType& entry,
bool force); bool force);
} }

6
DataSpec/DNACommon/MLVL.cpp
View File

@ -106,7 +106,7 @@ template bool ReadMLVLToBlender<PAKRouter<DNAMP1::PAKBridge>, DNAMP1::MLVL>
const DNAMP1::MLVL& mlvl, const DNAMP1::MLVL& mlvl,
const hecl::ProjectPath& outPath, const hecl::ProjectPath& outPath,
PAKRouter<DNAMP1::PAKBridge>& pakRouter, PAKRouter<DNAMP1::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP1::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP1::PAKBridge>::EntryType& entry,
bool force, bool force,
std::function<void(const hecl::SystemChar*)> fileChanged); std::function<void(const hecl::SystemChar*)> fileChanged);
@ -115,7 +115,7 @@ template bool ReadMLVLToBlender<PAKRouter<DNAMP2::PAKBridge>, DNAMP2::MLVL>
const DNAMP2::MLVL& mlvl, const DNAMP2::MLVL& mlvl,
const hecl::ProjectPath& outPath, const hecl::ProjectPath& outPath,
PAKRouter<DNAMP2::PAKBridge>& pakRouter, PAKRouter<DNAMP2::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP2::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP2::PAKBridge>::EntryType& entry,
bool force, bool force,
std::function<void(const hecl::SystemChar*)> fileChanged); std::function<void(const hecl::SystemChar*)> fileChanged);
@ -124,7 +124,7 @@ template bool ReadMLVLToBlender<PAKRouter<DNAMP3::PAKBridge>, DNAMP3::MLVL>
const DNAMP3::MLVL& mlvl, const DNAMP3::MLVL& mlvl,
const hecl::ProjectPath& outPath, const hecl::ProjectPath& outPath,
PAKRouter<DNAMP3::PAKBridge>& pakRouter, PAKRouter<DNAMP3::PAKBridge>& pakRouter,
const typename PAKRouter<DNAMP3::PAKBridge>::EntryType& entry, const PAKRouter<DNAMP3::PAKBridge>::EntryType& entry,
bool force, bool force,
std::function<void(const hecl::SystemChar*)> fileChanged); std::function<void(const hecl::SystemChar*)> fileChanged);

4
DataSpec/DNAMP1/DNAMP1.cpp
View File

@ -89,11 +89,7 @@ void PAKBridge::build()
} }
bool named; bool named;
#if HECL_UCS2 #if HECL_UCS2
<<<<<<< HEAD
level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry, named)); level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry, named));
=======
level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry));
>>>>>>> master
#else #else
level.name = m_pak.bestEntryName(entry, named); level.name = m_pak.bestEntryName(entry, named);
#endif #endif

2
DataSpec/DNAMP2/DNAMP2.cpp
View File

@ -83,7 +83,7 @@ void PAKBridge::build()
} }
bool named; bool named;
#if HECL_UCS2 #if HECL_UCS2
level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry)); level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry, named));
#else #else
level.name = m_pak.bestEntryName(entry, named); level.name = m_pak.bestEntryName(entry, named);
#endif #endif

2
DataSpec/DNAMP3/DNAMP3.cpp
View File

@ -91,7 +91,7 @@ void PAKBridge::build()
} }
bool named; bool named;
#if HECL_UCS2 #if HECL_UCS2
level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry)); level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry, named));
#else #else
level.name = m_pak.bestEntryName(entry, named); level.name = m_pak.bestEntryName(entry, named);
#endif #endif

2
Editor/ProjectResourceFactory.cpp
View File

@ -56,7 +56,7 @@ std::unique_ptr<urde::IObj> ProjectResourceFactory::Build(const urde::SObjectTag
if (search == m_tagToPath.end()) if (search == m_tagToPath.end())
return {}; return {};
fprintf(stderr, "Loading resource %s\n", search->second.getRelativePath().c_str()); //fprintf(stderr, "Loading resource %s\n", search->second.getRelativePath().c_str());
athena::io::FileReader fr(search->second.getAbsolutePath(), 32 * 1024, false); athena::io::FileReader fr(search->second.getAbsolutePath(), 32 * 1024, false);
if (fr.hasError()) if (fr.hasError())
return {}; return {};

4
Editor/icons/icons.cpp
View File

@ -47,6 +47,8 @@ specter::Icon& GetIcon(SpaceIcon icon)
return g_IconAtlas.getIcon(0, 3); return g_IconAtlas.getIcon(0, 3);
case SpaceIcon::ModelViewer: case SpaceIcon::ModelViewer:
return g_IconAtlas.getIcon(0, 4); return g_IconAtlas.getIcon(0, 4);
default:
return g_IconAtlas.getIcon(6, 0);
} }
} }
@ -84,6 +86,8 @@ specter::Icon& GetIcon(MonoIcon icon)
return g_IconAtlas.getIcon(6, 5); return g_IconAtlas.getIcon(6, 5);
case MonoIcon::Info: case MonoIcon::Info:
return g_IconAtlas.getIcon(6, 6); return g_IconAtlas.getIcon(6, 6);
default:
return g_IconAtlas.getIcon(6, 0);
} }
} }

2
hecl

@ -1 +1 @@
Subproject commit 0e0e454adec26503b896e3cb2f02195b3516c4a0 Subproject commit b11749b3cbba5dfd4c1581b7527934d72afb1ee0