Fixed water culling issue #498

Author: hzqst

Plugins/Renderer/gl_local.h

@@ -350,6 +350,8 @@ void R_DrawWorld(void);
 void R_DrawSkyBox(void);
 void R_CheckVariables(void);
 void R_AnimateLight(void);
+void R_SetupFrame(void);
+void R_SetFrustum(void);
 void R_SetupSceneUBO(void);
 void R_RenderPreFrame();
 void R_RenderStartFrame();

Plugins/Renderer/gl_rmain.cpp

@@ -3186,9 +3186,10 @@ void R_SetupFrame(void)
 	//R_CheckVariables();
 	//R_AnimateLight();
 
-	VectorCopy((*r_refdef.vieworg), r_origin);
+	R_UpdateRefDef();
+	//VectorCopy((*r_refdef.vieworg), r_origin);
 
-	gEngfuncs.pfnAngleVectors((*r_refdef.viewangles), vpn, vright, vup);
+	//gEngfuncs.pfnAngleVectors((*r_refdef.viewangles), vpn, vright, vup);
 
 	(*r_oldviewleaf) = (*r_viewleaf);
 

Plugins/Renderer/gl_rmisc.cpp

@@ -229,6 +229,10 @@ void R_PushRefDef(void)
 	++save_refdef_stack;
 }
 
+/*
+	Purpose: Update r_origin, vpn, vright and vup according to r_refdef stuffs
+*/
+
 void R_UpdateRefDef(void)
 {
 	VectorCopy((*r_refdef.vieworg), r_origin);

Plugins/Renderer/gl_water.cpp

@@ -865,6 +865,9 @@ void R_RenderWaterPass(void)
 	g_VisibleWaterEntity.clear();
 	R_ClearWaterReflectCaches();
 
+	//Mainly for updating frustrum
+	R_UpdateRefDef();
+
 	mleaf_t *viewleaf = NULL;
 
 	if (r_refdef_SvEngine && r_refdef_SvEngine->useCamera)
@@ -875,6 +878,8 @@ void R_RenderWaterPass(void)
 	{
 		viewleaf = Mod_PointInLeaf(r_origin, r_worldmodel);
 	}
+	R_SetupGL();
+	R_SetFrustum();
 
 	auto pModel = R_GetWorldSurfaceModel(r_worldmodel);
 
@@ -893,7 +898,7 @@ void R_RenderWaterPass(void)
 			g_VisibleWaterSurfaceModels.emplace_back(pWaterModel);
 		}
 	}
-
+	
 	for (int i = 0; i < (*cl_numvisedicts); ++i)
 	{
 		auto e = cl_visedicts[i];

Plugins/Renderer/gl_wsurf.cpp

@@ -3527,7 +3527,7 @@ void R_ParseBSPEntity_Env_Water_Control(bspentity_t *ent)
 		}
 		else
 		{
-			int lv;
+			int lv = 0;
 			if (sscanf(level_string, "%d", &lv) == 1)
 			{
 				pWaterControl->level = math_clamp(lv, WATER_LEVEL_LEGACY, WATER_LEVEL_MAX - 1);