summaryrefslogtreecommitdiff
path: root/src/engine/world.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/world.cpp')
-rw-r--r--src/engine/world.cpp520
1 files changed, 158 insertions, 362 deletions
diff --git a/src/engine/world.cpp b/src/engine/world.cpp
index 46aaa0f..489ea65 100644
--- a/src/engine/world.cpp
+++ b/src/engine/world.cpp
@@ -10,29 +10,23 @@ SVARR(maptitle, "Untitled Map by Unknown");
VAR(octaentsize, 0, 64, 1024);
VAR(entselradius, 0, 2, 10);
-static inline void mmboundbox(const entity &e, model *m, vec &center, vec &radius)
-{
+static inline void mmboundbox(const entity &e, model *m, vec &center, vec &radius) {
m->boundbox(center, radius);
rotatebb(center, radius, e.attr1);
}
-static inline void mmcollisionbox(const entity &e, model *m, vec &center, vec &radius)
-{
+static inline void mmcollisionbox(const entity &e, model *m, vec &center, vec &radius) {
m->collisionbox(center, radius);
rotatebb(center, radius, e.attr1);
}
-bool getentboundingbox(const extentity &e, ivec &o, ivec &r)
-{
- switch(e.type)
- {
+bool getentboundingbox(const extentity &e, ivec &o, ivec &r) {
+ switch(e.type) {
case ET_EMPTY:
return false;
- case ET_MAPMODEL:
- {
+ case ET_MAPMODEL: {
model *m = loadmapmodel(e.attr2);
- if(m)
- {
+ if(m) {
vec center, radius;
mmboundbox(e, m, center, radius);
center.add(e.o);
@@ -52,32 +46,25 @@ bool getentboundingbox(const extentity &e, ivec &o, ivec &r)
return true;
}
-enum
-{
+enum {
MODOE_ADD = 1<<0,
MODOE_UPDATEBB = 1<<1,
MODOE_LIGHTENT = 1<<2
};
-void modifyoctaentity(int flags, int id, extentity &e, cube *c, const ivec &cor, int size, const ivec &bo, const ivec &br, int leafsize, vtxarray *lastva = NULL)
-{
- loopoctabox(cor, size, bo, br)
- {
+void modifyoctaentity(int flags, int id, extentity &e, cube *c, const ivec &cor, int size, const ivec &bo, const ivec &br, int leafsize, vtxarray *lastva = NULL) {
+ loopoctabox(cor, size, bo, br) {
ivec o(i, cor, size);
vtxarray *va = c[i].ext && c[i].ext->va ? c[i].ext->va : lastva;
if(c[i].children != NULL && size > leafsize)
modifyoctaentity(flags, id, e, c[i].children, o, size>>1, bo, br, leafsize, va);
- else if(flags&MODOE_ADD)
- {
+ else if(flags&MODOE_ADD) {
if(!c[i].ext || !c[i].ext->ents) ext(c[i]).ents = new octaentities(o, size);
octaentities &oe = *c[i].ext->ents;
- switch(e.type)
- {
+ switch(e.type) {
case ET_MAPMODEL:
- if(loadmapmodel(e.attr2))
- {
- if(va)
- {
+ if(loadmapmodel(e.attr2)) {
+ if(va) {
va->bbmin.x = -1;
if(oe.mapmodels.empty()) va->mapmodels.add(&oe);
}
@@ -92,26 +79,20 @@ void modifyoctaentity(int flags, int id, extentity &e, cube *c, const ivec &cor,
oe.other.add(id);
break;
}
-
}
- else if(c[i].ext && c[i].ext->ents)
- {
+ else if(c[i].ext && c[i].ext->ents) {
octaentities &oe = *c[i].ext->ents;
- switch(e.type)
- {
+ switch(e.type) {
case ET_MAPMODEL:
- if(loadmapmodel(e.attr2))
- {
+ if(loadmapmodel(e.attr2)) {
oe.mapmodels.removeobj(id);
- if(va)
- {
+ if(va) {
va->bbmin.x = -1;
if(oe.mapmodels.empty()) va->mapmodels.removeobj(&oe);
}
oe.bbmin = oe.bbmax = oe.o;
oe.bbmin.add(oe.size);
- loopvj(oe.mapmodels)
- {
+ loopvj(oe.mapmodels) {
extentity &e = *entities::getents()[oe.mapmodels[j]];
ivec eo, er;
if(getentboundingbox(e, eo, er))
@@ -134,10 +115,8 @@ void modifyoctaentity(int flags, int id, extentity &e, cube *c, const ivec &cor,
freeoctaentities(c[i]);
}
if(c[i].ext && c[i].ext->ents) c[i].ext->ents->query = NULL;
- if(va && va!=lastva)
- {
- if(lastva)
- {
+ if(va && va!=lastva) {
+ if(lastva) {
if(va->bbmin.x < 0) lastva->bbmin.x = -1;
}
else if(flags&MODOE_UPDATEBB) updatevabb(va);
@@ -147,24 +126,18 @@ void modifyoctaentity(int flags, int id, extentity &e, cube *c, const ivec &cor,
vector<int> outsideents;
-static bool modifyoctaent(int flags, int id, extentity &e)
-{
+static bool modifyoctaent(int flags, int id, extentity &e) {
if(flags&MODOE_ADD ? e.flags&EF_OCTA : !(e.flags&EF_OCTA)) return false;
-
ivec o, r;
if(!getentboundingbox(e, o, r)) return false;
-
- if(!insideworld(e.o))
- {
+ if(!insideworld(e.o)) {
int idx = outsideents.find(id);
- if(flags&MODOE_ADD)
- {
+ if(flags&MODOE_ADD) {
if(idx < 0) outsideents.add(id);
}
else if(idx >= 0) outsideents.removeunordered(idx);
}
- else
- {
+ else {
int leafsize = octaentsize, limit = max(r.x - o.x, max(r.y - o.y, r.z - o.z));
while(leafsize < limit) leafsize *= 2;
int diff = ~(leafsize-1) & ((o.x^r.x)|(o.y^r.y)|(o.z^r.z));
@@ -178,8 +151,7 @@ static bool modifyoctaent(int flags, int id, extentity &e)
return true;
}
-static inline bool modifyoctaent(int flags, int id)
-{
+static inline bool modifyoctaent(int flags, int id) {
vector<extentity *> &ents = entities::getents();
return ents.inrange(id) && modifyoctaent(flags, id, *ents[id]);
}
@@ -187,68 +159,56 @@ static inline bool modifyoctaent(int flags, int id)
static inline void addentity(int id) { modifyoctaent(MODOE_ADD|MODOE_UPDATEBB|MODOE_LIGHTENT, id); }
static inline void removeentity(int id) { modifyoctaent(MODOE_UPDATEBB, id); }
-void freeoctaentities(cube &c)
-{
+void freeoctaentities(cube &c) {
if(!c.ext) return;
- if(entities::getents().length())
- {
+ if(entities::getents().length()) {
while(c.ext->ents && !c.ext->ents->mapmodels.empty()) removeentity(c.ext->ents->mapmodels.pop());
while(c.ext->ents && !c.ext->ents->other.empty()) removeentity(c.ext->ents->other.pop());
}
- if(c.ext->ents)
- {
+ if(c.ext->ents) {
delete c.ext->ents;
c.ext->ents = NULL;
}
}
-void entitiesinoctanodes()
-{
+void entitiesinoctanodes() {
vector<extentity *> &ents = entities::getents();
loopv(ents) modifyoctaent(MODOE_ADD, i, *ents[i]);
}
-static inline void findents(octaentities &oe, int low, int high, bool notspawned, const vec &pos, const vec &invradius, vector<int> &found)
-{
+static inline void findents(octaentities &oe, int low, int high, bool notspawned, const vec &pos, const vec &invradius, vector<int> &found) {
vector<extentity *> &ents = entities::getents();
- loopv(oe.other)
- {
+ loopv(oe.other) {
int id = oe.other[i];
extentity &e = *ents[id];
if(e.type >= low && e.type <= high && (e.spawned() || notspawned) && vec(e.o).sub(pos).mul(invradius).squaredlen() <= 1) found.add(id);
}
}
-static inline void findents(cube *c, const ivec &o, int size, const ivec &bo, const ivec &br, int low, int high, bool notspawned, const vec &pos, const vec &invradius, vector<int> &found)
-{
- loopoctabox(o, size, bo, br)
- {
+static inline void findents(cube *c, const ivec &o, int size, const ivec &bo, const ivec &br, int low, int high, bool notspawned, const vec &pos, const vec &invradius, vector<int> &found) {
+ loopoctabox(o, size, bo, br) {
if(c[i].ext && c[i].ext->ents) findents(*c[i].ext->ents, low, high, notspawned, pos, invradius, found);
- if(c[i].children && size > octaentsize)
- {
+ if(c[i].children && size > octaentsize) {
ivec co(i, o, size);
findents(c[i].children, co, size>>1, bo, br, low, high, notspawned, pos, invradius, found);
}
}
}
-void findents(int low, int high, bool notspawned, const vec &pos, const vec &radius, vector<int> &found)
-{
+void findents(int low, int high, bool notspawned, const vec &pos, const vec &radius, vector<int> &found) {
vec invradius(1/radius.x, 1/radius.y, 1/radius.z);
ivec bo(vec(pos).sub(radius).sub(1)),
br(vec(pos).add(radius).add(1));
int diff = (bo.x^br.x) | (bo.y^br.y) | (bo.z^br.z) | octaentsize,
scale = worldscale-1;
- if(diff&~((1<<scale)-1) || uint(bo.x|bo.y|bo.z|br.x|br.y|br.z) >= uint(worldsize))
- {
+ if(diff&~((1<<scale)-1) || uint(bo.x|bo.y|bo.z|br.x|br.y|br.z) >= uint(worldsize)) {
findents(worldroot, ivec(0, 0, 0), 1<<scale, bo, br, low, high, notspawned, pos, invradius, found);
return;
}
cube *c = &worldroot[octastep(bo.x, bo.y, bo.z, scale)];
if(c->ext && c->ext->ents) findents(*c->ext->ents, low, high, notspawned, pos, invradius, found);
scale--;
- while(c->children && !(diff&(1<<scale)))
- {
+ while(c->children && !(diff&(1<<scale))) {
c = &c->children[octastep(bo.x, bo.y, bo.z, scale)];
if(c->ext && c->ext->ents) findents(*c->ext->ents, low, high, notspawned, pos, invradius, found);
scale--;
@@ -256,13 +216,11 @@ void findents(int low, int high, bool notspawned, const vec &pos, const vec &rad
if(c->children && 1<<scale >= octaentsize) findents(c->children, ivec(bo).mask(~((2<<scale)-1)), 1<<scale, bo, br, low, high, notspawned, pos, invradius, found);
}
-char *entname(entity &e)
-{
+char *entname(entity &e) {
static string fullentname;
copystring(fullentname, entities::entname(e.type));
const char *einfo = entities::entnameinfo(e);
- if(*einfo)
- {
+ if(*einfo) {
concatstring(fullentname, ": ");
concatstring(fullentname, einfo);
}
@@ -277,14 +235,12 @@ bool undonext = true;
VARF(entediting, 0, 0, 1, { if(!entediting) { entcancel(); efocus = enthover = -1; } });
-bool noentedit()
-{
+bool noentedit() {
if(!editmode) { conoutf(CON_ERROR, "operation only allowed in edit mode"); return true; }
return !entediting;
}
-bool pointinsel(const selinfo &sel, const vec &o)
-{
+bool pointinsel(const selinfo &sel, const vec &o) {
return(o.x <= sel.o.x+sel.s.x*sel.grid
&& o.x >= sel.o.x
&& o.y <= sel.o.y+sel.s.y*sel.grid
@@ -295,31 +251,26 @@ bool pointinsel(const selinfo &sel, const vec &o)
vector<int> entgroup;
-bool haveselent()
-{
+bool haveselent() {
return entgroup.length() > 0;
}
-void entcancel()
-{
+void entcancel() {
entgroup.shrink(0);
}
-void entadd(int id)
-{
+void entadd(int id) {
undonext = true;
entgroup.add(id);
}
-undoblock *newundoent()
-{
+undoblock *newundoent() {
int numents = entgroup.length();
if(numents <= 0) return NULL;
undoblock *u = (undoblock *)new uchar[sizeof(undoblock) + numents*sizeof(undoent)];
u->numents = numents;
undoent *e = (undoent *)(u + 1);
- loopv(entgroup)
- {
+ loopv(entgroup) {
e->i = entgroup[i];
e->e = *entities::getents()[entgroup[i]];
e++;
@@ -327,8 +278,7 @@ undoblock *newundoent()
return u;
}
-void makeundoent()
-{
+void makeundoent() {
if(!undonext) return;
undonext = false;
oldhover = enthover;
@@ -336,8 +286,7 @@ void makeundoent()
if(u) addundo(u);
}
-void detachentity(extentity &e)
-{
+void detachentity(extentity &e) {
if(!e.attached) return;
e.attached->attached = NULL;
e.attached = NULL;
@@ -345,40 +294,31 @@ void detachentity(extentity &e)
VAR(attachradius, 1, 100, 1000);
-void attachentity(extentity &e)
-{
- switch(e.type)
- {
+void attachentity(extentity &e) {
+ switch(e.type) {
case ET_SPOTLIGHT:
break;
-
default:
if(e.type<ET_GAMESPECIFIC || !entities::mayattach(e)) return;
break;
}
-
detachentity(e);
-
vector<extentity *> &ents = entities::getents();
int closest = -1;
float closedist = 1e10f;
- loopv(ents)
- {
+ loopv(ents) {
extentity *a = ents[i];
if(a->attached) continue;
- switch(e.type)
- {
+ switch(e.type) {
case ET_SPOTLIGHT:
if(a->type!=ET_LIGHT) continue;
break;
-
default:
if(e.type<ET_GAMESPECIFIC || !entities::attachent(e, *a)) continue;
break;
}
float dist = e.o.dist(a->o);
- if(dist < closedist)
- {
+ if(dist < closedist) {
closest = i;
closedist = dist;
}
@@ -388,8 +328,7 @@ void attachentity(extentity &e)
ents[closest]->attached = &e;
}
-void attachentities()
-{
+void attachentities() {
vector<extentity *> &ents = entities::getents();
loopv(ents) attachentity(*ents[i]);
}
@@ -400,10 +339,10 @@ void attachentities()
#define addimplicit(f) { if(entgroup.empty() && enthover>=0) { entadd(enthover); undonext = (enthover != oldhover); f; entgroup.drop(); } else f; }
#define entfocusv(i, f, v){ int n = efocus = (i); if(n>=0) { extentity &e = *v[n]; f; } }
#define entfocus(i, f) entfocusv(i, f, entities::getents())
-#define enteditv(i, f, v) \
-{ \
- entfocusv(i, \
- { \
+#define enteditv(i, f, v) { \
+ \
+ entfocusv(i, { \
+ \
int oldtype = e.type; \
removeentity(n); \
f; \
@@ -413,23 +352,21 @@ void attachentities()
}, v); \
}
#define entedit(i, f) enteditv(i, f, entities::getents())
-#define addgroup(exp) { vector<extentity *> &ents = entities::getents(); loopv(ents) entfocusv(i, if(exp) entadd(n), ents); }
-#define setgroup(exp) { entcancel(); addgroup(exp); }
+#define addgroup(exp) { vector<extentity *> &ents = entities::getents(); loopv(ents) entfocusv(i, if(exp) entadd(n), ents); }
+#define setgroup(exp) { entcancel(); addgroup(exp); }
#define groupeditloop(f){ vector<extentity *> &ents = entities::getents(); entlooplevel++; int _ = efocus; loopv(entgroup) enteditv(entgroup[i], f, ents); efocus = _; entlooplevel--; }
#define groupeditpure(f){ if(entlooplevel>0) { entedit(efocus, f); } else groupeditloop(f); }
#define groupeditundo(f){ makeundoent(); groupeditpure(f); }
#define groupedit(f) { addimplicit(groupeditundo(f)); }
-vec getselpos()
-{
+vec getselpos() {
vector<extentity *> &ents = entities::getents();
if(entgroup.length() && ents.inrange(entgroup[0])) return ents[entgroup[0]]->o;
if(ents.inrange(enthover)) return ents[enthover]->o;
return vec(sel.o);
}
-undoblock *copyundoents(undoblock *u)
-{
+undoblock *copyundoents(undoblock *u) {
entcancel();
undoent *e = u->ents();
loopi(u->numents)
@@ -440,8 +377,7 @@ undoblock *copyundoents(undoblock *u)
return c;
}
-void pasteundoent(int idx, const entity &ue)
-{
+void pasteundoent(int idx, const entity &ue) {
if(idx < 0 || idx >= MAXENTS) return;
vector<extentity *> &ents = entities::getents();
while(ents.length() < idx) ents.add(entities::newentity())->type = ET_EMPTY;
@@ -449,23 +385,20 @@ void pasteundoent(int idx, const entity &ue)
entedit(idx, (entity &)e = ue);
}
-void pasteundoents(undoblock *u)
-{
+void pasteundoents(undoblock *u) {
undoent *ue = u->ents();
loopi(u->numents)
entedit(ue[i].i, (entity &)e = ue[i].e);
}
-void entflip()
-{
+void entflip() {
if(noentedit()) return;
int d = dimension(sel.orient);
float mid = sel.s[d]*sel.grid/2+sel.o[d];
groupeditundo(e.o[d] -= (e.o[d]-mid)*2);
}
-void entrotate(int *cw)
-{
+void entrotate(int *cw) {
if(noentedit()) return;
int d = dimension(sel.orient);
int dd = (*cw<0) == dimcoord(sel.orient) ? R[d] : C[d];
@@ -479,12 +412,10 @@ void entrotate(int *cw)
);
}
-void entselectionbox(const entity &e, vec &eo, vec &es)
-{
+void entselectionbox(const entity &e, vec &eo, vec &es) {
model *m = NULL;
const char *mname = entities::entmodel(e);
- if(mname && (m = loadmodel(mname)))
- {
+ if(mname && (m = loadmodel(mname))) {
m->collisionbox(eo, es);
if(es.x > es.y) es.y = es.x; else es.x = es.y; // square
es.z = (es.z + eo.z + 1 + entselradius)/2; // enclose ent radius box and model box
@@ -492,14 +423,12 @@ void entselectionbox(const entity &e, vec &eo, vec &es)
eo.y += e.o.y;
eo.z = e.o.z - entselradius + es.z;
}
- else if(e.type == ET_MAPMODEL && (m = loadmapmodel(e.attr2)))
- {
+ else if(e.type == ET_MAPMODEL && (m = loadmapmodel(e.attr2))) {
mmcollisionbox(e, m, eo, es);
es.max(entselradius);
eo.add(e.o);
}
- else
- {
+ else {
es = vec(entselradius);
eo = e.o;
}
@@ -517,31 +446,24 @@ extern bool editmoveplane(const vec &o, const vec &ray, int d, float off, vec &h
int entmoving = 0;
-void entdrag(const vec &ray)
-{
+void entdrag(const vec &ray) {
if(noentedit() || !haveselent()) return;
-
float r = 0, c = 0;
static vec v, handle;
vec eo, es;
int d = dimension(entorient),
dc= dimcoord(entorient);
-
entfocus(entgroup.last(),
entselectionbox(e, eo, es);
-
if(!editmoveplane(e.o, ray, d, eo[d] + (dc ? es[d] : 0), handle, v, entmoving==1))
return;
-
ivec g(v);
int z = g[d]&(~(sel.grid-1));
g.add(sel.grid/2).mask(~(sel.grid-1));
g[d] = z;
-
r = (entselsnap ? g[R[d]] : v[R[d]]) - e.o[R[d]];
c = (entselsnap ? g[C[d]] : v[C[d]]) - e.o[C[d]];
);
-
if(entmoving==1) makeundoent();
groupeditpure(e.o[R[d]] += r; e.o[C[d]] += c);
entmoving = 2;
@@ -549,13 +471,11 @@ void entdrag(const vec &ray)
VAR(showentradius, 0, 1, 1);
-void renderentring(const extentity &e, float radius, int axis)
-{
+void renderentring(const extentity &e, float radius, int axis) {
if(radius <= 0) return;
gle::defvertex();
gle::begin(GL_LINE_LOOP);
- loopi(15)
- {
+ loopi(15) {
vec p(e.o);
const vec2 &sc = sincos360[i*(360/15)];
p[axis>=2 ? 1 : 0] += radius*sc.x;
@@ -565,14 +485,12 @@ void renderentring(const extentity &e, float radius, int axis)
xtraverts += gle::end();
}
-void renderentsphere(const extentity &e, float radius)
-{
+void renderentsphere(const extentity &e, float radius) {
if(radius <= 0) return;
loopk(3) renderentring(e, radius, k);
}
-void renderentattachment(const extentity &e)
-{
+void renderentattachment(const extentity &e) {
if(!e.attached) return;
gle::defvertex();
gle::begin(GL_LINES);
@@ -581,63 +499,50 @@ void renderentattachment(const extentity &e)
xtraverts += gle::end();
}
-void renderentarrow(const extentity &e, const vec &dir, float radius)
-{
+void renderentarrow(const extentity &e, const vec &dir, float radius) {
if(radius <= 0) return;
float arrowsize = min(radius/8, 0.5f);
vec target = vec(dir).mul(radius).add(e.o), arrowbase = vec(dir).mul(radius - arrowsize).add(e.o), spoke;
spoke.orthogonal(dir);
spoke.normalize();
spoke.mul(arrowsize);
-
gle::defvertex();
-
gle::begin(GL_LINES);
gle::attrib(e.o);
gle::attrib(target);
xtraverts += gle::end();
-
gle::begin(GL_TRIANGLE_FAN);
gle::attrib(target);
loopi(5) gle::attrib(vec(spoke).rotate(2*M_PI*i/4.0f, dir).add(arrowbase));
xtraverts += gle::end();
}
-void renderentcone(const extentity &e, const vec &dir, float radius, float angle)
-{
+void renderentcone(const extentity &e, const vec &dir, float radius, float angle) {
if(radius <= 0) return;
vec spot = vec(dir).mul(radius*cosf(angle*RAD)).add(e.o), spoke;
spoke.orthogonal(dir);
spoke.normalize();
spoke.mul(radius*sinf(angle*RAD));
-
gle::defvertex();
-
gle::begin(GL_LINES);
- loopi(8)
- {
+ loopi(8) {
gle::attrib(e.o);
gle::attrib(vec(spoke).rotate(2*M_PI*i/8.0f, dir).add(spot));
}
xtraverts += gle::end();
-
gle::begin(GL_LINE_LOOP);
loopi(8) gle::attrib(vec(spoke).rotate(2*M_PI*i/8.0f, dir).add(spot));
xtraverts += gle::end();
}
-void renderentradius(extentity &e, bool color)
-{
- switch(e.type)
- {
+void renderentradius(extentity &e, bool color) {
+ switch(e.type) {
case ET_LIGHT:
if(color) gle::colorf(e.attr2/255.0f, e.attr3/255.0f, e.attr4/255.0f);
renderentsphere(e, e.attr1);
break;
-
case ET_SPOTLIGHT:
- if(e.attached)
- {
+ if(e.attached) {
if(color) gle::colorf(0, 1, 1);
float radius = e.attached->attr1;
if(!radius) radius = 2*e.o.dist(e.attached->o);
@@ -647,15 +552,12 @@ void renderentradius(extentity &e, bool color)
renderentcone(*e.attached, dir, radius, angle);
}
break;
-
case ET_SOUND:
if(color) gle::colorf(0, 1, 1);
renderentsphere(e, e.attr2);
break;
-
case ET_MAPMODEL:
- case ET_PLAYERSTART:
- {
+ case ET_PLAYERSTART: {
if(color) gle::colorf(0, 1, 1);
entities::entradius(e, color);
vec dir;
@@ -663,10 +565,8 @@ void renderentradius(extentity &e, bool color)
renderentarrow(e, dir, 4);
break;
}
-
default:
- if(e.type>=ET_GAMESPECIFIC)
- {
+ if(e.type>=ET_GAMESPECIFIC) {
if(color) gle::colorf(0, 1, 1);
entities::entradius(e, color);
}
@@ -674,22 +574,18 @@ void renderentradius(extentity &e, bool color)
}
}
-static void renderentbox(const vec &eo, vec es)
-{
+static void renderentbox(const vec &eo, vec es) {
es.add(eo);
-
// bottom quad
gle::attrib(eo.x, eo.y, eo.z); gle::attrib(es.x, eo.y, eo.z);
gle::attrib(es.x, eo.y, eo.z); gle::attrib(es.x, es.y, eo.z);
gle::attrib(es.x, es.y, eo.z); gle::attrib(eo.x, es.y, eo.z);
gle::attrib(eo.x, es.y, eo.z); gle::attrib(eo.x, eo.y, eo.z);
-
// top quad
gle::attrib(eo.x, eo.y, es.z); gle::attrib(es.x, eo.y, es.z);
gle::attrib(es.x, eo.y, es.z); gle::attrib(es.x, es.y, es.z);
gle::attrib(es.x, es.y, es.z); gle::attrib(eo.x, es.y, es.z);
gle::attrib(eo.x, es.y, es.z); gle::attrib(eo.x, eo.y, es.z);
-
// sides
gle::attrib(eo.x, eo.y, eo.z); gle::attrib(eo.x, eo.y, es.z);
gle::attrib(es.x, eo.y, eo.z); gle::attrib(es.x, eo.y, es.z);
@@ -697,13 +593,10 @@ static void renderentbox(const vec &eo, vec es)
gle::attrib(eo.x, es.y, eo.z); gle::attrib(eo.x, es.y, es.z);
}
-void renderentselection(const vec &o, const vec &ray, bool entmoving)
-{
+void renderentselection(const vec &o, bool entmoving) {
if(noentedit()) return;
vec eo, es;
-
- if(entgroup.length())
- {
+ if(entgroup.length()) {
gle::colorub(0, 40, 0);
gle::defvertex();
gle::begin(GL_LINES, entgroup.length()*24);
@@ -713,14 +606,11 @@ void renderentselection(const vec &o, const vec &ray, bool entmoving)
);
xtraverts += gle::end();
}
-
- if(enthover >= 0)
- {
+ if(enthover >= 0) {
gle::colorub(0, 40, 0);
entfocus(enthover, entselectionbox(e, eo, es)); // also ensures enthover is back in focus
boxs3D(eo, es, 1);
- if(entmoving && entmovingshadow==1)
- {
+ if(entmoving && entmovingshadow==1) {
vec a, b;
gle::colorub(20, 20, 20);
(a = eo).x = eo.x - fmod(eo.x, worldsize); (b = es).x = a.x + worldsize; boxs3D(a, b, 1);
@@ -731,9 +621,7 @@ void renderentselection(const vec &o, const vec &ray, bool entmoving)
boxs(entorient, eo, es);
boxs(entorient, eo, es, clamp(0.015f*camera1->o.dist(eo)*tan(fovy*0.5f*RAD), 0.1f, 1.0f));
}
-
- if(showentradius && (entgroup.length() || enthover >= 0))
- {
+ if(showentradius && (entgroup.length() || enthover >= 0)) {
glDepthFunc(GL_GREATER);
gle::colorf(0.25f, 0.25f, 0.25f);
loopv(entgroup) entfocus(entgroup[i], renderentradius(e, false));
@@ -744,8 +632,7 @@ void renderentselection(const vec &o, const vec &ray, bool entmoving)
}
}
-bool enttoggle(int id)
-{
+bool enttoggle(int id) {
undonext = true;
int i = entgroup.find(id);
if(i < 0)
@@ -755,8 +642,7 @@ bool enttoggle(int id)
return i < 0;
}
-bool hoveringonent(int ent, int orient)
-{
+bool hoveringonent(int ent, int orient) {
if(noentedit()) return false;
entorient = orient;
if((efocus = enthover = ent) >= 0)
@@ -768,28 +654,22 @@ bool hoveringonent(int ent, int orient)
VAR(entitysurf, 0, 0, 1);
-ICOMMAND(entadd, "", (),
-{
- if(enthover >= 0 && !noentedit())
- {
+ICOMMAND(entadd, "", (), {
+ if(enthover >= 0 && !noentedit()) {
if(entgroup.find(enthover) < 0) entadd(enthover);
if(entmoving > 1) entmoving = 1;
}
});
-ICOMMAND(enttoggle, "", (),
-{
+ICOMMAND(enttoggle, "", (), {
if(enthover < 0 || noentedit() || !enttoggle(enthover)) { entmoving = 0; intret(0); }
else { if(entmoving > 1) entmoving = 1; intret(1); }
});
-ICOMMAND(entmoving, "b", (int *n),
-{
- if(*n >= 0)
- {
+ICOMMAND(entmoving, "b", (int *n), {
+ if(*n >= 0) {
if(!*n || enthover < 0 || noentedit()) entmoving = 0;
- else
- {
+ else {
if(entgroup.find(enthover) < 0) { entadd(enthover); entmoving = 1; }
else if(!entmoving) entmoving = 1;
}
@@ -797,27 +677,23 @@ ICOMMAND(entmoving, "b", (int *n),
intret(entmoving);
});
-void entpush(int *dir)
-{
+void entpush(int *dir) {
if(noentedit()) return;
int d = dimension(entorient);
int s = dimcoord(entorient) ? -*dir : *dir;
- if(entmoving)
- {
+ if(entmoving) {
groupeditpure(e.o[d] += float(s*sel.grid)); // editdrag supplies the undo
}
else
groupedit(e.o[d] += float(s*sel.grid));
- if(entitysurf==1)
- {
+ if(entitysurf==1) {
player->o[d] += float(s*sel.grid);
player->resetinterp();
}
}
VAR(entautoviewdist, 0, 25, 100);
-void entautoview(int *dir)
-{
+void entautoview(int *dir) {
if(!haveselent()) return;
static int s = 0;
vec v(player->o);
@@ -839,15 +715,13 @@ COMMAND(entflip, "");
COMMAND(entrotate, "i");
COMMAND(entpush, "i");
-void delent()
-{
+void delent() {
if(noentedit()) return;
groupedit(e.type = ET_EMPTY;);
entcancel();
}
-int findtype(char *what)
-{
+int findtype(char *what) {
for(int i = 0; *entities::entname(i); i++) if(strcmp(what, entities::entname(i))==0) return i;
conoutf(CON_ERROR, "unknown entity type \"%s\"", what);
return ET_EMPTY;
@@ -855,15 +729,12 @@ int findtype(char *what)
VAR(entdrop, 0, 2, 3);
-bool dropentity(entity &e, int drop = -1)
-{
+bool dropentity(entity &e, int drop = -1) {
vec radius(4.0f, 4.0f, 4.0f);
if(drop<0) drop = entdrop;
- if(e.type == ET_MAPMODEL)
- {
+ if(e.type == ET_MAPMODEL) {
model *m = loadmapmodel(e.attr2);
- if(m)
- {
+ if(m) {
vec center;
mmboundbox(e, m, center, radius);
radius.x += fabs(center.x);
@@ -871,8 +742,7 @@ bool dropentity(entity &e, int drop = -1)
}
radius.z = 0.0f;
}
- switch(drop)
- {
+ switch(drop) {
case 1:
if(e.type != ET_LIGHT && e.type != ET_SPOTLIGHT)
dropenttofloor(&e);
@@ -880,8 +750,7 @@ bool dropentity(entity &e, int drop = -1)
case 2:
case 3:
int cx = 0, cy = 0;
- if(sel.cxs == 1 && sel.cys == 1)
- {
+ if(sel.cxs == 1 && sel.cys == 1) {
cx = (sel.cx ? 1 : -1) * sel.grid / 2;
cy = (sel.cy ? 1 : -1) * sel.grid / 2;
}
@@ -893,7 +762,6 @@ bool dropentity(entity &e, int drop = -1)
e.o[D[d]] -= radius[D[d]];
else
e.o[D[d]] += sel.grid + radius[D[d]];
-
if(drop == 3)
dropenttofloor(&e);
break;
@@ -901,14 +769,12 @@ bool dropentity(entity &e, int drop = -1)
return true;
}
-void dropent()
-{
+void dropent() {
if(noentedit()) return;
groupedit(dropentity(e));
}
-void attachent()
-{
+void attachent() {
if(noentedit()) return;
groupedit(attachentity(e));
}
@@ -919,11 +785,9 @@ VARP(entcamdir, 0, 1, 1);
static int keepents = 0;
-extentity *newentity(bool local, const vec &o, int type, int v1, int v2, int v3, int v4, int v5, int &idx)
-{
+extentity *newentity(bool local, const vec &o, int type, int v1, int v2, int v3, int v4, int v5, int &idx) {
vector<extentity *> &ents = entities::getents();
- if(local)
- {
+ if(local) {
idx = -1;
for(int i = keepents; i < ents.length(); i++) if(ents[i]->type == ET_EMPTY) { idx = i; break; }
if(idx < 0 && ents.length() >= MAXENTS) { conoutf(CON_ERROR, "too many entities"); return NULL; }
@@ -940,10 +804,8 @@ extentity *newentity(bool local, const vec &o, int type, int v1, int v2, int v3,
e.reserved = 0;
e.light.color = vec(1, 1, 1);
e.light.dir = vec(0, 0, 1);
- if(local)
- {
- if(entcamdir) switch(type)
- {
+ if(local) {
+ if(entcamdir) switch(type) {
case ET_MAPMODEL:
case ET_PLAYERSTART:
e.attr5 = e.attr4;
@@ -960,8 +822,7 @@ extentity *newentity(bool local, const vec &o, int type, int v1, int v2, int v3,
return &e;
}
-void newentity(int type, int a1, int a2, int a3, int a4, int a5)
-{
+void newentity(int type, int a1, int a2, int a3, int a4, int a5) {
int idx;
extentity *t = newentity(true, player->o, type, a1, a2, a3, a4, a5, idx);
if(!t) return;
@@ -972,8 +833,7 @@ void newentity(int type, int a1, int a2, int a3, int a4, int a5)
entedit(idx, e.type = type);
}
-void newent(char *what, int *a1, int *a2, int *a3, int *a4, int *a5)
-{
+void newent(char *what, int *a1, int *a2, int *a3, int *a4, int *a5) {
if(noentedit()) return;
int type = findtype(what);
if(type != ET_EMPTY)
@@ -983,8 +843,7 @@ void newent(char *what, int *a1, int *a2, int *a3, int *a4, int *a5)
int entcopygrid;
vector<entity> entcopybuf;
-void entcopy()
-{
+void entcopy() {
if(noentedit()) return;
entcopygrid = sel.grid;
entcopybuf.shrink(0);
@@ -992,14 +851,12 @@ void entcopy()
entfocus(entgroup[i], entcopybuf.add(e).o.sub(vec(sel.o)));
}
-void entpaste()
-{
+void entpaste() {
if(noentedit()) return;
if(entcopybuf.length()==0) return;
entcancel();
float m = float(sel.grid)/float(entcopygrid);
- loopv(entcopybuf)
- {
+ loopv(entcopybuf) {
entity &c = entcopybuf[i];
vec o(c.o);
o.mul(m).add(vec(sel.o));
@@ -1020,8 +877,7 @@ COMMAND(dropent, "");
COMMAND(entcopy, "");
COMMAND(entpaste, "");
-void entset(char *what, int *a1, int *a2, int *a3, int *a4, int *a5)
-{
+void entset(char *what, int *a1, int *a2, int *a3, int *a4, int *a5) {
if(noentedit()) return;
int type = findtype(what);
if(type != ET_EMPTY)
@@ -1033,14 +889,11 @@ void entset(char *what, int *a1, int *a2, int *a3, int *a4, int *a5)
e.attr5=*a5);
}
-void printent(extentity &e, char *buf, int len)
-{
- switch(e.type)
- {
+void printent(extentity &e, char *buf, int len) {
+ switch(e.type) {
case ET_PARTICLES:
if(printparticles(e, buf, len)) return;
break;
-
default:
if(e.type >= ET_GAMESPECIFIC && entities::printent(e, buf, len)) return;
break;
@@ -1048,19 +901,16 @@ void printent(extentity &e, char *buf, int len)
nformatstring(buf, len, "%s %d %d %d %d %d", entities::entname(e.type), e.attr1, e.attr2, e.attr3, e.attr4, e.attr5);
}
-void nearestent()
-{
+void nearestent() {
if(noentedit()) return;
int closest = -1;
float closedist = 1e16f;
vector<extentity *> &ents = entities::getents();
- loopv(ents)
- {
+ loopv(ents) {
extentity &e = *ents[i];
if(e.type == ET_EMPTY) continue;
float dist = e.o.dist(player->o);
- if(dist < closedist)
- {
+ if(dist < closedist) {
closest = i;
closedist = dist;
}
@@ -1077,27 +927,21 @@ ICOMMAND(entindex, "", (), intret(efocus));
COMMAND(entset, "siiiii");
COMMAND(nearestent, "");
-void enttype(char *type, int *numargs)
-{
- if(*numargs >= 1)
- {
+void enttype(char *type, int *numargs) {
+ if(*numargs >= 1) {
int typeidx = findtype(type);
if(typeidx != ET_EMPTY) groupedit(e.type = typeidx);
}
- else entfocus(efocus,
- {
+ else entfocus(efocus, {
result(entities::entname(e.type));
})
}
-void entattr(int *attr, int *val, int *numargs)
-{
- if(*numargs >= 2)
- {
+void entattr(int *attr, int *val, int *numargs) {
+ if(*numargs >= 2) {
if(*attr >= 0 && *attr <= 4)
groupedit(
- switch(*attr)
- {
+ switch(*attr) {
case 0: e.attr1 = *val; break;
case 1: e.attr2 = *val; break;
case 2: e.attr3 = *val; break;
@@ -1106,10 +950,8 @@ void entattr(int *attr, int *val, int *numargs)
}
);
}
- else entfocus(efocus,
- {
- switch(*attr)
- {
+ else entfocus(efocus, {
+ switch(*attr) {
case 0: intret(e.attr1); break;
case 1: intret(e.attr2); break;
case 2: intret(e.attr3); break;
@@ -1122,18 +964,15 @@ void entattr(int *attr, int *val, int *numargs)
COMMAND(enttype, "sN");
COMMAND(entattr, "iiN");
-int findentity(int type, int index, int attr1, int attr2)
-{
+int findentity(int type, int index, int attr1, int attr2) {
const vector<extentity *> &ents = entities::getents();
if(index > ents.length()) index = ents.length();
- else for(int i = index; i<ents.length(); i++)
- {
+ else for(int i = index; i<ents.length(); i++) {
extentity &e = *ents[i];
if(e.type==type && (attr1<0 || e.attr1==attr1) && (attr2<0 || e.attr2==attr2))
return i;
}
- loopj(index)
- {
+ loopj(index) {
extentity &e = *ents[j];
if(e.type==type && (attr1<0 || e.attr1==attr1) && (attr2<0 || e.attr2==attr2))
return j;
@@ -1145,12 +984,10 @@ struct spawninfo { const extentity *e; float weight; };
// Compiles a vector of available playerstarts, each with a non-zero weight
// which serves as a measure of its desirability for a spawning player.
-float gatherspawninfos(dynent *d, int tag, vector<spawninfo> &spawninfos)
-{
+float gatherspawninfos(dynent *d, int tag, vector<spawninfo> &spawninfos) {
const vector<extentity *> &ents = entities::getents();
float total = 0.0f;
- loopv(ents)
- {
+ loopv(ents) {
const extentity &e = *ents[i];
if(e.type != ET_PLAYERSTART || e.attr2 != tag) continue;
spawninfo &s = spawninfos.add();
@@ -1164,12 +1001,10 @@ float gatherspawninfos(dynent *d, int tag, vector<spawninfo> &spawninfos)
// Randomly picks a weighted spawn from the provided vector and removes it.
// The probability of a given spawn being picked is proportional to its weight.
// If all weights are zero, the index is picked uniformly.
-static const extentity *poprandomspawn(vector<spawninfo> &spawninfos, float &total)
-{
+static const extentity *poprandomspawn(vector<spawninfo> &spawninfos, float &total) {
if(spawninfos.empty()) return NULL;
int index = 0;
- if(total > 0.0f)
- {
+ if(total > 0.0f) {
float x = rndscale(total);
do x -= spawninfos[index].weight; while(x > 0 && ++index < spawninfos.length()-1);
}
@@ -1179,15 +1014,13 @@ static const extentity *poprandomspawn(vector<spawninfo> &spawninfos, float &tot
return s.e;
}
-static inline bool tryspawn(dynent *d, const extentity &e)
-{
+static inline bool tryspawn(dynent *d, const extentity &e) {
d->o = e.o;
d->yaw = e.attr1;
return entinmap(d, true);
}
-void findplayerspawn(dynent *d, int forceent, int tag)
-{
+void findplayerspawn(dynent *d, int forceent, int tag) {
const vector<extentity *> &ents = entities::getents();
d->pitch = 0;
d->roll = 0;
@@ -1200,18 +1033,15 @@ void findplayerspawn(dynent *d, int forceent, int tag)
entinmap(d);
}
-void splitocta(cube *c, int size)
-{
+void splitocta(cube *c, int size) {
if(size <= 0x1000) return;
- loopi(8)
- {
+ loopi(8) {
if(!c[i].children) c[i].children = newcubes(isempty(c[i]) ? F_EMPTY : F_SOLID);
splitocta(c[i].children, size>>1);
}
}
-void resetmap()
-{
+void resetmap() {
clearoverrides();
clearmapsounds();
resetlightmaps();
@@ -1222,101 +1052,74 @@ void resetmap()
cancelsel();
pruneundos();
clearmapcrc();
-
entities::clearents();
outsideents.setsize(0);
}
-void startmap(const char *name)
-{
+void startmap(const char *name) {
game::startmap(name);
}
-bool emptymap(int scale, bool force, const char *mname, bool usecfg) // main empty world creation routine
-{
- if(!force && !editmode)
- {
+bool emptymap(int scale, bool force, const char *mname, bool usecfg) { // main empty world creation routine {
+ if(!force && !editmode) {
conoutf(CON_ERROR, "newmap only allowed in edit mode");
return false;
}
-
resetmap();
-
setvar("mapscale", scale<10 ? 10 : (scale>16 ? 16 : scale), true, false);
setvar("mapsize", 1<<worldscale, true, false);
-
texmru.shrink(0);
freeocta(worldroot);
worldroot = newcubes(F_EMPTY);
loopi(4) solidfaces(worldroot[i]);
-
if(worldsize > 0x1000) splitocta(worldroot, worldsize>>1);
-
clearmainmenu();
-
- if(usecfg)
- {
+ if(usecfg) {
identflags |= IDF_OVERRIDDEN;
execfile("data/default_map.cfg", false);
identflags &= ~IDF_OVERRIDDEN;
}
-
initlights();
allchanged(true);
-
startmap(mname);
-
return true;
}
-bool enlargemap(bool force)
-{
- if(!force && !editmode)
- {
+bool enlargemap(bool force) {
+ if(!force && !editmode) {
conoutf(CON_ERROR, "mapenlarge only allowed in edit mode");
return false;
}
if(worldsize >= 1<<16) return false;
-
while(outsideents.length()) removeentity(outsideents.pop());
-
worldscale++;
worldsize *= 2;
cube *c = newcubes(F_EMPTY);
c[0].children = worldroot;
loopi(3) solidfaces(c[i+1]);
worldroot = c;
-
if(worldsize > 0x1000) splitocta(worldroot, worldsize>>1);
-
allchanged();
-
return true;
}
-static bool isallempty(cube &c)
-{
+static bool isallempty(cube &c) {
if(!c.children) return isempty(c);
loopi(8) if(!isallempty(c.children[i])) return false;
return true;
}
-void shrinkmap()
-{
+void shrinkmap() {
extern int nompedit;
if(noedit(true) || (nompedit && multiplayer())) return;
if(worldsize <= 1<<10) return;
-
int octant = -1;
- loopi(8) if(!isallempty(worldroot[i]))
- {
+ loopi(8) if(!isallempty(worldroot[i])) {
if(octant >= 0) return;
octant = i;
}
if(octant < 0) return;
-
while(outsideents.length()) removeentity(outsideents.pop());
-
if(!worldroot[octant].children) subdividecube(worldroot[octant], false, false);
cube *root = worldroot[octant].children;
worldroot[octant].children = NULL;
@@ -1324,13 +1127,10 @@ void shrinkmap()
worldroot = root;
worldscale--;
worldsize /= 2;
-
ivec offset(octant, ivec(0, 0, 0), worldsize);
vector<extentity *> &ents = entities::getents();
loopv(ents) ents[i]->o.sub(vec(offset));
-
allchanged();
-
conoutf("shrunk map to size %d", worldscale);
}
@@ -1340,26 +1140,22 @@ COMMAND(newmap, "i");
COMMAND(mapenlarge, "");
COMMAND(shrinkmap, "");
-void mapname()
-{
+void mapname() {
result(game::getclientmap());
}
COMMAND(mapname, "");
-void mpeditent(int i, const vec &o, int type, int attr1, int attr2, int attr3, int attr4, int attr5, bool local)
-{
+void mpeditent(int i, const vec &o, int type, int attr1, int attr2, int attr3, int attr4, int attr5, bool local) {
if(i < 0 || i >= MAXENTS) return;
vector<extentity *> &ents = entities::getents();
- if(ents.length()<=i)
- {
+ if(ents.length()<=i) {
extentity *e = newentity(local, o, type, attr1, attr2, attr3, attr4, attr5, i);
if(!e) return;
addentity(i);
attachentity(*e);
}
- else
- {
+ else {
extentity &e = *ents[i];
removeentity(i);
int oldtype = e.type;
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-21 04:59:04 +0000