X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fcalculations.qc;h=c35b1930c44672995718ab746454da9aabfcd243;hb=50bef5e0fcc9ffcb6693780b1ed6581a88e177f8;hp=7bc64e0b5371c0ddf3fb007257f5f6af34c25480;hpb=3bc58a45f32841ecde5913aa899172e3093b63a6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/calculations.qc b/qcsrc/common/weapons/calculations.qc
index 7bc64e0b5..c35b1930c 100644
--- a/qcsrc/common/weapons/calculations.qc
+++ b/qcsrc/common/weapons/calculations.qc
@@ -1,3 +1,5 @@
+#include "calculations.qh"
+
 // =============================
 //  Explosion Force Calculation
 // =============================
@@ -55,7 +57,7 @@ vector damage_explosion_calcpush(vector explosion_f, vector target_v, float spee
 	v = explosion_calcpush(explosion_f * speedfactor, m, target_v, 1, 0);
 	// the factor we then get is:
 	//   1
-	printf("MASS: %f\nv: %v -> %v\nENERGY BEFORE == %f + %f = %f\nENERGY AFTER >= %f\n",
+	LOG_INFOF("MASS: %f\nv: %v -> %v\nENERGY BEFORE == %f + %f = %f\nENERGY AFTER >= %f\n",
 		m,
 		target_v, target_v + v,
 		target_v * target_v, m * explosion_f * speedfactor * explosion_f * speedfactor, target_v * target_v + m * explosion_f * speedfactor * explosion_f * speedfactor,
@@ -129,122 +131,134 @@ vector solve_cubic_abcd(float a, float b, float c, float d)
 	v = solve_cubic_pq(p, q);
 	v = (v -  b * '1 1 1') * (1.0 / (3.0 * a));
 	if(a < 0)
-		v += '1 0 -1' * (v_z - v_x); // swap x, z
+		v += '1 0 -1' * (v.z - v.x); // swap x, z
 	return v;
 }
 
 vector findperpendicular(vector v)
 {
 	vector p;
-	p_x = v_z;
-	p_y = -v_x;
-	p_z = v_y;
+	p.x = v.z;
+	p.y = -v.x;
+	p.z = v.y;
 	return normalize(cliptoplane(p, v));
 }
 
+int W_GetGunAlignment(entity player)
+{
+	int gunalign = STAT(GUNALIGN, player);
+	if(gunalign < 1 || gunalign > 4)
+		gunalign = 3; // default value
+	--gunalign;
+
+	return gunalign;
+}
+
 vector W_CalculateSpread(vector forward, float spread, float spreadfactor, float spreadstyle)
 {
 	float sigma;
 	vector v1 = '0 0 0', v2;
 	float dx, dy, r;
-	float sstyle;
 	spread *= spreadfactor; //g_weaponspreadfactor;
 	if(spread <= 0)
 		return forward;
-	sstyle = spreadstyle; //autocvar_g_projectiles_spread_style;
-	
-	if(sstyle == 0)
-	{
-		// this is the baseline for the spread value!
-		// standard deviation: sqrt(2/5)
-		// density function: sqrt(1-r^2)
-		return forward + randomvec() * spread;
-	}
-	else if(sstyle == 1)
-	{
-		// same thing, basically
-		return normalize(forward + cliptoplane(randomvec() * spread, forward));
-	}
-	else if(sstyle == 2)
-	{
-		// circle spread... has at sigma=1 a standard deviation of sqrt(1/2)
-		sigma = spread * 0.89442719099991587855; // match baseline stddev
-		v1 = findperpendicular(forward);
-		v2 = cross(forward, v1);
-		// random point on unit circle
-		dx = random() * 2 * M_PI;
-		dy = sin(dx);
-		dx = cos(dx);
-		// radius in our dist function
-		r = random();
-		r = sqrt(r);
-		return normalize(forward + (v1 * dx + v2 * dy) * r * sigma);
-	}
-	else if(sstyle == 3) // gauss 3d
-	{
-		sigma = spread * 0.44721359549996; // match baseline stddev
-		// note: 2D gaussian has sqrt(2) times the stddev of 1D, so this factor is right
-		v1 = forward;
-		v1_x += gsl_ran_gaussian(sigma);
-		v1_y += gsl_ran_gaussian(sigma);
-		v1_z += gsl_ran_gaussian(sigma);
-		return v1;
-	}
-	else if(sstyle == 4) // gauss 2d
-	{
-		sigma = spread * 0.44721359549996; // match baseline stddev
-		// note: 2D gaussian has sqrt(2) times the stddev of 1D, so this factor is right
-		v1_x = gsl_ran_gaussian(sigma);
-		v1_y = gsl_ran_gaussian(sigma);
-		v1_z = gsl_ran_gaussian(sigma);
-		return normalize(forward + cliptoplane(v1, forward));
-	}
-	else if(sstyle == 5) // 1-r
-	{
-		sigma = spread * 1.154700538379252; // match baseline stddev
-		v1 = findperpendicular(forward);
-		v2 = cross(forward, v1);
-		// random point on unit circle
-		dx = random() * 2 * M_PI;
-		dy = sin(dx);
-		dx = cos(dx);
-		// radius in our dist function
-		r = random();
-		r = solve_cubic_abcd(-2, 3, 0, -r) * '0 1 0';
-		return normalize(forward + (v1 * dx + v2 * dy) * r * sigma);
-	}
-	else if(sstyle == 6) // 1-r^2
-	{
-		sigma = spread * 1.095445115010332; // match baseline stddev
-		v1 = findperpendicular(forward);
-		v2 = cross(forward, v1);
-		// random point on unit circle
-		dx = random() * 2 * M_PI;
-		dy = sin(dx);
-		dx = cos(dx);
-		// radius in our dist function
-		r = random();
-		r = sqrt(1 - r);
-		r = sqrt(1 - r);
-		return normalize(forward + (v1 * dx + v2 * dy) * r * sigma);
-	}
-	else if(sstyle == 7) // (1-r) (2-r)
+
+	switch(spreadstyle)
 	{
-		sigma = spread * 1.224744871391589; // match baseline stddev
-		v1 = findperpendicular(forward);
-		v2 = cross(forward, v1);
-		// random point on unit circle
-		dx = random() * 2 * M_PI;
-		dy = sin(dx);
-		dx = cos(dx);
-		// radius in our dist function
-		r = random();
-		r = 1 - sqrt(r);
-		r = 1 - sqrt(r);
-		return normalize(forward + (v1 * dx + v2 * dy) * r * sigma);
+		case 0:
+		{
+			// this is the baseline for the spread value!
+			// standard deviation: sqrt(2/5)
+			// density function: sqrt(1-r^2)
+			return forward + randomvec() * spread;
+		}
+		case 1:
+		{
+			// same thing, basically
+			return normalize(forward + cliptoplane(randomvec() * spread, forward));
+		}
+		case 2:
+		{
+			// circle spread... has at sigma=1 a standard deviation of sqrt(1/2)
+			sigma = spread * 0.89442719099991587855; // match baseline stddev
+			v1 = findperpendicular(forward);
+			v2 = cross(forward, v1);
+			// random point on unit circle
+			dx = random() * 2 * M_PI;
+			dy = sin(dx);
+			dx = cos(dx);
+			// radius in our dist function
+			r = random();
+			r = sqrt(r);
+			return normalize(forward + (v1 * dx + v2 * dy) * r * sigma);
+		}
+		case 3: // gauss 3d
+		{
+			sigma = spread * 0.44721359549996; // match baseline stddev
+			// note: 2D gaussian has sqrt(2) times the stddev of 1D, so this factor is right
+			v1 = forward;
+			v1_x += gsl_ran_gaussian(sigma);
+			v1_y += gsl_ran_gaussian(sigma);
+			v1_z += gsl_ran_gaussian(sigma);
+			return v1;
+		}
+		case 4: // gauss 2d
+		{
+			sigma = spread * 0.44721359549996; // match baseline stddev
+			// note: 2D gaussian has sqrt(2) times the stddev of 1D, so this factor is right
+			v1_x = gsl_ran_gaussian(sigma);
+			v1_y = gsl_ran_gaussian(sigma);
+			v1_z = gsl_ran_gaussian(sigma);
+			return normalize(forward + cliptoplane(v1, forward));
+		}
+		case 5: // 1-r
+		{
+			sigma = spread * 1.154700538379252; // match baseline stddev
+			v1 = findperpendicular(forward);
+			v2 = cross(forward, v1);
+			// random point on unit circle
+			dx = random() * 2 * M_PI;
+			dy = sin(dx);
+			dx = cos(dx);
+			// radius in our dist function
+			r = random();
+			r = solve_cubic_abcd(-2, 3, 0, -r) * '0 1 0';
+			return normalize(forward + (v1 * dx + v2 * dy) * r * sigma);
+		}
+		case 6: // 1-r^2
+		{
+			sigma = spread * 1.095445115010332; // match baseline stddev
+			v1 = findperpendicular(forward);
+			v2 = cross(forward, v1);
+			// random point on unit circle
+			dx = random() * 2 * M_PI;
+			dy = sin(dx);
+			dx = cos(dx);
+			// radius in our dist function
+			r = random();
+			r = sqrt(1 - r);
+			r = sqrt(1 - r);
+			return normalize(forward + (v1 * dx + v2 * dy) * r * sigma);
+		}
+		case 7: // (1-r) (2-r)
+		{
+			sigma = spread * 1.224744871391589; // match baseline stddev
+			v1 = findperpendicular(forward);
+			v2 = cross(forward, v1);
+			// random point on unit circle
+			dx = random() * 2 * M_PI;
+			dy = sin(dx);
+			dx = cos(dx);
+			// radius in our dist function
+			r = random();
+			r = 1 - sqrt(r);
+			r = 1 - sqrt(r);
+			return normalize(forward + (v1 * dx + v2 * dy) * r * sigma);
+		}
+		default:
+			error("g_projectiles_spread_style must be 0 (sphere), 1 (flattened sphere), 2 (circle), 3 (gauss 3D), 4 (gauss plane), 5 (linear falloff), 6 (quadratic falloff), 7 (stronger falloff)!");
 	}
-	else
-		error("g_projectiles_spread_style must be 0 (sphere), 1 (flattened sphere), 2 (circle), 3 (gauss 3D), 4 (gauss plane), 5 (linear falloff), 6 (quadratic falloff), 7 (stronger falloff)!");
+
 	return '0 0 0';
 	/*
 	 * how to derive falloff functions: