diff --git a/src/avp/win95/system.h b/src/avp/win95/system.h index c4d670d..c1c262e 100644 --- a/src/avp/win95/system.h +++ b/src/avp/win95/system.h @@ -40,7 +40,6 @@ extern "C" { #define Term -1 - /******************** General *****************************/ #define SupportFPMathsFunctions Yes @@ -55,7 +54,6 @@ extern "C" { #define ONE_FIXED 65536 #define ONE_FIXED_SHIFT 16 -#define Analogue Yes #define Digital No @@ -80,54 +78,12 @@ typedef enum { #define SupportMultiCamModules Yes - /************* Timer and Frame Rate Independence *************/ #define TimerFrame 1000 -#define TimerFrame10 10000 #define NormalFrame ONE_FIXED #define NormalFrameShift ONE_FIXED_SHIFT -#define UseAlarmTimer No - - - -/******************** Clip Outcodes *****************/ - -#define ClipTerm 0x1fffffff - -#define oc_left 0x00000001 -#define oc_right 0x00000002 -#define oc_up 0x00000004 -#define oc_down 0x00000008 -#define oc_z 0x00000010 - -#define oc_pntrot 0x00000020 -#define oc_xrot 0x00000040 -#define oc_yrot 0x00000080 -#define oc_zrot 0x00000100 - -#define oc_z_lt_h1 0x00000200 -#define oc_z_gte_h2 0x00000400 -#define oc_z_haze 0x00000800 -#define oc_clampz 0x00001000 - -/* Outcodes can be cast to this struct */ - -typedef struct oc_entry { - - int OC_Flags1; - int OC_Flags2; - int OC_HazeAlpha; - -} OC_ENTRY; - -/* now defunct - see next four defines*/ -#define Hardware2dTextureClipping No - -#define Texture3dClamping No -#define Texture2dClamping No -#define Texture3dSubdivide No /***************** Angles and VALUES ******************/ @@ -144,14 +100,10 @@ typedef struct oc_entry { #define wrap360 4095 #define Cosine45 46341 /* 46340.95001 cosine(45deg)*/ -#define DefaultSlope 46341 #define bigint 1<<30 /* max int size*/ #define smallint -(bigint) /* smallest int size*/ -#define BigLowY 100000 /* Must be bigger than any Screen Y */ - - /****************** BUFFER SIZES **********************/ @@ -164,48 +116,26 @@ extern int maxshapes; //tuning for morph sizes #define maxmorphPts 1024 -#define maxmorphNormals 1024 -#define maxmorphVNormals 1024 #define maxpolys 4000 #define maxpolyptrs maxpolys #define maxpolypts 9 /* Translates as number of vectors */ -#define maxvsize 6 /* 3d Phong is x,y,z,nx,ny,nz */ -#define pointsarraysize maxpolypts*maxvsize - -#define avgpolysize (1 + 1 + 1 + 1 + (6 * 4) + 1) /* 3d guard poly*/ - -#define maxscansize 8 /* e.g. Tx, U1, V1, U2, V2, X1, X2, Y */ #define vsize 3 /* Scale for polygon vertex indices */ -#define numfreebspblocks 1 -#define maxbspnodeitems 1 -#if 0 -#define MaxImages 80 /* Was 400, but now we only have one NPC in each image group */ -#define MaxImageGroups 15 /* Right: One for the ENV one for the CHARACTER, one for each NPC (max 4, though only MPS4 ever has as many as 3 at present) */ -#else #define MaxImages 400 #define MaxImageGroups 1 -#endif - -#define oversample_8bitg_threshold 256 - /************** Some Shell and Loading Platform Compiler Options ******************/ -#define binary_loading No #undef RIFF_SYSTEM #define RIFF_SYSTEM #define TestRiffLoaders Yes -#define SupportFarStrategyModel No #define LoadingMapsShapesAndTexturesEtc No #define pc_backdrops No -#define DynamicAdaptationToFrameRate No - /***************** DRAW SORT *******************/ @@ -222,22 +152,13 @@ extern int maxshapes; #define StandardShapeLanguage Yes -#define CalcShapeExtents No #define SupportModules Yes #define IncludeModuleFunctionPrototypes Yes -#define SupportDynamicModuleObjects Yes - #define SupportMorphing Yes #define LazyEvaluationForMorphing No - -/* Default Scale for Shape Vertices */ - -#define pscale 1 - - /***************** COLLISION DEFINES*************/ #define StandardStrategyAndCollisions No #define IntermediateSSACM No /* User preference */ @@ -246,10 +167,6 @@ extern int maxshapes; /************** TEXTURE DEFINES*******************/ - -#define LoadPGMPalettesFromAnywhere Yes - - #define maxTxAnimblocks 100 /* Texture usage of the colour int */ @@ -259,39 +176,6 @@ extern int maxshapes; #define ClrTxIndex 0xffff0000 /* AND with this to clear the low 16-bits */ #define ClrTxDefn 0x0000ffff /* AND with this to clear the high 16-bits */ -#define draw_palette No - -#define AssumeTextures256Wide Yes - -#define remap_table_rgb_bits 4 /* Gives 4,096 entries */ - -#define Remap24BitBMPFilesInRaw256Mode No -#define Remap8BitBMPFilesInRaw256Mode No - -#define SupportMIPMapping No -#define UseMIPMax No -#define UseMIPMin No -#define UseMIPAvg Yes - -/* Jake's addition to mip-mapping */ -/* improves resolution of mip images chosen for the scandraws */ -/* 0 is the worstt resoloution, best anti-aliasing 6 the best*/ -#define MIP_INDEX_SUBTRACT 1 -/* What to do if the images are not the most suitable size for mip mapping ... */ -/* Set this if you have inappropriately sized images and you want */ -/* the mip maps' sizes to be rounded up eg. 161x82 -> 81x41 -> 21x11 -> 11x6 -> 6x3 -> 3x2 -> 2x1 */ -#define MIP_ROUNDUP Yes - -#if 0 -#define num_shadetable_entries 256 -#define shadetable_shift 8 /* 65,535 -> 255 */ -#endif - -#if 1 -#define num_shadetable_entries 1024 -#define shadetable_shift 6 -#endif - /* 3d textures This defines the amount by which we can scale up U/Z, V/Z & 1/Z diff --git a/src/win95/platform.h b/src/win95/platform.h index d93366a..5e6bf93 100644 --- a/src/win95/platform.h +++ b/src/win95/platform.h @@ -15,12 +15,9 @@ extern "C" { #endif -//#include "fastfile.h" - #define platform_pc Yes #define Saturn No -#define Hardware2dTextureClipping No /* Types */ @@ -544,54 +541,6 @@ typedef enum { } WININITMODES; -/* - - Triangle Array Limits etc. - -*/ - -#define maxarrtriangles 7 /* Could be 6 if all shape data in triangles */ -#define trianglesize (1 + 1 + 1 + 1 + (6 * 3) + 1) /* largest, could be 5*3 if no 3d texturing */ -#define pta_max 9 /* Could be 8 if all shape data in triangles */ - -/* header + xy + terminator */ -#define item_polygon_trianglesize (1 + 1 + 1 + 1 + (2 * 3) + 1) -/* header + xyi + terminator */ -#define item_gouraudpolygon_trianglesize (1 + 1 + 1 + 1 + (3 * 3) + 1) -/* header + xyuv + terminator */ -#define item_2dtexturedpolygon_trianglesize (1 + 1 + 1 + 1 + (4 * 3) + 1) -/* header + xyuvi + terminator */ -#define item_gouraud2dtexturedpolygon_trianglesize (1 + 1 + 1 + 1 + (5 * 3) + 1) -/* header + xyuvw + terminator */ -#define item_3dtexturedpolygon_trianglesize (1 + 1 + 1 + 1 + (5 * 3) + 1) -/* header + xyuvwi + terminator */ -#define item_gouraud3dtexturedpolygon_trianglesize (1 + 1 + 1 + 1 + (6 * 3) + 1) - -/* - - Vertex sizes - - For copying vertices from item list polygons to triangles - - e.g. - - Vertex 2 (x component) of the quad would be (for Item_Polygon) - - q[2 * i_poly_vsize + i_vstart + ix] - - WARNING: If the item format changes these MUST be updated - -*/ - -#define vstart 4 - -#define poly_vsize 2 -#define gpoly_vsize 3 -#define t2poly_vsize 4 -#define gt2poly_vsize 5 -#define t3poly_vsize 5 -#define gt3poly_vsize 6 - /* Function prototypes