From: Mario <mario.mario@y7mail.com>
Date: Sat, 18 Jan 2020 22:36:44 +0000 (+1000)
Subject: Merge branch 'master' into Mario/rain_fix
X-Git-Tag: xonotic-v0.8.5~1161^2~4^2~4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=ae458cf44e1264534a20514f2f451c3d06ff135b;hp=-c

Merge branch 'master' into Mario/rain_fix
---

ae458cf44e1264534a20514f2f451c3d06ff135b
diff --combined qcsrc/common/mapobjects/func/rainsnow.qc
index 8414700a70,644194c354..12dd6d28c3
--- a/qcsrc/common/mapobjects/func/rainsnow.qc
+++ b/qcsrc/common/mapobjects/func/rainsnow.qc
@@@ -36,7 -36,7 +36,7 @@@ spawnfunc(func_rain
  	this.angles = '0 0 0';
  	set_movetype(this, MOVETYPE_NONE);
  	this.solid = SOLID_NOT;
- 	SetBrushEntityModel(this);
+ 	SetBrushEntityModel(this, true);
  	if (!this.cnt)
  	{
  		this.cnt = 12;
@@@ -44,7 -44,7 +44,7 @@@
  	if (!this.count)
  		this.count = 2000;
  	// relative to absolute particle count
 -	this.count = 0.1 * this.count * (this.size_x / 1024) * (this.size_y / 1024);
 +	//this.count = 0.1 * this.count * (this.size_x / 1024) * (this.size_y / 1024);
  	if (this.count < 1)
  		this.count = 1;
  	if(this.count > 65535)
@@@ -76,7 -76,7 +76,7 @@@ spawnfunc(func_snow
  	this.angles = '0 0 0';
  	set_movetype(this, MOVETYPE_NONE);
  	this.solid = SOLID_NOT;
- 	SetBrushEntityModel(this);
+ 	SetBrushEntityModel(this, true);
  	if (!this.cnt)
  	{
  		this.cnt = 12;
@@@ -84,7 -84,7 +84,7 @@@
  	if (!this.count)
  		this.count = 2000;
  	// relative to absolute particle count
 -	this.count = 0.1 * this.count * (this.size_x / 1024) * (this.size_y / 1024);
 +	//this.count = 0.1 * this.count * (this.size_x / 1024) * (this.size_y / 1024);
  	if (this.count < 1)
  		this.count = 1;
  	if(this.count > 65535)
@@@ -99,34 -99,20 +99,34 @@@ float autocvar_cl_rainsnow_maxdrawdist 
  
  void Draw_Rain(entity this)
  {
 -	vector maxdist = '1 1 0' * autocvar_cl_rainsnow_maxdrawdist;
 -	maxdist.z = 5;
 -	if(boxesoverlap(vec2(view_origin) - maxdist, vec2(view_origin) + maxdist, vec2(this.absmin) - '0 0 5', vec2(this.absmax) + '0 0 5'))
 +	vector maxdist = '1 1 1' * autocvar_cl_rainsnow_maxdrawdist;
 +
 +	vector effbox_min = vec_to_max(view_origin - maxdist, this.origin + this.mins);
 +	vector effbox_max = vec_to_min(view_origin + maxdist, this.origin + this.maxs);
 +
 +	vector mysize = effbox_min + effbox_max;
 +	float mycount = bound(1, 0.1 * this.count * (mysize.x / 1024) * (mysize.y / 1024), 65535);
 +	//LOG_INFO(ftos(mycount));
 +
 +	if(boxesoverlap(view_origin - maxdist, view_origin + maxdist, this.absmin, this.absmax)) // optimisation: don't render any rain if the player is outside the view distance
  	//if(autocvar_cl_rainsnow_maxdrawdist <= 0 || vdist(vec2(this.origin) - vec2(this.absmin + this.absmax * 0.5), <=, autocvar_cl_rainsnow_maxdrawdist))
 -    	te_particlerain(this.origin + this.mins, this.origin + this.maxs, this.velocity, floor(this.count * drawframetime + random()), this.glow_color);
 +    	te_particlerain(effbox_min, effbox_max, this.velocity, floor(mycount * drawframetime + random()), this.glow_color);
  }
  
  void Draw_Snow(entity this)
  {
 -	vector maxdist = '1 1 0' * autocvar_cl_rainsnow_maxdrawdist;
 -	maxdist.z = 5;
 -	if(boxesoverlap(vec2(view_origin) - maxdist, vec2(view_origin) + maxdist, vec2(this.absmin) - '0 0 5', vec2(this.absmax) + '0 0 5'))
 +	vector maxdist = '1 1 1' * autocvar_cl_rainsnow_maxdrawdist;
 +
 +	vector effbox_min = vec_to_max(view_origin - maxdist, this.origin + this.mins);
 +	vector effbox_max = vec_to_min(view_origin + maxdist, this.origin + this.maxs);
 +
 +	vector mysize = effbox_min + effbox_max;
 +	float mycount = bound(1, 0.1 * this.count * (mysize.x / 1024) * (mysize.y / 1024), 65535);
 +	//LOG_INFO(ftos(mycount));
 +
 +	if(boxesoverlap(view_origin - maxdist, view_origin + maxdist, this.absmin, this.absmax))
  	//if(autocvar_cl_rainsnow_maxdrawdist <= 0 || vdist(vec2(this.origin) - vec2(this.absmin + this.absmax * 0.5), <=, autocvar_cl_rainsnow_maxdrawdist))
 -    	te_particlesnow(this.origin + this.mins, this.origin + this.maxs, this.velocity, floor(this.count * drawframetime + random()), this.glow_color);
 +    	te_particlesnow(effbox_min, effbox_max, this.velocity, floor(mycount * drawframetime + random()), this.glow_color);
  }
  
  NET_HANDLE(ENT_CLIENT_RAINSNOW, bool isnew)