Renderer: Avoid near-clipping player weapon models

IssueID #2373
skyjake · Dec 21, 2019 · 99f9925 · 99f9925
1 parent 179f69a
commit 99f9925
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/doomsday/apps/client/include/render/rend_main.h b/doomsday/apps/client/include/render/rend_main.h
@@ -183,9 +183,10 @@ de::Vector3d Rend_EyeOrigin();
  * Returns the projection matrix that is used for rendering the current frame's
  * 3D portions.
  *
- * @param fixedFov  If non-zero, overrides the user's FOV with a fixed value.
+ * @param fixedFov        If non-zero, overrides the user's FOV with a fixed value.
+ * @param clipRangeScale  Multiplier to apply to clip plane distances.
  */
-de::Matrix4f Rend_GetProjectionMatrix(float fixedFov = 0.f);
+de::Matrix4f Rend_GetProjectionMatrix(float fixedFov = 0.0f, float clipRangeScale = 1.0f);
 
 #define Rend_PointDist2D(c) (abs((vOrigin.z-(c)[VY])*viewsidex - (vOrigin.x-(c)[VX])*viewsidey))
 

diff --git a/doomsday/apps/client/src/render/modelrenderer.cpp b/doomsday/apps/client/src/render/modelrenderer.cpp
@@ -190,7 +190,8 @@ DENG2_PIMPL(ModelRenderer)
         const Matrix4f localToWorld = Matrix4f::translate(origin) *
                                       Matrix4f::scale(aspectCorrect); // Inverse aspect correction.
 
-        const Matrix4f viewProj = Rend_GetProjectionMatrix(useFixedFov ? weaponFixedFOV : 0.0f) *
+        const Matrix4f viewProj = Rend_GetProjectionMatrix(useFixedFov ? weaponFixedFOV : 0.0f,
+                                                           0.1f /* near plane distance: IssueID #2373 */) *
                                   ClientApp::renderSystem().uViewMatrix().toMatrix4f();
 
         const Matrix4f localToScreen = viewProj * localToWorld;

diff --git a/doomsday/apps/client/src/render/rend_main.cpp b/doomsday/apps/client/src/render/rend_main.cpp
@@ -559,18 +559,19 @@ void Rend_ModelViewMatrix(bool inWorldSpace)
         Rend_GetModelViewMatrix(DoomsdayApp::players().indexOf(viewPlayer), inWorldSpace).values());
 }
 
-Matrix4f Rend_GetProjectionMatrix(float fixedFov)
+Matrix4f Rend_GetProjectionMatrix(float fixedFov, float clipRangeScale)
 {
     if (fixedView)
     {
         return fixedView->projectionMatrix;
     }
 
-    const dfloat fov = (fixedFov > 0 ? fixedFov : Rend_FieldOfView());
+    const dfloat   fov  = (fixedFov > 0 ? fixedFov : Rend_FieldOfView());
     const Vector2f size = R_Console3DViewRect(displayPlayer).size();
-    yfov = vrCfg().verticalFieldOfView(fov, size);
-    const Rangef clip = GL_DepthClipRange();
-    return vrCfg().projectionMatrix(fov, size, clip.start, clip.end) *
+    yfov                = vrCfg().verticalFieldOfView(fov, size);
+    const Rangef clip   = GL_DepthClipRange();
+    return vrCfg().projectionMatrix(
+               fov, size, clip.start * clipRangeScale, clip.end * clipRangeScale) *
            Matrix4f::scale(Vector3f(1, 1, -1));
 }