}
//[515]: these are required funcs
-static char *cl_required_func[] =
+static const char *cl_required_func[] =
{
"CSQC_Init",
"CSQC_InputEvent",
prog->globals.client->servercommandframe = cls.servermovesequence;
prog->globals.client->clientcommandframe = cl.movecmd[0].sequence;
VectorCopy(cl.viewangles, prog->globals.client->input_angles);
- VectorCopy(cl.viewangles, cl.csqc_angles);
// // FIXME: this actually belongs into getinputstate().. [12/17/2007 Black]
prog->globals.client->input_buttons = cl.movecmd[0].buttons;
VectorSet(prog->globals.client->input_movevalues, cl.movecmd[0].forwardmove, cl.movecmd[0].sidemove, cl.movecmd[0].upmove);
- //VectorCopy(cl.movement_origin, cl.csqc_origin);
- Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, cl.csqc_origin);
+ VectorCopy(cl.csqc_vieworiginfromengine, cl.csqc_vieworigin);
+ VectorCopy(cl.csqc_viewanglesfromengine, cl.csqc_viewangles);
// LordHavoc: Spike says not to do this, but without pmove_org the
// CSQC is useless as it can't alter the view origin without
// completely replacing it
- VectorCopy(cl.csqc_origin, prog->globals.client->pmove_org);
+ Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, prog->globals.client->pmove_org);
VectorCopy(cl.movement_velocity, prog->globals.client->pmove_vel);
if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_angles)))
VectorCopy(cl.viewangles, val->vector);
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_punchangle)))
+ VectorCopy(cl.punchangle, val->vector);
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_punchvector)))
+ VectorCopy(cl.punchvector, val->vector);
prog->globals.client->maxclients = cl.maxclients;
CSQC_END
}
prvm_eval_t *val;
entity_render_t *entrender;
dp_model_t *model;
- matrix4x4_t tagmatrix, matrix2;
model = CL_GetModelFromEdict(ed);
if (!model)
return false;
entrender = cl.csqcrenderentities + edictnum;
r_refdef.scene.entities[r_refdef.scene.numentities++] = entrender;
- entrender->entitynumber = edictnum;
+ entrender->entitynumber = edictnum + MAX_EDICTS;
//entrender->shadertime = 0; // shadertime was set by spawn()
+ entrender->flags = 0;
entrender->alpha = 1;
entrender->scale = 1;
VectorSet(entrender->colormod, 1, 1, 1);
return false;
}
+ if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.userwavefunc_param0))) entrender->userwavefunc_param[0] = val->_float;
+ if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.userwavefunc_param1))) entrender->userwavefunc_param[1] = val->_float;
+ if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.userwavefunc_param2))) entrender->userwavefunc_param[2] = val->_float;
+ if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.userwavefunc_param3))) entrender->userwavefunc_param[3] = val->_float;
+
entrender->model = model;
entrender->skinnum = (int)ed->fields.client->skin;
entrender->effects |= entrender->model->effects;
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float) entrender->scale = scale = val->_float;
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector)) VectorCopy(val->vector, entrender->colormod);
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.glowmod)) && VectorLength2(val->vector)) VectorCopy(val->vector, entrender->glowmod);
- if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float) entrender->effects |= (int)val->_float;
- if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict)
- {
- int tagentity;
- int tagindex = 0;
- tagentity = val->edict;
- if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_index)) && val->_float)
- tagindex = (int)val->_float;
- CL_GetTagMatrix (&tagmatrix, PRVM_PROG_TO_EDICT(tagentity), tagindex);
- }
- else
- Matrix4x4_CreateIdentity(&tagmatrix);
+ if(ed->fields.client->effects) entrender->effects |= (int)ed->fields.client->effects;
if (!VectorLength2(entrender->colormod))
VectorSet(entrender->colormod, 1, 1, 1);
if (!VectorLength2(entrender->glowmod))
VectorSet(entrender->glowmod, 1, 1, 1);
- if (renderflags & RF_USEAXIS)
- {
- vec3_t left;
- VectorNegate(prog->globals.client->v_right, left);
- Matrix4x4_FromVectors(&matrix2, prog->globals.client->v_forward, left, prog->globals.client->v_up, ed->fields.client->origin);
- Matrix4x4_Scale(&matrix2, scale, 1);
- }
- else
- {
- vec3_t angles;
- VectorCopy(ed->fields.client->angles, angles);
- // if model is alias, reverse pitch direction
- if (entrender->model->type == mod_alias)
- angles[0] = -angles[0];
-
- // set up the render matrix
- Matrix4x4_CreateFromQuakeEntity(&matrix2, ed->fields.client->origin[0], ed->fields.client->origin[1], ed->fields.client->origin[2], angles[0], angles[1], angles[2], scale);
- }
+ // LordHavoc: use the CL_GetTagMatrix function on self to ensure consistent behavior (duplicate code would be bad)
+ CL_GetTagMatrix(&entrender->matrix, ed, 0);
// set up the animation data
VM_GenerateFrameGroupBlend(ed->priv.server->framegroupblend, ed);
VM_UpdateEdictSkeleton(ed, model, ed->priv.server->frameblend);
if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.shadertime))) entrender->shadertime = val->_float;
- // concat the matrices to make the entity relative to its tag
- Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2);
-
// transparent offset
if ((renderflags & RF_USETRANSPARENTOFFSET) && (val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.transparent_offset)))
entrender->transparent_offset = val->_float;
if(renderflags & RF_NOCULL) entrender->flags |= RENDER_NOCULL;
if(renderflags & RF_DEPTHHACK) entrender->flags |= RENDER_NODEPTHTEST;
if(renderflags & RF_ADDITIVE) entrender->flags |= RENDER_ADDITIVE;
-
}
c = (int)ed->fields.client->colormap;
// either fullbright or lit
if(!r_fullbright.integer)
{
- if (!(entrender->effects & EF_FULLBRIGHT))
+ if (!(entrender->effects & EF_FULLBRIGHT) && !(renderflags & RF_FULLBRIGHT))
entrender->flags |= RENDER_LIGHT;
else if(r_equalize_entities_fullbright.integer)
entrender->flags |= RENDER_LIGHT | RENDER_EQUALIZE;
// hide player shadow during intermission or nehahra movie
if (!(entrender->effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
&& (entrender->alpha >= 1)
+ && !(renderflags & RF_NOSHADOW)
&& !(entrender->flags & RENDER_VIEWMODEL)
&& (!(entrender->flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
entrender->flags |= RENDER_SHADOW;
// vec3_t oldangles;
if(!cl.csqc_loaded)
return false;
+ R_TimeReport("pre-UpdateView");
CSQC_BEGIN
//VectorCopy(cl.viewangles, oldangles);
prog->globals.client->time = cl.time;
// Dresk : Reset Dmg Globals Here
CL_VM_UpdateDmgGlobals(0, 0, emptyvector);
CSQC_END
+ R_TimeReport("UpdateView");
return true;
}
prvm_edict_t *ent;
// link every entity except world
- for (i = 1, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+ for (i = 1, ent = prog->edicts;i < prog->num_edicts;i++, ent++)
if (!ent->priv.server->free)
CL_LinkEdict(ent);
}
if(cnt == 0)
{
MSG_WriteByte(buf, svc_stufftext);
- MSG_WriteString(buf, va("\ncl_downloadbegin %lu %s\n", len, filename));
+ MSG_WriteString(buf, va("\ncl_downloadbegin %lu %s\n", (unsigned long)len, filename));
return true;
}
else if(cnt >= 1 && cnt <= npackets)
else if(cnt == npackets + 1)
{
MSG_WriteByte(buf, svc_stufftext);
- MSG_WriteString(buf, va("\ncl_downloadfinished %lu %d\n", len, crc));
+ MSG_WriteString(buf, va("\ncl_downloadfinished %lu %d\n", (unsigned long)len, crc));
return true;
}
return false;
prog->globals.client->time = cl.time;
prog->globals.client->self = 0;
- prog->globals.client->mapname = cl.worldmodel ? PRVM_SetEngineString(cl.worldmodel->name) : PRVM_SetEngineString("");
+ prog->globals.client->mapname = PRVM_SetEngineString(cl.worldname);
prog->globals.client->player_localentnum = cl.playerentity;
// set map description (use world entity 0)
val = PRVM_EDICTFIELDVALUE(prog->edicts, prog->fieldoffsets.message);
if(val)
- val->string = PRVM_SetEngineString(cl.levelname);
+ val->string = PRVM_SetEngineString(cl.worldmessage);
VectorCopy(cl.world.mins, prog->edicts->fields.client->mins);
VectorCopy(cl.world.maxs, prog->edicts->fields.client->maxs);
return r;
}
+
+qboolean CL_VM_TransformView(int entnum, matrix4x4_t *viewmatrix, mplane_t *clipplane, vec3_t visorigin)
+{
+ qboolean ret = false;
+ prvm_edict_t *ed;
+ prvm_eval_t *val, *valforward, *valright, *valup, *valendpos;
+ vec3_t forward, left, up, origin, ang;
+ matrix4x4_t mat, matq;
+
+ CSQC_BEGIN
+ ed = PRVM_EDICT_NUM(entnum);
+ // camera:
+ // camera_transform
+ if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.camera_transform)) && val->function)
+ {
+ ret = true;
+ if(viewmatrix || clipplane || visorigin)
+ {
+ valforward = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_forward);
+ valright = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_right);
+ valup = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.v_up);
+ valendpos = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_endpos);
+ if(valforward && valright && valup && valendpos)
+ {
+ Matrix4x4_ToVectors(viewmatrix, forward, left, up, origin);
+ AnglesFromVectors(ang, forward, up, false);
+ prog->globals.client->time = cl.time;
+ prog->globals.client->self = entnum;
+ VectorCopy(origin, PRVM_G_VECTOR(OFS_PARM0));
+ VectorCopy(ang, PRVM_G_VECTOR(OFS_PARM1));
+ VectorCopy(forward, valforward->vector);
+ VectorScale(left, -1, valright->vector);
+ VectorCopy(up, valup->vector);
+ VectorCopy(origin, valendpos->vector);
+ PRVM_ExecuteProgram(val->function, "QC function e.camera_transform is missing");
+ VectorCopy(PRVM_G_VECTOR(OFS_RETURN), origin);
+ VectorCopy(valforward->vector, forward);
+ VectorScale(valright->vector, -1, left);
+ VectorCopy(valup->vector, up);
+ VectorCopy(valendpos->vector, visorigin);
+ Matrix4x4_Invert_Full(&mat, viewmatrix);
+ Matrix4x4_FromVectors(viewmatrix, forward, left, up, origin);
+ Matrix4x4_Concat(&matq, viewmatrix, &mat);
+ Matrix4x4_TransformPositivePlane(&matq, clipplane->normal[0], clipplane->normal[1], clipplane->normal[2], clipplane->dist, &clipplane->normal[0]);
+ }
+ }
+ }
+ CSQC_END
+
+ return ret;
+}