Difference for main/texmerge.c from version 1.1 to 1.2


version 1.1 version 1.2
Line 19
 
Line 19
  * Routines to cache merged textures.   * Routines to cache merged textures.
  *    *
  * $Log$   * $Log$
  * Revision 1.1  1999/06/14 22:11:46  donut   * Revision 1.2  1999/09/21 04:05:55  donut
  * Initial revision   * mostly complete OGL implementation (still needs bitmap handling (reticle), and door/fan textures are corrupt)
    *
    * Revision 1.1.1.1  1999/06/14 22:11:46  donut
    * Import of d1x 1.37 source.
  *   *
  * Revision 2.0  1995/02/27  11:31:08  john   * Revision 2.0  1995/02/27  11:31:08  john
  * New version 2.0, which has no anonymous unions, builds with   * New version 2.0, which has no anonymous unions, builds with
Line 134
 
Line 137
 #include "rle.h"  #include "rle.h"
 #include "piggy.h"  #include "piggy.h"
   
   //resending textures into video ram is very slow, so cache more (worst case, the ogl driver will swap out some itself, probably doing a better job) -MM
   #ifdef OGL
   #define MAX_NUM_CACHE_BITMAPS 200
   #else
 #define MAX_NUM_CACHE_BITMAPS 50  #define MAX_NUM_CACHE_BITMAPS 50
   #endif
   
 #ifndef D1XD3D  #ifndef D1XD3D
 #define PCCODE  #define PCCODE
Line 268
 
Line 276
  Assert( piggy_page_flushed == 0 );   Assert( piggy_page_flushed == 0 );
 #endif  #endif
   
   #ifdef OGL
    ogl_freebmtexture(Cache[least_recently_used].bitmap);
   #endif
  if (bitmap_top->bm_flags & BM_FLAG_SUPER_TRANSPARENT) {   if (bitmap_top->bm_flags & BM_FLAG_SUPER_TRANSPARENT) {
  merge_textures_super_xparent( orient, bitmap_bottom, bitmap_top, Cache[least_recently_used].bitmap->bm_data );   merge_textures_super_xparent( orient, bitmap_bottom, bitmap_top, Cache[least_recently_used].bitmap->bm_data );
  gr_set_bitmap_flags (Cache[least_recently_used].bitmap, BM_FLAG_TRANSPARENT);   gr_set_bitmap_flags (Cache[least_recently_used].bitmap, BM_FLAG_TRANSPARENT);

Legend:
line(s) removed in v.1.1 
line(s) changed
 line(s) added in v.1.2