X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ffunc%2Frainsnow.qc;h=c8b4e2924376fb510b27ba4ffb2c6d4dc1cba511;hp=fc4630318270dfdd44721dd009ccb7184e1a9e6e;hb=06ac66a5edaa645e19ed9a6482409e8656a65b1d;hpb=692cb758fe8f25fa078bfd5885333ee031885600

diff --git a/qcsrc/common/triggers/func/rainsnow.qc b/qcsrc/common/triggers/func/rainsnow.qc
index fc4630318..c8b4e2924 100644
--- a/qcsrc/common/triggers/func/rainsnow.qc
+++ b/qcsrc/common/triggers/func/rainsnow.qc
@@ -1,19 +1,20 @@
+#include "rainsnow.qh"
 REGISTER_NET_LINKED(ENT_CLIENT_RAINSNOW)
 
 #ifdef SVQC
 bool rainsnow_SendEntity(entity this, entity to, float sf)
 {
 	WriteHeader(MSG_ENTITY, ENT_CLIENT_RAINSNOW);
-	WriteByte(MSG_ENTITY, self.state);
-	WriteCoord(MSG_ENTITY, self.origin_x + self.mins_x);
-	WriteCoord(MSG_ENTITY, self.origin_y + self.mins_y);
-	WriteCoord(MSG_ENTITY, self.origin_z + self.mins_z);
-	WriteCoord(MSG_ENTITY, self.maxs_x - self.mins_x);
-	WriteCoord(MSG_ENTITY, self.maxs_y - self.mins_y);
-	WriteCoord(MSG_ENTITY, self.maxs_z - self.mins_z);
-	WriteShort(MSG_ENTITY, compressShortVector(self.dest));
-	WriteShort(MSG_ENTITY, self.count);
-	WriteByte(MSG_ENTITY, self.cnt);
+	WriteByte(MSG_ENTITY, this.state);
+	WriteCoord(MSG_ENTITY, this.origin_x + this.mins_x);
+	WriteCoord(MSG_ENTITY, this.origin_y + this.mins_y);
+	WriteCoord(MSG_ENTITY, this.origin_z + this.mins_z);
+	WriteCoord(MSG_ENTITY, this.maxs_x - this.mins_x);
+	WriteCoord(MSG_ENTITY, this.maxs_y - this.mins_y);
+	WriteCoord(MSG_ENTITY, this.maxs_z - this.mins_z);
+	WriteShort(MSG_ENTITY, compressShortVector(this.dest));
+	WriteShort(MSG_ENTITY, this.count);
+	WriteByte(MSG_ENTITY, this.cnt);
 	return true;
 }
 
@@ -30,28 +31,28 @@ Keys:
 */
 spawnfunc(func_rain)
 {
-	self.dest = self.velocity;
-	self.velocity = '0 0 0';
-	if (!self.dest)
-		self.dest = '0 0 -700';
-	self.angles = '0 0 0';
-	self.movetype = MOVETYPE_NONE;
-	self.solid = SOLID_NOT;
-	SetBrushEntityModel();
-	if (!self.cnt)
-		self.cnt = 12;
-	if (!self.count)
-		self.count = 2000;
-	self.count = 0.01 * self.count * (self.size_x / 1024) * (self.size_y / 1024);
-	if (self.count < 1)
-		self.count = 1;
-	if(self.count > 65535)
-		self.count = 65535;
-
-	self.state = 1; // 1 is rain, 0 is snow
-	self.Version = 1;
-
-	Net_LinkEntity(self, false, 0, rainsnow_SendEntity);
+	this.dest = this.velocity;
+	this.velocity = '0 0 0';
+	if (!this.dest)
+		this.dest = '0 0 -700';
+	this.angles = '0 0 0';
+	set_movetype(this, MOVETYPE_NONE);
+	this.solid = SOLID_NOT;
+	SetBrushEntityModel(this);
+	if (!this.cnt)
+		this.cnt = 12;
+	if (!this.count)
+		this.count = 2000;
+	this.count = 0.01 * this.count * (this.size_x / 1024) * (this.size_y / 1024);
+	if (this.count < 1)
+		this.count = 1;
+	if(this.count > 65535)
+		this.count = 65535;
+
+	this.state = 1; // 1 is rain, 0 is snow
+	this.Version = 1;
+
+	Net_LinkEntity(this, false, 0, rainsnow_SendEntity);
 }
 
 
