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

Merge branch 'master' of https://github.com/AxioDL/urde

Browse Source
This commit is contained in:
Jack Andersen
2017-08-12 22:19:33 -10:00
parent e25d2a423d 11d4aad746
commit 02f8f77b57
177 changed files with 830 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CFluidPlaneCPU.cpp
View File

@@ -43,8 +43,8 @@ CFluidPlaneCPU::CTurbulence::CTurbulence(float speed, float distance, float freq
}
}
CFluidPlaneCPU::CFluidPlaneCPU(ResId texPattern1, ResId texPattern2, ResId texColor, ResId bumpMap, ResId envMap,
ResId envBumpMap, ResId lightMap, float unitsPerLightmapTexel, float tileSize,
CFluidPlaneCPU::CFluidPlaneCPU(CAssetId texPattern1, CAssetId texPattern2, CAssetId texColor, CAssetId bumpMap, CAssetId envMap,
CAssetId envBumpMap, CAssetId lightMap, float unitsPerLightmapTexel, float tileSize,
u32 tileSubdivisions, EFluidType fluidType, float alpha,
const zeus::CVector3f& bumpLightDir, float bumpScale, const CFluidUVMotion& mot,
float turbSpeed, float turbDistance, float turbFreqMax, float turbFreqMin,