OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Added Translocator ammo feature from UT2k4.

Browse source 
Prefixed mk_math classes for cross-compat with any other mods that use them.
Fixed incorrect uses of gametic.
Fixed crash caused by incorrect ordering of PendingWeapon checks.
This commit is contained in:
Marisa the Magician 2018-12-17 16:32:15 +01:00
commit 931f89832c
23 changed files with 179 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

40
zscript/mk_matrix.zsc
View file

@ -5,25 +5,25 @@
See https://www.gnu.org/licenses/lgpl-3.0.txt for its terms.
*/
Class Matrix4
Class dt_Matrix4
{
private double m[16];
Matrix4 init()
dt_Matrix4 init()
{
int i;
for ( i=0; i<16; i++ ) m[i] = 0;
return self;
}
static Matrix4 create()
static dt_Matrix4 create()
{
return new("Matrix4").init();
return new("dt_Matrix4").init();
}
static Matrix4 identity()
static dt_Matrix4 identity()
{
Matrix4 o = Matrix4.create();
dt_Matrix4 o = dt_Matrix4.create();
for ( int i=0; i<4; i++ ) o.set(i,i,1);
return o;
}
@ -38,27 +38,27 @@ Class Matrix4
m[r*4+c] = v;
}
Matrix4 add( Matrix4 o )
dt_Matrix4 add( dt_Matrix4 o )
{
Matrix4 r = Matrix4.create();
dt_Matrix4 r = dt_Matrix4.create();
int i, j;
for ( i=0; i<4; i++ ) for ( j=0; j<4; j++ )
r.set(j,i,get(j,i)+o.get(j,i));
return r;
}
Matrix4 scale( double s )
dt_Matrix4 scale( double s )
{
Matrix4 r = Matrix4.create();
dt_Matrix4 r = dt_Matrix4.create();
int i, j;
for ( i=0; i<4; i++ ) for ( j=0; j<4; j++ )
r.set(j,i,get(j,i)*s);
return r;
}
Matrix4 mul( Matrix4 o )
dt_Matrix4 mul( dt_Matrix4 o )
{
Matrix4 r = Matrix4.create();
dt_Matrix4 r = dt_Matrix4.create();
int i, j;
for ( i=0; i<4; i++ ) for ( j=0; j<4; j++ )
r.set(j,i,get(0,i)*o.get(j,0)+get(1,i)*o.get(j,1)+get(2,i)*o.get(j,2)+get(3,i)*o.get(j,3));
@ -75,9 +75,9 @@ Class Matrix4
return (x,y,z)/w;
}
static Matrix4 rotate( Vector3 axis, double theta )
static dt_Matrix4 rotate( Vector3 axis, double theta )
{
Matrix4 r = Matrix4.identity();
dt_Matrix4 r = dt_Matrix4.identity();
double s, c, oc;
s = sin(theta);
c = cos(theta);
@ -94,9 +94,9 @@ Class Matrix4
return r;
}
static Matrix4 perspective( double fov, double ar, double znear, double zfar )
static dt_Matrix4 perspective( double fov, double ar, double znear, double zfar )
{
Matrix4 r = Matrix4.create();
dt_Matrix4 r = dt_Matrix4.create();
double f = 1/tan(fov*0.5);
r.set(0,0,f/ar);
r.set(1,1,f);
@ -110,10 +110,10 @@ Class Matrix4
static Vector3, Vector3, Vector3 getaxes( double pitch, double yaw, double roll )
{
Vector3 x = (1,0,0), y = (0,-1,0), z = (0,0,1); // y inverted for left-handed result
Matrix4 mRoll = Matrix4.rotate((1,0,0),roll);
Matrix4 mPitch = Matrix4.rotate((0,1,0),pitch);
Matrix4 mYaw = Matrix4.rotate((0,0,1),yaw);
Matrix4 mRot = mRoll.mul(mYaw);
dt_Matrix4 mRoll = dt_Matrix4.rotate((1,0,0),roll);
dt_Matrix4 mPitch = dt_Matrix4.rotate((0,1,0),pitch);
dt_Matrix4 mYaw = dt_Matrix4.rotate((0,0,1),yaw);
dt_Matrix4 mRot = mRoll.mul(mYaw);
mRot = mRot.mul(mPitch);
x = mRot.vmat(x);
y = mRot.vmat(y);