js/Cube
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove dotprod

Browse source 
FossilOrigin-Name: da90479adfbf8157d7f203d06b68ddc6b9d5d2667e54e6ac8b6380d96ce05048
This commit is contained in:
Jonathan Schleifer 2025-03-23 17:41:32 +00:00
parent e91d88fd2b
commit 6320094293
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cube.h
View file

@ -287,10 +287,9 @@ extern bool demoplayback;
#define PI2 (2 * PI) #define PI2 (2 * PI)
// simplistic vector ops // simplistic vector ops
#define dotprod(u, v) ((u).x * (v).x + (u).y * (v).y + (u).z * (v).z)
#define vdist(d, v, e, s) \ #define vdist(d, v, e, s) \
OFVector3D v = OFSubtractVectors3D(s, e); \ OFVector3D v = OFSubtractVectors3D(s, e); \
float d = (float)sqrt(dotprod(v, v)); float d = sqrtf(OFDotProductOfVectors3D(v, v));
#define vreject(v, u, max) \ #define vreject(v, u, max) \
((v).x > (u).x + (max) || (v).x < (u).x - (max) || \ ((v).x > (u).x + (max) || (v).x < (u).x - (max) || \
(v).y > (u).y + (max) || (v).y < (u).y - (max)) (v).y > (u).y + (max) || (v).y < (u).y - (max))

4
src/weapon.m
View file

@ -90,12 +90,12 @@ intersect(DynamicEntity *d, const OFVector3D *from, const OFVector3D *to)
const OFVector3D *p; const OFVector3D *p;
v = OFSubtractVectors3D(v, *from); v = OFSubtractVectors3D(v, *from);
w = OFSubtractVectors3D(w, *from); w = OFSubtractVectors3D(w, *from);
float c1 = dotprod(w, v); float c1 = OFDotProductOfVectors3D(w, v);
if (c1 <= 0) if (c1 <= 0)
p = from; p = from;
else { else {
float c2 = dotprod(v, v); float c2 = OFDotProductOfVectors3D(v, v);
if (c2 <= c1) if (c2 <= c1)
p = to; p = to;
else { else {