Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-15 23:59:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make randIntInRange inclusive on the max side

Browse source
This commit is contained in:
Stephen Birarda 2013-07-15 16:25:09 -07:00
parent 7075258317
commit 7f6009bb4a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
animation-server/src/main.cpp
View file

@ -434,7 +434,7 @@ void sendDanceFloor() {
for (int i = 0; i < DANCE_FLOOR_WIDTH; i++) { for (int i = 0; i < DANCE_FLOOR_WIDTH; i++) {
for (int j = 0; j < DANCE_FLOOR_LENGTH; j++) { for (int j = 0; j < DANCE_FLOOR_LENGTH; j++) {
int randomColorIndex = randIntInRange( -(DANCE_FLOOR_COLORS), (DANCE_FLOOR_COLORS + 1)); int randomColorIndex = randIntInRange(-DANCE_FLOOR_COLORS, DANCE_FLOOR_COLORS);
::danceFloorColors[i][j] = randomColorIndex; ::danceFloorColors[i][j] = randomColorIndex;
::danceFloorLights[i][j] = ::danceFloorPosition + ::danceFloorLights[i][j] = ::danceFloorPosition +
glm::vec3(i * DANCE_FLOOR_LIGHT_SIZE, 0, j * DANCE_FLOOR_LIGHT_SIZE); glm::vec3(i * DANCE_FLOOR_LIGHT_SIZE, 0, j * DANCE_FLOOR_LIGHT_SIZE);

4
libraries/shared/src/SharedUtil.cpp
View file

@ -40,7 +40,7 @@ float randFloat () {
} }
int randIntInRange (int min, int max) { int randIntInRange (int min, int max) {
return min + (rand() % (max - min)); return min + (rand() % ((max + 1) - min));
} }
float randFloatInRange (float min,float max) { float randFloatInRange (float min,float max) {
@ -48,7 +48,7 @@ float randFloatInRange (float min,float max) {
} }
unsigned char randomColorValue(int miniumum) { unsigned char randomColorValue(int miniumum) {
return miniumum + (rand() % (255 - miniumum)); return miniumum + (rand() % (256 - miniumum));
} }
bool randomBoolean() { bool randomBoolean() {