"DP_CL_LOADSKY "
"DP_CON_SET "
"DP_CON_SETA "
+"DP_CON_STARTMAP "
"DP_EF_ADDITIVE "
"DP_EF_BLUE "
"DP_EF_FLAME "
"DP_QC_TRACE_MOVETYPE_WORLDONLY "
"DP_QC_VECTORVECTORS "
"DP_QUAKE2_MODEL "
+"DP_QUAKE2_SPRITE "
"DP_QUAKE3_MODEL "
"DP_REGISTERCVAR "
"DP_SND_DIRECTIONLESSATTNNONE "
MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
-static void clippointtosurface(msurface_t *surf, vec3_t p, vec3_t out)
+static void clippointtosurface(msurface_t *surface, vec3_t p, vec3_t out)
{
- int i, j;
- vec3_t v1, clipplanenormal, normal;
- vec_t clipplanedist, clipdist;
+ int i, j, k;
+ float *v[3], facenormal[3], edgenormal[3], sidenormal[3], temp[3], offsetdist, dist, bestdist;
+ bestdist = 1000000000;
VectorCopy(p, out);
- if (surf->flags & SURF_PLANEBACK)
- VectorNegate(surf->plane->normal, normal);
- else
- VectorCopy(surf->plane->normal, normal);
- for (i = 0, j = surf->poly_numverts - 1;i < surf->poly_numverts;j = i, i++)
- {
- VectorSubtract(&surf->poly_verts[j * 3], &surf->poly_verts[i * 3], v1);
- VectorNormalizeFast(v1);
- CrossProduct(v1, normal, clipplanenormal);
- clipplanedist = DotProduct(&surf->poly_verts[i * 3], clipplanenormal);
- clipdist = DotProduct(out, clipplanenormal) - clipplanedist;
- if (clipdist > 0)
+ for (i = 0;i < surface->num_triangles;i++)
+ {
+ // clip original point to each triangle of the surface and find the
+ // triangle that is closest
+ v[0] = (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 0] * 3;
+ v[1] = (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 1] * 3;
+ v[2] = (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 2] * 3;
+ TriangleNormal(v[0], v[1], v[2], facenormal);
+ VectorNormalize(facenormal);
+ offsetdist = DotProduct(v[0], facenormal) - DotProduct(p, facenormal);
+ VectorMA(p, offsetdist, facenormal, temp);
+ for (j = 0, k = 2;j < 3;k = j, j++)
{
- clipdist = -clipdist;
- VectorMA(out, clipdist, clipplanenormal, out);
+ VectorSubtract(v[k], v[j], edgenormal);
+ CrossProduct(edgenormal, facenormal, sidenormal);
+ VectorNormalize(sidenormal);
+ offsetdist = DotProduct(v[k], sidenormal) - DotProduct(temp, sidenormal);
+ if (offsetdist < 0)
+ VectorMA(temp, offsetdist, sidenormal, temp);
+ }
+ dist = VectorDistance2(temp, p);
+ if (bestdist > dist)
+ {
+ bestdist = dist;
+ VectorCopy(temp, out);
}
}
}
-static msurface_t *getsurface(edict_t *ed, int surfnum)
+static msurface_t *getsurface(edict_t *ed, int surfacenum)
{
int modelindex;
model_t *model;
if (modelindex < 1 || modelindex >= MAX_MODELS)
return NULL;
model = sv.models[modelindex];
- if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
+ if (surfacenum < 0 || surfacenum >= model->nummodelsurfaces)
return NULL;
- return model->brushq1.surfaces + surfnum + model->firstmodelsurface;
+ return model->brush.data_surfaces + surfacenum + model->firstmodelsurface;
}
//PF_getsurfacenumpoints, // #434 float(entity e, float s) getsurfacenumpoints = #434;
void PF_getsurfacenumpoints(void)
{
- msurface_t *surf;
+ msurface_t *surface;
// return 0 if no such surface
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
{
G_FLOAT(OFS_RETURN) = 0;
return;
}
- G_FLOAT(OFS_RETURN) = surf->poly_numverts;
+ // note: this (incorrectly) assumes it is a simple polygon
+ G_FLOAT(OFS_RETURN) = surface->num_vertices;
}
//PF_getsurfacepoint, // #435 vector(entity e, float s, float n) getsurfacepoint = #435;
void PF_getsurfacepoint(void)
{
edict_t *ed;
- msurface_t *surf;
+ msurface_t *surface;
int pointnum;
VectorClear(G_VECTOR(OFS_RETURN));
ed = G_EDICT(OFS_PARM0);
if (!ed || ed->e->free)
return;
- if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(ed, G_FLOAT(OFS_PARM1))))
return;
+ // note: this (incorrectly) assumes it is a simple polygon
pointnum = G_FLOAT(OFS_PARM2);
- if (pointnum < 0 || pointnum >= surf->poly_numverts)
+ if (pointnum < 0 || pointnum >= surface->num_vertices)
return;
// FIXME: implement rotation/scaling
- VectorAdd(&surf->poly_verts[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
+ VectorAdd(&(surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
}
//PF_getsurfacenormal, // #436 vector(entity e, float s) getsurfacenormal = #436;
void PF_getsurfacenormal(void)
{
- msurface_t *surf;
+ msurface_t *surface;
+ vec3_t normal;
VectorClear(G_VECTOR(OFS_RETURN));
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
return;
// FIXME: implement rotation/scaling
- if (surf->flags & SURF_PLANEBACK)
- VectorNegate(surf->plane->normal, G_VECTOR(OFS_RETURN));
- else
- VectorCopy(surf->plane->normal, G_VECTOR(OFS_RETURN));
+ // note: this (incorrectly) assumes it is a simple polygon
+ // note: this only returns the first triangle, so it doesn't work very
+ // well for curved surfaces or arbitrary meshes
+ TriangleNormal((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex), (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + 3, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + 6, normal);
+ VectorNormalize(normal);
+ VectorCopy(normal, G_VECTOR(OFS_RETURN));
}
//PF_getsurfacetexture, // #437 string(entity e, float s) getsurfacetexture = #437;
void PF_getsurfacetexture(void)
{
- msurface_t *surf;
+ msurface_t *surface;
G_INT(OFS_RETURN) = 0;
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
return;
- G_INT(OFS_RETURN) = PR_SetString(surf->texinfo->texture->name);
+ G_INT(OFS_RETURN) = PR_SetString(surface->texture->name);
}
//PF_getsurfacenearpoint, // #438 float(entity e, vector p) getsurfacenearpoint = #438;
void PF_getsurfacenearpoint(void)
{
- int surfnum, best, modelindex;
+ int surfacenum, best, modelindex;
vec3_t clipped, p;
vec_t dist, bestdist;
edict_t *ed;
model_t *model;
- msurface_t *surf;
+ msurface_t *surface;
vec_t *point;
G_FLOAT(OFS_RETURN) = -1;
ed = G_EDICT(OFS_PARM0);
if (modelindex < 1 || modelindex >= MAX_MODELS)
return;
model = sv.models[modelindex];
- if (!model->brushq1.numsurfaces)
+ if (!model->brush.num_surfaces)
return;
// FIXME: implement rotation/scaling
VectorSubtract(point, ed->v->origin, p);
best = -1;
bestdist = 1000000000;
- for (surfnum = 0;surfnum < model->nummodelsurfaces;surfnum++)
- {
- surf = model->brushq1.surfaces + surfnum + model->firstmodelsurface;
- dist = PlaneDiff(p, surf->plane);
- dist = dist * dist;
+ for (surfacenum = 0;surfacenum < model->nummodelsurfaces;surfacenum++)
+ {
+ surface = model->brush.data_surfaces + surfacenum + model->firstmodelsurface;
+ // first see if the nearest point on the surface's box is closer than the previous match
+ clipped[0] = bound(surface->mins[0], p[0], surface->maxs[0]) - p[0];
+ clipped[1] = bound(surface->mins[1], p[1], surface->maxs[1]) - p[1];
+ clipped[2] = bound(surface->mins[2], p[2], surface->maxs[2]) - p[2];
+ dist = VectorLength2(clipped);
if (dist < bestdist)
{
- clippointtosurface(surf, p, clipped);
+ // it is, check the nearest point on the actual geometry
+ clippointtosurface(surface, p, clipped);
VectorSubtract(clipped, p, clipped);
- dist += DotProduct(clipped, clipped);
+ dist += VectorLength2(clipped);
if (dist < bestdist)
{
- best = surfnum;
+ // that's closer too, store it as the best match
+ best = surfacenum;
bestdist = dist;
}
}
void PF_getsurfaceclippedpoint(void)
{
edict_t *ed;
- msurface_t *surf;
+ msurface_t *surface;
vec3_t p, out;
VectorClear(G_VECTOR(OFS_RETURN));
ed = G_EDICT(OFS_PARM0);
if (!ed || ed->e->free)
return;
- if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(ed, G_FLOAT(OFS_PARM1))))
return;
// FIXME: implement rotation/scaling
VectorSubtract(G_VECTOR(OFS_PARM2), ed->v->origin, p);
- clippointtosurface(surf, p, out);
+ clippointtosurface(surface, p, out);
// FIXME: implement rotation/scaling
VectorAdd(out, ed->v->origin, G_VECTOR(OFS_RETURN));
}
}
filename = G_STRING(OFS_PARM0);
// -4 failure (dangerous/non-portable filename) removed, FS_Open checks
- pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false);
+ pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false, false);
if (pr_files[filenum] == NULL && modestring == "rb")
- pr_files[filenum] = FS_Open(filename, modestring, false);
+ pr_files[filenum] = FS_Open(filename, modestring, false, false);
if (pr_files[filenum] == NULL)
G_FLOAT(OFS_RETURN) = -1;
{
c = FS_Getc(pr_files[filenum]);
if (c != '\n')
- FS_UnGetc(pr_files[filenum], c);
+ FS_UnGetc(pr_files[filenum], (unsigned char)c);
}
if (developer.integer)
Con_Printf("fgets: %s\n", string);
edict_t *tagentity = G_EDICT(OFS_PARM1);
char *tagname = G_STRING(OFS_PARM2);
eval_t *v;
- int i, modelindex;
+ int modelindex;
model_t *model;
if (e == sv.edicts)
modelindex = (int)tagentity->v->modelindex;
if (modelindex >= 0 && modelindex < MAX_MODELS && (model = sv.models[modelindex]))
{
- if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
- for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
- if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))
- v->_float = i + 1;
- // FIXME: use a model function to get tag info (need to handle skeletal)
- if (v->_float == 0 && model->alias.aliasnum_tags)
- for (i = 0;i < model->alias.aliasnum_tags;i++)
- if (!strcmp(tagname, model->alias.aliasdata_tags[i].name))
- v->_float = i + 1;
+ v->_float = Mod_Alias_GetTagIndexForName(model, tagentity->v->skin, tagname);
if (v->_float == 0)
Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i (model \"%s\") but could not find it\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity), model->name);
}
int SV_GetTagIndex (edict_t *e, char *tagname)
{
- int tagindex, i;
+ int i;
model_t *model;
i = e->v->modelindex;
return -1;
model = sv.models[i];
- tagindex = -1;
- if (model->data_overridetagnamesforskin && (unsigned int)e->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)e->v->skin].num_overridetagnames)
- {
- for (i = 0; i < model->data_overridetagnamesforskin[(unsigned int)e->v->skin].num_overridetagnames; i++)
- {
- if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)e->v->skin].data_overridetagnames[i].name))
- {
- tagindex = i;
- break;
- }
- }
- }
- if (tagindex == -1)
- {
- for (i = 0;i < model->alias.aliasnum_tags; i++)
- {
- if (!(strcmp(tagname, model->alias.aliasdata_tags[i].name)))
- {
- tagindex = i;
- break;
- }
- }
- }
- return tagindex + 1;
+ return Mod_Alias_GetTagIndexForName(model, e->v->skin, tagname);
};
// Warnings/errors code:
int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex)
{
eval_t *val;
- int modelindex, reqtag, reqframe, attachloop;
+ int modelindex, reqframe, attachloop;
matrix4x4_t entitymatrix, tagmatrix, attachmatrix;
edict_t *attachent;
model_t *model;
return 3;
model = sv.models[modelindex];
- reqtag = model->alias.aliasnum_tags;
- if (tagindex <= 0 || tagindex > reqtag)
- {
- if (reqtag && tagindex) // Only appear if model has no tags or not-null tag requested
- return 4;
- return 0;
- }
-
- if (ent->v->frame < 0 || ent->v->frame > model->alias.aliasnum_tagframes)
- reqframe = model->numframes - 1; // if model has wrong frame, engine automatically switches to model last frame
+ if (ent->v->frame >= 0 && ent->v->frame < model->numframes && model->animscenes)
+ reqframe = model->animscenes[(int)ent->v->frame].firstframe;
else
- reqframe = ent->v->frame;
+ reqframe = 0; // if model has wrong frame, engine automatically switches to model first frame
// get initial tag matrix
if (tagindex)
{
- reqtag = (tagindex - 1) + ent->v->frame*model->alias.aliasnum_tags;
- Matrix4x4_Copy(&tagmatrix, &model->alias.aliasdata_tags[reqtag].matrix);
+ int ret = Mod_Alias_GetTagMatrix(model, reqframe, tagindex - 1, &tagmatrix);
+ if (ret)
+ return ret;
}
else
Matrix4x4_CreateIdentity(&tagmatrix);
{
attachent = EDICT_NUM(val->edict); // to this it entity our entity is attached
val = GETEDICTFIELDVALUE(ent, eval_tag_index);
- Matrix4x4_CreateIdentity(&attachmatrix);
- if (val->_float >= 1 && attachent->v->modelindex >= 1 && attachent->v->modelindex < MAX_MODELS)
- {
- model = sv.models[(int)attachent->v->modelindex];
- if (val->_float < model->alias.aliasnum_tags)
- {
- // got tagname on parent entity attachment tag via tag_index (and got it's matrix)
- model = sv.models[(int)attachent->v->modelindex];
- reqtag = (val->_float - 1) + attachent->v->frame*model->alias.aliasnum_tags;
- Matrix4x4_Copy(&attachmatrix, &model->alias.aliasdata_tags[reqtag].matrix);
- }
- }
+ if (val->_float >= 1 && attachent->v->modelindex >= 1 && attachent->v->modelindex < MAX_MODELS && (model = sv.models[(int)attachent->v->modelindex]) && model->animscenes && attachent->v->frame >= 0 && attachent->v->frame < model->numframes)
+ Mod_Alias_GetTagMatrix(model, model->animscenes[(int)attachent->v->frame].firstframe, val->_float - 1, &attachmatrix);
+ else
+ Matrix4x4_CreateIdentity(&attachmatrix);
// apply transformation by child entity matrix
val = GETEDICTFIELDVALUE(ent, eval_scale);
projects / xonotic / darkplaces.git / blobdiff