AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 12:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into omegapirate

Browse Source
This commit is contained in:
Luke Street
2020-04-18 18:14:51 -04:00
parent 3b0b3a39f9 81c2e5b03c
commit 30f2ac3f26
475 changed files with 8868 additions and 6713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/Particle/CParticleElectric.hpp
View File

@@ -85,28 +85,22 @@ private:
std::vector<zeus::CVector3f> x420_calculatedVerts;
std::vector<float> x430_fractalMags;
std::vector<zeus::CVector3f> x440_fractalOffsets;
bool x450_24_emitting : 1;
bool x450_25_haveGPSM : 1;
bool x450_26_haveEPSM : 1;
bool x450_27_haveSSWH : 1;
bool x450_28_haveLWD : 1;
bool x450_29_transformDirty : 1;
size_t m_nextLineRenderer = 0;
std::vector<std::unique_ptr<CLineRenderer>> m_lineRenderers;
union {
struct {
bool x450_24_emitting : 1;
bool x450_25_haveGPSM : 1;
bool x450_26_haveEPSM : 1;
bool x450_27_haveSSWH : 1;
bool x450_28_haveLWD : 1;
bool x450_29_transformDirty : 1;
};
u32 dummy = 0;
};
void SetupLineGXMaterial();
void DrawLineStrip(const std::vector<zeus::CVector3f>& verts, float width, const zeus::CColor& color);
void RenderLines();
void RenderSwooshes();
void UpdateCachedTransform();
void UpdateLine(int idx, int frame);
void UpdateLine(size_t idx, int frame);
void UpdateElectricalEffects();
void CalculateFractal(int start, int end, float ampl, float ampd);
void CalculatePoints();