Merge neko/mathlib into master

engine/client/cl_efrag.c

@@ -18,7 +18,7 @@ GNU General Public License for more details.
 #include "studio.h"
 #include "world.h" // BOX_ON_PLANE_SIDE
 #include "client.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 
 /*
 ===============================================================================

engine/client/client.h

@@ -17,7 +17,7 @@ GNU General Public License for more details.
 #define CLIENT_H
 
 #include "xash3d_types.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "cdll_int.h"
 #include "menu_int.h"
 #include "cl_entity.h"

engine/client/mod_dbghulls.c

@@ -15,7 +15,7 @@ GNU General Public License for more details.
 #include "common.h"
 #include "client.h"
 #include "mod_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "world.h"
 
 

engine/client/sound.h

@@ -18,7 +18,7 @@ GNU General Public License for more details.
 
 extern byte *sndpool;
 
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 
 // sound engine rate defines
 #define SOUND_DMA_SPEED		44100	// hardware playback rate

engine/common/common.c

@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 #include "common.h"
 #include "studio.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "const.h"
 #include "client.h"
 #include "library.h"

engine/common/dedicated.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */ 
 #if XASH_DEDICATED
 #include "common.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "ref_api.h"
 
 ref_globals_t refState;

engine/common/filesystem.c

@@ -32,7 +32,7 @@ GNU General Public License for more details.
 #include "wadfile.h"
 #include "filesystem.h"
 #include "library.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "protocol.h"
 
 #define FILE_COPY_SIZE		(1024 * 1024)

engine/common/gamma.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "common.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #if HAVE_TGMATH_H
 #include <tgmath.h>
 #endif

engine/common/host.c

@@ -36,7 +36,7 @@ GNU General Public License for more details.
 #include "netchan.h"
 #include "protocol.h"
 #include "mod_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "input.h"
 #include "enginefeatures.h"
 #include "render_api.h"	// decallist_t

