don't apply host_sleep when in a timedemo

[xonotic/darkplaces.git] / model_shared.c

diff --git a/model_shared.c b/model_shared.c
index b2d6535f89918789d10b487e93a341bc02eb02f9..664f0dab4c5d1eaf97397e870e58149cf8af4030 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -320,7 +320,8 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk, q
                num = LittleLong(*((int *)buf));
                // call the apropriate loader
                loadmodel = mod;
-                    if (!memcmp(buf, "IDPO", 4)) Mod_IDP0_Load(mod, buf, bufend);
+                    if (!strcasecmp(FS_FileExtension(mod->name), "obj")) Mod_OBJ_Load(mod, buf, bufend);
+               else if (!memcmp(buf, "IDPO", 4)) Mod_IDP0_Load(mod, buf, bufend);
                else if (!memcmp(buf, "IDP2", 4)) Mod_IDP2_Load(mod, buf, bufend);
                else if (!memcmp(buf, "IDP3", 4)) Mod_IDP3_Load(mod, buf, bufend);
                else if (!memcmp(buf, "IDSP", 4)) Mod_IDSP_Load(mod, buf, bufend);
@@ -2168,6 +2169,39 @@ void Mod_VertexRangeFromElements(int numelements, const int *elements, int *firs
                *lastvertexpointer = lastvertex;
 }
 
+void Mod_MakeSortedSurfaces(dp_model_t *mod)
+{
+       // make an optimal set of texture-sorted batches to draw...
+       int j, t;
+       int *firstsurfacefortexture;
+       int *numsurfacesfortexture;
+       if (!mod->sortedmodelsurfaces)
+               mod->sortedmodelsurfaces = Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->sortedmodelsurfaces));
+       firstsurfacefortexture = Mem_Alloc(tempmempool, mod->num_textures * sizeof(*firstsurfacefortexture));
+       numsurfacesfortexture = Mem_Alloc(tempmempool, mod->num_textures * sizeof(*numsurfacesfortexture));
+       memset(numsurfacesfortexture, 0, mod->num_textures * sizeof(*numsurfacesfortexture));
+       for (j = 0;j < mod->nummodelsurfaces;j++)
+       {
+               const msurface_t *surface = mod->data_surfaces + j + mod->firstmodelsurface;
+               int t = (int)(surface->texture - mod->data_textures);
+               numsurfacesfortexture[t]++;
+       }
+       j = 0;
+       for (t = 0;t < mod->num_textures;t++)
+       {
+               firstsurfacefortexture[t] = j;
+               j += numsurfacesfortexture[t];
+       }
+       for (j = 0;j < mod->nummodelsurfaces;j++)
+       {
+               const msurface_t *surface = mod->data_surfaces + j + mod->firstmodelsurface;
+               int t = (int)(surface->texture - mod->data_textures);
+               mod->sortedmodelsurfaces[firstsurfacefortexture[t]++] = j + mod->firstmodelsurface;
+       }
+       Mem_Free(firstsurfacefortexture);
+       Mem_Free(numsurfacesfortexture);
+}
+
 static void Mod_BuildVBOs(void)
 {
        if (!gl_support_arb_vertex_buffer_object)
@@ -2220,16 +2254,17 @@ static void Mod_BuildVBOs(void)
 static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const char *mtlfilename, const char *originalfilename)
 {
        int vertexindex, surfaceindex, triangleindex, textureindex, countvertices = 0, countsurfaces = 0, countfaces = 0, counttextures = 0;
+       int a, b, c;
        const char *texname;
        const int *e;
        const float *v, *vn, *vt;
        size_t l;
        size_t outbufferpos = 0;
        size_t outbuffermax = 0x100000;
-       char *outbuffer = Z_Malloc(outbuffermax), *oldbuffer;
+       char *outbuffer = (char *) Z_Malloc(outbuffermax), *oldbuffer;
        const msurface_t *surface;
        const int maxtextures = 256;
-       char *texturenames = Z_Malloc(maxtextures * MAX_QPATH);
+       char *texturenames = (char *) Z_Malloc(maxtextures * MAX_QPATH);
 
        // construct the mtllib file
        l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "# mtllib for %s exported by darkplaces engine\n", originalfilename);
@@ -2253,7 +2288,7 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha
                {
                        outbuffermax *= 2;
                        oldbuffer = outbuffer;
-                       outbuffer = Z_Malloc(outbuffermax);
+                       outbuffer = (char *) Z_Malloc(outbuffermax);
                        memcpy(outbuffer, oldbuffer, outbufferpos);
                        Z_Free(oldbuffer);
                }
