Move the soft renderer header files into a subdirectory header/.

This matches the rest of YQ2s source tree.

CMakeLists.txt

@@ -531,9 +531,9 @@ if (${SOFTRENDERER_SUPPORT})
 		)
 
 	set(SOFT-Header
-		${REF_SRC_DIR}/soft/adivtab.h
-		${REF_SRC_DIR}/soft/r_local.h
-		${REF_SRC_DIR}/soft/r_model.h
+		${REF_SRC_DIR}/soft/header/adivtab.h
+		${REF_SRC_DIR}/soft/header/local.h
+		${REF_SRC_DIR}/soft/header/model.h
 		${COMMON_SRC_DIR}/header/shared.h
 		)
 endif ()

src/client/refresh/soft/header/local.h

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <ctype.h>
 #include <math.h>
 
-#include "../ref_shared.h"
+#include "../../ref_shared.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -118,7 +118,7 @@ typedef struct
 
 extern oldrefdef_t	r_refdef;
 
-#include "r_model.h"
+#include "model.h"
 
 /*
 ====================================================

src/client/refresh/soft/r_aclip.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_aclip.c: clip routines for drawing Alias models directly to the screen
 
-#include "r_local.h"
+#include "header/local.h"
 
 static finalvert_t fv[2][8];
 

src/client/refresh/soft/r_alias.c

@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ** use a real variable to control lerping
 */
 #include <stdint.h>
-#include "r_local.h"
+#include "header/local.h"
 
 #define LIGHT_MIN	5	// lowest light value we'll allow, to avoid the
 				//  need for inner-loop light clamping

src/client/refresh/soft/r_bsp.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_bsp.c
 
-#include "r_local.h"
+#include "header/local.h"
 
 //
 // current entity info

src/client/refresh/soft/r_draw.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // draw.c
 
-#include "r_local.h"
+#include "header/local.h"
 
 
 image_t		*draw_chars;	// 8*8 graphic characters

src/client/refresh/soft/r_edge.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // r_edge.c
 #include <limits.h>
 #include <stdint.h>
-#include "r_local.h"
+#include "header/local.h"
 /*
 the complex cases add new polys on most lines, so dont optimize for keeping them the same
 have multiple free span lists to try to get better coherence?

src/client/refresh/soft/r_image.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "r_local.h"
+#include "header/local.h"
 
 
 #define	MAX_RIMAGES	1024

src/client/refresh/soft/r_light.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_light.c
 
-#include "r_local.h"
+#include "header/local.h"
 
 int	r_dlightframecount;
 

src/client/refresh/soft/r_main.c

@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <SDL/SDL.h>
 #endif //SDL2
 
-#include "r_local.h"
+#include "header/local.h"
 
 viddef_t	vid;
 pixel_t		*vid_buffer = NULL;

src/client/refresh/soft/r_misc.c

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <SDL/SDL.h>
 #endif //SDL2
 
-#include "r_local.h"
+#include "header/local.h"
 
 #define NUM_MIPS	4
 

src/client/refresh/soft/r_model.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // models are the only shared resource between a client and server running
 // on the same machine.
 
-#include "r_local.h"
+#include "header/local.h"
 
 model_t	*loadmodel;
 char	loadname[32];	// for hunk tags

src/client/refresh/soft/r_part.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "r_local.h"
+#include "header/local.h"
 
 vec3_t r_pright, r_pup, r_ppn;
 

src/client/refresh/soft/r_poly.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 #include <assert.h>
-#include "r_local.h"
+#include "header/local.h"
 
 #define AFFINE_SPANLET_SIZE      16
 #define AFFINE_SPANLET_SIZE_BITS 4

src/client/refresh/soft/r_polyse.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // d_polyset.c: routines for drawing sets of polygons sharing the same
 // texture (used for Alias models)
 
-#include "r_local.h"
+#include "header/local.h"
 
 #define MASK_1K	0x3FF
 
@@ -89,7 +89,7 @@ typedef struct {
 } adivtab_t;
 
 static adivtab_t	adivtab[32*32] = {
-#include "adivtab.h"
+#include "header/adivtab.h"
 };
 
 byte	*skintable[MAX_LBM_HEIGHT];

src/client/refresh/soft/r_rast.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdint.h>
 #include <assert.h>
 
-#include "r_local.h"
+#include "header/local.h"
 
 #define MAXLEFTCLIPEDGES	100
 

src/client/refresh/soft/r_scan.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 // Portable C scan-level rasterization code, all pixel depths.
 
-#include "r_local.h"
+#include "header/local.h"
 
 pixel_t	*r_turb_pbase, *r_turb_pdest;
 int		r_turb_s, r_turb_t, r_turb_sstep, r_turb_tstep;

src/client/refresh/soft/r_sprite.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 // r_sprite.c
-#include "r_local.h"
+#include "header/local.h"
 
 extern polydesc_t r_polydesc;
 

src/client/refresh/soft/r_surf.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_surf.c: surface-related refresh code
 
-#include "r_local.h"
+#include "header/local.h"
 
 drawsurf_t	r_drawsurf;