X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=world.h;h=4dad70ba435fde58ec0c08acf992726db45bc213;hb=c0d54f21bcaba56302f5e9475b8182056f4841c0;hp=1d16b74882c553172ce165d7f308eb185b43b36f;hpb=8ce2f78e1818d01c6fb0dd73998d4a07e1078617;p=xonotic%2Fdarkplaces.git

diff --git a/world.h b/world.h
index 1d16b748..4dad70ba 100644
--- a/world.h
+++ b/world.h
@@ -39,8 +39,30 @@ typedef struct link_s
 	struct link_s	*prev, *next;
 } link_t;
 
+typedef struct world_physics_s
+{
+	// for ODE physics engine
+	qboolean ode; // if true then ode is activated
+	void *ode_world;
+	void *ode_space;
+	void *ode_contactgroup;
+	// number of constraint solver iterations to use (for dWorldStepFast)
+	int ode_iterations;
+	// actual step (server frametime / ode_iterations)
+	vec_t ode_step;
+	// max velocity for a 1-unit radius object at current step to prevent
+	// missed collisions
+	vec_t ode_movelimit;
+}
+world_physics_t;
+
 typedef struct world_s
 {
+	// convenient fields
+	char filename[MAX_QPATH];
+	vec3_t mins;
+	vec3_t maxs;
+
 	int areagrid_stats_calls;
 	int areagrid_stats_nodechecks;
 	int areagrid_stats_entitychecks;
@@ -53,6 +75,9 @@ typedef struct world_s
 	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;
 
@@ -64,23 +89,37 @@ 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 vec3_t mins, const vec3_t maxs);
-// unlinks all entities (used before reallocation of edicts)
+/// 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);
+/// 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
+/// 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
+/// 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
+/// \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);
+
+// remove physics data from entity
+// this is called by entity removal
+struct prvm_edict_s;
+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