diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2019-07-11 03:44:54 +0300 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2019-07-11 03:44:54 +0300 |
| commit | d8dd649617d4583e43f58a774ad4faf20015934e (patch) | |
| tree | 37e846440606ae82fbf01550b6e7bdff9a95c121 /src/render/WaterLevel.cpp | |
| parent | 3225fe3b92d4e5b375e4e5dd4b09394b8a8224f3 (diff) | |
fixfixfix
Diffstat (limited to 'src/render/WaterLevel.cpp')
| -rw-r--r-- | src/render/WaterLevel.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp index fc368e0d..d5138b28 100644 --- a/src/render/WaterLevel.cpp +++ b/src/render/WaterLevel.cpp @@ -22,10 +22,6 @@ #include "WaterLevel.h" #include "patcher.h" -<<<<<<< HEAD - -======= ->>>>>>> a644c4e9ceb440f53e31dd39f11a9a3c859ffb44 float TEXTURE_ADDU; float TEXTURE_ADDV; @@ -282,12 +278,8 @@ CWaterLevel::GetWaterLevelNoWaves(float fX, float fY, float fZ, float *pfOutLeve return true; } -<<<<<<< HEAD inline float _GetWaterDrawDist() -======= -inline float _GetWaterDrawDist() ->>>>>>> a644c4e9ceb440f53e31dd39f11a9a3c859ffb44 { // if z less then 15.0f return 1200.0f if ( TheCamera.GetPosition().z < 15.0f ) @@ -300,12 +292,8 @@ inline float _GetWaterDrawDist() return (TheCamera.GetPosition().z + -15.0f) * 800.0f / 45.0f + 1200.0f; } -<<<<<<< HEAD inline float _GetWavyDrawDist() -======= -inline float _GetWavyDrawDist() ->>>>>>> a644c4e9ceb440f53e31dd39f11a9a3c859ffb44 { if ( FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() ) return 120.0f; @@ -313,12 +301,8 @@ inline float _GetWavyDrawDist() return 70.0f; } -<<<<<<< HEAD inline void _GetCamBounds(bool *bUseCamStartY, bool *bUseCamEndY, bool *bUseCamStartX, bool *bUseCamEndX) -======= -inline void _GetCamBounds(bool *bUseCamStartY, bool *bUseCamEndY, bool *bUseCamStartX, bool *bUseCamEndX) ->>>>>>> a644c4e9ceb440f53e31dd39f11a9a3c859ffb44 { if ( TheCamera.GetForward().z > -0.8f ) { @@ -339,7 +323,6 @@ inline void _GetCamBounds(bool *bUseCamStartY, bool *bUseCamEndY, bool *bUseCamS } } -<<<<<<< HEAD float SectorRadius(float fSize) { @@ -348,14 +331,6 @@ SectorRadius(float fSize) void CWaterLevel::RenderWater() -======= -float SectorRadius(float fSize) -{ - return sqrtf(powf(fSize, 2) + powf(fSize, 2)) * 1.0040916293f; -} - -void CWaterLevel::RenderWater() ->>>>>>> a644c4e9ceb440f53e31dd39f11a9a3c859ffb44 { bool bUseCamEndX = false; bool bUseCamStartY = false; |