2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 06:46:08 +00:00

Various imps and minor fixes

This commit is contained in:
2017-07-30 04:00:30 -07:00
parent c06c1e464b
commit db03927e1d
29 changed files with 364 additions and 59 deletions

View File

@@ -2,6 +2,7 @@
#define __URDE_CFLUIDUVMOTION_HPP__
#include "rstl.hpp"
#include "RetroTypes.hpp"
namespace urde
{
@@ -10,17 +11,19 @@ class CFluidUVMotion
public:
enum class EFluidUVMotion
{
Zero
Zero,
One,
Two,
};
struct SFluidLayerMotion
{
EFluidUVMotion x0_motion = EFluidUVMotion::Zero;
float x4_a = 0.f;
float x4_a = 0.16666667f;
float x8_b = 0.f;
float xc_c = 0.f;
float x10_d = 0.f;
float x14_e = 0.f;
float xc_c = 1.f;
float x10_d = 5.f;
float x14_e = 0.2f;
SFluidLayerMotion() = default;
SFluidLayerMotion(EFluidUVMotion motion, float a, float b, float c, float d)
@@ -35,9 +38,12 @@ private:
float x50_;
public:
CFluidUVMotion(float a, float b, const SFluidLayerMotion& c, const SFluidLayerMotion& d, const SFluidLayerMotion& e);
CFluidUVMotion(float, float);
const rstl::reserved_vector<SFluidLayerMotion, 3>& GetFluidLayers() const { return x0_fluidLayers; }
void GetOrientation() const;
void GetOOTimeToWrapTexPage() const;
void CalculateFluidTextureOffset(float, float[3][2]);
};
}
#endif // __URDE_CFLUIDUVMOTION_HPP__