zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- build.h cleanup

Browse source 
* moved krand and krandf into the games/duke folder because no other game uses them
* moved CVARS to gamefuncs.h.
This commit is contained in:
Christoph Oelckers 2022-09-30 19:06:44 +02:00
parent 679e029c6d
commit 94b91f6ec3
7 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/build/include/build.h
View file

@ -108,17 +108,6 @@ class F2DDrawer;
struct HitInfoBase;
inline int32_t krand(void)
{
randomseed = (randomseed * 27584621) + 1;
return ((uint32_t) randomseed)>>16;
}
inline double krandf(double span)
{
return (krand() & 0x7fff) * span / 32767;
}
inline int32_t ksqrt(uint64_t num)
{
return int(sqrt(double(num)));
@ -129,14 +118,6 @@ inline constexpr uint32_t uhypsq(int32_t const dx, int32_t const dy)
return (uint32_t)dx*dx + (uint32_t)dy*dy;
}
EXTERN_CVAR(Bool, hw_hightile)
EXTERN_CVAR(Bool, hw_models)
EXTERN_CVAR(Float, gl_texture_filter_anisotropic)
EXTERN_CVAR(Int, gl_texture_filter)
extern bool hw_int_useindexedcolortextures;
EXTERN_CVAR(Bool, hw_useindexedcolortextures)
EXTERN_CVAR(Bool, r_voxels)
static inline int64_t compat_maybe_truncate_to_int32(int64_t val)
{
return enginecompatibility_mode != ENGINECOMPATIBILITY_NONE ? (int32_t)val : val;

10
source/core/gamefuncs.h
View file

@ -6,9 +6,19 @@
#include "coreactor.h"
#include "intrect.h"
#include "geometry.h"
#include "c_cvars.h"
extern IntRect viewport3d;
EXTERN_CVAR(Bool, hw_hightile)
EXTERN_CVAR(Bool, hw_models)
EXTERN_CVAR(Float, gl_texture_filter_anisotropic)
EXTERN_CVAR(Int, gl_texture_filter)
extern bool hw_int_useindexedcolortextures;
EXTERN_CVAR(Bool, hw_useindexedcolortextures)
EXTERN_CVAR(Bool, r_voxels)
constexpr int SLOPEVAL_FACTOR = 4096;
//==========================================================================

1
source/core/models/modeldata.cpp
View file

@ -3,6 +3,7 @@
#include "modeldata.h"
#include "texturemanager.h"
#include "hw_voxels.h"
#include "gamefuncs.h"
#include "build.h"

1
source/core/precache.cpp
View file

@ -44,6 +44,7 @@
#include "hw_voxels.h"
#include "mapinfo.h"
#include "models/modeldata.h"
#include "gamefuncs.h"
BEGIN_BLD_NS
extern short voxelIndex[MAXTILES];

2
source/core/rendering/scene/hw_drawinfo.h
View file

@ -8,7 +8,7 @@
#include "v_video.h"
#include "hw_drawlist.h"
#include "hw_bunchdrawer.h"
//#include "r_viewpoint.h"
#include "gamefuncs.h"
EXTERN_CVAR(Int, hw_lightmode)

1
source/core/textures/hightile.cpp
View file

@ -49,6 +49,7 @@
#include "gamestruct.h"
#include "hw_renderstate.h"
#include "skyboxtexture.h"
#include "gamefuncs.h"
CVARD(Bool, hw_shadeinterpolate, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "enable/disable shade interpolation")

11
source/games/duke/src/funct.h
View file

@ -241,6 +241,17 @@ void loadcons();
void recordoldspritepos();
void DrawStatusBar();
inline int32_t krand(void)
{
randomseed = (randomseed * 27584621) + 1;
return ((uint32_t)randomseed) >> 16;
}
inline double krandf(double span)
{
return (krand() & 0x7fff) * span / 32767;
}
[[deprecated]]
inline double zrand(int spread, int ofs)
{