speed up decal creation in newdecalsystem by using BIH for finding the affected triangles

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 8c49d7132f2dbcb61a8f2cc21481b26f969edd78..f705982ea63237f82e0bf9148dc5193977520601 100644 (file)
--- a/world.c
+++ b/world.c
@@ -113,16 +113,16 @@ void World_SetSize(world_t *world, const char *filename, const vec3_t mins, cons
        if (world->areagrid_marknumber < 1)
                world->areagrid_marknumber = 1;
        // choose either the world box size, or a larger box to ensure the grid isn't too fine
-       world->areagrid_size[0] = max(world->areagrid_maxs[0] - world->areagrid_mins[0], AREA_GRID * sv_areagrid_mingridsize.value);
-       world->areagrid_size[1] = max(world->areagrid_maxs[1] - world->areagrid_mins[1], AREA_GRID * sv_areagrid_mingridsize.value);
-       world->areagrid_size[2] = max(world->areagrid_maxs[2] - world->areagrid_mins[2], AREA_GRID * sv_areagrid_mingridsize.value);
+       world->areagrid_size[0] = max(world->maxs[0] - world->mins[0], AREA_GRID * sv_areagrid_mingridsize.value);
+       world->areagrid_size[1] = max(world->maxs[1] - world->mins[1], AREA_GRID * sv_areagrid_mingridsize.value);
+       world->areagrid_size[2] = max(world->maxs[2] - world->mins[2], AREA_GRID * sv_areagrid_mingridsize.value);
        // figure out the corners of such a box, centered at the center of the world box
-       world->areagrid_mins[0] = (world->areagrid_mins[0] + world->areagrid_maxs[0] - world->areagrid_size[0]) * 0.5f;
-       world->areagrid_mins[1] = (world->areagrid_mins[1] + world->areagrid_maxs[1] - world->areagrid_size[1]) * 0.5f;
-       world->areagrid_mins[2] = (world->areagrid_mins[2] + world->areagrid_maxs[2] - world->areagrid_size[2]) * 0.5f;
-       world->areagrid_maxs[0] = (world->areagrid_mins[0] + world->areagrid_maxs[0] + world->areagrid_size[0]) * 0.5f;
-       world->areagrid_maxs[1] = (world->areagrid_mins[1] + world->areagrid_maxs[1] + world->areagrid_size[1]) * 0.5f;
-       world->areagrid_maxs[2] = (world->areagrid_mins[2] + world->areagrid_maxs[2] + world->areagrid_size[2]) * 0.5f;
+       world->areagrid_mins[0] = (world->mins[0] + world->maxs[0] - world->areagrid_size[0]) * 0.5f;
+       world->areagrid_mins[1] = (world->mins[1] + world->maxs[1] - world->areagrid_size[1]) * 0.5f;
+       world->areagrid_mins[2] = (world->mins[2] + world->maxs[2] - world->areagrid_size[2]) * 0.5f;
+       world->areagrid_maxs[0] = (world->mins[0] + world->maxs[0] + world->areagrid_size[0]) * 0.5f;
+       world->areagrid_maxs[1] = (world->mins[1] + world->maxs[1] + world->areagrid_size[1]) * 0.5f;
+       world->areagrid_maxs[2] = (world->mins[2] + world->maxs[2] + world->areagrid_size[2]) * 0.5f;
        // now calculate the actual useful info from that
        VectorNegate(world->areagrid_mins, world->areagrid_bias);
        world->areagrid_scale[0] = AREA_GRID / world->areagrid_size[0];
@@ -131,8 +131,8 @@ void World_SetSize(world_t *world, const char *filename, const vec3_t mins, cons
        World_ClearLink(&world->areagrid_outside);
        for (i = 0;i < AREA_GRIDNODES;i++)
                World_ClearLink(&world->areagrid[i]);
-       if (developer.integer >= 10)
-               Con_Printf("areagrid settings: divisions %ix%ix1 : box %f %f %f : %f %f %f size %f %f %f grid %f %f %f (mingrid %f)\n", AREA_GRID, AREA_GRID, world->areagrid_mins[0], world->areagrid_mins[1], world->areagrid_mins[2], world->areagrid_maxs[0], world->areagrid_maxs[1], world->areagrid_maxs[2], world->areagrid_size[0], world->areagrid_size[1], world->areagrid_size[2], 1.0f / world->areagrid_scale[0], 1.0f / world->areagrid_scale[1], 1.0f / world->areagrid_scale[2], sv_areagrid_mingridsize.value);
+       if (developer_extra.integer)
+               Con_DPrintf("areagrid settings: divisions %ix%ix1 : box %f %f %f : %f %f %f size %f %f %f grid %f %f %f (mingrid %f)\n", AREA_GRID, AREA_GRID, world->areagrid_mins[0], world->areagrid_mins[1], world->areagrid_mins[2], world->areagrid_maxs[0], world->areagrid_maxs[1], world->areagrid_maxs[2], world->areagrid_size[0], world->areagrid_size[1], world->areagrid_size[2], 1.0f / world->areagrid_scale[0], 1.0f / world->areagrid_scale[1], 1.0f / world->areagrid_scale[2], sv_areagrid_mingridsize.value);
 }
 
 /*
@@ -526,7 +526,7 @@ typedef void dNearCallback (void *data, dGeomID o1, dGeomID o2);
 #define dSAP_AXES_ZYX  ((2)|(1<<2)|(0<<4))
 
 //const char*     (ODE_API *dGetConfiguration)(void);
-//int             (ODE_API *dCheckConfiguration)( const char* token );
+int             (ODE_API *dCheckConfiguration)( const char* token );
 int             (ODE_API *dInitODE)(void);
 //int             (ODE_API *dInitODE2)(unsigned int uiInitFlags);
 //int             (ODE_API *dAllocateODEDataForThread)(unsigned int uiAllocateFlags);
@@ -992,7 +992,7 @@ dGeomID         (ODE_API *dCreateTriMesh)(dSpaceID space, dTriMeshDataID Data, d
 static dllfunction_t odefuncs[] =
 {
 //     {"dGetConfiguration",                                                   (void **) &dGetConfiguration},
-//     {"dCheckConfiguration",                                                 (void **) &dCheckConfiguration},
+       {"dCheckConfiguration",                                                 (void **) &dCheckConfiguration},
        {"dInitODE",                                                                    (void **) &dInitODE},
 //     {"dInitODE2",                                                                   (void **) &dInitODE2},
 //     {"dAllocateODEDataForThread",                                   (void **) &dAllocateODEDataForThread},
@@ -1449,9 +1449,7 @@ static void World_Physics_Init(void)
 #ifdef ODE_DYNAMIC
        const char* dllnames [] =
        {
-# if defined(WIN64)
-               "libode1_64.dll",
-# elif defined(WIN32)
+# if defined(WIN32)
                "libode1.dll",
 # elif defined(MACOSX)
                "libode.1.dylib",
@@ -1973,19 +1971,12 @@ static void World_Physics_Frame_BodyFromEntity(world_t *world, prvm_edict_t *ed)
                val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.modelindex);
                if (val)
                        modelindex = (int)val->_float;
-               if (world == &sv.world && modelindex >= 1 && modelindex < MAX_MODELS)
-               {
-                       model = sv.models[modelindex];
-               }
-               else if (world == &cl.world && modelindex >= 1 && modelindex < MAX_MODELS)
-               {
-                       model = cl.model_precache[modelindex];
-               }
+               if (world == &sv.world)
+                       model = SV_GetModelByIndex(modelindex);
+               else if (world == &cl.world)
+                       model = CL_GetModelByIndex(modelindex);
                else
-               {
                        model = NULL;
-                       modelindex = 0;
-               }
                if (model)
                {
                        VectorScale(model->normalmins, scale, entmins);