mirror of
https://github.com/geode-sdk/geode.git
synced 2025-02-17 00:30:26 -05:00
fix particlesystem and particlesystemquad
This commit is contained in:
parent
faa0c77304
commit
a58d40889c
2 changed files with 19 additions and 4 deletions
|
@ -424,6 +424,9 @@ public:
|
|||
void stopSystem();
|
||||
//! Kill all living particles.
|
||||
void resetSystem();
|
||||
RT_ADD(
|
||||
void resumeSystem();
|
||||
)
|
||||
//! whether or not the system is full
|
||||
bool isFull();
|
||||
|
||||
|
@ -437,13 +440,26 @@ public:
|
|||
|
||||
protected:
|
||||
virtual void updateBlendFunc();
|
||||
|
||||
RT_ADD(
|
||||
// saved/loaded in loadDefaults, loadScaledDefaults and saveDefaults
|
||||
|
||||
float m_fDefaultStartSize;
|
||||
float m_fDefaultStartSizeVar;
|
||||
// saved as m_fEndSize but not loaded,
|
||||
// probably was supposed to be m_fDefaultEndSizeVar and saved and loaded as m_fEndSizeVar but was scrapped?
|
||||
float m_fDefaultEndSize2;
|
||||
float m_fDefaultEndSize;
|
||||
float m_fDefaultModeASpeed;
|
||||
float m_fDefaultModeASpeedVar;
|
||||
CCPoint m_tDefaultPosVar;
|
||||
)
|
||||
public:
|
||||
RT_ADD(
|
||||
void saveDefaults(void);
|
||||
void loadDefaults(void);
|
||||
void loadScaledDefaults(float);
|
||||
void resumeSystem(void);
|
||||
void saveDefaults(void);
|
||||
);
|
||||
)
|
||||
};
|
||||
|
||||
// end of particle_nodes group
|
||||
|
|
|
@ -55,7 +55,6 @@ class CC_DLL CCParticleSystemQuad : public CCParticleSystem
|
|||
GEODE_FRIEND_MODIFY
|
||||
protected:
|
||||
|
||||
PAD(0x20);
|
||||
ccV3F_C4B_T2F_Quad *m_pQuads; // quads to be rendered
|
||||
GLushort *m_pIndices; // indices
|
||||
|
||||
|
|
Loading…
Reference in a new issue