summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2010-09-25 20:35:58 -0400
committerSøren Sandmann Pedersen <ssp@redhat.com>2010-09-25 20:35:58 -0400
commit7cac4c120b1aa35cbdb2997516ecdd01b7ca8588 (patch)
tree5322bedb656e16bb868d63cd7455bb8225831540
parent597d2c9472425f2feed5a02a7a3ee360a984bd51 (diff)
misc
-rw-r--r--bluenoise.c6
-rw-r--r--gtk-utils.c22
2 files changed, 16 insertions, 12 deletions
diff --git a/bluenoise.c b/bluenoise.c
index 5d0b4c1..97ea96e 100644
--- a/bluenoise.c
+++ b/bluenoise.c
@@ -94,12 +94,10 @@ main ()
noise[i * N_SAMPLES + j].re *= 2.4 * f;
noise[i * N_SAMPLES + j].im *= 2.4 * f;
#endif
-#if 0
- if (f < 0.4)
+ if (f < 0.2)
factor = 0;
else
- factor = 12 * (f - 0.4);
-#endif
+ factor = 5 * (f - 0.2);
noise[i * N_SAMPLES + j].re *= factor;
noise[i * N_SAMPLES + j].im *= factor; // 8 * N_SAMPLES * N_SAMPLES * factor;
diff --git a/gtk-utils.c b/gtk-utils.c
index e8a8d63..8d8add6 100644
--- a/gtk-utils.c
+++ b/gtk-utils.c
@@ -35,7 +35,7 @@ pixbuf_from_buffer (complex_t *buffer, int n)
#define SADD(v,a) (((v) + (a) > 0xff)? 0xff : ((v) + (a) < 0)? 0 : ((v) + (a)))
- g = ((double)h / n) * 255;
+ g = ((double)w / n) * 255;
#if 0
if (vi + g > 0xff)
@@ -48,19 +48,23 @@ pixbuf_from_buffer (complex_t *buffer, int n)
int rr, gg, bb;
- rr = 0x3;
- gg = 0x80 - 0x80/255.0 * g;
- bb = 0x3;
+ rr = 0;
+ gg = g * 0.5;
+ bb = 0;
+
+ int x = drand48() > 0.5;
pb[0] = SADD (rr, vi);
- pb[1] = SADD (gg, - vi);
+ pb[1] = SADD (gg, - (vi));
pb[2] = SADD (bb, vi);
pb[3] = 0xff;
+#if 0
pb[0] = rr;
pb[1] = gg;
pb[2] = bb;
pb[3] = 0xff;
+#endif
#define TRUNC(x, n) \
x >>= (8 - n); \
@@ -68,9 +72,11 @@ pixbuf_from_buffer (complex_t *buffer, int n)
x |= x >> n; \
x |= x >> (2 * n)
- TRUNC(pb[0], 8);
- TRUNC(pb[1], 8);
- TRUNC(pb[2], 8);
+#if 0
+ TRUNC(pb[0], 5);
+ TRUNC(pb[1], 6);
+ TRUNC(pb[2], 5);
+#endif
}
}