summaryrefslogtreecommitdiff
path: root/src/engine/rendermodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/rendermodel.cpp')
-rw-r--r--src/engine/rendermodel.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/engine/rendermodel.cpp b/src/engine/rendermodel.cpp
index cfdf326..8174e22 100644
--- a/src/engine/rendermodel.cpp
+++ b/src/engine/rendermodel.cpp
@@ -515,7 +515,7 @@ void endmodelbatches() {
batchedmodel &bm = b.batched[j];
if(bm.flags&(MDL_CULL_VFC|MDL_GHOST)) continue;
if(bm.query!=query) {
- if(query) endquery(query);
+ if(query) endquery();
query = bm.query;
if(query) startquery(query);
}
@@ -529,7 +529,7 @@ void endmodelbatches() {
if(!rendered) { b.m->startrender(); rendered = true; }
renderbatchedmodel(b.m, bm);
}
- if(query) endquery(query);
+ if(query) endquery();
if(rendered) b.m->endrender();
}
if(transparent.length()) {
@@ -543,13 +543,13 @@ void endmodelbatches() {
(lastmodel = tm.m)->startrender();
}
if(query!=tm.batched->query) {
- if(query) endquery(query);
+ if(query) endquery();
query = tm.batched->query;
if(query) startquery(query);
}
renderbatchedmodel(tm.m, *tm.batched);
}
- if(query) endquery(query);
+ if(query) endquery();
if(lastmodel) lastmodel->endrender();
}
numbatches = -1;
@@ -585,7 +585,7 @@ void endmodelquery() {
while(b.batched.length() && b.batched.last().query==modelquery);
b.m->endrender();
}
- endquery(modelquery);
+ endquery();
modelquery = NULL;
modelattached.setsize(minattached);
}
@@ -596,7 +596,7 @@ static inline void enablecullmodelquery() {
startbb();
}
-static inline void rendercullmodelquery(model *m, dynent *d, const vec &center, float radius) {
+static inline void rendercullmodelquery(dynent *d, const vec &center, float radius) {
if(fabs(camera1->o.x-center.x) < radius+1 &&
fabs(camera1->o.y-center.y) < radius+1 &&
fabs(camera1->o.z-center.z) < radius+1) {
@@ -608,7 +608,7 @@ static inline void rendercullmodelquery(model *m, dynent *d, const vec &center,
startquery(d->query);
int br = int(radius*2)+1;
drawbb(ivec(int(center.x-radius), int(center.y-radius), int(center.z-radius)), ivec(br, br, br));
- endquery(d->query);
+ endquery();
}
static inline void disablecullmodelquery() {
@@ -663,7 +663,7 @@ void rendermodel(entitylight *light, const char *mdl, int anim, const vec &o, fl
if(culled) {
if(culled&(MDL_CULL_OCCLUDED|MDL_CULL_QUERY) && flags&MDL_CULL_QUERY) {
enablecullmodelquery();
- rendercullmodelquery(m, d, center, radius);
+ rendercullmodelquery(d, center, radius);
disablecullmodelquery();
}
return;
@@ -756,7 +756,7 @@ void rendermodel(entitylight *light, const char *mdl, int anim, const vec &o, fl
if(d->query) startquery(d->query);
}
m->render(anim, basetime, basetime2, o, yaw, pitch, d, a, lightcolor, lightdir, trans);
- if(flags&MDL_CULL_QUERY && d->query) endquery(d->query);
+ if(flags&MDL_CULL_QUERY && d->query) endquery();
m->endrender();
}