engine/common/imagelib/img_bmp.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "imagelib.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "img_bmp.h"
 
 /*

engine/common/imagelib/img_dds.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "imagelib.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "img_dds.h"
 
 qboolean Image_CheckDXT3Alpha( dds_t *hdr, byte *fin )

engine/common/imagelib/img_png.c

@@ -16,7 +16,7 @@ GNU General Public License for more details.
 #define MINIZ_HEADER_FILE_ONLY
 #include "miniz.h"
 #include "imagelib.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "img_png.h"
 
 #if defined(XASH_NO_NETWORK)

engine/common/imagelib/img_tga.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "imagelib.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "img_tga.h"
 
 /*

engine/common/imagelib/img_utils.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "imagelib.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "mod_local.h"
 
 #define LERPBYTE( i )	r = resamplerow1[i]; out[i] = (byte)(((( resamplerow2[i] - r ) * lerp)>>16 ) + r )

engine/common/imagelib/img_wad.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "imagelib.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "wadfile.h"
 #include "studio.h"
 #include "sprite.h"

engine/common/mod_bmodel.c

@@ -15,7 +15,7 @@ GNU General Public License for more details.
 #include "common.h"
 #include "mod_local.h"
 #include "sprite.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "alias.h"
 #include "studio.h"
 #include "wadfile.h"

engine/common/model.c

@@ -15,7 +15,7 @@ GNU General Public License for more details.
 #include "common.h"
 #include "mod_local.h"
 #include "sprite.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "alias.h"
 #include "studio.h"
 #include "wadfile.h"

engine/common/net_buffer.c

@@ -16,7 +16,7 @@ GNU General Public License for more details.
 #include "common.h"
 #include "protocol.h"
 #include "net_buffer.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 
 //#define DEBUG_NET_MESSAGES_SEND
 //#define DEBUG_NET_MESSAGES_READ

engine/common/net_chan.c

@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 #include "common.h"
 #include "netchan.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "net_encode.h"
 #include "protocol.h"
 

engine/common/net_encode.c

@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 #include "common.h"
 #include "netchan.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "net_encode.h"
 #include "event_api.h"
 #include "usercmd.h"

engine/common/net_ws.c

@@ -16,7 +16,7 @@ GNU General Public License for more details.
 #include "common.h"
 #include "client.h" // ConnectionProgress
 #include "netchan.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #if XASH_WIN32
 // Winsock
 #include <WS2tcpip.h>

engine/common/pm_debug.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "common.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "pm_local.h"
 #if !XASH_DEDICATED
 #include "client.h" // CL_Particle

engine/common/pm_surface.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "common.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "pm_local.h"
 #include "ref_common.h"
 

engine/common/pm_trace.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "common.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "mod_local.h"
 #include "pm_local.h"
 #include "pm_movevars.h"

engine/common/system.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "common.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "platform/platform.h"
 #include <stdlib.h>
 

engine/common/world.c

@@ -17,7 +17,7 @@ GNU General Public License for more details.
 #include "world.h"
 #include "pm_defs.h"
 #include "mod_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "studio.h"
 
 // just for debug

engine/server/server.h

@@ -16,7 +16,7 @@ GNU General Public License for more details.
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "edict.h"
 #include "eiface.h"
 #include "physint.h"	// physics interface

engine/server/sv_move.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "common.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "server.h"
 #include "const.h"
 #include "pm_defs.h"

public/matrixlib.c

@@ -17,7 +17,7 @@ GNU General Public License for more details.
 #include "xash3d_types.h"
 #include "const.h"
 #include "com_model.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 
 const matrix3x4 matrix3x4_identity =
 {

public/xash3d_mathlib.c

@@ -1,5 +1,5 @@
 /*
-mathlib.c - internal mathlib
+xash3d_mathlib.c - internal mathlib
 Copyright (C) 2010 Uncle Mike
 
 This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 #include "xash3d_types.h"
 #include "const.h"
 #include "com_model.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "eiface.h"
 #if HAVE_TGMATH_H
 #include <tgmath.h>
@@ -874,3 +874,4 @@ int BoxOnPlaneSide( const vec3_t emins, const vec3_t emaxs, const mplane_t *p )
 
 	return sides;
 }
+

public/xash3d_mathlib.h

@@ -1,5 +1,5 @@
 /*
-mathlib.h - base math functions
+xash3d_mathlib.h - base math functions
 Copyright (C) 2007 Uncle Mike
 
 This program is free software: you can redistribute it and/or modify
@@ -13,8 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 
-#ifndef MATHLIB_H
-#define MATHLIB_H
+#ifndef XASH3D_MATHLIB_H
+#define XASH3D_MATHLIB_H
 
 #include <math.h>
 #if HAVE_TGMATH_H
@@ -227,4 +227,5 @@ extern const matrix3x4	matrix3x4_identity;
 extern const matrix4x4	matrix4x4_identity;
 extern const float		m_bytenormals[NUMVERTEXNORMALS][3];
 
-#endif//MATHLIB_H
+#endif // XASH3D_MATHLIB_H
+

ref_gl/gl_alias.c

@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
 #include "gl_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "const.h"
 #include "r_studioint.h"
 #include "triangleapi.h"

ref_gl/gl_backend.c

@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 
 #include "gl_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 
 char		r_speeds_msg[MAX_SYSPATH];
 ref_speeds_t	r_stats;	// r_speeds counters

ref_gl/gl_frustum.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "gl_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 
 void GL_FrustumEnablePlane( gl_frustum_t *out, int side )
 {

ref_gl/gl_local.h

@@ -26,7 +26,7 @@ GNU General Public License for more details.
 #include "dlight.h"
 #include "gl_frustum.h"
 #include "ref_api.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "ref_params.h"
 #include "enginefeatures.h"
 #include "com_strings.h"

ref_gl/gl_rlight.c

@@ -16,7 +16,7 @@ GNU General Public License for more details.
 #include "gl_local.h"
 #include "pm_local.h"
 #include "studio.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "ref_params.h"
 
 /*

ref_gl/gl_rmain.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "gl_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "library.h"
 #include "beamdef.h"
 #include "particledef.h"

ref_gl/gl_rmath.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "gl_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 
 /*
 ========================================================================

ref_gl/gl_rsurf.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "gl_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "mod_local.h"
 			
 typedef struct

ref_gl/gl_studio.c

@@ -14,7 +14,7 @@ GNU General Public License for more details.
 */
 
 #include "gl_local.h"
-#include "mathlib.h"
+#include "xash3d_mathlib.h"
 #include "const.h"
 #include "r_studioint.h"
 #include "triangleapi.h"