AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 19:04:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into omegapirate

Browse Source 
# Conflicts:
#	Runtime/GuiSys/CAuiImagePane.cpp
This commit is contained in:
Luke Street
2020-04-19 22:12:18 -04:00
parent de5513e277 1fd28d3fc3
commit 32c44cbf05
37 changed files with 149 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Graphics/CModel.hpp
View File

@@ -5,12 +5,13 @@
#include <unordered_map>
#include <vector>
#include "DNACommon/CMDL.hpp"
#include "DNAMP1/CMDLMaterials.hpp"
#include "DataSpec/DNACommon/CMDL.hpp"
#include "DataSpec/DNAMP1/CMDLMaterials.hpp"
#include "Runtime/CFactoryMgr.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Shaders/CModelShaders.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/Graphics/Shaders/CModelShaders.hpp"
#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
#include <hecl/HMDLMeta.hpp>
@@ -22,7 +23,6 @@ class CLight;
class CModel;
class CPoseAsTransforms;
class CSkinRules;
class CTexture;
class IObjectStore;
struct CModelFlags {

1
Runtime/Graphics/Shaders/CTextSupportShader.cpp
View File

@@ -1,5 +1,6 @@
#include "Runtime/Graphics/Shaders/CTextSupportShader.hpp"
#include "Runtime/GuiSys/CFontImageDef.hpp"
#include "Runtime/GuiSys/CRasterFont.hpp"
#include <hecl/Pipeline.hpp>