X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=world.h;h=4dad70ba435fde58ec0c08acf992726db45bc213;hb=a9ed1485040d02d386687db1632b49abbe8d7d38;hp=b95af6f8d2a3eb8340681b2415d7431720e77e88;hpb=c72641f5e795ed0e0d58a38d79860cc92597e4da;p=xonotic%2Fdarkplaces.git

diff --git a/world.h b/world.h
index b95af6f8..4dad70ba 100644
--- a/world.h
+++ b/world.h
@@ -39,6 +39,23 @@ 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
@@ -58,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;
 
@@ -69,6 +89,7 @@ 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);
@@ -87,5 +108,18 @@ void World_LinkEdict(world_t *world, struct prvm_edict_s *ent, const vec3_t mins
 /// \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