From 431853b1510682bd254befd391919aafdc871fce Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 18 Feb 2003 20:15:48 +0000 Subject: [PATCH] formatting --- texmap/ntmap.c | 110 ++++++++++++++++---------------------------- texmap/scanline.c | 44 ++++-------------- texmap/scanline.h | 24 ++++------ texmap/texmapl.h | 46 ++++++++---------- texmap/tmap_flt.asm | 10 +--- texmap/tmap_inc.asm | 13 +----- texmap/tmap_lin.asm | 32 ++++++------- texmap/tmap_ll.asm | 10 +--- texmap/tmap_per.asm | 13 +----- texmap/tmapfade.asm | 10 +--- texmap/tmapflat.c | 51 +++++++------------- texmap/tmappent.S | 1 + texmap/tmapppro.S | 1 + 13 files changed, 118 insertions(+), 247 deletions(-) diff --git a/texmap/ntmap.c b/texmap/ntmap.c index 29a2f8ec..36df241b 100644 --- a/texmap/ntmap.c +++ b/texmap/ntmap.c @@ -1,3 +1,4 @@ +/* $Id: ntmap.c,v 1.7 2003-02-18 20:15:48 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,145 +8,114 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ + /* - * $Source: /cvs/cvsroot/d2x/texmap/ntmap.c,v $ - * $Revision: 1.6 $ - * $Author: bradleyb $ - * $Date: 2002-02-23 22:24:10 $ - * - * Start of conversion to new texture mapper. - * - * $Log: not supported by cvs2svn $ - * Revision 1.5 2001/10/25 09:12:16 bradleyb - * Completed tmap selection code. - * - * Revision 1.4 2001/10/25 02:22:46 bradleyb - * adding support for runtime selection of tmap funcs - * - * Revision 1.3 2001/01/31 15:18:04 bradleyb - * Makefile and conf.h fixes - * - * Revision 1.2 2001/01/31 14:04:46 bradleyb - * Fix compiler warnings - * - * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb - * Import of d2x-0.0.8 * - * Revision 1.4 1999/10/18 00:31:55 donut - * allow FP_TMAP to be used without NO_ASM - * - * Revision 1.3 1999/08/05 22:53:41 sekmu - * - * D3D patch(es) from ADB - * - * Revision 1.2 1999/07/07 21:31:09 donut - * removed unused vars from ntmap_scanline_lighted and slightly optomized it - * - * Revision 1.1.1.1 1999/06/14 22:14:06 donut - * Import of d1x 1.37 source. + * Start of conversion to new texture mapper. * + * Old Log: * Revision 1.52 1995/03/14 15:13:06 john * Increased MAX_Y_Pointers to 480. - * + * * Revision 1.51 1995/02/23 14:25:09 john * Added editor tmap. - * + * * Revision 1.50 1995/02/20 18:22:58 john * Put all the externs in the assembly modules into tmap_inc.asm. - * Also, moved all the C versions of the inner loops into a new module, + * Also, moved all the C versions of the inner loops into a new module, * scanline.c. - * + * * Revision 1.49 1995/02/20 17:09:11 john * Added code so that you can build the tmapper with no assembly! - * + * * Revision 1.48 1995/01/06 11:11:30 mike * even when not in editor, have 400 lines in texture map scanline table. - * + * * Revision 1.47 1994/12/15 16:43:25 matt * Took out code only needed by editor - * + * * Revision 1.46 1994/12/09 22:35:37 mike * fix bug in before call to asm_tmap_scanline_per causing write of pixel onto past right border onto left. - * + * * Revision 1.45 1994/12/06 16:31:06 mike * fix bug in asm_tmap_scanline_matt interface. - * + * * Revision 1.44 1994/12/04 20:37:18 mike * *** empty log message *** - * + * * Revision 1.43 1994/12/02 23:30:04 mike * optimizations. - * + * * Revision 1.42 1994/11/30 00:57:43 mike * optimizations. - * + * * Revision 1.41 1994/11/28 13:34:27 mike * optimizations. - * + * * Revision 1.40 1994/11/28 01:30:01 mike * kill warning. - * + * * Revision 1.39 1994/11/28 01:28:59 mike * optimizations. - * + * * Revision 1.38 1994/11/21 14:08:07 john * Took out all multiple instead of divide code. - * + * * Revision 1.37 1994/11/19 15:21:52 mike * rip out unused code. - * + * * Revision 1.36 1994/11/14 11:42:51 mike * optimization. - * + * * Revision 1.35 1994/11/12 16:41:36 mike * *** empty log message *** - * + * * Revision 1.34 1994/11/10 21:28:41 mike * remove call to init_interface_vars_to_assembler. - * + * * Revision 1.33 1994/11/10 11:08:59 mike * detail level stuff. - * + * * Revision 1.32 1994/11/09 22:55:52 matt * Added variable Current_seg_depth for detail level optimization - * + * * Revision 1.31 1994/11/09 19:57:31 john * Added texture rle caching. - * + * * Revision 1.30 1994/11/09 19:54:48 mike * Call flat shader if Tmap_flat_flag set. - * + * * Revision 1.29 1994/11/02 21:33:31 john * Added Burger Bill's optimization, ie.. 2 muls per 8 pixels. - * + * * Revision 1.28 1994/11/02 11:32:16 john - * Added code for c callable inner loop and code to + * Added code for c callable inner loop and code to * test dividing out z0. - * + * * Revision 1.27 1994/10/28 20:54:32 matt * Added error checking - * + * * Revision 1.26 1994/10/25 11:20:20 mike * fix bug in lighting overflow checking for one scanline tall linear texture maps. - * + * * Revision 1.25 1994/08/03 15:40:33 mike * Prevent divide overflows, decrease occurrence of precision-caused glitches. - * + * * Revision 1.24 1994/07/27 09:31:16 mike * Fix concave texture map problem, decrease occurrence of unimportant int 3. - * + * * Revision 1.23 1994/06/17 12:23:31 mike * Support non-lighted texture maps. - * + * * Revision 1.22 1994/06/11 08:10:24 mike * Fix mysterious hang bug, lighting value was out of range. - * + * * Revision 1.21 1994/06/09 16:10:16 mike * Change SC2000 from constant to variable. - * + * */ #ifdef HAVE_CONFIG_H @@ -153,7 +123,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: ntmap.c,v 1.6 2002-02-23 22:24:10 bradleyb Exp $"; +static char rcsid[] = "$Id: ntmap.c,v 1.7 2003-02-18 20:15:48 btb Exp $"; #endif #define VESA 0 diff --git a/texmap/scanline.c b/texmap/scanline.c index 4a3e60eb..46a1f22f 100644 --- a/texmap/scanline.c +++ b/texmap/scanline.c @@ -1,3 +1,4 @@ +/* $Id: scanline.c,v 1.6 2003-02-18 20:15:48 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,49 +8,22 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ + /* - * $Source: /cvs/cvsroot/d2x/texmap/scanline.c,v $ - * $Revision: 1.5 $ - * $Author: bradleyb $ - * $Date: 2001-11-14 20:13:19 $ - * - * Routines to draw the texture mapped scanlines. - * - * $Log: not supported by cvs2svn $ - * Revision 1.4 2001/10/25 08:25:34 bradleyb - * Finished moving stuff to arch/blah. I know, it's ugly, but It'll be easier to sync with d1x. - * - * Revision 1.3 2001/10/25 02:22:46 bradleyb - * adding support for runtime selection of tmap funcs - * - * Revision 1.2 2001/01/31 15:18:04 bradleyb - * Makefile and conf.h fixes - * - * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb - * Import of d2x-0.0.8 - * - * Revision 1.4 1999/10/18 00:31:01 donut - * more alpha fixes from Falk Hueffner * - * Revision 1.3 1999/10/14 04:48:21 donut - * alpha fixes, and gl_font args - * - * Revision 1.2 1999/09/21 07:22:40 sekmu - * remove unused var warning - * - * Revision 1.1.1.1 1999/06/14 22:14:08 donut - * Import of d1x 1.37 source. + * Routines to draw the texture mapped scanlines. * + * Old Log: * Revision 1.2 1995/02/20 18:23:39 john * Added new module for C versions of inner loops. - * + * * Revision 1.1 1995/02/20 17:42:27 john * Initial revision - * - * + * + * */ #ifdef HAVE_CONFIG_H @@ -57,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: scanline.c,v 1.5 2001-11-14 20:13:19 bradleyb Exp $"; +static char rcsid[] = "$Id: scanline.c,v 1.6 2003-02-18 20:15:48 btb Exp $"; #endif #include diff --git a/texmap/scanline.h b/texmap/scanline.h index 006b9c45..dc0d6bc9 100644 --- a/texmap/scanline.h +++ b/texmap/scanline.h @@ -1,3 +1,4 @@ +/* $Id: scanline.h,v 1.3 2003-02-18 20:15:48 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,31 +8,22 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ + /* - * $Source: /cvs/cvsroot/d2x/texmap/scanline.h,v $ - * $Revision: 1.2 $ - * $Author: bradleyb $ - * $Date: 2001-10-25 02:22:46 $ - * - * Prototypes for C versions of texture mapped scanlines. - * - * $Log: not supported by cvs2svn $ - * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb - * Import of d2x-0.0.8 * - * Revision 1.1.1.1 1999/06/14 22:14:10 donut - * Import of d1x 1.37 source. + * Prototypes for C versions of texture mapped scanlines. * + * Old Log: * Revision 1.2 1995/02/20 18:23:40 john * Added new module for C versions of inner loops. - * + * * Revision 1.1 1995/02/20 17:44:16 john * Initial revision - * - * + * + * */ diff --git a/texmap/texmapl.h b/texmap/texmapl.h index f3f000b9..8228574b 100644 --- a/texmap/texmapl.h +++ b/texmap/texmapl.h @@ -1,3 +1,4 @@ +/* $Id: texmapl.h,v 1.3 2003-02-18 20:15:48 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,68 +8,59 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ + /* - * $Source: /cvs/cvsroot/d2x/texmap/texmapl.h,v $ - * $Revision: 1.2 $ - * $Author: bradleyb $ - * $Date: 2001-10-25 02:22:46 $ * * Local include file for texture mapper library -- NOT to be included by users. * - * $Log: not supported by cvs2svn $ - * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb - * Import of d2x-0.0.8 - * - * Revision 1.1.1.1 1999/06/14 22:14:11 donut - * Import of d1x 1.37 source. - * + * Old Log: * Revision 1.14 1995/02/20 18:23:02 john * Put all the externs in the assembly modules into tmap_inc.asm. - * Also, moved all the C versions of the inner loops into a new module, + * Also, moved all the C versions of the inner loops into a new module, * scanline.c. - * + * * Revision 1.13 1995/02/20 17:09:16 john * Added code so that you can build the tmapper with no assembly! - * + * * Revision 1.12 1994/11/28 13:34:34 mike * optimizations. - * + * * Revision 1.11 1994/11/12 16:41:27 mike * function prototype. - * + * * Revision 1.10 1994/05/24 17:30:00 mike * Prototype fix_recip, asm_tmap_scanline_lin_v. - * + * * Revision 1.9 1994/04/21 15:04:26 mike * Add prototype for texmapl.h - * + * * Revision 1.8 1994/03/31 08:34:53 mike * *** empty log message *** - * + * * Revision 1.7 1994/03/22 20:37:04 mike * *** empty log message *** - * + * * Revision 1.6 1994/03/14 15:43:03 mike * streamline code. - * + * * Revision 1.5 1994/01/31 15:43:18 mike * window_height, asm_tmap_scanline_lin_sky_v - * + * * Revision 1.4 1994/01/21 21:12:27 mike * Prototype asm_tmap_scanline_lin_sky - * + * * Revision 1.3 1994/01/14 14:01:45 mike * Add a bunch of variables. - * + * * Revision 1.2 1993/11/22 10:25:11 mike * *** empty log message *** - * + * * Revision 1.1 1993/09/08 17:29:13 mike * Initial revision - * + * * */ diff --git a/texmap/tmap_flt.asm b/texmap/tmap_flt.asm index cf45ef45..b94fc531 100644 --- a/texmap/tmap_flt.asm +++ b/texmap/tmap_flt.asm @@ -1,3 +1,4 @@ +; $Id: tmap_flt.asm,v 1.2 2003-02-18 20:15:48 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -9,17 +10,10 @@ ;AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. ;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. ; -; $Source: /cvs/cvsroot/d2x/texmap/tmap_flt.asm,v $ -; $Revision: 1.1.1.1 $ -; $Author: bradleyb $ -; $Date: 2001-01-19 03:30:16 $ ; ; Flat shader derived from texture mapper (kind of slow) ; -; $Log: not supported by cvs2svn $ -; Revision 1.1.1.1 1999/06/14 22:13:53 donut -; Import of d1x 1.37 source. -; +; Old Log: ; Revision 1.10 1995/02/20 18:22:53 john ; Put all the externs in the assembly modules into tmap_inc.asm. ; Also, moved all the C versions of the inner loops into a new module, diff --git a/texmap/tmap_inc.asm b/texmap/tmap_inc.asm index c1ffaf27..4a9e27fe 100644 --- a/texmap/tmap_inc.asm +++ b/texmap/tmap_inc.asm @@ -1,3 +1,4 @@ +; $Id: tmap_inc.asm,v 1.3 2003-02-18 20:15:48 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -9,20 +10,10 @@ ;AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. ;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. ; -; $Source: /cvs/cvsroot/d2x/texmap/tmap_inc.asm,v $ -; $Revision: 1.2 $ -; $Author: bradleyb $ -; $Date: 2001-10-18 23:59:23 $ ; ; Mike's include file for the texture mapper library. ; -; $Log: not supported by cvs2svn $ -; Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb -; Import of d2x-0.0.8 -; -; Revision 1.1.1.1 1999/06/14 22:13:53 donut -; Import of d1x 1.37 source. -; +; Old Log: ; Revision 1.10 1995/02/20 18:22:52 john ; Put all the externs in the assembly modules into tmap_inc.asm. ; Also, moved all the C versions of the inner loops into a new module, diff --git a/texmap/tmap_lin.asm b/texmap/tmap_lin.asm index d6cfa3b1..152b7406 100644 --- a/texmap/tmap_lin.asm +++ b/texmap/tmap_lin.asm @@ -1,3 +1,4 @@ +; $Id: tmap_lin.asm,v 1.2 2003-02-18 20:15:48 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -6,49 +7,42 @@ ;SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE ;FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE ;CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -;AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +;AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. ;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. ; -; $Source: /cvs/cvsroot/d2x/texmap/tmap_lin.asm,v $ -; $Revision: 1.1.1.1 $ -; $Author: bradleyb $ -; $Date: 2001-01-19 03:30:16 $ ; ; Linearly interpolating texture mapper inner loop ; -; $Log: not supported by cvs2svn $ -; Revision 1.1.1.1 1999/06/14 22:13:53 donut -; Import of d1x 1.37 source. -; +; Old Log: ; Revision 1.3 1995/02/20 18:22:57 john ; Put all the externs in the assembly modules into tmap_inc.asm. -; Also, moved all the C versions of the inner loops into a new module, +; Also, moved all the C versions of the inner loops into a new module, ; scanline.c. -; +; ; Revision 1.2 1995/02/20 17:09:10 john ; Added code so that you can build the tmapper with no assembly! -; +; ; Revision 1.1 1994/11/30 12:24:04 mike ; Initial revision -; +; ; Revision 1.6 1994/11/12 16:39:40 mike ; jae to ja. -; +; ; Revision 1.5 1994/02/10 21:24:43 matt ; Got rid of debug_on set -; +; ; Revision 1.4 1994/01/31 15:39:53 mike ; Write additional inner loop for transparency. -; +; ; Revision 1.3 1994/01/26 11:50:04 john ; Added transparency to linear unlighted texture mapper. -; +; ; Revision 1.2 1993/11/22 10:24:36 mike ; *** empty log message *** -; +; ; Revision 1.1 1993/09/08 17:29:50 mike ; Initial revision -; +; ; ; diff --git a/texmap/tmap_ll.asm b/texmap/tmap_ll.asm index 45afe9c6..018a4ca3 100644 --- a/texmap/tmap_ll.asm +++ b/texmap/tmap_ll.asm @@ -1,3 +1,4 @@ +; $Id: tmap_ll.asm,v 1.2 2003-02-18 20:15:48 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -9,17 +10,10 @@ ;AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. ;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. ; -; $Source: /cvs/cvsroot/d2x/texmap/tmap_ll.asm,v $ -; $Revision: 1.1.1.1 $ -; $Author: bradleyb $ -; $Date: 2001-01-19 03:30:16 $ ; ; Linear, lighted texture mapper inner loop. ; -; $Log: not supported by cvs2svn $ -; Revision 1.1.1.1 1999/06/14 22:13:55 donut -; Import of d1x 1.37 source. -; +; Old Log: ; Revision 1.10 1995/02/20 18:22:54 john ; Put all the externs in the assembly modules into tmap_inc.asm. ; Also, moved all the C versions of the inner loops into a new module, diff --git a/texmap/tmap_per.asm b/texmap/tmap_per.asm index 16d127f0..89f7eae7 100644 --- a/texmap/tmap_per.asm +++ b/texmap/tmap_per.asm @@ -1,3 +1,4 @@ +; $Id: tmap_per.asm,v 1.3 2003-02-18 20:15:48 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -9,20 +10,10 @@ ;AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. ;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. ; -; $Source: /cvs/cvsroot/d2x/texmap/tmap_per.asm,v $ -; $Revision: 1.2 $ -; $Author: bradleyb $ -; $Date: 2001-10-18 23:59:23 $ ; ; Perspective texture mapper inner loop. ; -; $Log: not supported by cvs2svn $ -; Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb -; Import of d2x-0.0.8 -; -; Revision 1.1.1.1 1999/06/14 22:14:01 donut -; Import of d1x 1.37 source. -; +; Old Log: ; Revision 1.26 1995/02/20 18:22:55 john ; Put all the externs in the assembly modules into tmap_inc.asm. ; Also, moved all the C versions of the inner loops into a new module, diff --git a/texmap/tmapfade.asm b/texmap/tmapfade.asm index a00ee621..840b0ded 100644 --- a/texmap/tmapfade.asm +++ b/texmap/tmapfade.asm @@ -1,3 +1,4 @@ +; $Id: tmapfade.asm,v 1.2 2003-02-18 20:15:48 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -9,17 +10,10 @@ ;AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. ;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. ; -; $Source: /cvs/cvsroot/d2x/texmap/tmapfade.asm,v $ -; $Revision: 1.1.1.1 $ -; $Author: bradleyb $ -; $Date: 2001-01-19 03:30:16 $ ; ; . ; -; $Log: not supported by cvs2svn $ -; Revision 1.1.1.1 1999/06/14 22:13:53 donut -; Import of d1x 1.37 source. -; +; Old Log: ; Revision 1.6 1995/02/20 18:23:01 john ; Put all the externs in the assembly modules into tmap_inc.asm. ; Also, moved all the C versions of the inner loops into a new module, diff --git a/texmap/tmapflat.c b/texmap/tmapflat.c index 312ded21..3f8a771c 100644 --- a/texmap/tmapflat.c +++ b/texmap/tmapflat.c @@ -1,3 +1,4 @@ +/* $Id: tmapflat.c,v 1.5 2003-02-18 20:15:48 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -7,75 +8,57 @@ IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. +AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ + /* - * $Source: /cvs/cvsroot/d2x/texmap/tmapflat.c,v $ - * $Revision: 1.4 $ - * $Author: bradleyb $ - * $Date: 2001-10-25 09:12:16 $ * * Flat shader derived from texture mapper (a little slow) * - * $Log: not supported by cvs2svn $ - * Revision 1.3 2001/01/31 15:18:05 bradleyb - * Makefile and conf.h fixes - * - * Revision 1.2 2001/01/31 14:04:46 bradleyb - * Fix compiler warnings - * - * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb - * Import of d2x-0.0.8 - * - * Revision 1.2 1999/10/07 21:03:29 donut - * OGL rendering of cloaked stuff - * - * Revision 1.1.1.1 1999/06/14 22:14:10 donut - * Import of d1x 1.37 source. - * + * Old Log: * Revision 1.13 1995/02/20 18:23:24 john * Added new module for C versions of inner loops. - * + * * Revision 1.12 1995/02/20 17:09:17 john * Added code so that you can build the tmapper with no assembly! - * + * * Revision 1.11 1994/11/30 00:58:01 mike * optimizations. - * + * * Revision 1.10 1994/11/28 13:34:32 mike * optimizations. - * + * * Revision 1.9 1994/11/19 15:21:46 mike * rip out unused code. - * + * * Revision 1.8 1994/11/12 16:41:41 mike * *** empty log message *** - * + * * Revision 1.7 1994/11/09 23:05:12 mike * do lighting on texture maps which get flat shaded instead. - * + * * Revision 1.6 1994/10/06 19:53:07 matt * Added function that takes same parms as draw_tmap(), but renders flat - * + * * Revision 1.5 1994/10/06 18:38:12 john * Added the ability to fade a scanline by calling gr_upoly_tmap * with Gr_scanline_darkening_level with a value < MAX_FADE_LEVELS. - * + * * Revision 1.4 1994/05/25 18:46:32 matt * Added gr_upoly_tmap_ylr(), which generates ylr's for a polygon - * + * * Revision 1.3 1994/04/08 16:25:58 mike * Comment out some includes (of header files) * call init_interface_vars_to_assembler. - * + * * Revision 1.2 1994/03/31 08:33:44 mike * Fixup flat shading version of texture mapper (get it?) * (Or maybe not, I admit to not testing my code...hahahah!) - * + * * Revision 1.1 1993/09/08 17:29:10 mike * Initial revision - * + * * */ diff --git a/texmap/tmappent.S b/texmap/tmappent.S index 9c5ac6b7..386433bb 100644 --- a/texmap/tmappent.S +++ b/texmap/tmappent.S @@ -1,3 +1,4 @@ +/// $Id: tmappent.S,v 1.4 2003-02-18 20:15:48 btb Exp $ /// tmap_scanline_per - Pentium-optimized assembly version /// written by Brian Raiter, Mar 1998. /// lighting roundoff error fixed by Matt Mueller, July 1999 diff --git a/texmap/tmapppro.S b/texmap/tmapppro.S index f7b865b7..6efeafe4 100644 --- a/texmap/tmapppro.S +++ b/texmap/tmapppro.S @@ -1,3 +1,4 @@ +/// $Id: tmapppro.S,v 1.5 2003-02-18 20:15:48 btb Exp $ /// tmap_scanline_per - Pentium-Pro-optimized assembly version /// written by Brian Raiter, Mar 1998. /// lighting roundoff error fixed by Matt Mueller, July 1999 -- 2.39.2