replaced Mod_LoadSkinFrame functions with R_SkinFrame system, this

[xonotic/darkplaces.git] / model_alias.c

diff --git a/model_alias.c b/model_alias.c
index b4e723f98572a3bdd1b031b4e7483f140079d6e7..b0f0af3bbe8758344d3d26d1f63d6374866bc090 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -674,18 +674,14 @@ static void Mod_MDL_LoadFrames (unsigned char* datapointer, int inverts, int *ve
 
 static void Mod_BuildAliasSkinFromSkinFrame(texture_t *texture, skinframe_t *skinframe)
 {
+       // hack
+       if (!skinframe)
+               skinframe = R_SkinFrame_LoadMissing();
        texture->currentframe = texture;
        texture->numskinframes = 1;
        texture->skinframerate = 1;
-       texture->currentskinframe = texture->skinframes + 0;
-       if (skinframe)
-               texture->skinframes[0] = *skinframe;
-       else
-       {
-               // hack
-               memset(texture->skinframes, 0, sizeof(texture->skinframes));
-               texture->skinframes[0].base = r_texture_notexture;
-       }
+       texture->skinframes[0] = skinframe;
+       texture->currentskinframe = skinframe;
 
        texture->basematerialflags = MATERIALFLAG_WALL;
        if (texture->currentskinframe->fog)
@@ -697,7 +693,7 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi
 {
        int i;
        skinfileitem_t *skinfileitem;
-       skinframe_t tempskinframe;
+       skinframe_t *tempskinframe;
        if (skinfile)
        {
                // the skin += loadmodel->num_surfaces part of this is because data_textures on alias models is arranged as [numskins][numsurfaces]
@@ -713,10 +709,11 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi
                                // leave the skin unitialized (nodraw) if the replacement is "common/nodraw" or "textures/common/nodraw"
                                if (!strcmp(skinfileitem->name, meshname) && strcmp(skinfileitem->replacement, "common/nodraw") && strcmp(skinfileitem->replacement, "textures/common/nodraw"))
                                {
-                                       if (!Mod_LoadSkinFrame(&tempskinframe, skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, true))
+                                       tempskinframe = R_SkinFrame_LoadExternal(skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP);
+                                       if (!tempskinframe)
                                                if (cls.state != ca_dedicated)
                                                        Con_DPrintf("mesh \"%s\": failed to load skin #%i \"%s\"\n", meshname, i, skinfileitem->replacement);
-                                       Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
+                                       Mod_BuildAliasSkinFromSkinFrame(skin, tempskinframe);
                                        break;
                                }
                        }
@@ -724,10 +721,11 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi
        }
        else
        {
-               if (!Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, true))
+               tempskinframe = R_SkinFrame_LoadExternal(shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP);
+               if (!tempskinframe)
                        if (cls.state != ca_dedicated)
                                Con_Printf("Can't find texture \"%s\" for mesh \"%s\", using grey checkerboard\n", shadername, meshname);
-               Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
+               Mod_BuildAliasSkinFromSkinFrame(skin, tempskinframe);
        }
 }
 
@@ -749,7 +747,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
        daliasgroup_t *pinframegroup;
        unsigned char *datapointer, *startframes, *startskins;
        char name[MAX_QPATH];
-       skinframe_t tempskinframe;
+       skinframe_t *tempskinframe;
        animscene_t *tempskinscenes;
        texture_t *tempaliasskins;
        float *vertst;
@@ -992,16 +990,17 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
                                        sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
                                else
                                        sprintf (name, "%s_%i", loadmodel->name, i);
-                               if (!Mod_LoadSkinFrame(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, true, true))
-                                       Mod_LoadSkinFrame_Internal(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_PICMIP, true, r_fullbrights.integer, (unsigned char *)datapointer, skinwidth, skinheight, 8, NULL, NULL);
-                               Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &tempskinframe);
+                               tempskinframe = R_SkinFrame_LoadExternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP);
+                               if (!tempskinframe)
+                                       tempskinframe = R_SkinFrame_LoadInternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_PICMIP, true, r_fullbrights.integer, (unsigned char *)datapointer, skinwidth, skinheight, 8, NULL, NULL);
+                               Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, tempskinframe);
                                datapointer += skinwidth * skinheight;
                                totalskins++;
                        }
                }
                // check for skins that don't exist in the model, but do exist as external images
                // (this was added because yummyluv kept pestering me about support for it)
-               while (Mod_LoadSkinFrame(&tempskinframe, va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, true, true))
+               while ((tempskinframe = R_SkinFrame_LoadExternal(va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP)))
                {
                        // expand the arrays to make room
                        tempskinscenes = loadmodel->skinscenes;
@@ -1015,7 +1014,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
                        Mem_Free(tempaliasskins);
 
                        // store the info about the new skin
-                       Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &tempskinframe);
+                       Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, tempskinframe);
                        strlcpy(loadmodel->skinscenes[loadmodel->numskins].name, name, sizeof(loadmodel->skinscenes[loadmodel->numskins].name));
                        loadmodel->skinscenes[loadmodel->numskins].firstframe = totalskins;
                        loadmodel->skinscenes[loadmodel->numskins].framecount = 1;
@@ -1029,10 +1028,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
                        // fix up the pointers since they are pointing at the old textures array
                        // FIXME: this is a hack!
                        for (j = 0;j < loadmodel->numskins * loadmodel->num_surfaces;j++)
-                       {
                                loadmodel->data_textures[j].currentframe = &loadmodel->data_textures[j];
-                               loadmodel->data_textures[j].currentskinframe = &loadmodel->data_textures[j].skinframes[0];
-                       }
                }
        }
 
@@ -1065,7 +1061,7 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
                unsigned short st;
        }
        *hash, **md2verthash, *md2verthashdata;
-       skinframe_t tempskinframe;
+       skinframe_t *tempskinframe;
        skinfile_t *skinfiles;
 
        pinmodel = (md2_t *)buffer;
@@ -1147,9 +1143,10 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
                loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
                for (i = 0;i < loadmodel->numskins;i++, inskin += MD2_SKINNAME)
                {
-                       if (!Mod_LoadSkinFrame(&tempskinframe, inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, true))
+                       tempskinframe = R_SkinFrame_LoadExternal(inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP);
+                       if (!tempskinframe)
                                Con_Printf("%s is missing skin \"%s\"\n", loadmodel->name, inskin);
-                       Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, &tempskinframe);
+                       Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, tempskinframe);
                }
        }
        else