X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_sprite.c;h=346fddb10297e7538c9e41f701dbd7782720d53a;hp=53dbb7c97162b8e2447eddeae37425188fb6555d;hb=754c702911eb45a08a4440be5b42e1b9582c0fa5;hpb=45982a9894c5bff60ff494a0f82865ec267d52f7 diff --git a/model_sprite.c b/model_sprite.c index 53dbb7c9..346fddb1 100644 --- a/model_sprite.c +++ b/model_sprite.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -51,436 +51,181 @@ void Mod_Sprite_StripExtension(char *in, char *out) *out++ = 0; } -/* -================= -Mod_LoadSpriteFrame -================= -*/ -void * Mod_LoadSpriteFrame (void * pin, mspriteframe_t *frame, int framenum, int bytesperpixel, byte *palette, float *modelradius) +void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette) { + int i, j, k, groupframes, realframes, x, y, origin[2], width, height; + dspriteframetype_t *pinframetype; dspriteframe_t *pinframe; - mspriteframe_t *pspriteframe; - float dist; - int i, width, height, size, origin[2]; - char name[256], tempname[256]; - byte *pixbuf, *pixel, *inpixel; - - pinframe = (dspriteframe_t *)pin; - - origin[0] = LittleLong (pinframe->origin[0]); - origin[1] = LittleLong (pinframe->origin[1]); - width = LittleLong (pinframe->width); - height = LittleLong (pinframe->height); - size = width * height * bytesperpixel; - - pspriteframe = frame; - - memset (pspriteframe, 0, sizeof (mspriteframe_t)); - - pspriteframe->left = origin[0]; - pspriteframe->right = origin[0] + width; - pspriteframe->up = origin[1]; - pspriteframe->down = origin[1] - height; - - dist = pspriteframe->left*pspriteframe->left+pspriteframe->up*pspriteframe->up; - if (*modelradius < dist) - *modelradius = dist; - dist = pspriteframe->right*pspriteframe->right+pspriteframe->down*pspriteframe->down; - if (*modelradius < dist) - *modelradius = dist; + dspritegroup_t *pingroup; + dspriteinterval_t *pinintervals; + float modelradius, interval; + char tempname[MAX_QPATH], name[MAX_QPATH]; + qbyte *pixbuf; + void *startframes; + modelradius = 0; Mod_Sprite_StripExtension(loadmodel->name, tempname); - sprintf (name, "%s_%i", tempname, framenum); - pspriteframe->texture = loadtextureimagewithmask(name, 0, 0, false, r_mipsprites.value, true); - pspriteframe->fogtexture = image_masktex; - - pixbuf = qmalloc(width*height*4); - - inpixel = (byte *)(pinframe + 1); - pixel = pixbuf; - if (bytesperpixel == 1) - { - for (i = 0;i < width * height;i++) - { - *pixel++ = palette[inpixel[i]*4+0]; - *pixel++ = palette[inpixel[i]*4+1]; - *pixel++ = palette[inpixel[i]*4+2]; - *pixel++ = palette[inpixel[i]*4+3]; - } - } - else - memcpy(pixel, inpixel, width*height*4); - - if (!pspriteframe->texture) - { - pspriteframe->texture = R_LoadTexture (name, width, height, pixbuf, TEXF_ALPHA | TEXF_RGBA | (r_mipsprites.value ? TEXF_MIPMAP : 0) | TEXF_PRECACHE); - // make fog version (just alpha) - pixel = pixbuf; - for (i = 0;i < width*height;i++) - { - *pixel++ = 255; - *pixel++ = 255; - *pixel++ = 255; - pixel++; - } - sprintf (name, "%s_%ifog", loadmodel->name, framenum); - pspriteframe->fogtexture = R_LoadTexture (name, width, height, pixbuf, TEXF_ALPHA | TEXF_RGBA | (r_mipsprites.value ? TEXF_MIPMAP : 0) | TEXF_PRECACHE); - } - - qfree(pixbuf); - - return (void *)((byte *)pinframe + sizeof (dspriteframe_t) + size); -} - - -/* -================= -Mod_LoadSpriteGroup -================= -*/ -/* -void *Mod_LoadSpriteGroup (void * pin, mspriteframe_t *frame, int numframes, int framenum, int bytesperpixel) -{ - int i; - void *ptemp; - - ptemp = (void *)(sizeof(dspriteinterval_t) * numframes + sizeof(dspritegroup_t) + (int) pin); - - for (i = 0;i < numframes;i++) - ptemp = Mod_LoadSpriteFrame (ptemp, frame++, framenum * 100 + i, bytesperpixel); - - return ptemp; -} -*/ -// this actually handles both quake sprite and darkplaces sprite32 -void Mod_LoadQuakeSprite (model_t *mod, void *buffer) -{ - int i, j, version, numframes, realframes, size, bytesperpixel, start, end, total; - dsprite_t *pin; - msprite_t *psprite; - dspriteframetype_t *pframetype; - dspriteframe_t *pframe; - animscene_t *animscenes; - mspriteframe_t *frames; - dspriteframe_t **framedata; - float modelradius; - - modelradius = 0; + if (loadmodel->numframes < 1) + Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d\n", loadmodel->numframes); - start = Hunk_LowMark (); + loadmodel->type = mod_sprite; + loadmodel->flags = EF_FULLBRIGHT; - mod->flags = EF_FULLBRIGHT; // LordHavoc: hack to allow sprites to be non-fullbright - for (i = 0;i < MAX_QPATH && mod->name[i];i++) + for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++) { - if (mod->name[i] == '!') + if (loadmodel->name[i] == '!') { - mod->flags &= ~EF_FULLBRIGHT; + loadmodel->flags &= ~EF_FULLBRIGHT; break; } } - // build a list of frames while parsing - framedata = qmalloc(65536*sizeof(dspriteframe_t)); - - pin = (dsprite_t *)buffer; - - version = LittleLong (pin->version); // LordHavoc: 32bit textures - bytesperpixel = 1; - if (version == SPRITE32_VERSION) - bytesperpixel = 4; - - numframes = LittleLong (pin->numframes); - - psprite = Hunk_AllocName (sizeof(msprite_t), va("%s info", loadname)); - -// mod->cache.data = psprite; - - psprite->type = LittleLong (pin->type); -// maxwidth = LittleLong (pin->width); -// maxheight = LittleLong (pin->height); -// psprite->beamlength = LittleFloat (pin->beamlength); - mod->synctype = LittleLong (pin->synctype); -// psprite->numframes = numframes; - -// mod->mins[0] = mod->mins[1] = -maxwidth/2; -// mod->maxs[0] = mod->maxs[1] = maxwidth/2; -// mod->mins[2] = -maxheight/2; -// mod->maxs[2] = maxheight/2; + if (version != SPRITE_VERSION && version != SPRITE32_VERSION && version != SPRITEHL_VERSION) + Host_Error("Mod_Sprite_SharedSetup: unsupported version %i, only %i (quake), %i (HalfLife), and %i (sprite32) supported", version, SPRITE_VERSION, SPRITEHL_VERSION, SPRITE32_VERSION); // // load the frames // - if (numframes < 1) - Host_Error ("Mod_LoadQuakeSprite: Invalid # of frames: %d\n", numframes); - - mod->numframes = numframes; - - pframetype = (dspriteframetype_t *)(pin + 1); - - animscenes = Hunk_AllocName(sizeof(animscene_t) * mod->numframes, va("%s sceneinfo", loadname)); - + startframes = datapointer; realframes = 0; - - for (i = 0;i < numframes;i++) + for (i = 0;i < loadmodel->numframes;i++) { - spriteframetype_t frametype; + pinframetype = (dspriteframetype_t *)datapointer; + datapointer += sizeof(dspriteframetype_t); - frametype = LittleLong (pframetype->type); - - sprintf(animscenes[i].name, "frame%i", i); - animscenes[i].firstframe = realframes; - animscenes[i].loop = true; - if (frametype == SPR_SINGLE) - { - animscenes[i].framecount = 1; - animscenes[i].framerate = 10; - pframe = (dspriteframe_t *) (pframetype + 1); - framedata[realframes] = pframe; - size = LittleLong(pframe->width) * LittleLong(pframe->height) * bytesperpixel; - pframetype = (dspriteframetype_t *) (size + sizeof(dspriteframe_t) + (int) pframe); - realframes++; - } + if (LittleLong (pinframetype->type) == SPR_SINGLE) + groupframes = 1; else { - j = LittleLong(((dspritegroup_t *) (sizeof(dspriteframetype_t) + (int) pframetype))->numframes); - animscenes[i].framecount = j; - // FIXME: support variable framerate? - animscenes[i].framerate = 1.0f / LittleFloat(((dspriteinterval_t *) (sizeof(dspritegroup_t) + sizeof(dspriteframetype_t) + (int) pframetype))->interval); - pframe = (dspriteframe_t *) (sizeof(dspriteinterval_t) * j + sizeof(dspritegroup_t) + sizeof(dspriteframetype_t) + (int) pframetype); - while (j--) - { - framedata[realframes] = pframe; - size = LittleLong(pframe->width) * LittleLong(pframe->height) * bytesperpixel; - pframe = (dspriteframe_t *) (size + sizeof(dspriteframe_t) + (int) pframe); - realframes++; - } - pframetype = (dspriteframetype_t *) pframe; - } - } + pingroup = (dspritegroup_t *)datapointer; + datapointer += sizeof(dspritegroup_t); - mod->ofs_scenes = (int) animscenes - (int) psprite; + groupframes = LittleLong(pingroup->numframes); - frames = Hunk_AllocName(sizeof(mspriteframe_t) * realframes, va("%s frames", loadname)); + datapointer += sizeof(dspriteinterval_t) * groupframes; + } - realframes = 0; - for (i = 0;i < numframes;i++) - { - for (j = 0;j < animscenes[i].framecount;j++) + for (j = 0;j < groupframes;j++) { - Mod_LoadSpriteFrame (framedata[realframes], frames + realframes, i, bytesperpixel, (byte *)&d_8to24table, &modelradius); - realframes++; + pinframe = (dspriteframe_t *)datapointer; + if (version == SPRITE32_VERSION) + datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height) * 4; + else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION) + datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height); } + realframes += groupframes; } - psprite->ofs_frames = (int) frames - (int) psprite; - - qfree(framedata); - - mod->type = mod_sprite; + loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes); + loadmodel->sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes); - modelradius = sqrt(modelradius); - for (i = 0;i < 3;i++) + datapointer = startframes; + realframes = 0; + for (i = 0;i < loadmodel->numframes;i++) { - mod->normalmins[i] = mod->yawmins[i] = mod->rotatedmins[i] = -modelradius; - mod->normalmaxs[i] = mod->yawmaxs[i] = mod->rotatedmaxs[i] = modelradius; - } -// mod->modelradius = modelradius; - -// move the complete, relocatable sprite model to the cache - end = Hunk_LowMark (); - mod->cachesize = total = end - start; - - Cache_Alloc (&mod->cache, total, loadname); - if (!mod->cache.data) - return; - memcpy (mod->cache.data, psprite, total); + pinframetype = (dspriteframetype_t *)datapointer; + datapointer += sizeof(dspriteframetype_t); - Hunk_FreeToLowMark (start); -} - -void Mod_LoadHLSprite (model_t *mod, void *buffer) -{ - int i, j, numframes, realframes, size, start, end, total, rendermode; - byte palette[256][4], *in; - dspritehl_t *pin; - msprite_t *psprite; - dspriteframetype_t *pframetype; - dspriteframe_t *pframe; - animscene_t *animscenes; - mspriteframe_t *frames; - dspriteframe_t **framedata; - float modelradius; - - modelradius = 0; - - start = Hunk_LowMark (); - - mod->flags = EF_FULLBRIGHT; - - // build a list of frames while parsing - framedata = qmalloc(65536*sizeof(dspriteframe_t)); - - pin = (dspritehl_t *)buffer; - - numframes = LittleLong (pin->numframes); - - psprite = Hunk_AllocName (sizeof(msprite_t), va("%s info", loadname)); - - psprite->type = LittleLong (pin->type); -// maxwidth = LittleLong (pin->width); -// maxheight = LittleLong (pin->height); - mod->synctype = LittleLong (pin->synctype); - rendermode = pin->rendermode; - -// mod->mins[0] = mod->mins[1] = -maxwidth/2; -// mod->maxs[0] = mod->maxs[1] = maxwidth/2; -// mod->mins[2] = -maxheight/2; -// mod->maxs[2] = maxheight/2; - -// -// load the frames -// - if (numframes < 1) - Host_Error ("Mod_LoadHLSprite: Invalid # of frames: %d\n", numframes); - - mod->numframes = numframes; - - in = (byte *)(pin + 1); - i = in[0] + in[1] * 256; - if (i != 256) - Host_Error ("Mod_LoadHLSprite: unexpected number of palette colors %i (should be 256)", i); - in += 2; - switch(rendermode) - { - case SPRHL_NORMAL: - for (i = 0;i < 256;i++) - { - palette[i][0] = *in++; - palette[i][1] = *in++; - palette[i][2] = *in++; - palette[i][3] = 255; - } - palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0; - break; - case SPRHL_ADDITIVE: - for (i = 0;i < 256;i++) - { - palette[i][0] = *in++; - palette[i][1] = *in++; - palette[i][2] = *in++; - palette[i][3] = 255; - } -// palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0; - mod->flags |= EF_ADDITIVE; - break; - case SPRHL_INDEXALPHA: - for (i = 0;i < 256;i++) + if (LittleLong (pinframetype->type) == SPR_SINGLE) { - palette[i][0] = 255; - palette[i][1] = 255; - palette[i][2] = 255; - palette[i][3] = i; - in += 3; + groupframes = 1; + interval = 0.1f; } - break; - case SPRHL_ALPHATEST: - for (i = 0;i < 256;i++) + else { - palette[i][0] = *in++; - palette[i][1] = *in++; - palette[i][2] = *in++; - palette[i][3] = 255; + pingroup = (dspritegroup_t *)datapointer; + datapointer += sizeof(dspritegroup_t); + + groupframes = LittleLong(pingroup->numframes); + + pinintervals = (dspriteinterval_t *)datapointer; + datapointer += sizeof(dspriteinterval_t) * groupframes; + + interval = LittleFloat(pinintervals[0].interval); + if (interval < 0.01f) + Host_Error("Mod_Sprite_SharedSetup: invalid interval"); } - palette[0][0] = palette[0][1] = palette[0][2] = palette[0][3] = 0; - break; - default: - Host_Error("Mod_LoadHLSprite: unknown texFormat (%i, should be 0, 1, 2, or 3)\n", i); - return; - } - pframetype = (dspriteframetype_t *)in; + sprintf(loadmodel->animscenes[i].name, "frame %i", i); + loadmodel->animscenes[i].firstframe = realframes; + loadmodel->animscenes[i].framecount = groupframes; + loadmodel->animscenes[i].framerate = 1.0f / interval; + loadmodel->animscenes[i].loop = true; - animscenes = Hunk_AllocName(sizeof(animscene_t) * mod->numframes, va("%s sceneinfo", loadname)); + for (j = 0;j < groupframes;j++) + { + pinframe = (dspriteframe_t *)datapointer; + datapointer += sizeof(dspriteframe_t); - realframes = 0; + origin[0] = LittleLong (pinframe->origin[0]); + origin[1] = LittleLong (pinframe->origin[1]); + width = LittleLong (pinframe->width); + height = LittleLong (pinframe->height); - for (i = 0;i < numframes;i++) - { - spriteframetype_t frametype; + loadmodel->sprdata_frames[realframes].left = origin[0]; + loadmodel->sprdata_frames[realframes].right = origin[0] + width; + loadmodel->sprdata_frames[realframes].up = origin[1]; + loadmodel->sprdata_frames[realframes].down = origin[1] - height; - frametype = LittleLong (pframetype->type); + x = max(loadmodel->sprdata_frames[realframes].left * loadmodel->sprdata_frames[realframes].left, loadmodel->sprdata_frames[realframes].right * loadmodel->sprdata_frames[realframes].right); + y = max(loadmodel->sprdata_frames[realframes].up * loadmodel->sprdata_frames[realframes].up, loadmodel->sprdata_frames[realframes].down * loadmodel->sprdata_frames[realframes].down); + if (modelradius < x + y) + modelradius = x + y; - sprintf(animscenes[i].name, "frame%i", i); - animscenes[i].firstframe = realframes; - animscenes[i].loop = true; - if (frametype == SPR_SINGLE) - { - animscenes[i].framecount = 1; - animscenes[i].framerate = 10; - pframe = (dspriteframe_t *) (pframetype + 1); - framedata[realframes] = pframe; - size = LittleLong(pframe->width) * LittleLong(pframe->height); - pframetype = (dspriteframetype_t *) (size + sizeof(dspriteframe_t) + (int) pframe); - realframes++; - } - else - { - j = LittleLong(((dspritegroup_t *) (sizeof(dspriteframetype_t) + (int) pframetype))->numframes); - animscenes[i].framecount = j; - // FIXME: support variable framerate? - animscenes[i].framerate = 1.0f / LittleFloat(((dspriteinterval_t *) (sizeof(dspritegroup_t) + sizeof(dspriteframetype_t) + (int) pframetype))->interval); - pframe = (dspriteframe_t *) (sizeof(dspriteinterval_t) * j + sizeof(dspritegroup_t) + sizeof(dspriteframetype_t) + (int) pframetype); - while (j--) + if (width > 0 && height > 0) { - framedata[realframes] = pframe; - size = LittleLong(pframe->width) * LittleLong(pframe->height); - pframe = (dspriteframe_t *) (size + sizeof(dspriteframe_t) + (int) pframe); - realframes++; + if (groupframes > 1) + sprintf (name, "%s_%i_%i", tempname, i, j); + else + sprintf (name, "%s_%i", tempname, i); + loadmodel->sprdata_frames[realframes].texture = loadtextureimagewithmask(loadmodel->texturepool, name, 0, 0, false, r_mipsprites.integer, true); + loadmodel->sprdata_frames[realframes].fogtexture = image_masktex; + + if (!loadmodel->sprdata_frames[realframes].texture) + { + pixbuf = Mem_Alloc(tempmempool, width*height*4); + if (version == SPRITE32_VERSION) + memcpy(pixbuf, datapointer, width*height*4); + else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION) + Image_Copy8bitRGBA(datapointer, pixbuf, width*height, palette); + + loadmodel->sprdata_frames[realframes].texture = R_LoadTexture (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE); + + // make fog version (just alpha) + for (k = 0;k < width*height;k++) + { + pixbuf[k*4+0] = 255; + pixbuf[k*4+1] = 255; + pixbuf[k*4+2] = 255; + } + if (groupframes > 1) + sprintf (name, "%s_%i_%ifog", tempname, i, j); + else + sprintf (name, "%s_%ifog", tempname, i); + loadmodel->sprdata_frames[realframes].fogtexture = R_LoadTexture (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE); + + Mem_Free(pixbuf); + } } - pframetype = (dspriteframetype_t *) pframe; - } - } - - mod->ofs_scenes = (int) animscenes - (int) psprite; - frames = Hunk_AllocName(sizeof(mspriteframe_t) * realframes, va("%s frames", loadname)); - - realframes = 0; - for (i = 0;i < numframes;i++) - { - for (j = 0;j < animscenes[i].framecount;j++) - { - Mod_LoadSpriteFrame (framedata[realframes], frames + realframes, i, 1, &palette[0][0], &modelradius); + if (version == SPRITE32_VERSION) + datapointer += width * height * 4; + else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION) + datapointer += width * height; realframes++; } } - psprite->ofs_frames = (int) frames - (int) psprite; - - qfree(framedata); - - mod->type = mod_sprite; - modelradius = sqrt(modelradius); for (i = 0;i < 3;i++) { - mod->normalmins[i] = mod->yawmins[i] = mod->rotatedmins[i] = -modelradius; - mod->normalmaxs[i] = mod->yawmaxs[i] = mod->rotatedmaxs[i] = modelradius; + loadmodel->normalmins[i] = loadmodel->yawmins[i] = loadmodel->rotatedmins[i] = -modelradius; + loadmodel->normalmaxs[i] = loadmodel->yawmaxs[i] = loadmodel->rotatedmaxs[i] = modelradius; } - -// move the complete, relocatable sprite model to the cache - end = Hunk_LowMark (); - mod->cachesize = total = end - start; - - Cache_Alloc (&mod->cache, total, loadname); - if (!mod->cache.data) - return; - memcpy (mod->cache.data, psprite, total); - - Hunk_FreeToLowMark (start); +// loadmodel->modelradius = modelradius; } void Mod_Sprite_SERAddEntity(void) @@ -496,23 +241,98 @@ Mod_LoadSpriteModel */ void Mod_LoadSpriteModel (model_t *mod, void *buffer) { - int version; - version = ((dsprite_t *)buffer)->version; - switch(version) + int version, i, rendermode; + qbyte palette[256][4], *in; + dsprite_t *pinqsprite; + dspritehl_t *pinhlsprite; + qbyte *datapointer; + + datapointer = buffer; + + loadmodel->SERAddEntity = Mod_Sprite_SERAddEntity; + loadmodel->Draw = R_DrawSpriteModel; + loadmodel->DrawSky = NULL; + loadmodel->DrawShadow = NULL; + + version = LittleLong(((dsprite_t *)buffer)->version); + if (version == SPRITE_VERSION || SPRITE32_VERSION) + { + pinqsprite = (dsprite_t *)datapointer; + datapointer += sizeof(dsprite_t); + + loadmodel->numframes = LittleLong (pinqsprite->numframes); + loadmodel->sprnum_type = LittleLong (pinqsprite->type); + loadmodel->synctype = LittleLong (pinqsprite->synctype); + + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), d_8to24table); + } + else if (version == SPRITEHL_VERSION) { - case SPRITEHL_VERSION: - Mod_LoadHLSprite (mod, buffer); - break; - case SPRITE_VERSION: - case SPRITE32_VERSION: - Mod_LoadQuakeSprite(mod, buffer); - break; - default: - Host_Error ("Mod_LoadSpriteModel: %s has wrong version number (%i should be 1 (quake) or 32 (sprite32) or 2 (halflife)", mod->name, version); - break; + pinhlsprite = (dspritehl_t *)datapointer; + datapointer += sizeof(dspritehl_t); + + loadmodel->numframes = LittleLong (pinhlsprite->numframes); + loadmodel->sprnum_type = LittleLong (pinhlsprite->type); + loadmodel->synctype = LittleLong (pinhlsprite->synctype); + rendermode = pinhlsprite->rendermode; + + in = datapointer; + datapointer += 2; + i = in[0] + in[1] * 256; + if (i != 256) + Host_Error ("Mod_LoadHLSprite: unexpected number of palette colors %i (should be 256)", i); + in = datapointer; + datapointer += 768; + switch(rendermode) + { + case SPRHL_NORMAL: + for (i = 0;i < 255;i++) + { + palette[i][0] = *in++; + palette[i][1] = *in++; + palette[i][2] = *in++; + palette[i][3] = 255; + } + palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0; + break; + case SPRHL_ADDITIVE: + for (i = 0;i < 256;i++) + { + palette[i][0] = *in++; + palette[i][1] = *in++; + palette[i][2] = *in++; + palette[i][3] = 255; + } + // palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0; + loadmodel->flags |= EF_ADDITIVE; + break; + case SPRHL_INDEXALPHA: + for (i = 0;i < 256;i++) + { + palette[i][0] = 255; + palette[i][1] = 255; + palette[i][2] = 255; + palette[i][3] = i; + in += 3; + } + break; + case SPRHL_ALPHATEST: + for (i = 0;i < 255;i++) + { + palette[i][0] = *in++; + palette[i][1] = *in++; + palette[i][2] = *in++; + palette[i][3] = 255; + } + palette[0][0] = palette[0][1] = palette[0][2] = palette[0][3] = 0; + break; + default: + Host_Error("Mod_LoadHLSprite: unknown texFormat (%i, should be 0, 1, 2, or 3)\n", i); + return; + } + + Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (int *)(&palette[0][0])); } - mod->SERAddEntity = Mod_Sprite_SERAddEntity; - mod->DrawEarly = R_DrawSpriteModel; - mod->DrawLate = NULL; - mod->DrawShadow = NULL; + else + Host_Error ("Mod_LoadSpriteModel: %s has wrong version number (%i should be 1 (quake) or 32 (sprite32) or 2 (halflife)", loadmodel->name, version); }