zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 08:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move t6 xmodel json to proper folder

Browse Source
This commit is contained in:
Jan 2024-09-13 21:50:28 +02:00
parent e9c66a2e28
commit 28ecee3a1d
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ObjCommon/Game/T6/Json/JsonXModel.h → src/ObjCommon/Game/T6/XModel/JsonXModel.h
View File

@ -1,11 +1,7 @@
#pragma once #pragma once
#include "Game/T6/T6.h"
#include "Json/JsonCommon.h" #include "Json/JsonCommon.h"
#include "Json/JsonExtension.h"
#include <memory> #include <memory>
#include <nlohmann/json.hpp>
#include <optional> #include <optional>
#include <string> #include <string>
#include <vector> #include <vector>

3
src/ObjCommon/Json/JsonCommon.h
View File

@ -1,7 +1,10 @@
#pragma once #pragma once
#include "Json/JsonExtension.h" #include "Json/JsonExtension.h"
#pragma warning(push, 0)
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#pragma warning(pop)
class JsonVec2 class JsonVec2
{ {

2
src/ObjLoading/Game/T6/XModel/XModelLoaderT6.cpp
View File

@ -1,7 +1,7 @@
#include "XModelLoaderT6.h" #include "XModelLoaderT6.h"
#include "Game/T6/CommonT6.h" #include "Game/T6/CommonT6.h"
#include "Game/T6/Json/JsonXModel.h" #include "Game/T6/XModel/JsonXModel.h"
#define GAME_NAMESPACE T6 #define GAME_NAMESPACE T6