AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Jack Andersen 2016-07-03 17:43:43 -10:00
parent b05d2a2f7f 9bc184e4eb
commit 24a07ae419
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/CRandom16.hpp
View File

@ -43,8 +43,11 @@ public:
inline s32 Range(s32 min, s32 max) inline s32 Range(s32 min, s32 max)
{ {
const s32 rand = Next(); s32 diff = max - min;
return min + (rand / ((min - max) + 1)) - rand; s32 rand = -1;
while (rand < 0)
rand = s32((Next() << 16) | Next());
return rand % diff + min;
} }
static CRandom16* GetRandomNumber() {return g_randomNumber;} static CRandom16* GetRandomNumber() {return g_randomNumber;}
@ -58,7 +61,7 @@ class CGlobalRandom
static CGlobalRandom* g_currentGlobalRandom; static CGlobalRandom* g_currentGlobalRandom;
public: public:
CGlobalRandom(CRandom16& rand) CGlobalRandom(CRandom16& rand)
: m_random(rand), m_prev(g_currentGlobalRandom) : m_random(rand), m_prev(g_currentGlobalRandom)
{ {
g_currentGlobalRandom = this; g_currentGlobalRandom = this;
CRandom16::SetRandomNumber(&m_random); CRandom16::SetRandomNumber(&m_random);

1
Runtime/Graphics/CLineRendererShadersGLSL.cpp
View File

@ -72,6 +72,7 @@ BOO_GLSL_BINDING_HEAD
static const char* FS_GLSL_NOTEX = static const char* FS_GLSL_NOTEX =
"#version 330\n" "#version 330\n"
BOO_GLSL_BINDING_HEAD
"struct VertToFrag\n" "struct VertToFrag\n"
"{\n" "{\n"
" vec4 color;\n" " vec4 color;\n"

1
Runtime/Particle/CElementGenShadersGLSL.cpp
View File

@ -173,6 +173,7 @@ BOO_GLSL_BINDING_HEAD
static const char* FS_GLSL_NOTEX = static const char* FS_GLSL_NOTEX =
"#version 330\n" "#version 330\n"
BOO_GLSL_BINDING_HEAD
"struct VertToFrag\n" "struct VertToFrag\n"
"{\n" "{\n"
" vec4 color;\n" " vec4 color;\n"