version 1.3 | | version 1.4 |
---|
| | |
* Sample setup for RCS header | | * Sample setup for RCS header |
* | | * |
* $Log$ | | * $Log$ |
| | * Revision 1.4 1999/10/07 21:09:47 donut |
| | * OGL alternate texmerge |
| | * |
* Revision 1.3 1999/09/03 22:43:06 sekmu | | * Revision 1.3 1999/09/03 22:43:06 sekmu |
* more warning fixes | | * more warning fixes |
* | | * |
| | |
| | |
#include "d_io.h" | | #include "d_io.h" |
| | |
| | #ifdef OGL |
| | #include "ogl_init.h" |
| | #endif |
| | |
#define INITIAL_LOCAL_LIGHT (F1_0/4) // local light value in segment of occurence (of light emission) | | #define INITIAL_LOCAL_LIGHT (F1_0/4) // local light value in segment of occurence (of light emission) |
| | |
#ifndef NDEBUG | | #ifndef NDEBUG |
| | |
{ | | { |
fix face_light; | | fix face_light; |
grs_bitmap *bm; | | grs_bitmap *bm; |
| | #ifdef OGL |
| | grs_bitmap *bm2=NULL; |
| | #endif |
fix reflect; | | fix reflect; |
uvl uvl_copy[8]; | | uvl uvl_copy[8]; |
int i; | | int i; |
| | |
Segments[segnum].sides[sidenum].tmap_num = 0; | | Segments[segnum].sides[sidenum].tmap_num = 0; |
} | | } |
| | |
| | #ifdef OGL |
| | if (ogl_alttexmerge){ |
| | PIGGY_PAGE_IN(Textures[tmap1]); |
| | bm = &GameBitmaps[Textures[tmap1].index]; |
| | if (tmap2){ |
| | PIGGY_PAGE_IN(Textures[tmap2&0x3FFF]); |
| | bm2 = &GameBitmaps[Textures[tmap2&0x3FFF].index]; |
| | } |
| | if (bm2 && (bm2->bm_flags&BM_FLAG_SUPER_TRANSPARENT)){ |
| | bm = texmerge_get_cached_bitmap( tmap1, tmap2 ); |
| | bm2 = NULL; |
| | } |
| | }else |
| | #endif |
// New code for overlapping textures... | | // New code for overlapping textures... |
if (tmap2 != 0) | | if (tmap2 != 0){ |
bm = texmerge_get_cached_bitmap( tmap1, tmap2 ); | | bm = texmerge_get_cached_bitmap( tmap1, tmap2 ); |
else { | | }else{ |
bm = &GameBitmaps[Textures[tmap1].index]; | | bm = &GameBitmaps[Textures[tmap1].index]; |
PIGGY_PAGE_IN(Textures[tmap1]); | | PIGGY_PAGE_IN(Textures[tmap1]); |
} | | } |
| | |
g3_draw_tmap(nv,pointlist,(g3s_uvl *) uvl_copy,&GameBitmaps[Textures[Bottom_bitmap_num].index]); | | g3_draw_tmap(nv,pointlist,(g3s_uvl *) uvl_copy,&GameBitmaps[Textures[Bottom_bitmap_num].index]); |
else | | else |
#endif | | #endif |
| | #ifdef OGL |
| | if (bm2){ |
| | g3_draw_tmap_2(nv,pointlist,(g3s_uvl *) uvl_copy,bm,bm2,((tmap2&0xC000)>>14) & 3); |
| | }else |
| | #endif |
g3_draw_tmap(nv,pointlist,(g3s_uvl *) uvl_copy,bm); | | g3_draw_tmap(nv,pointlist,(g3s_uvl *) uvl_copy,bm); |
| | |
#ifndef NDEBUG | | #ifndef NDEBUG |