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

CFluidPlane: Resolve constness related compile errors that slipped through 

Gotta love Find References not, in fact, finding all the references.
This commit is contained in:
Lioncash 2020-04-06 05:29:05 -04:00
parent f0eadfe56c
commit c9e8b3366d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CFluidPlane.cpp
View File

@ -87,7 +87,7 @@ void CFluidPlane::RenderStripWithRipples(float curY, const CFluidPlaneRender::SH
const u8 (&flags)[9][9], int startYDiv, const u8 (&flags)[9][9], int startYDiv,
const CFluidPlaneRender::SPatchInfo& info, const CFluidPlaneRender::SPatchInfo& info,
std::vector<CFluidPlaneShader::Vertex>& vOut, std::vector<CFluidPlaneShader::Vertex>& vOut,
std::vector<CFluidPlaneShader::PatchVertex>& pvOut) const { std::vector<CFluidPlaneShader::PatchVertex>& pvOut) {
m_shader->bindRegular(); m_shader->bindRegular();
int yTile = (startYDiv + CFluidPlaneRender::numSubdivisionsInTile - 1) / CFluidPlaneRender::numSubdivisionsInTile; int yTile = (startYDiv + CFluidPlaneRender::numSubdivisionsInTile - 1) / CFluidPlaneRender::numSubdivisionsInTile;
@ -313,7 +313,7 @@ void CFluidPlane::RenderStripWithRipples(float curY, const CFluidPlaneRender::SH
void CFluidPlane::RenderPatch(const CFluidPlaneRender::SPatchInfo& info, void CFluidPlane::RenderPatch(const CFluidPlaneRender::SPatchInfo& info,
const CFluidPlaneRender::SHFieldSample (&heights)[46][46], const u8 (&flags)[9][9], const CFluidPlaneRender::SHFieldSample (&heights)[46][46], const u8 (&flags)[9][9],
bool noRipples, bool flagIs1, std::vector<CFluidPlaneShader::Vertex>& vOut, bool noRipples, bool flagIs1, std::vector<CFluidPlaneShader::Vertex>& vOut,
std::vector<CFluidPlaneShader::PatchVertex>& pvOut) const { std::vector<CFluidPlaneShader::PatchVertex>& pvOut) {
if (noRipples) { if (noRipples) {
m_shader->bindRegular(); m_shader->bindRegular();

4
Runtime/World/CFluidPlane.hpp
View File

@ -138,10 +138,10 @@ protected:
virtual void RenderStripWithRipples(float curY, const CFluidPlaneRender::SHFieldSample (&heights)[46][46], virtual void RenderStripWithRipples(float curY, const CFluidPlaneRender::SHFieldSample (&heights)[46][46],
const u8 (&flags)[9][9], int startYDiv, const CFluidPlaneRender::SPatchInfo& info, const u8 (&flags)[9][9], int startYDiv, const CFluidPlaneRender::SPatchInfo& info,
std::vector<CFluidPlaneShader::Vertex>& vOut, std::vector<CFluidPlaneShader::Vertex>& vOut,
std::vector<CFluidPlaneShader::PatchVertex>& pvOut) const; std::vector<CFluidPlaneShader::PatchVertex>& pvOut);
void RenderPatch(const CFluidPlaneRender::SPatchInfo& info, const CFluidPlaneRender::SHFieldSample (&heights)[46][46], void RenderPatch(const CFluidPlaneRender::SPatchInfo& info, const CFluidPlaneRender::SHFieldSample (&heights)[46][46],
const u8 (&flags)[9][9], bool noRipples, bool flagIs1, std::vector<CFluidPlaneShader::Vertex>& vOut, const u8 (&flags)[9][9], bool noRipples, bool flagIs1, std::vector<CFluidPlaneShader::Vertex>& vOut,
std::vector<CFluidPlaneShader::PatchVertex>& pvOut) const; std::vector<CFluidPlaneShader::PatchVertex>& pvOut);
public: public:
virtual ~CFluidPlane() = default; virtual ~CFluidPlane() = default;

4
Runtime/World/CFluidPlaneCPU.hpp
View File

@ -60,8 +60,8 @@ protected:
u32 m_maxVertCount; u32 m_maxVertCount;
bool m_tessellation = false; bool m_tessellation = false;
mutable bool m_cachedDoubleLightmapBlend; bool m_cachedDoubleLightmapBlend;
mutable bool m_cachedAdditive; bool m_cachedAdditive;
static bool PrepareRipple(const CRipple& ripple, const CFluidPlaneRender::SPatchInfo& info, static bool PrepareRipple(const CRipple& ripple, const CFluidPlaneRender::SPatchInfo& info,
CFluidPlaneRender::SRippleInfo& rippleOut); CFluidPlaneRender::SRippleInfo& rippleOut);

2
Runtime/World/CFluidPlaneGPU.cpp
View File

@ -21,7 +21,7 @@ void CFluidPlaneGPU::RenderStripWithRipples(float curY, const CFluidPlaneRender:
const u8 (&flags)[9][9], int startYDiv, const u8 (&flags)[9][9], int startYDiv,
const CFluidPlaneRender::SPatchInfo& info, const CFluidPlaneRender::SPatchInfo& info,
std::vector<CFluidPlaneShader::Vertex>& vOut, std::vector<CFluidPlaneShader::Vertex>& vOut,
std::vector<CFluidPlaneShader::PatchVertex>& pvOut) const { std::vector<CFluidPlaneShader::PatchVertex>& pvOut) {
m_shader->bindTessellation(); m_shader->bindTessellation();
int yTile = (startYDiv + CFluidPlaneRender::numSubdivisionsInTile - 1) / CFluidPlaneRender::numSubdivisionsInTile; int yTile = (startYDiv + CFluidPlaneRender::numSubdivisionsInTile - 1) / CFluidPlaneRender::numSubdivisionsInTile;

2
Runtime/World/CFluidPlaneGPU.hpp
View File

@ -20,7 +20,7 @@ public:
void RenderStripWithRipples(float curY, const CFluidPlaneRender::SHFieldSample (&heights)[46][46], void RenderStripWithRipples(float curY, const CFluidPlaneRender::SHFieldSample (&heights)[46][46],
const u8 (&flags)[9][9], int startYDiv, const CFluidPlaneRender::SPatchInfo& info, const u8 (&flags)[9][9], int startYDiv, const CFluidPlaneRender::SPatchInfo& info,
std::vector<CFluidPlaneShader::Vertex>& vOut, std::vector<CFluidPlaneShader::Vertex>& vOut,
std::vector<CFluidPlaneShader::PatchVertex>& pvOut) const override; std::vector<CFluidPlaneShader::PatchVertex>& pvOut) override;
}; };
} // namespace urde } // namespace urde