feat: twiddling

Signed-off-by: Michael Pollind <[email protected]>

Author: pollend

source/cgame/cg_pmodels.cpp

@@ -1310,6 +1310,9 @@ void CG_AddPModel( centity_t *cent )
 	if( !cent->ent.model )
 		return;
 
+	CG_PModel_AddFlag( cent );
+
+	CG_AddShellEffects( &cent->ent, cent->effects );
 
 	{
 		entity_t shellOutline = cent->ent;
@@ -1322,9 +1325,6 @@ void CG_AddPModel( centity_t *cent )
 		CG_AddEntityToScene( &shellOutline );
 	}
 
-	CG_PModel_AddFlag( cent );
-
-	CG_AddShellEffects( &cent->ent, cent->effects );
 
 	CG_AddHeadIcon( cent );
 

source/ref_gl/r_backend_program.c

@@ -1379,7 +1379,7 @@ static void RB_RenderMeshGLSL_Shadowmap( const shaderpass_t *pass, r_glslfeat_t
 */
 static void RB_RenderMeshGLSL_OverlayOutline( const shaderpass_t *pass, r_glslfeat_t programFeatures )
 {
-//	int faceCull = rb.gl.faceCull;
+	int faceCull = rb.gl.faceCull;
 	mat4_t texMatrix;
 
 	if( rb.currentModelType == mod_brush ) {
@@ -1401,7 +1401,6 @@ static void RB_RenderMeshGLSL_OverlayOutline( const shaderpass_t *pass, r_glslfe
 
 	Matrix4_Identity( texMatrix );
 
-	//RB_Cull( GL_BACK );
 
 	RB_UpdateCommonUniforms( program, pass, texMatrix );
 
@@ -1422,25 +1421,27 @@ static void RB_RenderMeshGLSL_OverlayOutline( const shaderpass_t *pass, r_glslfe
 	RB_SetShaderpassState( pass->flags | GLSTATE_STENCIL_TEST | GLSTATE_DEPTHFUNC_GT | GLSTATE_NO_COLORWRITE );
 	RP_UpdateOutlineUniforms( program, 2.0f );
 	RB_DrawElementsReal( &rb.drawElements );
+	
+  RB_SetStencilFunc( GL_ALWAYS, 0x0, 0xFF );
+  RB_SetStencilOp( GL_REPLACE, GL_REPLACE, GL_REPLACE );
 
-	RB_SetStencilFunc( GL_ALWAYS, 0x0, 0xFF );
-	RB_SetStencilOp( GL_REPLACE, GL_REPLACE, GL_REPLACE );
+  RB_SetShaderpassState( pass->flags | GLSTATE_STENCIL_TEST | GLSTATE_NO_DEPTH_TEST | GLSTATE_NO_COLORWRITE );
+  RP_UpdateOutlineUniforms( program, 0 );
+  RB_DrawElementsReal( &rb.drawElements );
 
-	RB_SetShaderpassState( pass->flags | GLSTATE_STENCIL_TEST | GLSTATE_NO_DEPTH_TEST | GLSTATE_NO_COLORWRITE );
-	RP_UpdateOutlineUniforms( program, 0 );
-	RB_DrawElementsReal( &rb.drawElements );
+  RB_Cull( GL_BACK );
 
-	RB_SetStencilOp( GL_KEEP, GL_KEEP, GL_KEEP );
-	RB_SetStencilFunc( GL_EQUAL, 1, 0xFF );
-	RB_SetStencilMask( 0x00 );
+  RB_SetStencilOp( GL_ZERO, GL_ZERO, GL_ZERO );
+  RB_SetStencilFunc( GL_EQUAL, 1, 0xFF );
+  RB_SetStencilMask( 0xFF );
 
-	RB_SetShaderpassState( pass->flags | GLSTATE_NO_DEPTH_TEST  | GLSTATE_STENCIL_TEST );
-	RP_UpdateOutlineUniforms( program, 2.0f );
-	RB_DrawElementsReal( &rb.drawElements );
+  RB_SetShaderpassState( pass->flags | GLSTATE_DEPTHFUNC_GT | GLSTATE_STENCIL_TEST );
+  RP_UpdateOutlineUniforms( program, rb.currentEntity->outlineHeight * r_outlines_scale->value );
+  RB_DrawElementsReal( &rb.drawElements );
 
-	RB_SetShaderpassState( pass->flags );
+	//RB_SetShaderpassState( pass->flags );
 
-	//RB_Cull( faceCull );
+	RB_Cull( faceCull );
 }
 
 /*
@@ -1472,7 +1473,7 @@ static void RB_RenderMeshGLSL_Outline( const shaderpass_t *pass, r_glslfeat_t pr
 	RB_Cull( GL_BACK );
 
 	// set shaderpass state (blending, depthwrite, etc)
-	RB_SetShaderpassState( pass->flags );
+	RB_SetShaderpassState( pass->flags);
 
 	RB_UpdateCommonUniforms( program, pass, texMatrix );
 
@@ -1486,6 +1487,10 @@ static void RB_RenderMeshGLSL_Outline( const shaderpass_t *pass, r_glslfeat_t pr
 	if( programFeatures & GLSL_SHADER_COMMON_BONE_TRANSFORMS ) {
 		RP_UpdateBonesUniforms( program, rb.bonesData.numBones, rb.bonesData.dualQuats );
 	}
+	
+	//RB_SetStencilMask( 0xFF );
+	//RB_SetStencilOp( GL_ZERO, GL_REPLACE, GL_REPLACE);
+	//RB_SetStencilFunc( GL_ALWAYS, 1, 0xFF );
 
 	RB_DrawElementsReal( &rb.drawElements );
 

source/ref_gl/r_mesh.c

@@ -185,7 +185,6 @@ void *R_AddSurfToDrawList( drawList_t *list, const entity_t *e, const mfog_t *fo
 	}
 	if(renderFx & RF_OUTLINE_WRITE_THROUGH) {
 		shaderSort = SHADER_SORT_DECAL;
-		dist = -1;
 		if(portalSurf) {
 			return false;
 		}
@@ -218,6 +217,7 @@ void *R_AddSurfToDrawList( drawList_t *list, const entity_t *e, const mfog_t *fo
 		dist = 0;
 	}
 
+
 	sortedDrawSurf_t *sds = &list->drawSurfs[list->numDrawSurfs++];
 	sds->distKey = R_PackDistKey( shaderSort, (int)dist, order );
 	sds->sortKey = R_PackSortKey( shader->id, fog ? fog - rsh.worldBrushModel->fogs : -1,