fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix adddecal builtin.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5170 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2017-11-23 04:05:53 +00:00
parent 0dbb57dd5c
commit eeaa949d5d
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
engine/client/cl_ents.c
View file

@ -2863,29 +2863,27 @@ static void CL_AddDecal_Callback(void *vctx, vec3_t *fte_restrict points, size_t
void CL_AddDecal(shader_t *shader, vec3_t origin, vec3_t up, vec3_t side, vec3_t rgbvalue, float alphavalue) void CL_AddDecal(shader_t *shader, vec3_t origin, vec3_t up, vec3_t side, vec3_t rgbvalue, float alphavalue)
{ {
scenetris_t *t; scenetris_t *t;
float l, s; float l, s, radius;
cl_adddecal_ctx_t ctx; cl_adddecal_ctx_t ctx;
VectorNegate(up, ctx.axis[0]); VectorNegate(up, ctx.axis[0]);
VectorCopy(side, ctx.axis[2]); VectorCopy(side, ctx.axis[2]);
s = DotProduct(ctx.axis[2], ctx.axis[2]);
l = DotProduct(ctx.axis[0], ctx.axis[0]);
radius = 1/sqrt(s);
VectorScale(ctx.axis[0], 1/sqrt(l), ctx.axis[0]);
VectorScale(ctx.axis[2], radius, ctx.axis[2]);
CrossProduct(ctx.axis[0], ctx.axis[2], ctx.axis[1]); CrossProduct(ctx.axis[0], ctx.axis[2], ctx.axis[1]);
s = sqrt(DotProduct(ctx.axis[2], ctx.axis[2])); ctx.offset[1] = DotProduct(origin, ctx.axis[1]) + 0.5*radius;
l = sqrt(DotProduct(ctx.axis[1], ctx.axis[1])); ctx.offset[2] = DotProduct(origin, ctx.axis[2]) + 0.5*radius;
VectorScale(ctx.axis[1], s/l, ctx.axis[1]);
VectorScale(ctx.axis[1], 0.5/(s*s), ctx.axis[1]);
VectorScale(ctx.axis[2], 0.5/(s*s), ctx.axis[2]);
l = sqrt(DotProduct(ctx.axis[0], ctx.axis[0]));
VectorScale(ctx.axis[0], 1/(l*l), ctx.axis[0]);
ctx.offset[1] = DotProduct(origin, ctx.axis[1]) + 0.5;
ctx.offset[2] = DotProduct(origin, ctx.axis[2]) + 0.5;
ctx.offset[0] = DotProduct(origin, ctx.axis[0]); ctx.offset[0] = DotProduct(origin, ctx.axis[0]);
ctx.scale[1] = 1; ctx.scale[1] = 1/radius;
ctx.scale[2] = 1; ctx.scale[2] = 1/radius;
ctx.scale[0] = 1; ctx.scale[0] = 1;
/*reuse the previous trigroup if its the same shader*/ /*reuse the previous trigroup if its the same shader*/
@ -2910,7 +2908,7 @@ void CL_AddDecal(shader_t *shader, vec3_t origin, vec3_t up, vec3_t side, vec3_t
ctx.t = t; ctx.t = t;
VectorCopy(rgbvalue, ctx.rgbavalue); VectorCopy(rgbvalue, ctx.rgbavalue);
ctx.rgbavalue[3] = alphavalue; ctx.rgbavalue[3] = alphavalue;
Mod_ClipDecal(cl.worldmodel, origin, ctx.axis[0], ctx.axis[1], ctx.axis[2], 2, 0,0, CL_AddDecal_Callback, &ctx); Mod_ClipDecal(cl.worldmodel, origin, ctx.axis[0], ctx.axis[1], ctx.axis[2], radius*2, 0,0, CL_AddDecal_Callback, &ctx);
if (!t->numidx) if (!t->numidx)
cl_numstris--; cl_numstris--;