Difference for texmap/ntmap.c from version 1.4 to 1.5


version 1.4 version 1.5
Line 19
 
Line 19
  * Start of conversion to new texture mapper.   * Start of conversion to new texture mapper.
  *    *
  * $Log$   * $Log$
    * Revision 1.5  1999/12/08 01:03:51  donut
    * allow runtime selection of tmap routines
    *
  * Revision 1.4  1999/10/18 00:31:55  donut   * Revision 1.4  1999/10/18 00:31:55  donut
  * allow FP_TMAP to be used without NO_ASM   * allow FP_TMAP to be used without NO_ASM
  *   *
Line 514
 
Line 517
  if (fx_xright > Window_clip_right)   if (fx_xright > Window_clip_right)
  fx_xright = Window_clip_right;   fx_xright = Window_clip_right;
    
  #if (defined(NO_ASM) && !defined(ASM_PER)) || defined(FP_TMAP)   cur_tmap_scanline_per();
  c_tmap_scanline_per_nolight();  
  #else  
  asm_tmap_scanline_per();  
  #endif  
  break;   break;
  case 1: {   case 1: {
  fix mul_thing;   fix mul_thing;
Line 545
 
Line 544
  if (fx_xright > Window_clip_right)   if (fx_xright > Window_clip_right)
  fx_xright = Window_clip_right;   fx_xright = Window_clip_right;
   
  #if (defined(NO_ASM) && !defined(ASM_PER)) || defined(FP_TMAP)   cur_tmap_scanline_per();
  c_tmap_scanline_per();  
  #else  
  asm_tmap_scanline_per();  
  #endif  
  break;   break;
  }   }
  case 2:   case 2:
Line 557
 
Line 552
  fx_xright = f2i(xright);   fx_xright = f2i(xright);
  fx_xleft = f2i(xleft);   fx_xleft = f2i(xleft);
   
 #if defined(FL1_WITH_FLAT) || defined(NO_ASM)  
  tmap_flat_color = 1;   tmap_flat_color = 1;
                         #ifdef NO_ASM   cur_tmap_scanline_flat();
  c_tmap_scanline_flat();  
  #else  
  asm_tmap_scanline_flat();  
  #endif  
 #else  
  asm_tmap_scanline_matt();  
 #endif  
 #else  #else
  Int3(); // Illegal, called an editor only routine!   Int3(); // Illegal, called an editor only routine!
 #endif  #endif
Line 815
 
Line 802
  fx_xleft = 0;   fx_xleft = 0;
  //end addition -adb   //end addition -adb
    
  #ifdef NO_ASM   cur_tmap_scanline_lin_nolight();
  c_tmap_scanline_lin_nolight();  
  #else  
  #ifdef NO_ASM_NOLIGHT  
  asm_tmap_scanline_lin_lighted();  
  #else  
                                         asm_tmap_scanline_lin();  
  #endif  
  #endif  
  break;   break;
  case 1:   case 1:
  if (lleft < F1_0/2)   if (lleft < F1_0/2)
Line 858
 
Line 837
  fx_l = lleft;   fx_l = lleft;
  dl_dx = fixmul(lright - lleft,recip_dx);   dl_dx = fixmul(lright - lleft,recip_dx);
  fx_dl_dx = dl_dx;   fx_dl_dx = dl_dx;
                                 #ifdef NO_ASM   cur_tmap_scanline_lin();
  c_tmap_scanline_lin();  
  #else  
  asm_tmap_scanline_lin_lighted();  
  #endif  
  break;   break;
  case 2:   case 2:
 #ifdef EDITOR_TMAP  #ifdef EDITOR_TMAP
  fx_xright = f2i(xright);   fx_xright = f2i(xright);
  fx_xleft = f2i(xleft);   fx_xleft = f2i(xleft);
 #if defined(FL1_WITH_FLAT) || defined(NO_ASM)  
  tmap_flat_color = 1;   tmap_flat_color = 1;
                                 #ifdef NO_ASM   cur_tmap_scanline_flat();
  c_tmap_scanline_flat();  
  #else  
  asm_tmap_scanline_flat();  
  #endif  
 #else  
  asm_tmap_scanline_matt();  
 #endif  
 #else  #else
  Int3(); // Illegal, called an editor only routine!   Int3(); // Illegal, called an editor only routine!
 #endif  #endif

Legend:
line(s) removed in v.1.4 
line(s) changed
 line(s) added in v.1.5