@@ -2276,7 +2311,7 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha
                {
                        outbuffermax *= 2;
                        oldbuffer = outbuffer;
-                       outbuffer = Z_Malloc(outbuffermax);
+                       outbuffer = (char *) Z_Malloc(outbuffermax);
                        memcpy(outbuffer, oldbuffer, outbufferpos);
                        Z_Free(oldbuffer);
                }
@@ -2295,11 +2330,14 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha
                        {
                                outbuffermax *= 2;
                                oldbuffer = outbuffer;
-                               outbuffer = Z_Malloc(outbuffermax);
+                               outbuffer = (char *) Z_Malloc(outbuffermax);
                                memcpy(outbuffer, oldbuffer, outbufferpos);
                                Z_Free(oldbuffer);
                        }
-                       l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "f %i/%i/%i %i/%i/%i %i/%i/%i\n", e[0]+1, e[0]+1, e[0]+1, e[2]+1, e[2]+1, e[2]+1, e[1]+1, e[1]+1, e[1]+1);
+                       a = e[0]+1;
+                       b = e[2]+1;
+                       c = e[1]+1;
+                       l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "f %i/%i/%i %i/%i/%i %i/%i/%i\n", a,a,a,b,b,b,c,c,c);
                        if (l > 0)
                                outbufferpos += l;
                }
@@ -2324,23 +2362,34 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
        int transformindex;
        int poseindex;
        int cornerindex;
+       float modelscale;
        const int *e;
        const float *pose;
        size_t l;
        size_t outbufferpos = 0;
        size_t outbuffermax = 0x100000;
-       char *outbuffer = Z_Malloc(outbuffermax), *oldbuffer;
+       char *outbuffer = (char *) Z_Malloc(outbuffermax), *oldbuffer;
        const msurface_t *surface;
        l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "version 1\nnodes\n");
        if (l > 0)
                outbufferpos += l;
+       modelscale = 1;
+       if(model->num_poses >= 0)
+               modelscale = sqrt(model->data_poses[0] * model->data_poses[0] + model->data_poses[1] * model->data_poses[1] + model->data_poses[2] * model->data_poses[2]);
+       if(fabs(modelscale - 1) > 1e-4)
+       {
+               if(firstpose == 0) // only print the when writing the reference pose
+                       Con_Printf("The model has an old-style model scale of %f\n", modelscale);
+       }
+       else
+               modelscale = 1;
        for (transformindex = 0;transformindex < model->num_bones;transformindex++)
        {
                if (outbufferpos >= outbuffermax >> 1)
                {
                        outbuffermax *= 2;
                        oldbuffer = outbuffer;
-                       outbuffer = Z_Malloc(outbuffermax);
+                       outbuffer = (char *) Z_Malloc(outbuffermax);
                        memcpy(outbuffer, oldbuffer, outbufferpos);
                        Z_Free(oldbuffer);
                }
@@ -2367,7 +2416,7 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
                        {
                                outbuffermax *= 2;
                                oldbuffer = outbuffer;
-                               outbuffer = Z_Malloc(outbuffermax);
+                               outbuffer = (char *) Z_Malloc(outbuffermax);
                                memcpy(outbuffer, oldbuffer, outbufferpos);
                                Z_Free(oldbuffer);
                        }
@@ -2421,7 +2470,7 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
                        test[2][3] = pose[11];
 }
 #endif
-                       l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f\n", transformindex, pose[3], pose[7], pose[11], DEG2RAD(angles[ROLL]), DEG2RAD(angles[PITCH]), DEG2RAD(angles[YAW]));
+                       l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f\n", transformindex, pose[3] * modelscale, pose[7] * modelscale, pose[11] * modelscale, DEG2RAD(angles[ROLL]), DEG2RAD(angles[PITCH]), DEG2RAD(angles[YAW]));
                        if (l > 0)
                                outbufferpos += l;
                }
@@ -2443,7 +2492,7 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
                                {
                                        outbuffermax *= 2;
                                        oldbuffer = outbuffer;
-                                       outbuffer = Z_Malloc(outbuffermax);
+                                       outbuffer = (char *) Z_Malloc(outbuffermax);
                                        memcpy(outbuffer, oldbuffer, outbufferpos);
                                        Z_Free(oldbuffer);
                                }
@@ -2530,7 +2579,7 @@ static void Mod_Decompile_f(void)
        }
 
        // export SMD if possible (only for skeletal models)
-       if (mod->surfmesh.num_triangles && mod->num_poses)
+       if (mod->surfmesh.num_triangles && mod->num_bones)
        {
                dpsnprintf(outname, sizeof(outname), "%s_decompiled/ref1.smd", basename);
                Mod_Decompile_SMD(mod, outname, 0, 1, true);