diff options
Diffstat (limited to 'src/engine/animmodel.h')
| -rw-r--r-- | src/engine/animmodel.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/animmodel.h b/src/engine/animmodel.h index 51d09e8..07143a2 100644 --- a/src/engine/animmodel.h +++ b/src/engine/animmodel.h @@ -86,7 +86,7 @@ struct animmodel : model { void setkey() { key = &shaderparamskey::keys[*this]; } - void setshaderparams(mesh *m, const animstate *as) { + void setshaderparams(const animstate *as) { if(!Shader::lastshader) return; float mincolor = as->cur.anim&ANIM_FULLBRIGHT ? fullbrightmodels/100.0f : 0.0f; if(fullbright) { @@ -140,7 +140,7 @@ struct animmodel : model { //~if(force) cleanup(); loadshader(); } - void setshader(mesh *m, const animstate *as) { + void setshader(mesh *m) { m->setshader(loadshader()); } void bind(mesh *b, const animstate *as) { @@ -152,8 +152,8 @@ struct animmodel : model { else /*if(as->cur.anim&ANIM_SHADOW)*/ SETMODELSHADER(b, notexturemodel); return; } - setshader(b, as); - setshaderparams(b, as); + setshader(b); + setshaderparams(as); int activetmu = 0; if(tex!=lasttex) { glBindTexture(GL_TEXTURE_2D, tex->id); @@ -366,8 +366,8 @@ struct animmodel : model { bool hasframes(int i, int n) const { return i>=0 && i+n<=totalframes(); } int clipframes(int i, int n) const { return min(n, totalframes() - i); } virtual void cleanup() {} - virtual void preload(part *p) {} - virtual void render(const animstate *as, float pitch, const vec &axis, const vec &forward, dynent *d, part *p) {} + virtual void preload(part *) {} + virtual void render(const animstate *, float , const vec &, const vec &, dynent *, part *) {} void bindpos(GLuint ebuf, GLuint vbuf, void *v, int stride) { if(lastebuf!=ebuf) { gle::bindebo(ebuf); @@ -423,7 +423,7 @@ struct animmodel : model { } } }; - virtual meshgroup *loadmeshes(const char *name, va_list args) { return NULL; } + virtual meshgroup *loadmeshes(const char *, va_list ) { return NULL; } meshgroup *sharemeshes(const char *name, ...) { static hashnameset<meshgroup *> meshgroups; if(!meshgroups.access(name)) { |