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

Migrate vec to OFVector3D

Browse source 
FossilOrigin-Name: 2e931ae3e1bb8a3ac23d368cfacc7394d07f295bd0bc56a40e0c70190d019d8b
This commit is contained in:
Jonathan Schleifer 2025-03-04 00:14:25 +00:00
parent 4ce99636d3
commit 6f64252d65
15 changed files with 141 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/cube.h
View file

@ -102,9 +102,6 @@ struct header // map file format header
((x) < MINBORD || (y) < MINBORD || (x) >= ssize - MINBORD || \
(y) >= ssize - MINBORD)
struct vec {
float x, y, z;
};
struct block {
int x, y, xs, ys;
};
@ -128,8 +125,8 @@ enum {
struct dynent // players & monsters
{
vec o, vel; // origin, velocity
float yaw, pitch, roll; // used as vec in one place
OFVector3D o, vel; // origin, velocity
float yaw, pitch, roll; // used as OFVector3D in one place
float maxspeed; // cubes per second, 24 for player
bool outsidemap; // from his eyes
bool inwater;
@ -154,8 +151,8 @@ struct dynent // players & monsters
bool blocked, moving; // used by physics to signal ai
int trigger; // millis at which transition to another monsterstate takes
// place
vec attacktarget; // delayed attacks
int anger; // how many times already hit by fellow monster
OFVector3D attacktarget; // delayed attacks
int anger; // how many times already hit by fellow monster
string name, team;
};
@ -295,7 +292,7 @@ extern dynent
extern dvector players; // all the other clients (in multiplayer)
extern bool editmode;
extern vector<entity> ents; // map entities
extern vec worldpos; // current target of the crosshair in the world
extern OFVector3D worldpos; // current target of the crosshair in the world
extern int lastmillis; // last time
extern int curtime; // current frame time
extern int gamemode, nextmode;
@ -341,7 +338,7 @@ extern bool demoplayback;
(u).z -= (v).z; \
};
#define vdist(d, v, e, s) \
vec v = s; \
OFVector3D v = s; \
vsub(v, e); \
float d = (float)sqrt(dotprod(v, v));
#define vreject(v, u, max) \