From e3b547c8a9feb6afee602012c717ce2caed6e869 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Mon, 10 Feb 2020 15:07:06 +0500 Subject: [PATCH] public: rename mathlib to xash3d_mathlib. --- engine/client/cl_efrag.c | 2 +- engine/client/client.h | 2 +- engine/client/mod_dbghulls.c | 2 +- engine/client/sound.h | 2 +- engine/common/common.c | 2 +- engine/common/dedicated.c | 2 +- engine/common/filesystem.c | 2 +- engine/common/gamma.c | 2 +- engine/common/host.c | 2 +- engine/common/imagelib/img_bmp.c | 2 +- engine/common/imagelib/img_dds.c | 2 +- engine/common/imagelib/img_png.c | 2 +- engine/common/imagelib/img_tga.c | 2 +- engine/common/imagelib/img_utils.c | 2 +- engine/common/imagelib/img_wad.c | 2 +- engine/common/mod_bmodel.c | 2 +- engine/common/model.c | 2 +- engine/common/net_buffer.c | 2 +- engine/common/net_chan.c | 2 +- engine/common/net_encode.c | 2 +- engine/common/net_ws.c | 2 +- engine/common/pm_debug.c | 2 +- engine/common/pm_surface.c | 2 +- engine/common/pm_trace.c | 2 +- engine/common/system.c | 2 +- engine/common/world.c | 2 +- engine/server/server.h | 2 +- engine/server/sv_move.c | 2 +- public/matrixlib.c | 2 +- public/{mathlib.c => xash3d_mathlib.c} | 5 +++-- public/{mathlib.h => xash3d_mathlib.h} | 9 +++++---- ref_gl/gl_alias.c | 2 +- ref_gl/gl_backend.c | 2 +- ref_gl/gl_frustum.c | 2 +- ref_gl/gl_local.h | 2 +- ref_gl/gl_rlight.c | 2 +- ref_gl/gl_rmain.c | 2 +- ref_gl/gl_rmath.c | 2 +- ref_gl/gl_rsurf.c | 2 +- ref_gl/gl_studio.c | 2 +- 40 files changed, 46 insertions(+), 44 deletions(-) rename public/{mathlib.c => xash3d_mathlib.c} (99%) rename public/{mathlib.h => xash3d_mathlib.h} (99%) diff --git a/engine/client/cl_efrag.c b/engine/client/cl_efrag.c index d8ce446c..cabe26bd 100644 --- a/engine/client/cl_efrag.c +++ b/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" /* =============================================================================== diff --git a/engine/client/client.h b/engine/client/client.h index 637a5f16..c219f70b 100644 --- a/engine/client/client.h +++ b/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" diff --git a/engine/client/mod_dbghulls.c b/engine/client/mod_dbghulls.c index 23c3b95b..53f7b28f 100644 --- a/engine/client/mod_dbghulls.c +++ b/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" diff --git a/engine/client/sound.h b/engine/client/sound.h index ae616a4d..fba869f7 100644 --- a/engine/client/sound.h +++ b/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 diff --git a/engine/common/common.c b/engine/common/common.c index 88f03636..a9fdae32 100644 --- a/engine/common/common.c +++ b/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" diff --git a/engine/common/dedicated.c b/engine/common/dedicated.c index f6bf0987..7d018a01 100644 --- a/engine/common/dedicated.c +++ b/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; diff --git a/engine/common/filesystem.c b/engine/common/filesystem.c index 5140c47d..abab1b88 100644 --- a/engine/common/filesystem.c +++ b/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) diff --git a/engine/common/gamma.c b/engine/common/gamma.c index 955d52bd..f1fe6e44 100644 --- a/engine/common/gamma.c +++ b/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 #endif diff --git a/engine/common/host.c b/engine/common/host.c index a9f1758f..d1619ad9 100644 --- a/engine/common/host.c +++ b/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 diff --git a/engine/common/imagelib/img_bmp.c b/engine/common/imagelib/img_bmp.c index cb3b5dd1..25219dc7 100644 --- a/engine/common/imagelib/img_bmp.c +++ b/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" #define BI_SIZE 40 //size of bitmap info header. #if !XASH_WIN32 diff --git a/engine/common/imagelib/img_dds.c b/engine/common/imagelib/img_dds.c index bac77452..0036039e 100644 --- a/engine/common/imagelib/img_dds.c +++ b/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" qboolean Image_CheckDXT3Alpha( dds_t *hdr, byte *fin ) { diff --git a/engine/common/imagelib/img_png.c b/engine/common/imagelib/img_png.c index 1e80c582..6504b73d 100644 --- a/engine/common/imagelib/img_png.c +++ b/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" #if defined(XASH_NO_NETWORK) #include "platform/stub/net_stub.h" diff --git a/engine/common/imagelib/img_tga.c b/engine/common/imagelib/img_tga.c index 69c670e1..6d690e3f 100644 --- a/engine/common/imagelib/img_tga.c +++ b/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" /* ============= diff --git a/engine/common/imagelib/img_utils.c b/engine/common/imagelib/img_utils.c index 0f39c0fd..358de8e3 100644 --- a/engine/common/imagelib/img_utils.c +++ b/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 ) diff --git a/engine/common/imagelib/img_wad.c b/engine/common/imagelib/img_wad.c index 8a19d8bc..ac6ee34f 100644 --- a/engine/common/imagelib/img_wad.c +++ b/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" diff --git a/engine/common/mod_bmodel.c b/engine/common/mod_bmodel.c index e220a79f..10c27e7c 100644 --- a/engine/common/mod_bmodel.c +++ b/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" diff --git a/engine/common/model.c b/engine/common/model.c index 2281e8df..fd3bcd93 100644 --- a/engine/common/model.c +++ b/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" diff --git a/engine/common/net_buffer.c b/engine/common/net_buffer.c index bb948e7c..53a2f981 100644 --- a/engine/common/net_buffer.c +++ b/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 diff --git a/engine/common/net_chan.c b/engine/common/net_chan.c index 3fd4bb54..271dfcce 100644 --- a/engine/common/net_chan.c +++ b/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" diff --git a/engine/common/net_encode.c b/engine/common/net_encode.c index 1c4d0a4c..c132b1bd 100644 --- a/engine/common/net_encode.c +++ b/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" diff --git a/engine/common/net_ws.c b/engine/common/net_ws.c index 734a2630..b372c133 100644 --- a/engine/common/net_ws.c +++ b/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 diff --git a/engine/common/pm_debug.c b/engine/common/pm_debug.c index 0730968a..54aa1e45 100644 --- a/engine/common/pm_debug.c +++ b/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 diff --git a/engine/common/pm_surface.c b/engine/common/pm_surface.c index 382f4807..b4c38f22 100644 --- a/engine/common/pm_surface.c +++ b/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" diff --git a/engine/common/pm_trace.c b/engine/common/pm_trace.c index 90e049bd..c5154a66 100644 --- a/engine/common/pm_trace.c +++ b/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" diff --git a/engine/common/system.c b/engine/common/system.c index 55f9e675..43f8201e 100644 --- a/engine/common/system.c +++ b/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 diff --git a/engine/common/world.c b/engine/common/world.c index 70db5f13..09ed0749 100644 --- a/engine/common/world.c +++ b/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 diff --git a/engine/server/server.h b/engine/server/server.h index 4058f7e5..47fbf173 100644 --- a/engine/server/server.h +++ b/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 diff --git a/engine/server/sv_move.c b/engine/server/sv_move.c index 826cdf22..491e0a89 100644 --- a/engine/server/sv_move.c +++ b/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" diff --git a/public/matrixlib.c b/public/matrixlib.c index 18ded0e1..f536e4f9 100644 --- a/public/matrixlib.c +++ b/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 = { diff --git a/public/mathlib.c b/public/xash3d_mathlib.c similarity index 99% rename from public/mathlib.c rename to public/xash3d_mathlib.c index e60a3cd2..a6d1b7b2 100644 --- a/public/mathlib.c +++ b/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 @@ -874,3 +874,4 @@ int BoxOnPlaneSide( const vec3_t emins, const vec3_t emaxs, const mplane_t *p ) return sides; } + diff --git a/public/mathlib.h b/public/xash3d_mathlib.h similarity index 99% rename from public/mathlib.h rename to public/xash3d_mathlib.h index f3fc0db3..944bf92b 100644 --- a/public/mathlib.h +++ b/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 #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 + diff --git a/ref_gl/gl_alias.c b/ref_gl/gl_alias.c index 1e508518..89bcf672 100644 --- a/ref_gl/gl_alias.c +++ b/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" diff --git a/ref_gl/gl_backend.c b/ref_gl/gl_backend.c index 73e19ebe..297f7ca4 100644 --- a/ref_gl/gl_backend.c +++ b/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 diff --git a/ref_gl/gl_frustum.c b/ref_gl/gl_frustum.c index 64c56118..786d1b12 100644 --- a/ref_gl/gl_frustum.c +++ b/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 ) { diff --git a/ref_gl/gl_local.h b/ref_gl/gl_local.h index 6549236a..7f80268a 100644 --- a/ref_gl/gl_local.h +++ b/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" diff --git a/ref_gl/gl_rlight.c b/ref_gl/gl_rlight.c index de46d492..9a8b37e6 100644 --- a/ref_gl/gl_rlight.c +++ b/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" /* diff --git a/ref_gl/gl_rmain.c b/ref_gl/gl_rmain.c index 8e6c9fe2..e758be01 100644 --- a/ref_gl/gl_rmain.c +++ b/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" diff --git a/ref_gl/gl_rmath.c b/ref_gl/gl_rmath.c index 6c6953bc..69fb4eb2 100644 --- a/ref_gl/gl_rmath.c +++ b/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" /* ======================================================================== diff --git a/ref_gl/gl_rsurf.c b/ref_gl/gl_rsurf.c index c1b14447..5b081af5 100644 --- a/ref_gl/gl_rsurf.c +++ b/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 diff --git a/ref_gl/gl_studio.c b/ref_gl/gl_studio.c index 80631d8d..aa9a8db6 100644 --- a/ref_gl/gl_studio.c +++ b/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"