client: render: fix sway break and missing uniforms in decal render

Author: ugozapad

client/render/gl_backend.cpp

@@ -974,6 +974,18 @@ void GL_ClipPlane( bool enable )
 	}
 }
 
+/*
+=================
+GL_InitClipPlane
+=================
+*/
+void GL_InitClipPlane( const mplane_t *in, GLdouble *out )
+{
+	out[0] = in->normal[0];
+	out[1] = in->normal[1];
+	out[2] = in->normal[2];
+	out[3] = -in->dist;
+}
 
 /*
 =================

client/render/gl_cubemap.cpp

@@ -604,14 +604,11 @@ static void GL_FilterCubemapSpecularIBL(mcubemap_t *cubemap)
 					{
 						GLdouble	clip[4];
 						mplane_t	*p = &RI->clipPlane;
-						
-						clip[0] = p->normal[0];
-						clip[1] = p->normal[1];
-						clip[2] = p->normal[2];
-						clip[3] = -p->dist;
-						
+
+						GL_InitClipPlane(p, clip);
+
 						u->SetValue(clip);
-						
+
 						break;
 					}
 				}

client/render/gl_decals.cpp

@@ -1453,14 +1453,11 @@ void R_SetDecalUniforms( brushdecal_t *decal )
 		{
 			GLdouble	clip[4];
 			mplane_t	*p = &RI->clipPlane;
-			
-			clip[0] = p->normal[0];
-			clip[1] = p->normal[1];
-			clip[2] = p->normal[2];
-			clip[3] = -p->dist;
-			
+
+			GL_InitClipPlane(p, clip);
+
 			u->SetValue(clip);
-			
+
 			break;
 		}
 		default:

client/render/gl_grass.cpp

@@ -863,14 +863,11 @@ void R_SetGrassUniforms( word hProgram, grass_t *grass )
 		{
 			GLdouble	clip[4];
 			mplane_t	*p = &RI->clipPlane;
-			
-			clip[0] = p->normal[0];
-			clip[1] = p->normal[1];
-			clip[2] = p->normal[2];
-			clip[3] = -p->dist;
-			
+
+			GL_InitClipPlane(p, clip);
+
 			u->SetValue(clip);
-			
+
 			break;
 		}
 		default:

client/render/gl_local.h

@@ -764,6 +764,7 @@ void GL_DisableAllTexGens(void);
 void GL_DepthMask(GLint enable);
 void GL_FrontFace(GLenum front);
 void GL_ClipPlane(bool enable);
+void GL_InitClipPlane( const mplane_t *in, GLdouble *out );
 void GL_BindFBO(GLuint buffer);
 void GL_AlphaTest(GLint enable);
 void GL_AlphaToCoverage(bool enable);

client/render/gl_sky.cpp

@@ -322,10 +322,7 @@ static void GL_DrawSkySide( word hProgram, int skyside )
 			GLdouble	clip[4];
 			mplane_t	*p = &RI->clipPlane;
 
-			clip[0] = p->normal[0];
-			clip[1] = p->normal[1];
-			clip[2] = p->normal[2];
-			clip[3] = -p->dist;
+			GL_InitClipPlane(p, clip);
 
 			u->SetValue(clip);
 

client/render/gl_studio_draw.cpp

@@ -3706,6 +3706,7 @@ void CStudioModelRenderer :: DrawSingleMesh( CSolidEntry *entry, bool force, boo
 			break;
 		case UT_SWAYHEIGHT:
 			u->SetValue(mat->swayHeight);
+			break;
 		case UT_MODELVIEWMATRIX:
 			u->SetValue( &RI->view.worldMatrix );
 			break;
@@ -3716,14 +3717,11 @@ void CStudioModelRenderer :: DrawSingleMesh( CSolidEntry *entry, bool force, boo
 		{
 			GLdouble	clip[4];
 			mplane_t	*p = &RI->clipPlane;
-			
-			clip[0] = p->normal[0];
-			clip[1] = p->normal[1];
-			clip[2] = p->normal[2];
-			clip[3] = -p->dist;
-			
+
+			GL_InitClipPlane(p, clip);
+
 			u->SetValue(clip);
-			
+
 			break;
 		}
 		default:

client/render/gl_studiodecal_new.cpp

@@ -1712,6 +1712,23 @@ void CStudioModelRenderer :: SetDecalUniforms( studiodecal_t *pDecal )
 			height = pDecal->texinfo->gl_heightmap_id.GetHeight();
 			u->SetValue( (float)width, (float)height, pDecal->texinfo->matdesc->reliefScale, cv_shadow_offset->value );
 			break;
+		case UT_MODELVIEWMATRIX:
+			u->SetValue(&RI->view.worldMatrix);
+			break;
+		case UT_MODELVIEWPROJECTIONMATRIX:
+			u->SetValue(&RI->view.worldProjectionMatrix);
+			break;
+		case UT_CLIPPLANE:
+		{
+			GLdouble	clip[4];
+			mplane_t	*p = &RI->clipPlane;
+
+			GL_InitClipPlane(p, clip);
+
+			u->SetValue(clip);
+
+			break;
+		}
 		default:
 			ALERT( at_error, "Unhandled uniform %s\n", u->name );
 			break;

client/render/gl_world_new.cpp

@@ -2878,14 +2878,11 @@ void R_SetSurfaceUniforms( word hProgram, msurface_t *surface, bool force )
 		{
 			GLdouble	clip[4];
 			mplane_t	*p = &RI->clipPlane;
-			
-			clip[0] = p->normal[0];
-			clip[1] = p->normal[1];
-			clip[2] = p->normal[2];
-			clip[3] = -p->dist;
-			
+
+			GL_InitClipPlane(p, clip);
+
 			u->SetValue(clip);
-			
+
 			break;
 		}
 		default: