X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=8f6938768a328f4fe105bf7c8c53ea1179366365;hb=5c4e0198b632b298df925652359182f52f3a253f;hp=37e18bd8e0b17f4a4e5e4e4a08a3766fba9993aa;hpb=4181392df811a93dee6b97c303c3f7655f2f0a23;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 37e18bd8e..8f6938768 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -26,8 +26,10 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer);
 .int lodmodelindex0;
 .int lodmodelindex1;
 .int lodmodelindex2;
-void CSQCPlayer_LOD_Apply(entity this)
+void CSQCPlayer_LOD_Apply(entity this, bool isplayer)
 {
+	int detailreduction = ((isplayer) ? autocvar_cl_playerdetailreduction : autocvar_cl_modeldetailreduction);
+
 	// LOD model loading
 	if(this.lodmodelindex0 != this.modelindex)
 	{
@@ -66,19 +68,19 @@ void CSQCPlayer_LOD_Apply(entity this)
 	}
 
 	// apply LOD
-	if(autocvar_cl_playerdetailreduction <= 0)
+	if(detailreduction <= 0)
 	{
-		if(autocvar_cl_playerdetailreduction <= -2)
+		if(detailreduction <= -2)
 			this.modelindex = this.lodmodelindex2;
-		else if(autocvar_cl_playerdetailreduction <= -1)
+		else if(detailreduction <= -1)
 			this.modelindex = this.lodmodelindex1;
 		else
 			this.modelindex = this.lodmodelindex0;
 	}
 	else
 	{
-		float distance = vlen(this.origin - view_origin);
-		float f = (distance * current_viewzoom + 100.0) * autocvar_cl_playerdetailreduction;
+		float distance = vlen(((isplayer) ? this.origin : NearestPointOnBox(this, view_origin)) - view_origin); // TODO: perhaps it should just use NearestPointOnBox all the time, player hitbox can potentially be huge
+		float f = (distance * current_viewzoom + 100.0) * detailreduction;
 		f *= 1.0 / bound(0.01, view_quality, 1);
 		if(f > autocvar_cl_loddistance2)
 			this.modelindex = this.lodmodelindex2;
@@ -613,7 +615,7 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer)
 	if(this.isplayermodel) // this checks if it's a player MODEL!
 	{
 		CSQCPlayer_ModelAppearance_Apply(this, this.entnum == player_localnum + 1);
-		CSQCPlayer_LOD_Apply(this);
+		CSQCPlayer_LOD_Apply(this, true);
 
 		if(!isplayer)
 		{
@@ -689,6 +691,8 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer)
 			}
 		}
 	}
+	else
+		CSQCPlayer_LOD_Apply(this, false);
 
 	CSQCModel_AutoTagIndex_Apply(this);