implemented support for GL_ARB_texture_compression - this is controlled

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index 49c793381f90360e9a397ae615cac5d6c947bf9c..7111d27f3f75a39ab611ffd8445798bef6580f17 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -43,7 +43,7 @@ static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, q
 {
        if (!skinframe)
                skinframe = R_SkinFrame_LoadMissing();
 {
        if (!skinframe)
                skinframe = R_SkinFrame_LoadMissing();

-       texture->basematerialflags = MATERIALFLAG_WALL | MATERIALFLAG_NOCULLFACE;
+       texture->basematerialflags = MATERIALFLAG_WALL;

        if (fullbright)
                texture->basematerialflags |= MATERIALFLAG_FULLBRIGHT;
        if (additive)
        if (fullbright)
                texture->basematerialflags |= MATERIALFLAG_FULLBRIGHT;
        if (additive)


@@ -66,7 +66,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
        float                           modelradius, interval;
        char                            name[MAX_QPATH], fogname[MAX_QPATH];
        const void                      *startframes;
        float                           modelradius, interval;
        char                            name[MAX_QPATH], fogname[MAX_QPATH];
        const void                      *startframes;

-       int                 texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;
+       int                 texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;

        modelradius = 0;
 
        if (loadmodel->numframes < 1)
        modelradius = 0;
 
        if (loadmodel->numframes < 1)


@@ -223,6 +223,8 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
 
        datapointer = (unsigned char *)buffer;
 
 
        datapointer = (unsigned char *)buffer;
 

+       loadmodel->modeldatatypestring = "SPR1";
+

        loadmodel->type = mod_sprite;
 
        loadmodel->DrawSky = NULL;
        loadmodel->type = mod_sprite;
 
        loadmodel->DrawSky = NULL;


@@ -337,7 +339,9 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
        const dsprite2_t *pinqsprite;
        skinframe_t *skinframe;
        float modelradius;
        const dsprite2_t *pinqsprite;
        skinframe_t *skinframe;
        float modelradius;

-       int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;
+       int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;
+
+       loadmodel->modeldatatypestring = "SPR2";

 
        loadmodel->type = mod_sprite;
 
 
        loadmodel->type = mod_sprite;