mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-07-04 18:21:49 +00:00
chore: use RawTemplater to template XModel loading code for t5 and t6
This commit is contained in:
@ -2,14 +2,14 @@
|
||||
|
||||
#include "GltfInput.h"
|
||||
#include "XModel/Gltf/JsonGltf.h"
|
||||
#include "XModel/XModelLoader.h"
|
||||
#include "XModel/XModelFileLoader.h"
|
||||
|
||||
#include <memory>
|
||||
#include <ostream>
|
||||
|
||||
namespace gltf
|
||||
{
|
||||
class Loader : public XModelLoader
|
||||
class Loader : public XModelFileLoader
|
||||
{
|
||||
public:
|
||||
Loader() = default;
|
||||
|
18
src/ObjLoading/XModel/XModelFileLoader.h
Normal file
18
src/ObjLoading/XModel/XModelFileLoader.h
Normal file
@ -0,0 +1,18 @@
|
||||
#pragma once
|
||||
|
||||
#include "XModel/XModelCommon.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
class XModelFileLoader
|
||||
{
|
||||
public:
|
||||
XModelFileLoader() = default;
|
||||
virtual ~XModelFileLoader() = default;
|
||||
XModelFileLoader(const XModelFileLoader& other) = default;
|
||||
XModelFileLoader(XModelFileLoader&& other) noexcept = default;
|
||||
XModelFileLoader& operator=(const XModelFileLoader& other) = default;
|
||||
XModelFileLoader& operator=(XModelFileLoader&& other) noexcept = default;
|
||||
|
||||
virtual std::unique_ptr<XModelCommon> Load() = 0;
|
||||
};
|
@ -1,9 +1,24 @@
|
||||
#pragma once
|
||||
#options GAME (T5, T6)
|
||||
|
||||
#ifndef GAME_NAMESPACE
|
||||
#error Must define GAME_NAMESPACE
|
||||
#filename "Game/" + GAME + "/XModel/XModelLoader" + GAME + ".cpp"
|
||||
|
||||
#set LOADER_HEADER "\"XModelLoader" + GAME + ".h\""
|
||||
#set COMMON_HEADER "\"Game/" + GAME + "/Common" + GAME + ".h\""
|
||||
#set CONSTANTS_HEADER "\"Game/" + GAME + "/XModel/XModelConstants" + GAME + ".h\""
|
||||
#set JSON_HEADER "\"Game/" + GAME + "/XModel/JsonXModel" + GAME + ".h\""
|
||||
|
||||
#if GAME == "T5"
|
||||
#define FEATURE_T5
|
||||
#elif GAME == "T6"
|
||||
#define FEATURE_T6
|
||||
#endif
|
||||
|
||||
#include LOADER_HEADER
|
||||
|
||||
#include COMMON_HEADER
|
||||
#include CONSTANTS_HEADER
|
||||
#include JSON_HEADER
|
||||
|
||||
#include "ObjLoading.h"
|
||||
#include "Utils/QuatInt16.h"
|
||||
#include "Utils/StringUtils.h"
|
||||
@ -26,9 +41,10 @@
|
||||
#include <format>
|
||||
#include <iostream>
|
||||
#include <numeric>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
|
||||
namespace GAME_NAMESPACE
|
||||
namespace GAME
|
||||
{
|
||||
class XModelLoader
|
||||
{
|
||||
@ -794,4 +810,14 @@ namespace GAME_NAMESPACE
|
||||
PartClassificationState& m_part_classification_state;
|
||||
std::set<XAssetInfoGeneric*>& m_dependencies;
|
||||
};
|
||||
} // namespace GAME_NAMESPACE
|
||||
|
||||
bool LoadXModel(std::istream& stream, XModel& xmodel, MemoryManager* memory, IAssetLoadingManager* manager, std::vector<XAssetInfoGeneric*>& dependencies)
|
||||
{
|
||||
std::set<XAssetInfoGeneric*> dependenciesSet;
|
||||
XModelLoader loader(stream, *memory, *manager, dependenciesSet);
|
||||
|
||||
dependencies.assign(dependenciesSet.cbegin(), dependenciesSet.cend());
|
||||
|
||||
return loader.Load(xmodel);
|
||||
}
|
||||
} // namespace GAME
|
@ -1,18 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include "XModel/XModelCommon.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
class XModelLoader
|
||||
{
|
||||
public:
|
||||
XModelLoader() = default;
|
||||
virtual ~XModelLoader() = default;
|
||||
XModelLoader(const XModelLoader& other) = default;
|
||||
XModelLoader(XModelLoader&& other) noexcept = default;
|
||||
XModelLoader& operator=(const XModelLoader& other) = default;
|
||||
XModelLoader& operator=(XModelLoader&& other) noexcept = default;
|
||||
|
||||
virtual std::unique_ptr<XModelCommon> Load() = 0;
|
||||
};
|
19
src/ObjLoading/XModel/XModelLoader.h.template
Normal file
19
src/ObjLoading/XModel/XModelLoader.h.template
Normal file
@ -0,0 +1,19 @@
|
||||
#options GAME (T5, T6)
|
||||
|
||||
#filename "Game/" + GAME + "/XModel/XModelLoader" + GAME + ".h"
|
||||
|
||||
#set GAME_HEADER "\"Game/" + GAME + "/" + GAME + ".h\""
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "AssetLoading/IAssetLoadingManager.h"
|
||||
#include GAME_HEADER
|
||||
#include "Utils/MemoryManager.h"
|
||||
|
||||
#include <istream>
|
||||
#include <vector>
|
||||
|
||||
namespace GAME
|
||||
{
|
||||
bool LoadXModel(std::istream& stream, XModel& xmodel, MemoryManager* memory, IAssetLoadingManager* manager, std::vector<XAssetInfoGeneric*>& dependencies);
|
||||
}
|
Reference in New Issue
Block a user