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

Update Zeus

This commit is contained in:
Phillip Stephens 2015-10-07 17:30:10 -07:00
parent 3b7f7f2f3a
commit c13757106b
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MathLib

@ -1 +1 @@
Subproject commit 5270d232ab4d46dde7ea2e662a08a6ec3d4c9775 Subproject commit 57cfbc93b935b03edb3a1311b8c61afc1f69ae79

4
Runtime/Audio/CAudioSys.hpp
View File

@ -12,8 +12,8 @@ class CAudioSys
public: public:
struct C3DEmitterParmData struct C3DEmitterParmData
{ {
CVector3f pos; Zeus::CVector3f pos;
CVector3f dir; Zeus::CVector3f dir;
float maxDist; float maxDist;
float distComp; float distComp;
u32 flags; u32 flags;

8
Runtime/Input/CFinalInput.cpp
View File

@ -55,10 +55,10 @@ CFinalInput::CFinalInput(int cIdx, float dt,
float leftDiv, float rightDiv) float leftDiv, float rightDiv)
: x0_dt(dt), : x0_dt(dt),
x4_controllerIdx(cIdx), x4_controllerIdx(cIdx),
x8_anaLeftX(Math::clamp<float>(-1.0, data.m_leftStick[0] / 72.0 / leftDiv, 1.0)), x8_anaLeftX(Zeus::Math::clamp(-1.0f, data.m_leftStick[0] / 72.0f / leftDiv, 1.0f)),
xc_anaLeftY(Math::clamp<float>(-1.0, data.m_leftStick[1] / 72.0 / leftDiv, 1.0)), xc_anaLeftY(Zeus::Math::clamp(-1.0f, data.m_leftStick[1] / 72.0f / leftDiv, 1.0f)),
x10_anaRightX(Math::clamp<float>(-1.0, data.m_rightStick[0] / 59.0 / rightDiv, 1.0)), x10_anaRightX(Zeus::Math::clamp(-1.0f, data.m_rightStick[0] / 59.0f / rightDiv, 1.0f)),
x14_anaRightY(Math::clamp<float>(-1.0, data.m_rightStick[0] / 59.0 / rightDiv, 1.0)), x14_anaRightY(Zeus::Math::clamp(-1.0f, data.m_rightStick[0] / 59.0f / rightDiv, 1.0f)),
x18_anaLeftTrigger(data.m_analogTriggers[0] * 0.0066666668), x18_anaLeftTrigger(data.m_analogTriggers[0] * 0.0066666668),
x1c_anaRightTrigger(data.m_analogTriggers[1] * 0.0066666668), x1c_anaRightTrigger(data.m_analogTriggers[1] * 0.0066666668),
x20_enableAnaLeftXP(DLARight() && !prevInput.DLARight()), x20_enableAnaLeftXP(DLARight() && !prevInput.DLARight()),

28
Runtime/Particle/CParticleGen.hpp
View File

@ -18,23 +18,23 @@ public:
virtual ~CParticleGen() {} virtual ~CParticleGen() {}
virtual void Update(double); virtual void Update(double);
virtual void Render(); virtual void Render();
virtual void SetOrientation(const CTransform&); virtual void SetOrientation(const Zeus::CTransform&);
virtual void SetTranslation(const CVector3f&); virtual void SetTranslation(const Zeus::CVector3f&);
virtual void SetGlobalOrientation(const CTransform&); virtual void SetGlobalOrientation(const Zeus::CTransform&);
virtual void SetGlobalTranslation(const CVector3f&); virtual void SetGlobalTranslation(const Zeus::CVector3f&);
virtual void SetGlobalScale(const CVector3f&); virtual void SetGlobalScale(const Zeus::CVector3f&);
virtual void SetLocalScale(const CVector3f&); virtual void SetLocalScale(const Zeus::CVector3f&);
virtual void SetParticleEmission(bool); virtual void SetParticleEmission(bool);
virtual void SetModulationColor(const CColor&); virtual void SetModulationColor(const Zeus::CColor&);
virtual const CTransform& GetOrientation() const; virtual const Zeus::CTransform& GetOrientation() const;
virtual const CVector3f& GetTranslation() const; virtual const Zeus::CVector3f& GetTranslation() const;
virtual const CTransform& GetGlobalOrientation() const; virtual const Zeus::CTransform& GetGlobalOrientation() const;
virtual const CVector3f& GetGlobalTranslation() const; virtual const Zeus::CVector3f& GetGlobalTranslation() const;
virtual const CVector3f& GetGlobalScale() const; virtual const Zeus::CVector3f& GetGlobalScale() const;
virtual bool GetParticleEmission() const; virtual bool GetParticleEmission() const;
virtual const CColor& GetModulationColor() const; virtual const Zeus::CColor& GetModulationColor() const;
virtual bool IsSystemDeletable() const; virtual bool IsSystemDeletable() const;
virtual CAABox GetBounds() const; virtual Zeus::CAABox GetBounds() const;
virtual u32 GetParticleCount() const; virtual u32 GetParticleCount() const;
virtual bool SystemHasLight() const; virtual bool SystemHasLight() const;
virtual CLight GetLight() const; virtual CLight GetLight() const;