#include "quakedef.h"
#include "clvm_cmds.h"
#include "cl_collision.h"
+#include "com_list.h"
/*
void World_ClearLink (link_t *l)
{
l->entitynumber = 0;
- l->prev = l->next = l;
+ l->list.prev = l->list.next = &l->list;
}
void World_RemoveLink (link_t *l)
{
- l->next->prev = l->prev;
- l->prev->next = l->next;
+ List_Delete(&l->list);
}
void World_InsertLinkBefore (link_t *l, link_t *before, int entitynumber)
{
l->entitynumber = entitynumber;
- l->next = before;
- l->prev = before->prev;
- l->prev->next = l;
- l->next->prev = l;
+ List_Add_Tail(&l->list, &before->list);
}
/*
link_t *grid;
// unlink all entities one by one
grid = &world->areagrid_outside;
- while (grid->next != grid)
- World_UnlinkEdict(PRVM_EDICT_NUM(grid->next->entitynumber));
+ while (grid->list.next != &grid->list)
+ World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber));
for (i = 0, grid = world->areagrid;i < AREA_GRIDNODES;i++, grid++)
- while (grid->next != grid)
- World_UnlinkEdict(PRVM_EDICT_NUM(grid->next->entitynumber));
+ while (grid->list.next != &grid->list)
+ World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber));
}
/*
int i;
for (i = 0;i < ENTITYGRIDAREAS;i++)
{
- if (ent->priv.server->areagrid[i].prev)
- {
+ if (ent->priv.server->areagrid[i].list.prev)
World_RemoveLink (&ent->priv.server->areagrid[i]);
- ent->priv.server->areagrid[i].prev = ent->priv.server->areagrid[i].next = NULL;
- }
}
}
vec3_t paddedmins, paddedmaxs;
int igrid[3], igridmins[3], igridmaxs[3];
- VectorSet(paddedmins, requestmins[0] - 1.0f, requestmins[1] - 1.0f, requestmins[2] - 1.0f);
- VectorSet(paddedmaxs, requestmaxs[0] + 1.0f, requestmaxs[1] + 1.0f, requestmaxs[2] + 1.0f);
+ // avoid crash in showtex code on level change
+ if (prog == NULL || prog->num_edicts < 1)
+ return 0;
+
+ // LadyHavoc: discovered this actually causes its own bugs (dm6 teleporters being too close to info_teleport_destination)
+ //VectorSet(paddedmins, requestmins[0] - 1.0f, requestmins[1] - 1.0f, requestmins[2] - 1.0f);
+ //VectorSet(paddedmaxs, requestmaxs[0] + 1.0f, requestmaxs[1] + 1.0f, requestmaxs[2] + 1.0f);
+ VectorCopy(requestmins, paddedmins);
+ VectorCopy(requestmaxs, paddedmaxs);
// FIXME: if areagrid_marknumber wraps, all entities need their
// ent->priv.server->areagridmarknumber reset
numlist = 0;
// add entities not linked into areagrid because they are too big or
// outside the grid bounds
- if (world->areagrid_outside.next)
+ if (world->areagrid_outside.list.next)
{
grid = &world->areagrid_outside;
- for (l = grid->next;l != grid;l = l->next)
+ List_For_Each_Entry(l, &grid->list, list)
{
ent = PRVM_EDICT_NUM(l->entitynumber);
if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
grid = world->areagrid + igrid[1] * AREA_GRID + igridmins[0];
for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
{
- if (grid->next)
+ if (grid->list.next)
{
- for (l = grid->next;l != grid;l = l->next)
+ List_For_Each_Entry(l, &grid->list, list)
{
ent = PRVM_EDICT_NUM(l->entitynumber);
if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
{
prvm_prog_t *prog = world->prog;
// unlink from old position first
- if (ent->priv.server->areagrid[0].prev)
+ if (ent->priv.server->areagrid[0].list.prev)
World_UnlinkEdict(ent);
// don't add the world
//============================================================================
#ifdef USEODE
-cvar_t physics_ode_quadtree_depth = {0, "physics_ode_quadtree_depth","5", "desired subdivision level of quadtree culling space"};
-cvar_t physics_ode_allowconvex = {0, "physics_ode_allowconvex", "0", "allow usage of Convex Hull primitive type on trimeshes that have custom 'collisionconvex' mesh. If disabled, trimesh primitive type are used."};
-cvar_t physics_ode_contactsurfacelayer = {0, "physics_ode_contactsurfacelayer","1", "allows objects to overlap this many units to reduce jitter"};
-cvar_t physics_ode_worldstep_iterations = {0, "physics_ode_worldstep_iterations", "20", "parameter to dWorldQuickStep"};
-cvar_t physics_ode_contact_mu = {0, "physics_ode_contact_mu", "1", "contact solver mu parameter - friction pyramid approximation 1 (see ODE User Guide)"};
-cvar_t physics_ode_contact_erp = {0, "physics_ode_contact_erp", "0.96", "contact solver erp parameter - Error Restitution Percent (see ODE User Guide)"};
-cvar_t physics_ode_contact_cfm = {0, "physics_ode_contact_cfm", "0", "contact solver cfm parameter - Constraint Force Mixing (see ODE User Guide)"};
-cvar_t physics_ode_contact_maxpoints = {0, "physics_ode_contact_maxpoints", "16", "maximal number of contact points between 2 objects, higher = stable (and slower), can be up to 32"};
-cvar_t physics_ode_world_erp = {0, "physics_ode_world_erp", "-1", "world solver erp parameter - Error Restitution Percent (see ODE User Guide); use defaults when set to -1"};
-cvar_t physics_ode_world_cfm = {0, "physics_ode_world_cfm", "-1", "world solver cfm parameter - Constraint Force Mixing (see ODE User Guide); not touched when -1"};
-cvar_t physics_ode_world_damping = {0, "physics_ode_world_damping", "1", "enabled damping scale (see ODE User Guide), this scales all damping values, be aware that behavior depends of step type"};
-cvar_t physics_ode_world_damping_linear = {0, "physics_ode_world_damping_linear", "0.01", "world linear damping scale (see ODE User Guide); use defaults when set to -1"};
-cvar_t physics_ode_world_damping_linear_threshold = {0, "physics_ode_world_damping_linear_threshold", "0.1", "world linear damping threshold (see ODE User Guide); use defaults when set to -1"};
-cvar_t physics_ode_world_damping_angular = {0, "physics_ode_world_damping_angular", "0.05", "world angular damping scale (see ODE User Guide); use defaults when set to -1"};
-cvar_t physics_ode_world_damping_angular_threshold = {0, "physics_ode_world_damping_angular_threshold", "0.1", "world angular damping threshold (see ODE User Guide); use defaults when set to -1"};
-cvar_t physics_ode_world_gravitymod = {0, "physics_ode_world_gravitymod", "1", "multiplies gravity got from sv_gravity, this may be needed to tweak if strong damping is used"};
-cvar_t physics_ode_iterationsperframe = {0, "physics_ode_iterationsperframe", "1", "divisor for time step, runs multiple physics steps per frame"};
-cvar_t physics_ode_constantstep = {0, "physics_ode_constantstep", "0", "use constant step instead of variable step which tends to increase stability, if set to 1 uses sys_ticrate, instead uses it's own value"};
-cvar_t physics_ode_autodisable = {0, "physics_ode_autodisable", "1", "automatic disabling of objects which dont move for long period of time, makes object stacking a lot faster"};
-cvar_t physics_ode_autodisable_steps = {0, "physics_ode_autodisable_steps", "10", "how many steps object should be dormant to be autodisabled"};
-cvar_t physics_ode_autodisable_time = {0, "physics_ode_autodisable_time", "0", "how many seconds object should be dormant to be autodisabled"};
-cvar_t physics_ode_autodisable_threshold_linear = {0, "physics_ode_autodisable_threshold_linear", "0.6", "body will be disabled if it's linear move below this value"};
-cvar_t physics_ode_autodisable_threshold_angular = {0, "physics_ode_autodisable_threshold_angular", "6", "body will be disabled if it's angular move below this value"};
-cvar_t physics_ode_autodisable_threshold_samples = {0, "physics_ode_autodisable_threshold_samples", "5", "average threshold with this number of samples"};
-cvar_t physics_ode_movelimit = {0, "physics_ode_movelimit", "0.5", "clamp velocity if a single move would exceed this percentage of object thickness, to prevent flying through walls, be aware that behavior depends of step type"};
-cvar_t physics_ode_spinlimit = {0, "physics_ode_spinlimit", "10000", "reset spin velocity if it gets too large"};
-cvar_t physics_ode_trick_fixnan = {0, "physics_ode_trick_fixnan", "1", "engine trick that checks and fixes NaN velocity/origin/angles on objects, a value of 2 makes console prints on each fix"};
-cvar_t physics_ode_printstats = {0, "physics_ode_printstats", "0", "print ODE stats each frame"};
-
-cvar_t physics_ode = {0, "physics_ode", "0", "run ODE physics (VERY experimental and potentially buggy)"};
-
-// LordHavoc: this large chunk of definitions comes from the ODE library
+cvar_t physics_ode_quadtree_depth = {CF_CLIENT | CF_SERVER, "physics_ode_quadtree_depth","5", "desired subdivision level of quadtree culling space"};
+cvar_t physics_ode_allowconvex = {CF_CLIENT | CF_SERVER, "physics_ode_allowconvex", "0", "allow usage of Convex Hull primitive type on trimeshes that have custom 'collisionconvex' mesh. If disabled, trimesh primitive type are used."};
+cvar_t physics_ode_contactsurfacelayer = {CF_CLIENT | CF_SERVER, "physics_ode_contactsurfacelayer","1", "allows objects to overlap this many units to reduce jitter"};
+cvar_t physics_ode_worldstep_iterations = {CF_CLIENT | CF_SERVER, "physics_ode_worldstep_iterations", "20", "parameter to dWorldQuickStep"};
+cvar_t physics_ode_contact_mu = {CF_CLIENT | CF_SERVER, "physics_ode_contact_mu", "1", "contact solver mu parameter - friction pyramid approximation 1 (see ODE User Guide)"};
+cvar_t physics_ode_contact_erp = {CF_CLIENT | CF_SERVER, "physics_ode_contact_erp", "0.96", "contact solver erp parameter - Error Restitution Percent (see ODE User Guide)"};
+cvar_t physics_ode_contact_cfm = {CF_CLIENT | CF_SERVER, "physics_ode_contact_cfm", "0", "contact solver cfm parameter - Constraint Force Mixing (see ODE User Guide)"};
+cvar_t physics_ode_contact_maxpoints = {CF_CLIENT | CF_SERVER, "physics_ode_contact_maxpoints", "16", "maximal number of contact points between 2 objects, higher = stable (and slower), can be up to 32"};
+cvar_t physics_ode_world_erp = {CF_CLIENT | CF_SERVER, "physics_ode_world_erp", "-1", "world solver erp parameter - Error Restitution Percent (see ODE User Guide); use defaults when set to -1"};
+cvar_t physics_ode_world_cfm = {CF_CLIENT | CF_SERVER, "physics_ode_world_cfm", "-1", "world solver cfm parameter - Constraint Force Mixing (see ODE User Guide); not touched when -1"};
+cvar_t physics_ode_world_damping = {CF_CLIENT | CF_SERVER, "physics_ode_world_damping", "1", "enabled damping scale (see ODE User Guide), this scales all damping values, be aware that behavior depends of step type"};
+cvar_t physics_ode_world_damping_linear = {CF_CLIENT | CF_SERVER, "physics_ode_world_damping_linear", "0.01", "world linear damping scale (see ODE User Guide); use defaults when set to -1"};
+cvar_t physics_ode_world_damping_linear_threshold = {CF_CLIENT | CF_SERVER, "physics_ode_world_damping_linear_threshold", "0.1", "world linear damping threshold (see ODE User Guide); use defaults when set to -1"};
+cvar_t physics_ode_world_damping_angular = {CF_CLIENT | CF_SERVER, "physics_ode_world_damping_angular", "0.05", "world angular damping scale (see ODE User Guide); use defaults when set to -1"};
+cvar_t physics_ode_world_damping_angular_threshold = {CF_CLIENT | CF_SERVER, "physics_ode_world_damping_angular_threshold", "0.1", "world angular damping threshold (see ODE User Guide); use defaults when set to -1"};
+cvar_t physics_ode_world_gravitymod = {CF_CLIENT | CF_SERVER, "physics_ode_world_gravitymod", "1", "multiplies gravity got from sv_gravity, this may be needed to tweak if strong damping is used"};
+cvar_t physics_ode_iterationsperframe = {CF_CLIENT | CF_SERVER, "physics_ode_iterationsperframe", "1", "divisor for time step, runs multiple physics steps per frame"};
+cvar_t physics_ode_constantstep = {CF_CLIENT | CF_SERVER, "physics_ode_constantstep", "0", "use constant step instead of variable step which tends to increase stability, if set to 1 uses sys_ticrate, instead uses it's own value"};
+cvar_t physics_ode_autodisable = {CF_CLIENT | CF_SERVER, "physics_ode_autodisable", "1", "automatic disabling of objects which dont move for long period of time, makes object stacking a lot faster"};
+cvar_t physics_ode_autodisable_steps = {CF_CLIENT | CF_SERVER, "physics_ode_autodisable_steps", "10", "how many steps object should be dormant to be autodisabled"};
+cvar_t physics_ode_autodisable_time = {CF_CLIENT | CF_SERVER, "physics_ode_autodisable_time", "0", "how many seconds object should be dormant to be autodisabled"};
+cvar_t physics_ode_autodisable_threshold_linear = {CF_CLIENT | CF_SERVER, "physics_ode_autodisable_threshold_linear", "0.6", "body will be disabled if it's linear move below this value"};
+cvar_t physics_ode_autodisable_threshold_angular = {CF_CLIENT | CF_SERVER, "physics_ode_autodisable_threshold_angular", "6", "body will be disabled if it's angular move below this value"};
+cvar_t physics_ode_autodisable_threshold_samples = {CF_CLIENT | CF_SERVER, "physics_ode_autodisable_threshold_samples", "5", "average threshold with this number of samples"};
+cvar_t physics_ode_movelimit = {CF_CLIENT | CF_SERVER, "physics_ode_movelimit", "0.5", "clamp velocity if a single move would exceed this percentage of object thickness, to prevent flying through walls, be aware that behavior depends of step type"};
+cvar_t physics_ode_spinlimit = {CF_CLIENT | CF_SERVER, "physics_ode_spinlimit", "10000", "reset spin velocity if it gets too large"};
+cvar_t physics_ode_trick_fixnan = {CF_CLIENT | CF_SERVER, "physics_ode_trick_fixnan", "1", "engine trick that checks and fixes NaN velocity/origin/angles on objects, a value of 2 makes console prints on each fix"};
+cvar_t physics_ode_printstats = {CF_CLIENT | CF_SERVER, "physics_ode_printstats", "0", "print ODE stats each frame"};
+
+cvar_t physics_ode = {CF_CLIENT | CF_SERVER, "physics_ode", "0", "run ODE physics (VERY experimental and potentially buggy)"};
+
+// LadyHavoc: this large chunk of definitions comes from the ODE library
// include files.
-#ifdef ODE_STATIC
+#ifdef LINK_TO_LIBODE
#include "ode/ode.h"
#else
#ifdef WINAPI
static void World_Physics_Init(void)
{
#ifdef USEODE
-#ifdef ODE_DYNAMIC
+#ifndef LINK_TO_LIBODE
const char* dllnames [] =
{
# if defined(WIN32)
+ "libode3.dll",
+ "libode2.dll",
"libode1.dll",
# elif defined(MACOSX)
+ "libode.3.dylib",
+ "libode.2.dylib",
"libode.1.dylib",
# else
+ "libode.so.3",
+ "libode.so.2",
"libode.so.1",
# endif
NULL
Cvar_RegisterVariable(&physics_ode_allowconvex);
Cvar_RegisterVariable(&physics_ode);
-#ifdef ODE_DYNAMIC
+#ifndef LINK_TO_LIBODE
// Load the DLL
- if (Sys_LoadLibrary (dllnames, &ode_dll, odefuncs))
+ if (Sys_LoadDependency (dllnames, &ode_dll, odefuncs))
#endif
{
dInitODE();
// dInitODE2(0);
-#ifdef ODE_DYNAMIC
+#ifndef LINK_TO_LIBODE
# ifdef dSINGLE
if (!dCheckConfiguration("ODE_single_precision"))
# else
# else
Con_Printf("ODE library not compiled for double precision - incompatible! Not using ODE physics.\n");
# endif
- Sys_UnloadLibrary(&ode_dll);
+ Sys_FreeLibrary(&ode_dll);
ode_dll = NULL;
}
else
static void World_Physics_Shutdown(void)
{
#ifdef USEODE
-#ifdef ODE_DYNAMIC
+#ifndef LINK_TO_LIBODE
if (ode_dll)
#endif
{
dCloseODE();
-#ifdef ODE_DYNAMIC
- Sys_UnloadLibrary(&ode_dll);
+#ifndef LINK_TO_LIBODE
+ Sys_FreeLibrary(&ode_dll);
ode_dll = NULL;
#endif
}
dVector3 center, extents;
if (world->physics.ode)
return;
-#ifdef ODE_DYNAMIC
+#ifndef LINK_TO_LIBODE
if (!ode_dll)
return;
#endif
void World_Physics_ApplyCmd(prvm_edict_t *ed, edict_odefunc_t *f)
{
+#ifdef USEODE
dBodyID body = (dBodyID)ed->priv.server->ode_body;
-#ifdef USEODE
switch(f->type)
{
case ODEFUNC_ENABLE:
prvm_prog_t *prog = world->prog;
const float *iv;
const int *ie;
- dBodyID body = (dBodyID)ed->priv.server->ode_body;
+ dBodyID body;
dMass mass;
- dReal test;
const dReal *ovelocity, *ospinvelocity;
void *dataID;
- dp_model_t *model;
+ model_t *model;
float *ov;
int *oe;
int axisindex;
int triangleindex;
int vertexindex;
mempool_t *mempool;
- qboolean modified = false;
+ qbool modified = false;
vec3_t angles;
vec3_t avelocity;
vec3_t entmaxs;
vec_t radius;
vec3_t scale;
vec_t spinlimit;
- qboolean gravity;
- qboolean geom_modified = false;
+ vec_t test;
+ qbool gravity;
+ qbool geom_modified = false;
edict_odefunc_t *func, *nextf;
dReal *planes, *planesData, *pointsData;
unsigned int *polygons, *polygonsData, polyvert;
- qboolean *mapped, *used, convex_compatible;
+ qbool *mapped, *used, convex_compatible;
int numplanes = 0, numpoints = 0, i;
-#ifdef ODE_DYNAMIC
+#ifndef LINK_TO_LIBODE
if (!ode_dll)
return;
#endif
// check if trimesh can be defined with convex
convex_compatible = false;
- for (i = 0;i < model->nummodelsurfaces;i++)
+ for (i = model->submodelsurfaces_start;i < model->submodelsurfaces_end;i++)
{
- if (!strcmp(((msurface_t *)(model->data_surfaces + model->firstmodelsurface + i))->texture->name, "collisionconvex"))
+ if (!strcmp(model->data_surfaces[i].texture->name, "collisionconvex"))
{
convex_compatible = true;
break;
// followed by that amount of indices to "points" in counter clockwise order
polygonsData = polygons = (unsigned int *)Mem_Alloc(mempool, numtriangles*sizeof(int)*4);
planesData = planes = (dReal *)Mem_Alloc(mempool, numtriangles*sizeof(dReal)*4);
- mapped = (qboolean *)Mem_Alloc(mempool, numvertices*sizeof(qboolean));
- used = (qboolean *)Mem_Alloc(mempool, numtriangles*sizeof(qboolean));
- memset(mapped, 0, numvertices*sizeof(qboolean));
- memset(used, 0, numtriangles*sizeof(qboolean));
+ mapped = (qbool *)Mem_Alloc(mempool, numvertices*sizeof(qbool));
+ used = (qbool *)Mem_Alloc(mempool, numtriangles*sizeof(qbool));
+ memset(mapped, 0, numvertices*sizeof(qbool));
+ memset(used, 0, numtriangles*sizeof(qbool));
numplanes = numpoints = polyvert = 0;
// build convex hull
// todo: merge duplicated verts here
pointsData[(polygons[1]*3)+2]*pointsData[(polygons[2]*3)+1]*pointsData[(polygons[3]*3)+0] -
pointsData[(polygons[1]*3)+1]*pointsData[(polygons[2]*3)+0]*pointsData[(polygons[3]*3)+2] -
pointsData[(polygons[1]*3)+0]*pointsData[(polygons[2]*3)+2]*pointsData[(polygons[3]*3)+1]) < 0)
- Con_Printf("WARNING: Polygon %d is not defined counterclockwise\n", i);
+ Con_Printf(CON_WARN "WARNING: Polygon %d is not defined counterclockwise\n", i);
if (planesData[(i*4)+3] < 0)
- Con_Printf("WARNING: Plane %d does not contain the origin\n", i);
+ Con_Printf(CON_WARN "WARNING: Plane %d does not contain the origin\n", i);
polygons += (*polygons + 1);
}
// create geom
if (physics_ode_trick_fixnan.integer)
{
test = VectorLength2(origin) + VectorLength2(forward) + VectorLength2(left) + VectorLength2(up) + VectorLength2(velocity) + VectorLength2(spinvelocity);
- if (IS_NAN(test))
+ if (VEC_IS_NAN(test))
{
modified = true;
//Con_Printf("Fixing NAN values on entity %i : .classname = \"%s\" .origin = '%f %f %f' .velocity = '%f %f %f' .axis_forward = '%f %f %f' .axis_left = '%f %f %f' .axis_up = %f %f %f' .spinvelocity = '%f %f %f'\n", PRVM_NUM_FOR_EDICT(ed), PRVM_GetString(PRVM_gameedictstring(ed, classname)), origin[0], origin[1], origin[2], velocity[0], velocity[1], velocity[2], forward[0], forward[1], forward[2], left[0], left[1], left[2], up[0], up[1], up[2], spinvelocity[0], spinvelocity[1], spinvelocity[2]);
if (physics_ode_trick_fixnan.integer >= 2)
Con_Printf("Fixing NAN values on entity %i : .classname = \"%s\" .origin = '%f %f %f' .velocity = '%f %f %f' .angles = '%f %f %f' .avelocity = '%f %f %f'\n", PRVM_NUM_FOR_EDICT(ed), PRVM_GetString(prog, PRVM_gameedictstring(ed, classname)), origin[0], origin[1], origin[2], velocity[0], velocity[1], velocity[2], angles[0], angles[1], angles[2], avelocity[0], avelocity[1], avelocity[2]);
test = VectorLength2(origin);
- if (IS_NAN(test))
+ if (VEC_IS_NAN(test))
VectorClear(origin);
test = VectorLength2(forward) * VectorLength2(left) * VectorLength2(up);
- if (IS_NAN(test))
+ if (VEC_IS_NAN(test))
{
VectorSet(angles, 0, 0, 0);
VectorSet(forward, 1, 0, 0);
VectorSet(up, 0, 0, 1);
}
test = VectorLength2(velocity);
- if (IS_NAN(test))
+ if (VEC_IS_NAN(test))
VectorClear(velocity);
test = VectorLength2(spinvelocity);
- if (IS_NAN(test))
+ if (VEC_IS_NAN(test))
{
VectorClear(avelocity);
VectorClear(spinvelocity);
void World_Physics_Frame(world_t *world, double frametime, double gravity)
{
+#ifdef USEODE
prvm_prog_t *prog = world->prog;
double tdelta, tdelta2, tdelta3, simulationtime, collisiontime;
tdelta = Sys_DirtyTime();
-#ifdef USEODE
if (world->physics.ode && physics_ode.integer)
{
int i;
projects / xonotic / darkplaces.git / blobdiff