X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fq3map2.h;h=f5ab761942e128ae85b3fbd06d57d67377f07f01;hb=cde1f3c0d50198402dceb1b7d4bc955358e98751;hp=f78f45f2ae093fab018e538cdfddfe400ef5e242;hpb=e6fa8d7f3c1edbfbd0c652dfe5bee7e3f9f24de2;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index f78f45f2..f5ab7619 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -535,6 +535,13 @@ typedef struct surfaceParm_s
 }
 surfaceParm_t;
 
+typedef enum
+{
+	MINIMAP_MODE_GRAY,
+	MINIMAP_MODE_BLACK,
+	MINIMAP_MODE_WHITE
+}
+miniMapMode_t;
 
 typedef struct game_s
 {
@@ -561,6 +568,12 @@ typedef struct game_s
 	qboolean			patchShadows;					/* patch casting enabled */
 	qboolean			deluxeMap;						/* compile deluxemaps */
 	int					deluxeMode;						/* deluxemap mode (0 - modelspace, 1 - tangentspace with renormalization, 2 - tangentspace without renormalization) */
+	int                 miniMapSize;                    /* minimap size */
+	float               miniMapSharpen;                 /* minimap sharpening coefficient */
+	float               miniMapBorder;                  /* minimap border amount */
+	qboolean            miniMapKeepAspect;              /* minimap keep aspect ratio by letterboxing */
+	miniMapMode_t       miniMapMode;                    /* minimap mode */
+	char                *miniMapNameFormat;             /* minimap name format */
 	char				*bspIdent;						/* 4-letter bsp file prefix */
 	int					bspVersion;						/* bsp version to use */
 	qboolean			lumpSwap;						/* cod-style len/ofs order */
@@ -876,7 +889,9 @@ typedef struct brush_s
 	shaderInfo_t		*celShader;			/* :) */
 	
 	/* ydnar: gs mods */
+	int					lightmapSampleSize; /* jal : entity based _lightmapsamplesize */
 	float				lightmapScale;
+	float				shadeAngleDegrees; /* jal : entity based _shadeangle */
 	vec3_t				eMins, eMaxs;
 	indexMap_t			*im;
 
@@ -927,6 +942,7 @@ typedef struct parseMesh_s
 	shaderInfo_t		*celShader;				/* :) */
 	
 	/* ydnar: gs mods */
+	int					lightmapSampleSize;		/* jal : entity based _lightmapsamplesize */
 	float				lightmapScale;
 	vec3_t				eMins, eMaxs;
 	indexMap_t			*im;
@@ -1024,6 +1040,9 @@ typedef struct mapDrawSurface_s
 	
 	/* ydnar: per-surface (per-entity, actually) lightmap sample size scaling */
 	float				lightmapScale;
+
+	/* jal: per-surface (per-entity, actually) shadeangle */
+	float				shadeAngleDegrees;
 	
 	/* ydnar: surface classification */
 	vec3_t				mins, maxs;
@@ -1067,6 +1086,7 @@ typedef struct metaTriangle_s
 	shaderInfo_t		*si;
 	side_t				*side;
 	int					entityNum, surfaceNum, planeNum, fogNum, sampleSize, castShadows, recvShadows;
+	float				shadeAngleDegrees;
 	vec4_t				plane;
 	vec3_t				lightmapAxis;
 	int					indexes[ 3 ];
@@ -1091,7 +1111,6 @@ typedef struct
 	int					firstBrush, numBrushes;		/* only valid during BSP compile */
 	epair_t				*epairs;
 	vec3_t				originbrush_origin;
-	qboolean			forceNormalSmoothing; /* vortex: true if entity has _smoothnormals/_sn/_smooth key */
 }
 entity_t;
 
@@ -1622,7 +1641,7 @@ void						PicoPrintFunc( int level, const char *str );
 void						PicoLoadFileFunc( char *name, byte **buffer, int *bufSize );
 picoModel_t					*FindModel( char *name, int frame );
 picoModel_t					*LoadModel( char *name, int frame );
-void						InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shaderInfo_t *celShader, int eNum, int castShadows, int recvShadows, int spawnFlags, float lightmapScale );
+void						InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shaderInfo_t *celShader, int eNum, int castShadows, int recvShadows, int spawnFlags, float lightmapScale, int lightmapSampleSize, float shadeAngle );
 void						AddTriangleModels( entity_t *e );
 
 
@@ -2160,6 +2179,7 @@ Q_EXTERN qboolean			dark Q_ASSIGN( qfalse );
 Q_EXTERN qboolean			sunOnly Q_ASSIGN( qfalse );
 Q_EXTERN int				approximateTolerance Q_ASSIGN( 0 );
 Q_EXTERN qboolean			noCollapse Q_ASSIGN( qfalse );
+Q_EXTERN qboolean			noLightmapSearch Q_ASSIGN( qfalse );
 Q_EXTERN qboolean			exportLightmaps Q_ASSIGN( qfalse );
 Q_EXTERN qboolean			externalLightmaps Q_ASSIGN( qfalse );
 Q_EXTERN int				lmCustomSize Q_ASSIGN( LIGHTMAP_WIDTH );