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

Merge branch 'master' of https://github.com/AxioDL/PathShagged

This commit is contained in:
Phillip Stephens 2016-02-17 00:08:06 -08:00
parent 25de1ca641 6cabf3d3e7
commit f1bba142d5
11 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/ProjectResourceFactory.cpp
View File

@ -2,6 +2,10 @@
#include "Runtime/IOStreams.hpp" #include "Runtime/IOStreams.hpp"
#include "Runtime/Particle/CParticleDataFactory.hpp" #include "Runtime/Particle/CParticleDataFactory.hpp"
#include "Runtime/Particle/CGenDescription.hpp"
#include "Runtime/Particle/CElectricDescription.hpp"
#include "Runtime/Particle/CSwooshDescription.hpp"
#include "Runtime/CModel.hpp"
#include "Runtime/CTexture.hpp" #include "Runtime/CTexture.hpp"
namespace URDE namespace URDE

4
Editor/ViewManager.cpp
View File

@ -6,6 +6,10 @@
#include "locale/locale.hpp" #include "locale/locale.hpp"
#include "ResourceBrowser.hpp" #include "ResourceBrowser.hpp"
#include "icons/icons.hpp" #include "icons/icons.hpp"
#include "Runtime/Particle/CGenDescription.hpp"
#include "Runtime/Particle/CElectricDescription.hpp"
#include "Runtime/Particle/CSwooshDescription.hpp"
#include "Runtime/CModel.hpp"
#include <cstdio> #include <cstdio>
using YAMLNode = Athena::io::YAMLNode; using YAMLNode = Athena::io::YAMLNode;

4
Runtime/Particle/CCollisionResponseData.cpp
View File

@ -1,6 +1,10 @@
#include "CCollisionResponseData.hpp" #include "CCollisionResponseData.hpp"
#include "CParticleDataFactory.hpp" #include "CParticleDataFactory.hpp"
#include "CDecalDescription.hpp" #include "CDecalDescription.hpp"
#include "CSwooshDescription.hpp"
#include "CElectricDescription.hpp"
#include "CGenDescription.hpp"
#include "CModel.hpp"
#include "CSimplePool.hpp" #include "CSimplePool.hpp"
#include "CRandom16.hpp" #include "CRandom16.hpp"

2
Runtime/Particle/CElementGen.cpp
View File

@ -1,5 +1,7 @@
#include "CElementGen.hpp" #include "CElementGen.hpp"
#include "CGenDescription.hpp" #include "CGenDescription.hpp"
#include "CSwooshDescription.hpp"
#include "CElectricDescription.hpp"
#include "CParticleGlobals.hpp" #include "CParticleGlobals.hpp"
#include "CParticleSwoosh.hpp" #include "CParticleSwoosh.hpp"
#include "CParticleElectric.hpp" #include "CParticleElectric.hpp"

3
Runtime/Particle/CElementGenShadersGLSL.cpp
View File

@ -1,6 +1,9 @@
#include "CElementGenShaders.hpp" #include "CElementGenShaders.hpp"
#include "CElementGen.hpp" #include "CElementGen.hpp"
#include "CGenDescription.hpp" #include "CGenDescription.hpp"
#include "CElectricDescription.hpp"
#include "CSwooshDescription.hpp"
#include "CModel.hpp"
namespace pshag namespace pshag
{ {

3
Runtime/Particle/CElementGenShadersHLSL.cpp
View File

@ -1,6 +1,9 @@
#include "CElementGenShaders.hpp" #include "CElementGenShaders.hpp"
#include "CElementGen.hpp" #include "CElementGen.hpp"
#include "CGenDescription.hpp" #include "CGenDescription.hpp"
#include "CElectricDescription.hpp"
#include "CSwooshDescription.hpp"
#include "CModel.hpp"
namespace pshag namespace pshag
{ {

3
Runtime/Particle/CParticleDataFactory.cpp
View File

@ -3,6 +3,9 @@
#include "CSimplePool.hpp" #include "CSimplePool.hpp"
#include "CGenDescription.hpp" #include "CGenDescription.hpp"
#include "CRandom16.hpp" #include "CRandom16.hpp"
#include "CModel.hpp"
#include "CSwooshDescription.hpp"
#include "CElectricDescription.hpp"
namespace pshag namespace pshag
{ {

3
Runtime/Particle/CParticleElectricDataFactory.cpp
View File

@ -1,5 +1,8 @@
#include "CParticleElectricDataFactory.hpp" #include "CParticleElectricDataFactory.hpp"
#include "CSwooshDescription.hpp"
#include "CElectricDescription.hpp" #include "CElectricDescription.hpp"
#include "CGenDescription.hpp"
#include "CModel.hpp"
#include "CToken.hpp" #include "CToken.hpp"
#include "CSimplePool.hpp" #include "CSimplePool.hpp"
#include "CRandom16.hpp" #include "CRandom16.hpp"

3
Runtime/Particle/CParticleSwooshDataFactory.cpp
View File

@ -1,5 +1,8 @@
#include "CParticleSwooshDataFactory.hpp" #include "CParticleSwooshDataFactory.hpp"
#include "CSwooshDescription.hpp" #include "CSwooshDescription.hpp"
#include "CElectricDescription.hpp"
#include "CGenDescription.hpp"
#include "CModel.hpp"
#include "CRandom16.hpp" #include "CRandom16.hpp"
#include "CSimplePool.hpp" #include "CSimplePool.hpp"

4
Runtime/Particle/CProjectileWeaponDataFactory.cpp
View File

@ -1,6 +1,10 @@
#include "CProjectileWeaponDataFactory.hpp" #include "CProjectileWeaponDataFactory.hpp"
#include "CWeaponDescription.hpp" #include "CWeaponDescription.hpp"
#include "CCollisionResponseData.hpp" #include "CCollisionResponseData.hpp"
#include "CElectricDescription.hpp"
#include "CSwooshDescription.hpp"
#include "CGenDescription.hpp"
#include "CModel.hpp"
#include "CRandom16.hpp" #include "CRandom16.hpp"
#include "CSimplePool.hpp" #include "CSimplePool.hpp"

4
Runtime/Particle/CSpawnSystemKeyframeData.cpp
View File

@ -1,4 +1,8 @@
#include "CSpawnSystemKeyframeData.hpp" #include "CSpawnSystemKeyframeData.hpp"
#include "CGenDescription.hpp"
#include "CSwooshDescription.hpp"
#include "CElectricDescription.hpp"
#include "CModel.hpp"
#include "CSimplePool.hpp" #include "CSimplePool.hpp"
namespace pshag namespace pshag