X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_subs.qc;h=79369b74b9553dbcca2c0859560d46341c7b6111;hp=500240d6ce4aee4c96220ee9dc9d4bec52ebf5e2;hb=dcaa708cee1093798a651369d9fd46ad5074121e;hpb=d7a834f0cfbf327e001d53f09c7ddfe2e2783955

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 500240d6ce..79369b74b9 100644
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -177,10 +177,51 @@ void SUB_CalcMoveDone (void)
 		self.think1 ();
 }
 
+void SUB_CalcMove_controller_think (void)
+{
+	entity oldself;
+	float traveltime;
+	float phasepos;
+	float nexttick;
+	vector delta;
+	vector veloc;
+	vector nextpos;
+	if(time < self.animstate_endtime) {
+		delta = self.destvec;
+		nexttick = time + sys_frametime;
+
+		if(nexttick < self.animstate_endtime) {
+			traveltime = self.animstate_endtime - self.animstate_starttime;
+			phasepos = (nexttick - self.animstate_starttime) / traveltime; // range: [0, 1]
+			phasepos = 3.14159265 + (phasepos * 3.14159265); // range: [pi, 2pi]
+			phasepos = cos(phasepos); // cos [pi, 2pi] is in [-1, 1]
+			phasepos = phasepos + 1; // correct range to [0, 2]
+			phasepos = phasepos / 2; // correct range to [0, 1]
+			nextpos = self.origin + (delta * phasepos);
+
+			veloc = nextpos - self.owner.origin;
+			veloc = veloc * (1 / sys_frametime); // so it arrives for the next frame
+
+		} else {
+			veloc = self.finaldest - self.owner.origin;
+			veloc = veloc * (1 / sys_frametime); // so it arrives for the next frame
+		}
+		self.owner.velocity = veloc;
+		self.nextthink = nexttick;
+	} else {
+		oldself = self;
+		self.owner.think = self.think1;
+		self = self.owner;
+		remove(oldself);
+		self.think();
+	}
+}
+
 void SUB_CalcMove (vector tdest, float tspeed, void() func)
 {
 	vector	delta;
 	float	traveltime;
+	entity controller;
 
 	if (!tspeed)
 		objerror ("No speed is defined!");
@@ -206,9 +247,34 @@ void SUB_CalcMove (vector tdest, float tspeed, void() func)
 		return;
 	}
 
-	self.velocity = delta * (1/traveltime);	// QuakeC doesn't allow vector/float division
+	// very short animations don't really show off the effect
+	// of controlled animation, so let's just use linear movement
+	if (traveltime < 0.15)
+	{
+		self.velocity = delta * (1/traveltime);	// QuakeC doesn't allow vector/float division
+		self.nextthink = self.ltime + traveltime;
+		return;
+	}
 
+	controller = spawn();
+	controller.classname = "SUB_CalcMove_controller";
+	controller.owner = self;
+	controller.origin = self.origin; // starting point
+	controller.finaldest = (tdest + '0 0 1'); // where do we want to end? Offset to overshoot a bit.
+	controller.destvec = delta;
+	controller.animstate_starttime = time;
+	controller.animstate_endtime = time + traveltime;
+	controller.think = SUB_CalcMove_controller_think;
+	controller.think1 = self.think;
+
+	// the thinking is now done by the controller
+	self.think = SUB_Null;
 	self.nextthink = self.ltime + traveltime;
+	
+	// invoke controller
+	self = controller;
+	self.think();
+	self = self.owner;
 }
 
 void SUB_CalcMoveEnt (entity ent, vector tdest, float tspeed, void() func)
@@ -698,6 +764,33 @@ void LODmodel_attach()
 			SetCustomizer(self, LOD_customize, LOD_uncustomize);
 }
 
+void ApplyMinMaxScaleAngles(entity e)
+{
+	if(e.angles_x != 0 || e.angles_z != 0 || self.avelocity_x != 0 || self.avelocity_z != 0) // "weird" rotation
+	{
+		e.maxs = '1 1 1' * vlen(
+			'1 0 0' * max(-e.mins_x, e.maxs_x) +
+			'0 1 0' * max(-e.mins_y, e.maxs_y) +
+			'0 0 1' * max(-e.mins_z, e.maxs_z)
+		);
+		e.mins = -e.maxs;
+	}
+	else if(e.angles_y != 0 || self.avelocity_y != 0) // yaw only is a bit better
+	{
+		e.maxs_x = vlen(
+			'1 0 0' * max(-e.mins_x, e.maxs_x) +
+			'0 1 0' * max(-e.mins_y, e.maxs_y)
+		);
+		e.maxs_y = e.maxs_x;
+		e.mins_x = -e.maxs_x;
+		e.mins_y = -e.maxs_x;
+	}
+	if(e.scale)
+		setsize(e, e.mins * e.scale, e.maxs * e.scale);
+	else
+		setsize(e, e.mins, e.maxs);
+}
+
 void SetBrushEntityModel()
 {
  	if(self.model != "")
@@ -707,10 +800,7 @@ void SetBrushEntityModel()
 		InitializeEntity(self, LODmodel_attach, INITPRIO_FINDTARGET);
  	}
 	setorigin(self, self.origin);
-	if(self.scale)
-		setsize(self, self.mins * self.scale, self.maxs * self.scale);
-	else
-		setsize(self, self.mins, self.maxs);
+	ApplyMinMaxScaleAngles(self);
 }
 
 void SetBrushEntityModelNoLOD()
@@ -721,10 +811,7 @@ void SetBrushEntityModelNoLOD()
  		setmodel(self, self.model); // no precision needed
  	}
 	setorigin(self, self.origin);
-	if(self.scale)
-		setsize(self, self.mins * self.scale, self.maxs * self.scale);
-	else
-		setsize(self, self.mins, self.maxs);
+	ApplyMinMaxScaleAngles(self);
 }
 
 /*
@@ -750,9 +837,7 @@ void InitTrigger()
 {
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
-	if (self.movedir == '0 0 0')
-	if (self.angles != '0 0 0')
-		SetMovedir ();
+	SetMovedir ();
 	self.solid = SOLID_TRIGGER;
 	SetBrushEntityModel();
 	self.movetype = MOVETYPE_NONE;
@@ -764,9 +849,7 @@ void InitSolidBSPTrigger()
 {
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
-	if (self.movedir == '0 0 0')
-	if (self.angles != '0 0 0')
-		SetMovedir ();
+	SetMovedir ();
 	self.solid = SOLID_BSP;
 	SetBrushEntityModel();
 	self.movetype = MOVETYPE_NONE; // why was this PUSH? -div0