diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/mem3dc.h | 6 | ||||
| -rw-r--r-- | src/include/prototyp.h | 231 | ||||
| -rw-r--r-- | src/include/shape.h | 13 |
3 files changed, 1 insertions, 249 deletions
diff --git a/src/include/mem3dc.h b/src/include/mem3dc.h index dbc9089..4bc4450 100644 --- a/src/include/mem3dc.h +++ b/src/include/mem3dc.h @@ -12,10 +12,6 @@ #include <stddef.h> /* defines */ -#if Saturn -#define DBGMALLOC 1 -#endif - #if SupportWindows95 #if 1 #define DBGMALLOC 0 @@ -47,7 +43,7 @@ a separate copy of the string for each malloc - just store the pointer. So, on PC this reduces the data size for the malloc records from 1.04Mb to 320K ! */ -#if SupportWindows95 || PSX +#if SupportWindows95 #define COPY_FILENAME 0 /* new behavior */ #else #define COPY_FILENAME 1 /* previous behavior */ diff --git a/src/include/prototyp.h b/src/include/prototyp.h index 265960b..5a84c89 100644 --- a/src/include/prototyp.h +++ b/src/include/prototyp.h @@ -2311,212 +2311,8 @@ void UpdateParallelStrategy(void); unsigned char* AllocateScreenBuffer(int sbuffersize); - -#if 0 - -#if 0 -void *AllocateMem(size_t __size); -void DeallocateMem(void *__ptr); -#endif - -#if PSX - #ifdef DBGMALLOC - extern void *record_malloc(long size, char string[], unsigned long lineno); - extern void record_free(void *ptr,char string[], unsigned long lineno); - #define AllocateMem(x) record_malloc(x,__FILE__, __LINE__) - #define DeallocateMem(x) record_free(x,__FILE__, __LINE__) - #else - void *AllocateMem(size_t __size); - void DeallocateMem(void *__ptr); - #endif -#else -void *AllocateMem(size_t __size); -void DeallocateMem(void *__ptr); -#endif - -#endif - - -void ScanDraw_Item_Polygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_Polygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_Polygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_Polygon_VideoModeType_8T(int *itemptr); - -#if (ZBufferTest || SupportZBuffering) -void ScanDraw_Item_Polygon_ZBuffer_VideoModeType_8(int *itemptr); -void ScanDraw_Item_Polygon_ZBuffer_VideoModeType_15(int *itemptr); -void ScanDraw_Item_Polygon_ZBuffer_VideoModeType_24(int *itemptr); -void ScanDraw_Item_Polygon_ZBuffer_VideoModeType_8T(int *itemptr); -#endif - -void ScanDraw_Item_GouraudPolygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_GouraudPolygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_GouraudPolygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_GouraudPolygon_VideoModeType_8T(int *itemptr); - -void ScanDraw_Item_GouraudPolygon_HPV_VideoModeType_15(int *itemptr); -void ScanDraw_Item_GouraudPolygon_HPV_VideoModeType_24(int *itemptr); -void ScanDraw_Item_GouraudPolygon_HPV_VideoModeType_8T(int *itemptr); - -#if ZBufferTest -void ScanDraw_Item_GouraudPolygon_ZBuffer_VideoModeType_8(int *itemptr); -void ScanDraw_Item_GouraudPolygon_ZBuffer_VideoModeType_15(int *itemptr); -void ScanDraw_Item_GouraudPolygon_ZBuffer_VideoModeType_24(int *itemptr); -void ScanDraw_Item_GouraudPolygon_ZBuffer_VideoModeType_8T(int *itemptr); -#endif - -#if SupportZBuffering -void ScanDraw_ZB_Item_GouraudPolygon_VideoModeType_8(int *itemptr); -void ScanDraw_ZB_Item_GouraudPolygon_VideoModeType_15(int *itemptr); -void ScanDraw_ZB_Item_GouraudPolygon_VideoModeType_24(int *itemptr); -void ScanDraw_ZB_Item_GouraudPolygon_VideoModeType_8T(int *itemptr); -#endif - -void ScanDraw_Item_2dTexturePolygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_2dTexturePolygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_2dTexturePolygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_2dTexturePolygon_VideoModeType_8T(int *itemptr); - -#if SupportZBuffering -void ScanDraw_ZB_Item_2dTexturePolygon_VideoModeType_8(int *itemptr); -void ScanDraw_ZB_Item_2dTexturePolygon_VideoModeType_15(int *itemptr); -void ScanDraw_ZB_Item_2dTexturePolygon_VideoModeType_24(int *itemptr); -void ScanDraw_ZB_Item_2dTexturePolygon_VideoModeType_8T(int *itemptr); -#endif - -void ScanDraw_Item_Gouraud2dTexturePolygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_Gouraud2dTexturePolygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_Gouraud2dTexturePolygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_Gouraud2dTexturePolygon_VideoModeType_8T(int *itemptr); - -void ScanDraw_Item_ZB_Gouraud2dTexturePolygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_ZB_Gouraud2dTexturePolygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_ZB_Gouraud2dTexturePolygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_ZB_Gouraud2dTexturePolygon_VideoModeType_8T(int *itemptr); - - -#if support3dtextures -void ScanDraw_Item_3dTexturePolygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_VideoModeType_8T(int *itemptr); -#endif - -#if SupportGouraud3dTextures - -void ScanDraw_Item_Gouraud3dTexturePolygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_VideoModeType_8T(int *itemptr); - -void ScanDraw_Item_Gouraud3dTexturePolygon_Linear_VideoModeType_8(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_Linear_VideoModeType_15(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_Linear_VideoModeType_24(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_Linear_VideoModeType_8T(int *itemptr); - -void ScanDraw_Item_Gouraud3dTexturePolygon_Linear_S_VideoModeType_8(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_Linear_S_VideoModeType_15(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_Linear_S_VideoModeType_24(int *itemptr); -void ScanDraw_Item_Gouraud3dTexturePolygon_Linear_S_VideoModeType_8T(int *itemptr); - -#if SupportZBuffering - -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_VideoModeType_8T(int *itemptr); - -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_Linear_VideoModeType_8(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_Linear_VideoModeType_15(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_Linear_VideoModeType_24(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_Linear_VideoModeType_8T(int *itemptr); - -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_Linear_S_VideoModeType_8(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_Linear_S_VideoModeType_15(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_Linear_S_VideoModeType_24(int *itemptr); -void ScanDraw_Item_ZB_Gouraud3dTexturePolygon_Linear_S_VideoModeType_8T(int *itemptr); - -#endif /* SupportZBuffering */ - -#endif /* SupportGouraud3dTextures */ - -#if support3dtextures - -#if SupportZBuffering -void ScanDraw_Item_ZB_3dTexturePolygon_VideoModeType_8(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_VideoModeType_15(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_VideoModeType_24(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_VideoModeType_8T(int *itemptr); -#endif - -void ScanDraw_Item_3dTexturePolygon_QuadI_VideoModeType_8(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_QuadI_VideoModeType_15(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_QuadI_VideoModeType_24(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_QuadI_VideoModeType_8T(int *itemptr); - -#if SupportZBuffering -void ScanDraw_ZB_Item_3dTexturePolygon_QuadI_VideoModeType_8(int *itemptr); -void ScanDraw_ZB_Item_3dTexturePolygon_QuadI_VideoModeType_15(int *itemptr); -void ScanDraw_ZB_Item_3dTexturePolygon_QuadI_VideoModeType_24(int *itemptr); -void ScanDraw_ZB_Item_3dTexturePolygon_QuadI_VideoModeType_8T(int *itemptr); -#endif - -void ScanDraw_Item_3dTexturePolygon_Linear_VideoModeType_8(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_Linear_VideoModeType_15(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_Linear_VideoModeType_24(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_Linear_VideoModeType_8T(int *itemptr); - -#if SupportZBuffering -void ScanDraw_Item_ZB_3dTexturePolygon_Linear_VideoModeType_8(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_Linear_VideoModeType_15(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_Linear_VideoModeType_24(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_Linear_VideoModeType_8T(int *itemptr); -#endif - -void ScanDraw_Item_3dTexturePolygon_Linear_S_VideoModeType_8(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_Linear_S_VideoModeType_15(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_Linear_S_VideoModeType_24(int *itemptr); -void ScanDraw_Item_3dTexturePolygon_Linear_S_VideoModeType_8T(int *itemptr); - -#if SupportZBuffering -void ScanDraw_Item_ZB_3dTexturePolygon_Linear_S_VideoModeType_8(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_Linear_S_VideoModeType_15(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_Linear_S_VideoModeType_24(int *itemptr); -void ScanDraw_Item_ZB_3dTexturePolygon_Linear_S_VideoModeType_8T(int *itemptr); -#endif - -#endif /* support3dtextures */ - -void ScanDraw_Item_Polyline_VideoModeType_8(int *itemptr); -void ScanDraw_Item_Polyline_VideoModeType_15(int *itemptr); -void ScanDraw_Item_Polyline_VideoModeType_24(int *itemptr); -void ScanDraw_Item_Polyline_VideoModeType_8T(int *itemptr); - -void ScanDraw_Item_FilledPolyline_VideoModeType_8(int *itemptr); -void ScanDraw_Item_FilledPolyline_VideoModeType_15(int *itemptr); -void ScanDraw_Item_FilledPolyline_VideoModeType_24(int *itemptr); -void ScanDraw_Item_FilledPolyline_VideoModeType_8T(int *itemptr); - -void ScanDraw_Item_Wireframe_VideoModeType_8(int *itemptr); -void ScanDraw_Item_Wireframe_VideoModeType_15(int *itemptr); -void ScanDraw_Item_Wireframe_VideoModeType_24(int *itemptr); -void ScanDraw_Item_Wireframe_VideoModeType_8T(int *itemptr); - -#if 0 -void ScanDraw_Item_HUDPolyline_VideoModeType_8(int *itemptr); -void ScanDraw_Item_HUDPolyline_VideoModeType_15(int *itemptr); -void ScanDraw_Item_HUDPolyline_VideoModeType_24(int *itemptr); -void ScanDraw_Item_HUDPolyline_VideoModeType_8T(int *itemptr); -#endif - void SetPalette(unsigned char *palette); -void MakeTextureLightingTable6(void); -void MakeTextureLightingTable6G(void); -void MakeTextureLightingTable15(void); -void MakeTextureLightingTable24(void); -void MakeTextureLightingTable8T(void); - void CreatePaletteRemapTable(unsigned char *palette); unsigned char GetRemappedPaletteColour(int r, int g, int b, int bitsize); @@ -2574,7 +2370,6 @@ TEXTURE* LoadBMP(char *fname, IMAGEHEADER *iheader); TEXTURE* LoadPGM(char *fname, IMAGEHEADER *iheader); int LoadPGMPalette(char *fname, unsigned char *palette); int LoadPGMPaletteLightingTable(char *filename, unsigned char *palette); -void MakeTextureLightingTableRaw256(unsigned char *palette); void Create_MIP_Map(IMAGEHEADER *iheader); @@ -2605,32 +2400,6 @@ typedef struct mousedata { void ReadKeyboard(void); -#if 0 -void ReadEmulatedSaturnControlPad(void); -unsigned int CheckPad(void); -void ExaminePad(void); -/* - Saturn Control Pad - See pad.h - Model S Pad, direct mode -*/ -#define PAD_DOWN 0x0001 -#define PAD_UP 0x0002 -#define PAD_LEFT 0x0004 -#define PAD_RIGHT 0x0008 -#define PAD_BUTC 0x0010 -#define PAD_BUTB 0x0020 -#define PAD_BUTA 0x0040 -#define PAD_START 0x0080 -#define PAD_BUTZ 0x0100 -#define PAD_BUTY 0x0200 -#define PAD_BUTX 0x0400 -#define PAD_MODE 0x0800 -#define PAD_R 0x0800 -#define PAD_L 0x1000 -#endif - - void WaitForReturn(void); void CursorHome(void); diff --git a/src/include/shape.h b/src/include/shape.h index 3f3057b..5ef5c10 100644 --- a/src/include/shape.h +++ b/src/include/shape.h @@ -527,10 +527,6 @@ typedef struct merged_poly #else - #if Saturn - #define iflag_sattexture 0x00000080 /* Outcode if outside frame buffer or behind z plane, else just draw */ - #endif - #if platform_pc #define iflag_zbuffer_w 0x00000080 /* Z-Buffer, Write-Only */ #endif @@ -578,11 +574,6 @@ typedef struct merged_poly #define iflag_sortfarz 0x04000000 /* Use maxz for depth value */ -#define iflag_bufferxy 0x08000000 /* Internal - Saturn Only - - for xy clamped item */ - -#define iflag_clampz 0x10000000 /* Internal - Saturn Only - - for z clamped item */ #define iflag_light_corona 0x20000000 /* For use by the placed light strategy */ @@ -781,11 +772,7 @@ typedef struct texelgtx3d { typedef unsigned char TEXTURE; -#if Saturn -#define ImageNameSize 16 -#else #define ImageNameSize 128+1 -#endif typedef struct imageheader { |
