if an origin brush exists, ALSO take into account the "origin" key (add the two)

[xonotic/netradiant.git] / tools / quake3 / q3map2 / q3map2.h

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index b62a2da52d6c468959a51bbd8b77022ee20f80d3..2fe5f7b883b95b427237dd1a8563f0e2b7e629bb 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -181,7 +181,7 @@ constants
 
 /* bsp */
 #define        MAX_PATCH_SIZE                  32
-#define        MAX_BRUSH_SIDES                 4096
+#define        MAX_BRUSH_SIDES                 1024
 #define MAX_BUILD_SIDES                        300
 
 #define        MAX_EXPANDED_AXIS               128
@@ -213,7 +213,7 @@ constants
 
 #define        MAX_PORTALS                             32768
 #define MAX_SEPERATORS                 MAX_POINTS_ON_WINDING
-#define        MAX_POINTS_ON_FIXED_WINDING     36      /* ydnar: increased this from 12 at the expense of more memory */
+#define        MAX_POINTS_ON_FIXED_WINDING     24      /* ydnar: increased this from 12 at the expense of more memory */
 #define        MAX_PORTALS_ON_LEAF             128
 
 
@@ -265,8 +265,8 @@ constants
 #define SUPER_LUXEL_SIZE               4
 #define SUPER_ORIGIN_SIZE              3
 #define SUPER_NORMAL_SIZE              4
-#define SUPER_DELUXEL_SIZE             4
-#define BSP_DELUXEL_SIZE               4
+#define SUPER_DELUXEL_SIZE             3
+#define BSP_DELUXEL_SIZE               3
 #define SUPER_FLOODLIGHT_SIZE  1
 
 #define VERTEX_LUXEL( s, v )   (vertexLuxels[ s ] + ((v) * VERTEX_LUXEL_SIZE))
@@ -303,26 +303,25 @@ abstracted bsp file
 
 /* ok to increase these at the expense of more memory */
 #define        MAX_MAP_MODELS                  0x400
-#define        MAX_MAP_BRUSHES                 0x8000
-#define        MAX_MAP_ENTITIES                0x8000          //%     0x800   /* ydnar */
+#define        MAX_MAP_BRUSHES                 0x10000
+#define        MAX_MAP_ENTITIES                0x1000          //%     0x800   /* ydnar */
 #define        MAX_MAP_ENTSTRING               0x80000         //%     0x40000 /* ydnar */
 #define        MAX_MAP_SHADERS                 0x800           //%     0x400   /* ydnar */
 
 #define        MAX_MAP_AREAS                   0x100           /* MAX_MAP_AREA_BYTES in q_shared must match! */
 #define        MAX_MAP_FOGS                    30                      //& 0x100       /* RBSP (32 - world fog - goggles) */
-#define        MAX_MAP_PLANES                  0x400000        //%     0x20000 /* ydnar for md */
+#define        MAX_MAP_PLANES                  0x200000        //%     0x20000 /* ydnar for md */
 #define        MAX_MAP_NODES                   0x20000
-#define        MAX_MAP_BRUSHSIDES              0x400000        //%     0x20000 /* ydnar */
+#define        MAX_MAP_BRUSHSIDES              0x100000        //%     0x20000 /* ydnar */
 #define        MAX_MAP_LEAFS                   0x20000
 #define        MAX_MAP_LEAFFACES               0x100000        //%     0x20000 /* ydnar */
 #define        MAX_MAP_LEAFBRUSHES             0x40000
 #define        MAX_MAP_PORTALS                 0x20000
 #define        MAX_MAP_LIGHTING                0x800000
 #define        MAX_MAP_LIGHTGRID               0x100000        //%     0x800000 /* ydnar: set to points, not bytes */
-#define        MAX_MAP_VISIBILITY              0x800000
+#define        MAX_MAP_VISIBILITY              0x200000
 
 #define        MAX_MAP_DRAW_SURFS              0x20000
-#define        MAX_MAP_DRAW_VERTS              0x80000
 #define        MAX_MAP_DRAW_INDEXES    0x80000
 
 #define MAX_MAP_ADVERTISEMENTS 30
@@ -1077,6 +1076,7 @@ typedef struct
        int                                     mapEntityNum, firstDrawSurf;
        int                                     firstBrush, numBrushes;         /* only valid during BSP compile */
        epair_t                         *epairs;
+       vec3_t                          originbrush_origin;
 }
 entity_t;
 
@@ -1714,7 +1714,6 @@ void                                              RadFreeLights();
 
 /* light_ydnar.c */
 void                                           ColorToBytes( const float *color, byte *colorBytes, float scale );
-void                                           ColorToBytesDeluxe( const float *color, byte *colorBytes, float scale, const float *deluxel, byte *deluxeBytes );
 void                                           SmoothNormals( void );
 
 void                                           MapRawLightmap( int num );
@@ -2095,7 +2094,6 @@ Q_EXTERN qboolean                 cpmaHack Q_ASSIGN( qfalse );
 
 Q_EXTERN qboolean                      deluxemap Q_ASSIGN( qfalse );
 Q_EXTERN qboolean                      debugDeluxemap Q_ASSIGN( qfalse );
-Q_EXTERN qboolean                      normalizeDeluxemap Q_ASSIGN( qtrue );
 
 Q_EXTERN qboolean                      fast Q_ASSIGN( qfalse );
 Q_EXTERN qboolean                      faster Q_ASSIGN( qfalse );
@@ -2164,6 +2162,9 @@ Q_EXTERN qboolean                 exactPointToPolygon Q_ASSIGN( qtrue );
 Q_EXTERN float                         formFactorValueScale Q_ASSIGN( 3.0f );
 Q_EXTERN float                         linearScale Q_ASSIGN( 1.0f / 8000.0f );
 
+// for .ase conversion
+Q_EXTERN qboolean                      shadersAsBitmap Q_ASSIGN( qfalse );
+
 Q_EXTERN light_t                       *lights;
 Q_EXTERN int                           numPointLights;
 Q_EXTERN int                           numSpotLights;
@@ -2358,6 +2359,5 @@ Q_EXTERN bspFog_t                 bspFogs[ MAX_MAP_FOGS ];
 Q_EXTERN int                           numBSPAds Q_ASSIGN( 0 );
 Q_EXTERN bspAdvertisement_t    bspAds[ MAX_MAP_ADVERTISEMENTS ];
 
-
 /* end marker */
 #endif