@@ -68,65 +69,76 @@ Keys:
 */
 spawnfunc(func_snow)
 {
-	self.dest = self.velocity;
-	self.velocity = '0 0 0';
-	if (!self.dest)
-		self.dest = '0 0 -300';
-	self.angles = '0 0 0';
-	self.movetype = MOVETYPE_NONE;
-	self.solid = SOLID_NOT;
-	SetBrushEntityModel();
-	if (!self.cnt)
-		self.cnt = 12;
-	if (!self.count)
-		self.count = 2000;
-	self.count = 0.01 * self.count * (self.size_x / 1024) * (self.size_y / 1024);
-	if (self.count < 1)
-		self.count = 1;
-	if(self.count > 65535)
-		self.count = 65535;
-
-	self.state = 0; // 1 is rain, 0 is snow
-	self.Version = 1;
-
-	Net_LinkEntity(self, false, 0, rainsnow_SendEntity);
+	this.dest = this.velocity;
+	this.velocity = '0 0 0';
+	if (!this.dest)
+		this.dest = '0 0 -300';
+	this.angles = '0 0 0';
+	set_movetype(this, MOVETYPE_NONE);
+	this.solid = SOLID_NOT;
+	SetBrushEntityModel(this);
+	if (!this.cnt)
+		this.cnt = 12;
+	if (!this.count)
+		this.count = 2000;
+	this.count = 0.01 * this.count * (this.size_x / 1024) * (this.size_y / 1024);
+	if (this.count < 1)
+		this.count = 1;
+	if(this.count > 65535)
+		this.count = 65535;
+
+	this.state = 0; // 1 is rain, 0 is snow
+	this.Version = 1;
+
+	Net_LinkEntity(this, false, 0, rainsnow_SendEntity);
 }
 #elif defined(CSQC)
+float autocvar_cl_rainsnow_maxdrawdist = 2048;
+
 void Draw_Rain(entity this)
 {
-    te_particlerain(this.origin + this.mins, this.origin + this.maxs, this.velocity, floor(this.count * drawframetime + random()), this.glow_color);
+	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'))
+	//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);
 }
 
 void Draw_Snow(entity this)
 {
-    te_particlesnow(this.origin + this.mins, this.origin + this.maxs, this.velocity, floor(this.count * drawframetime + random()), this.glow_color);
+	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'))
+	//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);
 }
 
 NET_HANDLE(ENT_CLIENT_RAINSNOW, bool isnew)
 {
-	self.impulse = ReadByte(); // Rain, Snow, or Whatever
-	self.origin_x = ReadCoord();
-	self.origin_y = ReadCoord();
-	self.origin_z = ReadCoord();
-	self.maxs_x = ReadCoord();
-	self.maxs_y = ReadCoord();
-	self.maxs_z = ReadCoord();
-	self.velocity = decompressShortVector(ReadShort());
-	self.count = ReadShort() * 10;
-	self.glow_color = ReadByte(); // color
+	this.impulse = ReadByte(); // Rain, Snow, or Whatever
+	this.origin_x = ReadCoord();
+	this.origin_y = ReadCoord();
+	this.origin_z = ReadCoord();
+	this.maxs_x = ReadCoord();
+	this.maxs_y = ReadCoord();
+	this.maxs_z = ReadCoord();
+	this.velocity = decompressShortVector(ReadShort());
+	this.count = ReadShort() * 10;
+	this.glow_color = ReadByte(); // color
 
 	return = true;
 
-	self.mins    = -0.5 * self.maxs;
-	self.maxs    =  0.5 * self.maxs;
-	self.origin  = self.origin - self.mins;
+	this.mins    = -0.5 * this.maxs;
+	this.maxs    =  0.5 * this.maxs;
+	this.origin  = this.origin - this.mins;
 
-	setorigin(self, self.origin);
-	setsize(self, self.mins, self.maxs);
-	self.solid = SOLID_NOT;
-	if(self.impulse)
-		self.draw = Draw_Rain;
+	setorigin(this, this.origin);
+	setsize(this, this.mins, this.maxs);
+	this.solid = SOLID_NOT;
+	if (isnew) IL_PUSH(g_drawables, this);
+	if(this.impulse)
+		this.draw = Draw_Rain;
 	else
-		self.draw = Draw_Snow;
+		this.draw = Draw_Snow;
 }
 #endif