summaryrefslogtreecommitdiff
path: root/prb_math.c
diff options
context:
space:
mode:
Diffstat (limited to 'prb_math.c')
-rw-r--r--prb_math.c118
1 files changed, 59 insertions, 59 deletions
diff --git a/prb_math.c b/prb_math.c
index bbc3161..2efb091 100644
--- a/prb_math.c
+++ b/prb_math.c
@@ -42,76 +42,76 @@ V2 v2a(F32 x)
return r;
}
-V2 v2inv(V2 a)
+V2 invv2(V2 a)
{
V2 r;
r = v2(-a.x, -a.y);
return r;
}
-V2 v2add(V2 a, V2 b)
+V2 addv2(V2 a, V2 b)
{
V2 r;
r = v2(a.x+b.x, a.y+b.y);
return r;
}
-V2 v2sub(V2 a, V2 b)
+V2 subv2(V2 a, V2 b)
{
V2 r;
r = v2(a.x-b.x, a.y-b.y);
return r;
}
-V2 v2scalef(V2 a, F32 s)
+V2 scalefv2(V2 a, F32 s)
{
V2 r;
r = v2(a.x*s, a.y*s);
return r;
}
-V2 v2scale(V2 a, V2 s)
+V2 scalev2(V2 a, V2 s)
{
V2 r;
r = v2(a.x*s.x, a.y*s.y);
return r;
}
-F32 v2dot(V2 a, V2 b)
+F32 dotv2(V2 a, V2 b)
{
F32 r;
r = a.x*b.x+a.y*b.y;
return r;
}
-F32 v2len2(V2 a)
+F32 len2v2(V2 a)
{
F32 r;
- r = v2dot(a, a);
+ r = dotv2(a, a);
return r;
}
-F32 v2len(V2 a)
+F32 lenv2(V2 a)
{
F32 r;
- r = f32sqrt(v2len2(a));
+ r = f32sqrt(len2v2(a));
return r;
}
-V2 v2norm(V2 a)
+V2 normv2(V2 a)
{
F32 len;
V2 r;
r = V2_ZERO;
- len = v2len(a);
+ len = lenv2(a);
if (len)
r = v2(a.x/len, a.y/len);
return r;
}
-void v2print(V2 a)
+void printv2(V2 a)
{
fprintf(stdout, "{%f, %f}T\n", a.x, a.y);
}
@@ -146,49 +146,49 @@ V3 v3fromv4(V4 a)
return r;
}
-V3 v3inv(V3 a)
+V3 invv3(V3 a)
{
V3 r;
r = v3(-a.x, -a.y, -a.z);
return r;
}
-V3 v3add(V3 a, V3 b)
+V3 addv3(V3 a, V3 b)
{
V3 r;
r = v3(a.x+b.x, a.y+b.y, a.z+b.z);
return r;
}
-V3 v3sub(V3 a, V3 b)
+V3 subv3(V3 a, V3 b)
{
V3 r;
r = v3(a.x-b.x, a.y-b.y, a.z-b.z);
return r;
}
-V3 v3scalef(V3 a, F32 s)
+V3 scalefv3(V3 a, F32 s)
{
V3 r;
r = v3(a.x*s, a.y*s, a.z*s);
return r;
}
-V3 v3scale(V3 a, V3 s)
+V3 scalev3(V3 a, V3 s)
{
V3 r;
r = v3(a.x*s.x, a.y*s.y, a.z*s.z);
return r;
}
-F32 v3dot(V3 a, V3 b)
+F32 dotv3(V3 a, V3 b)
{
F32 r;
r = a.x*b.x + a.y*b.y + a.z*b.z;
return r;
}
-V3 v3cross(V3 left, V3 right)
+V3 crossv3(V3 left, V3 right)
{
V3 r;
r = v3((left.y*right.z-right.y*left.z),
@@ -197,34 +197,34 @@ V3 v3cross(V3 left, V3 right)
return r;
}
-F32 v3len2(V3 a)
+F32 len2v3(V3 a)
{
F32 r;
- r = v3dot(a, a);
+ r = dotv3(a, a);
return r;
}
-F32 v3len(V3 a)
+F32 lenv3(V3 a)
{
F32 r;
- r = f32sqrt(v3len2(a));
+ r = f32sqrt(len2v3(a));
return r;
}
-V3 v3norm(V3 a)
+V3 normv3(V3 a)
{
F32 len;
V3 r;
r = V3_ZERO;
- len = v3len(a);
+ len = lenv3(a);
if (len)
r = v3(a.x/len, a.y/len, a.z/len);
return r;
}
-void v3print(V3 a)
+void printv3(V3 a)
{
fprintf(stdout, "{%f, %f, %f}T\n", a.x, a.y, a.z);
}
@@ -253,82 +253,82 @@ V4 v4fromv3(V3 a)
return r;
}
-V4 v4inv(V4 a)
+V4 invv4(V4 a)
{
V4 r;
r = v4(-a.x, -a.y, -a.z, -a.w);
return r;
}
-V4 v4add(V4 a, V4 b)
+V4 addv4(V4 a, V4 b)
{
V4 r;
r = v4(a.x+b.x, a.y+b.y, a.z+b.z, a.w+b.w);
return r;
}
-V4 v4sub(V4 a, V4 b)
+V4 subv4(V4 a, V4 b)
{
V4 r;
r = v4(a.x-b.x, a.y-b.y, a.z-b.z, a.w-b.w);
return r;
}
-V4 v4scalef(V4 a, F32 s)
+V4 scalefv4(V4 a, F32 s)
{
V4 r;
r = v4(a.x*s, a.y*s, a.z*s, a.w*s);
return r;
}
-V4 v4scale(V4 a, V4 s)
+V4 scalev4(V4 a, V4 s)
{
V4 r;
r = v4(a.x*s.x, a.y*s.y, a.z*s.z, a.w*s.w);
return r;
}
-F32 v4dot(V4 a, V4 b)
+F32 dotv4(V4 a, V4 b)
{
F32 r;
r = a.x*b.x+a.y*b.y+a.z*b.z+a.w*b.w;
return r;
}
-F32 v4len2(V4 a)
+F32 len2v4(V4 a)
{
F32 r;
- r = v4dot(a, a);
+ r = dotv4(a, a);
return r;
}
-F32 v4len(V4 a)
+F32 lenv4(V4 a)
{
F32 r;
- r = f32sqrt(v4len2(a));
+ r = f32sqrt(len2v4(a));
return r;
}
-V4 v4norm(V4 a)
+V4 normv4(V4 a)
{
F32 len;
V4 r;
r = V4_ZERO;
- len = v4len(a);
+ len = lenv4(a);
if (len)
r = v4(a.x/len, a.y/len, a.z/len, a.w/len);
return r;
}
-void v4print(V4 a)
+void printv4(V4 a)
{
fprintf(stdout, "{%f, %f, %f, %f}T\n", a.x, a.y, a.z, a.w);
}
/* NOTE(pryazha): Matrices */
-F32 mat4det(MAT4 m)
+F32 detmat4(MAT4 m)
{
F32 r, m00minor, m01minor, m02minor, m03minor;
@@ -354,25 +354,25 @@ F32 mat4det(MAT4 m)
return r;
}
-MAT4 mat4transp(MAT4 m)
+MAT4 transpmat4(MAT4 m)
{
MAT4 r;
r = m;
- Swap(F32, r.m0.y, r.m1.x);
- Swap(F32, r.m0.z, r.m2.x);
- Swap(F32, r.m0.w, r.m3.x);
+ SWAP(F32, r.m0.y, r.m1.x);
+ SWAP(F32, r.m0.z, r.m2.x);
+ SWAP(F32, r.m0.w, r.m3.x);
- Swap(F32, r.m1.z, r.m2.y);
- Swap(F32, r.m1.w, r.m3.y);
+ SWAP(F32, r.m1.z, r.m2.y);
+ SWAP(F32, r.m1.w, r.m3.y);
- Swap(F32, r.m2.w, r.m3.z);
+ SWAP(F32, r.m2.w, r.m3.z);
return r;
}
-MAT4 mat4mul(MAT4 left, MAT4 right)
+MAT4 mulmat4(MAT4 left, MAT4 right)
{
F32 l00, l01, l02, l03;
F32 l10, l11, l12, l13;
@@ -419,7 +419,7 @@ MAT4 mat4mul(MAT4 left, MAT4 right)
return r;
}
-MAT4 mat4transl(MAT4 m, V3 v)
+MAT4 translmat4(MAT4 m, V3 v)
{
MAT4 t, r;
@@ -427,12 +427,12 @@ MAT4 mat4transl(MAT4 m, V3 v)
t.m3.x = v.x;
t.m3.y = v.y;
t.m3.z = v.z;
- r = mat4mul(t, m);
+ r = mulmat4(t, m);
return r;
}
-MAT4 mat4scale(MAT4 m, V3 v)
+MAT4 scalemat4(MAT4 m, V3 v)
{
MAT4 s, r;
@@ -440,12 +440,12 @@ MAT4 mat4scale(MAT4 m, V3 v)
s.m0.x = v.x;
s.m1.y = v.y;
s.m2.z = v.z;
- r = mat4mul(s, m);
+ r = mulmat4(s, m);
return r;
}
-MAT4 mat4_change_basis(V3 x, V3 y, V3 z)
+MAT4 rotateaxismat4(V3 x, V3 y, V3 z)
{
MAT4 r;
@@ -463,7 +463,7 @@ MAT4 mat4_change_basis(V3 x, V3 y, V3 z)
* | 0 cx -sx |*| 0 1 0 |*| sz cz 0 |=| sx*sy*cz+cx*sz -sx*sy*sz+cx*cz -sx*cy |
* | 0 sx cx | | -sy 0 cy | | 0 0 1 | | -cx*sy*cz+sx*sz cx*sy*sz+sx*cz cx*cy |
*/
-MAT4 mat4rotate(MAT4 m, V3 angles)
+MAT4 rotatemat4(MAT4 m, V3 angles)
{
F32 angle, cx, sx, cy, sy, cz, sz;
MAT4 rotate, r;
@@ -482,14 +482,14 @@ MAT4 mat4rotate(MAT4 m, V3 angles)
newx = v3(cy*cz, sx*sy*cz+cx*sz, -cx*sy*cz+sx*sz);
newy = v3(-cy*sz, -sx*sy*sz+cx*cz, cx*sy*sz+sx*cz);
newz = v3(sy, -sx*cy, cx*cy);
- rotate = mat4_change_basis(newx, newy, newz);
+ rotate = rotateaxismat4(newx, newy, newz);
- r = mat4mul(rotate, m);
+ r = mulmat4(rotate, m);
return r;
}
-V4 mat4v4mul(MAT4 m, V4 v)
+V4 mulmat4v4(MAT4 m, V4 v)
{
V4 r;
@@ -501,7 +501,7 @@ V4 mat4v4mul(MAT4 m, V4 v)
return r;
}
-void mat4print(MAT4 m)
+void printmat4(MAT4 m)
{
fprintf(stdout, "| %.4f %.4f %.4f %.4f |\n", m.m0.x, m.m1.x, m.m2.x, m.m3.x);
fprintf(stdout, "| %.4f %.4f %.4f %.4f |\n", m.m0.y, m.m1.y, m.m2.y, m.m3.y);