mirror of https://github.com/AxioDL/metaforce.git
Class name fix
This commit is contained in:
parent
080c484a96
commit
259eb89b00
|
@ -14,7 +14,7 @@ namespace Retro
|
|||
class CMetroidModelInstance;
|
||||
class CLight;
|
||||
class CAreaOctTree;
|
||||
class CParticleGen;
|
||||
class CElementGen;
|
||||
class CModel;
|
||||
class CSkinnedModel;
|
||||
|
||||
|
@ -42,7 +42,7 @@ public:
|
|||
virtual void DrawSortedGeometry(const std::vector<CLight>&, int, unsigned int, unsigned int);
|
||||
virtual void DrawStaticGeometry(const std::vector<CLight>&, int, unsigned int, unsigned int);
|
||||
virtual void PostRenderFogs();
|
||||
virtual void AddParticleGen(const CParticleGen&);
|
||||
virtual void AddParticleGen(const CElementGen&);
|
||||
virtual void AddPlaneObject(const void*, const CAABox&, const CPlane&, int);
|
||||
virtual void AddDrawable(void const *, const CVector3f&, const CAABox&, int, EDrawableSorting);
|
||||
virtual void SetDrawableCallback(TDrawableCallback, const void*);
|
||||
|
|
|
@ -1,12 +1,20 @@
|
|||
#ifndef __RETRO_CELEMENTGEN_HPP__
|
||||
#define __RETRO_CELEMENTGEN_HPP__
|
||||
|
||||
#include "CParticleGen.hpp"
|
||||
#include "../RetroTypes.hpp"
|
||||
#include "CTransform.hpp"
|
||||
#include "CColor.hpp"
|
||||
#include "CAABox.hpp"
|
||||
|
||||
namespace Retro
|
||||
{
|
||||
class CWarp;
|
||||
class CLight;
|
||||
class CGenDescription
|
||||
{
|
||||
};
|
||||
|
||||
class CElementGen : public CParticleGen
|
||||
class CElementGen
|
||||
{
|
||||
bool x68_particleEmission;
|
||||
float x78_generatorRate;
|
||||
|
@ -40,6 +48,29 @@ public:
|
|||
{
|
||||
}
|
||||
void BuildParticleSystemBounds();
|
||||
|
||||
virtual ~CElementGen() {}
|
||||
virtual void Update(double);
|
||||
virtual void Render();
|
||||
virtual void SetOrientation(const Zeus::CTransform&);
|
||||
virtual void SetTranslation(const Zeus::CVector3f&);
|
||||
virtual void SetGlobalOrientation(const Zeus::CTransform&);
|
||||
virtual void SetGlobalTranslation(const Zeus::CVector3f&);
|
||||
virtual void SetGlobalScale(const Zeus::CVector3f&);
|
||||
virtual void SetLocalScale(const Zeus::CVector3f&);
|
||||
virtual void SetParticleEmission(bool);
|
||||
virtual void SetModulationColor(const Zeus::CColor&);
|
||||
virtual const Zeus::CTransform& GetOrientation() const;
|
||||
virtual const Zeus::CVector3f& GetTranslation() const;
|
||||
virtual const Zeus::CVector3f& GetGlobalScale() const;
|
||||
virtual const Zeus::CColor& GetModulationColor() const;
|
||||
virtual bool IsSystemDeletable() const;
|
||||
virtual Zeus::CAABox GetBounds() const;
|
||||
virtual u32 GetParticleCount() const;
|
||||
virtual bool SystemHasLight() const;
|
||||
virtual CLight GetLight() const;
|
||||
virtual void DestroyParticles();
|
||||
virtual void AddModifier(CWarp*);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -14,7 +14,6 @@ add_library(RuntimeCommonParticle
|
|||
CDecalDescription.hpp CDecalDescription.cpp
|
||||
CWeaponDescription.hpp CWeaponDescription.cpp
|
||||
CDecalDataFactory.hpp CDecalDataFactory.cpp
|
||||
CParticleGen.hpp CParticleGen.cpp
|
||||
CElementGen.hpp CElementGen.cpp
|
||||
CParticleSwoosh.hpp CParticleSwoosh.cpp
|
||||
CParticleElectric.hpp CParticleElectric.cpp
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
namespace Retro
|
||||
{
|
||||
|
||||
class CParticleElectric : public CParticleGen
|
||||
class CParticleElectric : public CElementGen
|
||||
{
|
||||
};
|
||||
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
#ifndef __RETRO_CPARTICLEGEN_HPP__
|
||||
#define __RETRO_CPARTICLEGEN_HPP__
|
||||
|
||||
#include "../RetroTypes.hpp"
|
||||
#include "CParticleGen.hpp"
|
||||
#include "CTransform.hpp"
|
||||
#include "CColor.hpp"
|
||||
#include "CAABox.hpp"
|
||||
|
||||
namespace Retro
|
||||
{
|
||||
class CWarp;
|
||||
class CLight;
|
||||
class CGenDescription
|
||||
{
|
||||
};
|
||||
|
||||
class CParticleGen
|
||||
{
|
||||
public:
|
||||
virtual ~CParticleGen() {}
|
||||
virtual void Update(double);
|
||||
virtual void Render();
|
||||
virtual void SetOrientation(const Zeus::CTransform&);
|
||||
virtual void SetTranslation(const Zeus::CVector3f&);
|
||||
virtual void SetGlobalOrientation(const Zeus::CTransform&);
|
||||
virtual void SetGlobalTranslation(const Zeus::CVector3f&);
|
||||
virtual void SetGlobalScale(const Zeus::CVector3f&);
|
||||
virtual void SetLocalScale(const Zeus::CVector3f&);
|
||||
virtual void SetParticleEmission(bool);
|
||||
virtual void SetModulationColor(const Zeus::CColor&);
|
||||
virtual const Zeus::CTransform& GetOrientation() const;
|
||||
virtual const Zeus::CVector3f& GetTranslation() const;
|
||||
virtual const Zeus::CTransform& GetGlobalOrientation() const;
|
||||
virtual const Zeus::CVector3f& GetGlobalTranslation() const;
|
||||
virtual const Zeus::CVector3f& GetGlobalScale() const;
|
||||
virtual bool GetParticleEmission() const;
|
||||
virtual const Zeus::CColor& GetModulationColor() const;
|
||||
virtual bool IsSystemDeletable() const;
|
||||
virtual Zeus::CAABox GetBounds() const;
|
||||
virtual u32 GetParticleCount() const;
|
||||
virtual bool SystemHasLight() const;
|
||||
virtual CLight GetLight() const;
|
||||
virtual void DestroyParticles();
|
||||
virtual void AddModifier(CWarp*);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // __RETRO_CPARTICLEGEN_HPP__
|
|
@ -6,7 +6,7 @@
|
|||
namespace Retro
|
||||
{
|
||||
|
||||
class CParticleSwoosh : public CParticleGen
|
||||
class CParticleSwoosh : public CElementGen
|
||||
{
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue