2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 19:07:44 +00:00

Rename namespaces

This commit is contained in:
2016-02-13 01:02:47 -08:00
parent 4595b7b6ab
commit af69c9d3ab
404 changed files with 790 additions and 787 deletions

View File

@@ -3,7 +3,7 @@
#include "CRandom16.hpp"
#include <math.h>
namespace Retro
namespace pshag
{
CCEKeyframeEmitter::CCEKeyframeEmitter(CInputStream& in)

View File

@@ -1,9 +1,9 @@
#ifndef __RETRO_CCOLORELEMENT_HPP__
#define __RETRO_CCOLORELEMENT_HPP__
#ifndef __PSHAG_CCOLORELEMENT_HPP__
#define __PSHAG_CCOLORELEMENT_HPP__
#include "IElement.hpp"
namespace Retro
namespace pshag
{
class CCEKeyframeEmitter : public CColorElement
@@ -94,4 +94,4 @@ public:
};
}
#endif // __RETRO_CCOLORELEMENT_HPP__
#endif // __PSHAG_CCOLORELEMENT_HPP__

View File

@@ -2,7 +2,7 @@
#include "CDecalDescription.hpp"
#include "CSimplePool.hpp"
namespace Retro
namespace pshag
{
std::unique_ptr<IObj> FDealDataFactory(const SObjectTag &tag, CInputStream &in, const CVParamTransfer &vparms)
{

View File

@@ -1,5 +1,5 @@
#ifndef __RETRO_CDECALDATAFACTORY_HPP__
#define __RETRO_CDECALDATAFACTORY_HPP__
#ifndef __PSHAG_CDECALDATAFACTORY_HPP__
#define __PSHAG_CDECALDATAFACTORY_HPP__
#include "RetroTypes.hpp"
#include "IObj.hpp"
@@ -7,7 +7,7 @@
#include "IOStreams.hpp"
namespace Retro
namespace pshag
{
class CDecalDescription;
class CSimplePool;
@@ -22,4 +22,4 @@ public:
std::unique_ptr<IObj> FDealDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms);
}
#endif // __RETRO_CDECALDATAFACTORY_HPP__
#endif // __PSHAG_CDECALDATAFACTORY_HPP__

View File

@@ -1,11 +1,11 @@
#ifndef __RETRO_CDECALDESCRIPTION_HPP__
#define __RETRO_CDECALDESCRIPTION_HPP__
#ifndef __PSHAG_CDECALDESCRIPTION_HPP__
#define __PSHAG_CDECALDESCRIPTION_HPP__
namespace Retro
namespace pshag
{
class CDecalDescription
{
};
}
#endif // __RETRO_CDECALDESCRIPTION_HPP__
#endif // __PSHAG_CDECALDESCRIPTION_HPP__

View File

@@ -1,7 +1,7 @@
#ifndef __RETRO_CDECALMANAGER_HPP__
#define __RETRO_CDECALMANAGER_HPP__
#ifndef __PSHAG_CDECALMANAGER_HPP__
#define __PSHAG_CDECALMANAGER_HPP__
namespace Retro
namespace pshag
{
class CDecalManager
@@ -14,4 +14,4 @@ public:
}
#endif // __RETRO_CDECALMANAGER_HPP__
#endif // __PSHAG_CDECALMANAGER_HPP__

View File

@@ -1,5 +1,5 @@
#ifndef __RETRO_CELECTRICDESCRIPTION_HPP__
#define __RETRO_CELECTRICDESCRIPTION_HPP__
#ifndef __PSHAG_CELECTRICDESCRIPTION_HPP__
#define __PSHAG_CELECTRICDESCRIPTION_HPP__
#include "CParticleDataFactory.hpp"
#include "CRealElement.hpp"
@@ -9,7 +9,7 @@
#include "CColorElement.hpp"
#include "CUVElement.hpp"
namespace Retro
namespace pshag
{
class CElectricDescription
{
@@ -37,4 +37,4 @@ public:
};
}
#endif // __RETRO_CELECTRICDESCRIPTION_HPP__
#endif // __PSHAG_CELECTRICDESCRIPTION_HPP__

View File

@@ -5,7 +5,7 @@
#include "CParticleElectric.hpp"
#include "CModel.hpp"
namespace Retro
namespace pshag
{
static LogVisor::LogModule Log("Retro::CElementGen");

View File

@@ -1,5 +1,5 @@
#ifndef __RETRO_CELEMENTGEN_HPP__
#define __RETRO_CELEMENTGEN_HPP__
#ifndef __PSHAG_CELEMENTGEN_HPP__
#define __PSHAG_CELEMENTGEN_HPP__
#include "RetroTypes.hpp"
#include "CTransform.hpp"
@@ -12,7 +12,7 @@
#include "CRandom16.hpp"
#include "CParticleGen.hpp"
namespace Retro
namespace pshag
{
class CWarp;
class CLight;
@@ -221,4 +221,4 @@ ENABLE_BITWISE_ENUM(CElementGen::EOptionalSystemFlags)
}
#endif // __RETRO_CELEMENTGEN_HPP__
#endif // __PSHAG_CELEMENTGEN_HPP__

View File

@@ -1,9 +1,9 @@
#ifndef __RETRO_CEMITTERELEMENT_HPP__
#define __RETRO_CEMITTERELEMENT_HPP__
#ifndef __PSHAG_CEMITTERELEMENT_HPP__
#define __PSHAG_CEMITTERELEMENT_HPP__
#include "IElement.hpp"
namespace Retro
namespace pshag
{
class CEESimpleEmitter : public CEmitterElement
@@ -45,4 +45,4 @@ public:
}
#endif // __RETRO_CEMITTERELEMENT_HPP__
#endif // __PSHAG_CEMITTERELEMENT_HPP__

View File

@@ -1,5 +1,5 @@
#ifndef __RETRO_CGENDESCRIPTION_HPP__
#define __RETRO_CGENDESCRIPTION_HPP__
#ifndef __PSHAG_CGENDESCRIPTION_HPP__
#define __PSHAG_CGENDESCRIPTION_HPP__
#include <memory>
#include "CRealElement.hpp"
@@ -12,7 +12,7 @@
#include "CSpawnSystemKeyframeData.hpp"
#include "CParticleDataFactory.hpp"
namespace Retro
namespace pshag
{
class CGenDescription
@@ -112,4 +112,4 @@ public:
}
#endif // __RETRO_CGENDESCRIPTION_HPP__
#endif // __PSHAG_CGENDESCRIPTION_HPP__

View File

@@ -2,7 +2,7 @@
#include "CParticleGlobals.hpp"
#include "CRandom16.hpp"
namespace Retro
namespace pshag
{
CIEKeyframeEmitter::CIEKeyframeEmitter(CInputStream& in)

View File

@@ -1,9 +1,9 @@
#ifndef __RETRO_CINTELEMENT_HPP__
#define __RETRO_CINTELEMENT_HPP__
#ifndef __PSHAG_CINTELEMENT_HPP__
#define __PSHAG_CINTELEMENT_HPP__
#include "IElement.hpp"
namespace Retro
namespace pshag
{
class CIEKeyframeEmitter : public CIntElement
@@ -192,4 +192,4 @@ public:
}
#endif // __RETRO_CINTELEMENT_HPP__
#endif // __PSHAG_CINTELEMENT_HPP__

View File

@@ -3,7 +3,7 @@
#include "CRandom16.hpp"
#include <math.h>
namespace Retro
namespace pshag
{
bool CMVEImplosion::GetValue(int frame, Zeus::CVector3f& pVel, Zeus::CVector3f& pPos) const

View File

@@ -1,9 +1,9 @@
#ifndef __RETRO_CMODVECTORELEMENT_HPP__
#define __RETRO_CMODVECTORELEMENT_HPP__
#ifndef __PSHAG_CMODVECTORELEMENT_HPP__
#define __PSHAG_CMODVECTORELEMENT_HPP__
#include "IElement.hpp"
namespace Retro
namespace pshag
{
class CMVEImplosion : public CModVectorElement
@@ -155,4 +155,4 @@ public:
}
#endif // __RETRO_CMODVECTORELEMENT_HPP__
#endif // __PSHAG_CMODVECTORELEMENT_HPP__

View File

@@ -3,7 +3,7 @@
#include "CSimplePool.hpp"
#include "CGenDescription.hpp"
namespace Retro
namespace pshag
{
static LogVisor::LogModule Log("Retro::CParticleDataFactory");

View File

@@ -1,12 +1,12 @@
#ifndef __RETRO_CPARTICLEDATAFACTORY_HPP__
#define __RETRO_CPARTICLEDATAFACTORY_HPP__
#ifndef __PSHAG_CPARTICLEDATAFACTORY_HPP__
#define __PSHAG_CPARTICLEDATAFACTORY_HPP__
#include "RetroTypes.hpp"
#include "IObj.hpp"
#include "CToken.hpp"
#include "IOStreams.hpp"
namespace Retro
namespace pshag
{
class CGenDescription;
class CSwooshDescription;
@@ -82,4 +82,4 @@ std::unique_ptr<IObj> FParticleFactory(const SObjectTag& tag, CInputStream& in,
}
#endif // __RETRO_CPARTICLEDATAFACTORY_HPP__
#endif // __PSHAG_CPARTICLEDATAFACTORY_HPP__

View File

@@ -1,6 +1,6 @@
#include "CParticleElectric.hpp"
namespace Retro
namespace pshag
{
CParticleElectric::CParticleElectric(const TToken<CElectricDescription>& desc)

View File

@@ -1,10 +1,10 @@
#ifndef __RETRO_CPARTICLEELECTRIC_HPP__
#define __RETRO_CPARTICLEELECTRIC_HPP__
#ifndef __PSHAG_CPARTICLEELECTRIC_HPP__
#define __PSHAG_CPARTICLEELECTRIC_HPP__
#include "CParticleGen.hpp"
#include "CToken.hpp"
namespace Retro
namespace pshag
{
class CElectricDescription;
@@ -40,4 +40,4 @@ public:
}
#endif // __RETRO_CPARTICLEELECTRIC_HPP__
#endif // __PSHAG_CPARTICLEELECTRIC_HPP__

View File

@@ -4,7 +4,7 @@
#include "CSimplePool.hpp"
#include "CRandom16.hpp"
namespace Retro
namespace pshag
{
static LogVisor::LogModule Log("Retro::CParticleElectricDataFactory");
@@ -88,7 +88,7 @@ bool CParticleElectricDataFactory::CreateELSM(CElectricDescription *desc, CInput
break;
case SBIG('SSWH'):
desc->x40_SSWH = CPF::GetSwooshGeneratorDesc(in, resPool);
break;
break;
case SBIG('GPSM'):
{
std::vector<TResId> tracker;
@@ -118,7 +118,7 @@ bool CParticleElectricDataFactory::CreateELSM(CElectricDescription *desc, CInput
return true;
}
std::unique_ptr<Retro::IObj> FParticleElecrticFactory(const Retro::SObjectTag &tag, Retro::CInputStream &in, const Retro::CVParamTransfer &vparms)
std::unique_ptr<pshag::IObj> FParticleElecrticFactory(const pshag::SObjectTag &tag, pshag::CInputStream &in, const pshag::CVParamTransfer &vparms)
{
CSimplePool* sp = static_cast<CSimplePool*>(static_cast<TObjOwnerParam<IObjectStore*>*>(vparms.GetObj())->GetParam());
return TToken<CElectricDescription>::GetIObjObjectFor(std::unique_ptr<CElectricDescription>(CParticleElectricDataFactory::GetGeneratorDesc(in, sp)));

View File

@@ -1,12 +1,12 @@
#ifndef __RETRO_CPARTICLEELECTRICDATAFACTORY_HPP__
#define __RETRO_CPARTICLEELECTRICDATAFACTORY_HPP__
#ifndef __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__
#define __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__
#include "RetroTypes.hpp"
#include "IObj.hpp"
#include "CToken.hpp"
#include "IOStreams.hpp"
namespace Retro
namespace pshag
{
class CElectricDescription;
class CSimplePool;
@@ -22,4 +22,4 @@ public:
std::unique_ptr<IObj> FParticleElectricDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms);
}
#endif // __RETRO_CPARTICLEELECTRICDATAFACTORY_HPP__
#endif // __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__

View File

@@ -1,6 +1,6 @@
#include "CParticleGen.hpp"
namespace Retro
namespace pshag
{
void CParticleGen::AddModifier(CWarp* mod)

View File

@@ -1,5 +1,5 @@
#ifndef __RETRO_CPARTICLEGEN_HPP__
#define __RETRO_CPARTICLEGEN_HPP__
#ifndef __PSHAG_CPARTICLEGEN_HPP__
#define __PSHAG_CPARTICLEGEN_HPP__
#include "RetroTypes.hpp"
#include "CLight.hpp"
@@ -10,7 +10,7 @@
#include "CAABox.hpp"
#include <list>
namespace Retro
namespace pshag
{
class CParticleGen
@@ -48,4 +48,4 @@ public:
}
#endif // __RETRO_CPARTICLEGEN_HPP__
#endif // __PSHAG_CPARTICLEGEN_HPP__

View File

@@ -1,6 +1,6 @@
#include "CParticleGlobals.hpp"
namespace Retro
namespace pshag
{
int CParticleGlobals::g_EmitterTime = 0;

View File

@@ -1,9 +1,9 @@
#ifndef __RETRO_CPARTICLEGLOBALS_HPP__
#define __RETRO_CPARTICLEGLOBALS_HPP__
#ifndef __PSHAG_CPARTICLEGLOBALS_HPP__
#define __PSHAG_CPARTICLEGLOBALS_HPP__
#include "CVector3f.hpp"
namespace Retro
namespace pshag
{
class CParticleGlobals
@@ -51,4 +51,4 @@ public:
}
#endif // __RETRO_CPARTICLEGLOBALS_HPP__
#endif // __PSHAG_CPARTICLEGLOBALS_HPP__

View File

@@ -1,6 +1,6 @@
#include "CParticleSwoosh.hpp"
namespace Retro
namespace pshag
{
CParticleSwoosh::CParticleSwoosh(const TToken<CSwooshDescription>& desc, int)

View File

@@ -1,10 +1,10 @@
#ifndef __RETRO_CPARTICLESWOOSH_HPP__
#define __RETRO_CPARTICLESWOOSH_HPP__
#ifndef __PSHAG_CPARTICLESWOOSH_HPP__
#define __PSHAG_CPARTICLESWOOSH_HPP__
#include "CParticleGen.hpp"
#include "CToken.hpp"
namespace Retro
namespace pshag
{
class CSwooshDescription;
@@ -40,4 +40,4 @@ public:
}
#endif // __RETRO_CPARTICLESWOOSH_HPP__
#endif // __PSHAG_CPARTICLESWOOSH_HPP__

View File

@@ -3,7 +3,7 @@
#include "CRandom16.hpp"
#include "CSimplePool.hpp"
namespace Retro
namespace pshag
{
static LogVisor::LogModule Log("Retro::CParticleSwooshDataFactory");
@@ -132,7 +132,7 @@ bool CParticleSwooshDataFactory::CreateWPSM(CSwooshDescription* desc, CInputStre
return true;
}
std::unique_ptr<Retro::IObj> FParticleSwooshDataFactory(const SObjectTag &tag, CInputStream &in, const CVParamTransfer &vparms)
std::unique_ptr<pshag::IObj> FParticleSwooshDataFactory(const SObjectTag &tag, CInputStream &in, const CVParamTransfer &vparms)
{
CSimplePool* sp = static_cast<CSimplePool*>(static_cast<TObjOwnerParam<IObjectStore*>*>(vparms.GetObj())->GetParam());
return TToken<CSwooshDescription>::GetIObjObjectFor(std::unique_ptr<CSwooshDescription>(CParticleSwooshDataFactory::GetGeneratorDesc(in, sp)));

View File

@@ -1,12 +1,12 @@
#ifndef __RETRO_CPARTICLESWOOSHDATAFACTORY_HPP__
#define __RETRO_CPARTICLESWOOSHDATAFACTORY_HPP__
#ifndef __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__
#define __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__
#include "RetroTypes.hpp"
#include "IObj.hpp"
#include "CToken.hpp"
#include "IOStreams.hpp"
namespace Retro
namespace pshag
{
class CSwooshDescription;
class CSimplePool;
@@ -21,4 +21,4 @@ public:
std::unique_ptr<IObj> FParticleSwooshDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms);
}
#endif // __RETRO_CPARTICLESWOOSHDATAFACTORY_HPP__
#endif // __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__

View File

@@ -3,7 +3,7 @@
#include "CRandom16.hpp"
#include <math.h>
namespace Retro
namespace pshag
{
CREKeyframeEmitter::CREKeyframeEmitter(CInputStream& in)

View File

@@ -1,9 +1,9 @@
#ifndef __RETRO_CREALELEMENT_HPP__
#define __RETRO_CREALELEMENT_HPP__
#ifndef __PSHAG_CREALELEMENT_HPP__
#define __PSHAG_CREALELEMENT_HPP__
#include "IElement.hpp"
namespace Retro
namespace pshag
{
class CREKeyframeEmitter : public CRealElement
@@ -367,4 +367,4 @@ public:
};
}
#endif // __RETRO_CREALELEMENT_HPP__
#endif // __PSHAG_CREALELEMENT_HPP__

View File

@@ -1,7 +1,7 @@
#include "CSpawnSystemKeyframeData.hpp"
#include "CSimplePool.hpp"
namespace Retro
namespace pshag
{
CSpawnSystemKeyframeData::CSpawnSystemKeyframeData(CInputStream& in)

View File

@@ -1,10 +1,10 @@
#ifndef __RETRO_CSPAWNSYSTEMKEYFRAMEDATA_HPP__
#define __RETRO_CSPAWNSYSTEMKEYFRAMEDATA_HPP__
#ifndef __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__
#define __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__
#include "IOStreams.hpp"
#include "CToken.hpp"
namespace Retro
namespace pshag
{
class CSimplePool;
class CGenDescription;
@@ -40,4 +40,4 @@ public:
}
#endif // __RETRO_CSPAWNSYSTEMKEYFRAMEDATA_HPP__
#endif // __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__

View File

@@ -1,5 +1,5 @@
#ifndef __RETRO_CSWOOSHDESCRIPTION_HPP__
#define __RETRO_CSWOOSHDESCRIPTION_HPP__
#ifndef __PSHAG_CSWOOSHDESCRIPTION_HPP__
#define __PSHAG_CSWOOSHDESCRIPTION_HPP__
#include "CParticleDataFactory.hpp"
#include "CRealElement.hpp"
@@ -9,7 +9,7 @@
#include "CColorElement.hpp"
#include "CUVElement.hpp"
namespace Retro
namespace pshag
{
class CSwooshDescription
{
@@ -44,4 +44,4 @@ public:
};
}
#endif // __RETRO_CSWOOSHDESCRIPTION_HPP__
#endif // __PSHAG_CSWOOSHDESCRIPTION_HPP__

View File

@@ -1,6 +1,6 @@
#include "CUVElement.hpp"
namespace Retro
namespace pshag
{
CUVEAnimTexture::CUVEAnimTexture(TToken<CTexture>&& tex, CIntElement* a, CIntElement* b,

View File

@@ -1,11 +1,11 @@
#ifndef __RETRO_CUVELEMENT_HPP__
#define __RETRO_CUVELEMENT_HPP__
#ifndef __PSHAG_CUVELEMENT_HPP__
#define __PSHAG_CUVELEMENT_HPP__
#include "IElement.hpp"
#include "CToken.hpp"
#include "CTexture.hpp"
namespace Retro
namespace pshag
{
class CToken;
@@ -63,4 +63,4 @@ public:
}
#endif // __RETRO_CUVELEMENT_HPP__
#endif // __PSHAG_CUVELEMENT_HPP__

View File

@@ -3,7 +3,7 @@
#include "CRandom16.hpp"
#include <math.h>
namespace Retro
namespace pshag
{
CVEKeyframeEmitter::CVEKeyframeEmitter(CInputStream& in)

View File

@@ -1,9 +1,9 @@
#ifndef __RETRO_CVECTORELEMENT_HPP__
#define __RETRO_CVECTORELEMENT_HPP__
#ifndef __PSHAG_CVECTORELEMENT_HPP__
#define __PSHAG_CVECTORELEMENT_HPP__
#include "IElement.hpp"
namespace Retro
namespace pshag
{
class CVEKeyframeEmitter : public CVectorElement
@@ -205,4 +205,4 @@ public:
}
#endif // __RETRO_CVECTORELEMENT_HPP__
#endif // __PSHAG_CVECTORELEMENT_HPP__

View File

@@ -1,7 +1,7 @@
#ifndef __RETRO_CWARP_HPP__
#define __RETRO_CWARP_HPP__
#ifndef __PSHAG_CWARP_HPP__
#define __PSHAG_CWARP_HPP__
namespace Retro
namespace pshag
{
class CWarp
@@ -10,4 +10,4 @@ class CWarp
}
#endif // __RETRO_CWARP_HPP__
#endif // __PSHAG_CWARP_HPP__

View File

@@ -1,4 +1,4 @@
#ifndef __RETRO_CWEAPONDESCRIPTION_HPP__
#define __RETRO_CWEAPONDESCRIPTION_HPP__
#ifndef __PSHAG_CWEAPONDESCRIPTION_HPP__
#define __PSHAG_CWEAPONDESCRIPTION_HPP__
#endif // __RETRO_CWEAPONDESCRIPTION_HPP__
#endif // __PSHAG_CWEAPONDESCRIPTION_HPP__

View File

@@ -1,5 +1,5 @@
#ifndef __RETRO_IELEMENT_HPP__
#define __RETRO_IELEMENT_HPP__
#ifndef __PSHAG_IELEMENT_HPP__
#define __PSHAG_IELEMENT_HPP__
#include <memory>
#include "GCNTypes.hpp"
@@ -7,7 +7,7 @@
#include "CColor.hpp"
#include "IOStreams.hpp"
namespace Retro
namespace pshag
{
class IElement
@@ -56,4 +56,4 @@ public:
}
#endif // __RETRO_IELEMENT_HPP__
#endif // __PSHAG_IELEMENT_HPP__