e16
/
e16-epplets
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change MAX to MAXVAL to avoid name clashes.

This commit is contained in:
Kim Woelders 2013-07-12 09:55:45 +02:00
parent e00a53d390
commit 695a39808a
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epplets/E-Cpu.c
View File

@ -76,7 +76,7 @@ static void flame_col(int r1, int g1, int b1, int r2, int g2, int b2,
#define VSPREAD 160
#define RESIDUAL 75
#define MAX 255
#define MAXVAL 255
static void
flame_col(int r1, int g1, int b1, int r2, int g2, int b2, int r3, int g3,
@ -133,7 +133,7 @@ draw_flame(void)
hspread[x] = HSPREAD + (load_val[(x * cpus) / 40] / 50);
residual[x] = RESIDUAL + (load_val[(x * cpus) / 40] / 50);
ptr[x] = (rand() % ((load_val[(x * cpus) / 40]) + 155));
if (ptr[x] > MAX)
if (ptr[x] > MAXVAL)
ptr[x] = 0;
else if (ptr[x] < 0)
ptr[x] = 0;
@ -163,14 +163,14 @@ draw_flame(void)
val3 = (ptr[x] * residual[x]) >> 8;
ptr[x - 1] += val2;
if (ptr[x - 1] > MAX)
ptr[x - 1] = MAX;
if (ptr[x - 1] > MAXVAL)
ptr[x - 1] = MAXVAL;
ptr[x - 40] += val1;
if (ptr[x - 40] > MAX)
ptr[x - 40] = MAX;
if (ptr[x - 40] > MAXVAL)
ptr[x - 40] = MAXVAL;
ptr[x + 1] += val2;
if (ptr[x + 1] > MAX)
ptr[x + 1] = MAX;
if (ptr[x + 1] > MAXVAL)
ptr[x + 1] = MAXVAL;
ptr[x] = val3;
}
}

16
epplets/E-NetFlame.c
View File

@ -86,7 +86,7 @@ static void epplet_bandwidth(void *data);
#define WIDTH 40
#define HEIGHT 30
#define MAX 255
#define MAXVAL 255
#define DOWN 0
#define UP 1
@ -155,7 +155,7 @@ draw_flame(void)
* load ... gives randomness to flames */
ptr[x] = (rand() % ((load_val[(x * DIVISIONS) / WIDTH]) + 155));
/* bounds checking */
if (ptr[x] > MAX)
if (ptr[x] > MAXVAL)
{
ptr[x] = 0;
}
@ -202,16 +202,16 @@ draw_flame(void)
/* add val2 to B */
ptr[x - 1] += val2;
if (ptr[x - 1] > MAX)
ptr[x - 1] = MAX;
if (ptr[x - 1] > MAXVAL)
ptr[x - 1] = MAXVAL;
/* add val1 to A */
ptr[x - WIDTH] += val1;
if (ptr[x - WIDTH] > MAX)
ptr[x - WIDTH] = MAX;
if (ptr[x - WIDTH] > MAXVAL)
ptr[x - WIDTH] = MAXVAL;
/* add val2 to D */
ptr[x + 1] += val2;
if (ptr[x + 1] > MAX)
ptr[x + 1] = MAX;
if (ptr[x + 1] > MAXVAL)
ptr[x + 1] = MAXVAL;
/* add val3 to C */
ptr[x] = val3;
}

16
epplets/cloak.c
View File

@ -6,7 +6,7 @@
#define HSPREAD 10
#define VSPREAD 160
#define RESIDUAL 75
#define MAX 255
#define MAXVAL 255
double prev_val = 0.0;
int *flame = NULL;
int *vspread, *hspread, *residual;
@ -215,7 +215,7 @@ draw_flame(void)
hspread[x] = HSPREAD + (load_val / 50);
residual[x] = RESIDUAL + (load_val / 50);
ptr[x] = (rand() % (load_val + 155));
if (ptr[x] > MAX)
if (ptr[x] > MAXVAL)
ptr[x] = 0;
else if (ptr[x] < 0)
ptr[x] = 0;
@ -230,14 +230,14 @@ draw_flame(void)
val3 = (ptr[x] * residual[x]) >> 8;
ptr[x - 1] += val2;
if (ptr[x - 1] > MAX)
ptr[x - 1] = MAX;
if (ptr[x - 1] > MAXVAL)
ptr[x - 1] = MAXVAL;
ptr[x - 40] += val1;
if (ptr[x - 40] > MAX)
ptr[x - 40] = MAX;
if (ptr[x - 40] > MAXVAL)
ptr[x - 40] = MAXVAL;
ptr[x + 1] += val2;
if (ptr[x + 1] > MAX)
ptr[x + 1] = MAX;
if (ptr[x + 1] > MAXVAL)
ptr[x + 1] = MAXVAL;
ptr[x] = val3;
}
}

16
epplets/esdcloak.c
View File

@ -6,7 +6,7 @@
#define HSPREAD 10
#define VSPREAD 160
#define RESIDUAL 75
#define MAX 255
#define MAXVAL 255
double prev_val = 0.0;
int *flame = NULL;
int *vspread, *hspread, *residual;
@ -226,7 +226,7 @@ draw_flame(void)
hspread[x] = HSPREAD + (load_val / 50);
residual[x] = RESIDUAL + (load_val / 50);
ptr[x] = (rand() % (load_val + 155));
if (ptr[x] > MAX)
if (ptr[x] > MAXVAL)
ptr[x] = 0;
else if (ptr[x] < 0)
ptr[x] = 0;
@ -265,14 +265,14 @@ draw_flame(void)
val3 = (ptr[x] * residual[x]) >> 8;
ptr[x - 1] += val2;
if (ptr[x - 1] > MAX)
ptr[x - 1] = MAX;
if (ptr[x - 1] > MAXVAL)
ptr[x - 1] = MAXVAL;
ptr[x - 40] += val1;
if (ptr[x - 40] > MAX)
ptr[x - 40] = MAX;
if (ptr[x - 40] > MAXVAL)
ptr[x - 40] = MAXVAL;
ptr[x + 1] += val2;
if (ptr[x + 1] > MAX)
ptr[x + 1] = MAX;
if (ptr[x + 1] > MAXVAL)
ptr[x + 1] = MAXVAL;
ptr[x] = val3;
}
}