X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=world.h;h=1b60ac6c2b48cbd74db530237db1db418e98ec4d;hp=1e8486c7d51e326b3b1f2a0d4f4602657fac6d7d;hb=2f5dfa4708db4112f682b31146a8db1d456a0482;hpb=e24d834dcbcc61f28fdf0e2c1ba75693d9e23ed1

diff --git a/world.h b/world.h
index 1e8486c7..1b60ac6c 100644
--- a/world.h
+++ b/world.h
@@ -22,43 +22,117 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef WORLD_H
 #define WORLD_H
 
+#include "qtypes.h"
 #include "collision.h"
 
 #define MOVE_NORMAL     0
 #define MOVE_NOMONSTERS 1
 #define MOVE_MISSILE    2
 #define MOVE_WORLDONLY  3
-
-
-// called after the world model has been loaded, before linking any entities
-void SV_ClearWorld (void);
-
-// call before removing an entity, and before trying to move one,
-// so it doesn't clip against itself
-void SV_UnlinkEdict (edict_t *ent);
-
-// Needs to be called any time an entity changes origin, mins, maxs, or solid
-// sets ent->v.absmin and ent->v.absmax
-// if touchtriggers, calls prog functions for the intersected triggers
-void SV_LinkEdict (edict_t *ent, qboolean touch_triggers);
-
-// returns true if the entity is in solid currently
-int SV_TestEntityPosition (edict_t *ent);
-
-// mins and maxs are relative
-// if the entire move stays in a solid volume, trace.allsolid will be set
-
-// if the starting point is in a solid, it will be allowed to move out
-// to an open area
-
-// nomonsters is used for line of sight or edge testing, where mosnters
-// shouldn't be considered solid objects
-
-// passedict is explicitly excluded from clipping checks (normally NULL)
-trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict);
-
-int SV_PointQ1Contents(const vec3_t point);
-int SV_PointSuperContents(const vec3_t point);
+#define MOVE_HITMODEL   4
+
+#define AREA_GRID 128
+#define AREA_GRIDNODES (AREA_GRID * AREA_GRID)
+
+typedef struct link_s
+{
+	llist_t list;
+	int entitynumber;
+} link_t;
+
+typedef struct world_physics_s
+{
+	// for ODE physics engine
+	qbool ode; // if true then ode is activated
+	void *ode_world;
+	void *ode_space;
+	void *ode_contactgroup;
+	// number of constraint solver iterations to use (for dWorldQuickStep)
+	int ode_iterations;
+	// actual step (server frametime / ode_iterations)
+	vec_t ode_step;
+	// time we need to simulate, for constantstep
+	vec_t ode_time;
+	// stats
+	int ode_numobjects; // total objects cound
+	int ode_activeovjects; // active objects count
+	// max velocity for a 1-unit radius object at current step to prevent
+	// missed collisions
+	vec_t ode_movelimit;
+}
+world_physics_t;
+
+struct prvm_prog_s;
+
+typedef struct world_s
+{
+	// convenient fields
+	char filename[MAX_QPATH];
+	vec3_t mins;
+	vec3_t maxs;
+	struct prvm_prog_s *prog;
+
+	int areagrid_stats_calls;
+	int areagrid_stats_nodechecks;
+	int areagrid_stats_entitychecks;
+
+	link_t areagrid[AREA_GRIDNODES];
+	link_t areagrid_outside;
+	vec3_t areagrid_bias;
+	vec3_t areagrid_scale;
+	vec3_t areagrid_mins;
+	vec3_t areagrid_maxs;
+	vec3_t areagrid_size;
+	int areagrid_marknumber;
+
+	// if the QC uses a physics engine, the data for it is here
+	world_physics_t physics;
+}
+world_t;
+
+struct prvm_edict_s;
+
+// cyclic doubly-linked list functions
+void World_ClearLink(link_t *l);
+void World_RemoveLink(link_t *l);
+void World_InsertLinkBefore(link_t *l, link_t *before, int entitynumber);
+
+void World_Init(void);
+void World_Shutdown(void);
+
+/// called after the world model has been loaded, before linking any entities
+void World_SetSize(world_t *world, const char *filename, const vec3_t mins, const vec3_t maxs, struct prvm_prog_s *prog);
+/// unlinks all entities (used before reallocation of edicts)
+void World_UnlinkAll(world_t *world);
+
+void World_PrintAreaStats(world_t *world, const char *worldname);
+
+/// call before removing an entity, and before trying to move one,
+/// so it doesn't clip against itself
+void World_UnlinkEdict(struct prvm_edict_s *ent);
+
+/// Needs to be called any time an entity changes origin, mins, maxs
+void World_LinkEdict(world_t *world, struct prvm_edict_s *ent, const vec3_t mins, const vec3_t maxs);
+
+/// \returns list of entities touching a box
+int World_EntitiesInBox(world_t *world, const vec3_t mins, const vec3_t maxs, int maxlist, struct prvm_edict_s **list);
+
+void World_Start(world_t *world);
+void World_End(world_t *world);
+
+// update physics
+// this is called by SV_Physics
+void World_Physics_Frame(world_t *world, double frametime, double gravity);
+
+// change physics properties of entity
+struct prvm_edict_s;
+struct edict_odefunc_s;
+void World_Physics_ApplyCmd(struct prvm_edict_s *ed, struct edict_odefunc_s *f);
+
+// remove physics data from entity
+// this is called by entity removal
+void World_Physics_RemoveFromEntity(world_t *world, struct prvm_edict_s *ed);
+void World_Physics_RemoveJointFromEntity(world_t *world, struct prvm_edict_s *ed);
 
 #endif