New presets + bugfixes
authorlekernel <sebastien.bourdeauducq@lekernel.net>
Sun, 4 Apr 2010 00:32:10 +0000 (02:32 +0200)
committerlekernel <sebastien.bourdeauducq@lekernel.net>
Sun, 4 Apr 2010 00:32:10 +0000 (02:32 +0200)
17 files changed:
presets/Geiss - Aieeeeee!!!.milk [new file with mode: 0644]
presets/Geiss - Bonfire.milk [new file with mode: 0644]
presets/Geiss - Cepiasound.milk [new file with mode: 0644]
presets/Geiss - Digital Smoke.milk [new file with mode: 0644]
presets/Geiss - Journey.milk [new file with mode: 0644]
presets/Geiss - Microcosm.milk [new file with mode: 0644]
presets/Geiss - Quasilinear Submanifolds.milk [new file with mode: 0644]
presets/Geiss - Scary.milk [new file with mode: 0644]
presets/Geiss - Sound And The Fury.milk [new file with mode: 0644]
presets/Geiss - Swirlie 5.milk [new file with mode: 0644]
presets/Geiss - Symmetry.milk [new file with mode: 0644]
presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk [new file with mode: 0644]
presets/Geiss - Three And A Half Kinds Of Amphetamines.milk [new file with mode: 0644]
software/demo/color.h
software/demo/line.c
software/demo/renderer.c
software/demo/wave.c

diff --git a/presets/Geiss - Aieeeeee!!!.milk b/presets/Geiss - Aieeeeee!!!.milk
new file mode 100644 (file)
index 0000000..2ad8be0
--- /dev/null
@@ -0,0 +1,65 @@
+[preset00]\r
+fRating=3.000000\r
+fGammaAdj=2.000000\r
+fDecay=0.960000\r
+fVideoEchoZoom=1.006596\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=3\r
+nWaveMode=2\r
+bAdditiveWaves=1\r
+bWaveDots=0\r
+bModWaveAlphaByVolume=1\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bMotionVectorsOn=0\r
+bRedBlueStereo=0\r
+nMotionVectorsX=12\r
+nMotionVectorsY=9\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=4.099998\r
+fWaveScale=1.421896\r
+fWaveSmoothing=0.900000\r
+fWaveParam=-0.500000\r
+fModWaveAlphaStart=0.710000\r
+fModWaveAlphaEnd=1.300000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.331000\r
+fZoomExponent=1.000000\r
+fShader=0.000000\r
+zoom=1.990548\r
+rot=0.020000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.198054\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.650000\r
+wave_g=0.650000\r
+wave_b=0.650000\r
+wave_x=0.500000\r
+wave_y=0.550000\r
+ob_size=0.010000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.000000\r
+ib_size=0.010000\r
+ib_r=0.250000\r
+ib_g=0.250000\r
+ib_b=0.250000\r
+ib_a=0.000000\r
+per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) );\r
+per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) );\r
+per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) );\r
+per_frame_4=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) );\r
+per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) );\r
+per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) );\r
+per_frame_7=zoom=zoom+0.05+0.05*sin(time*0.133);\r
+per_frame_8=\r
+per_pixel_1=zoom=(zoom-1.0)*rad+1.0;\r
diff --git a/presets/Geiss - Bonfire.milk b/presets/Geiss - Bonfire.milk
new file mode 100644 (file)
index 0000000..c3c5617
--- /dev/null
@@ -0,0 +1,69 @@
+[preset00]\r
+fRating=3.000000\r
+fGammaAdj=2.000000\r
+fDecay=0.980000\r
+fVideoEchoZoom=1.728000\r
+fVideoEchoAlpha=0.500000\r
+nVideoEchoOrientation=1\r
+nWaveMode=2\r
+bAdditiveWaves=0\r
+bWaveDots=0\r
+bWaveThick=1\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bRedBlueStereo=0\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=2.200000\r
+fWaveScale=1.170000\r
+fWaveSmoothing=0.600000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.611000\r
+fZoomExponent=1.000000\r
+fShader=0.000000\r
+zoom=1.031000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=-0.018000\r
+warp=0.313000\r
+sx=0.952000\r
+sy=1.000000\r
+wave_r=0.675000\r
+wave_g=0.550000\r
+wave_b=0.350000\r
+wave_x=0.500000\r
+wave_y=0.140000\r
+ob_size=0.010000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.000000\r
+ib_size=0.010000\r
+ib_r=0.250000\r
+ib_g=0.250000\r
+ib_b=0.250000\r
+ib_a=0.000000\r
+nMotionVectorsX=12.000000\r
+nMotionVectorsY=9.000000\r
+mv_dx=0.000000\r
+mv_dy=0.000000\r
+mv_l=0.900000\r
+mv_r=1.000000\r
+mv_g=1.000000\r
+mv_b=1.000000\r
+mv_a=0.000000\r
+per_frame_1=wave_r = wave_r + 0.20*( 0.60*sin(0.849*time) + 0.40*sin(1.090*time) );\r
+per_frame_2=wave_g = wave_g + 0.20*( 0.60*sin(0.711*time) + 0.40*sin(0.982*time) );\r
+per_frame_3=wave_b = wave_b + 0.20*( 0.60*sin(0.737*time) + 0.40*sin(1.012*time) );\r
+per_frame_4=cy = cy + 0.030*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) );\r
+per_frame_5=sx = sx + 0.010*( 0.60*sin(0.313*time) + 0.40*sin(0.383*time) );\r
+per_frame_6=sy = sy + 0.010*( 0.60*sin(0.367*time) + 0.40*sin(0.272*time) );\r
diff --git a/presets/Geiss - Cepiasound.milk b/presets/Geiss - Cepiasound.milk
new file mode 100644 (file)
index 0000000..fa53595
--- /dev/null
@@ -0,0 +1,71 @@
+[preset00]\r
+fRating=2.000000\r
+fGammaAdj=1.994000\r
+fDecay=0.980000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=0\r
+nWaveMode=2\r
+bAdditiveWaves=0\r
+bWaveDots=0\r
+bWaveThick=1\r
+bModWaveAlphaByVolume=1\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bRedBlueStereo=0\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=7.900000\r
+fWaveScale=0.436037\r
+fWaveSmoothing=0.900000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=1.050000\r
+fModWaveAlphaEnd=1.390000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.000000\r
+fZoomExponent=1.000000\r
+fShader=0.000000\r
+zoom=1.065000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.280000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=1.000000\r
+wave_g=0.600000\r
+wave_b=0.200000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+ob_size=0.010000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.000000\r
+ib_size=0.010000\r
+ib_r=0.250000\r
+ib_g=0.250000\r
+ib_b=0.250000\r
+ib_a=0.000000\r
+nMotionVectorsX=12.000000\r
+nMotionVectorsY=9.000000\r
+mv_dx=-1.400000\r
+mv_dy=2.000000\r
+mv_l=1.000000\r
+mv_r=1.000000\r
+mv_g=1.000000\r
+mv_b=1.000000\r
+mv_a=0.000000\r
+per_frame_1=wave_g = wave_g + 0.100*( 0.90*sin(0.583*time) + 0.10*sin(1.006*time) );\r
+per_frame_2=wave_b = wave_b + 0.100*( 0.90*sin(0.993*time) + 0.10*sin(0.933*time) );\r
+per_frame_3=zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) );\r
+per_frame_4=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) );\r
+per_frame_5=cx = cx + 0.003*( 0.60*sin(0.471*time) + 0.40*sin(0.297*time) );\r
+per_frame_6=cy = cy + 0.003*( 0.60*sin(0.379*time) + 0.40*sin(0.351*time) );\r
+per_frame_7=dx = dx + 0.003*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) );\r
+per_pixel_1=zoom=zoom+max(bass-1,0)*0.25*sin(rad*15);\r
diff --git a/presets/Geiss - Digital Smoke.milk b/presets/Geiss - Digital Smoke.milk
new file mode 100644 (file)
index 0000000..10107bf
--- /dev/null
@@ -0,0 +1,54 @@
+[preset00]\r
+fGammaAdj=1.000000\r
+fDecay=0.970000\r
+fVideoEchoZoom=1.728000\r
+fVideoEchoAlpha=0.400000\r
+nVideoEchoOrientation=0\r
+nWaveMode=2\r
+bAdditiveWaves=0\r
+bWaveDots=0\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bMotionVectorsOn=0\r
+bRedBlueStereo=0\r
+nMotionVectorsX=12\r
+nMotionVectorsY=9\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=3.800000\r
+fWaveScale=1.694000\r
+fWaveSmoothing=0.100000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.331000\r
+fZoomExponent=2.000000\r
+fShader=0.000000\r
+zoom=1.031000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.239000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.500000\r
+wave_g=0.500000\r
+wave_b=0.500000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+per_frame_1=wave_r = wave_r + 0.10*( 0.60*sin(1.037*time) + 0.40*sin(0.370*time) );\r
+per_frame_2=wave_g = wave_g + 0.10*( 0.60*sin(0.944*time) + 0.40*sin(0.441*time) );\r
+per_frame_3=wave_b = wave_b + 0.10*( 0.60*sin(0.851*time) + 0.40*sin(0.55*time) );\r
+per_frame_4=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) );\r
+per_frame_5=cx = cx + 0.210*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) );\r
+per_frame_6=cy = cy + 0.210*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) );\r
+per_frame_7=dx = dx + 0.010*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) );\r
+per_frame_8=dy = dy + 0.010*( 0.60*sin(0.284*time) + 0.40*sin(0.247*time) );\r
+fRating=2.000000\r
diff --git a/presets/Geiss - Journey.milk b/presets/Geiss - Journey.milk
new file mode 100644 (file)
index 0000000..702a177
--- /dev/null
@@ -0,0 +1,69 @@
+[preset00]\r
+fRating=2.000000\r
+fGammaAdj=2.000000\r
+fDecay=0.960000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=0\r
+nWaveMode=6\r
+bAdditiveWaves=1\r
+bWaveDots=0\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bMotionVectorsOn=0\r
+bRedBlueStereo=0\r
+nMotionVectorsX=12\r
+nMotionVectorsY=9\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=10.140000\r
+fWaveScale=2.868977\r
+fWaveSmoothing=0.900000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.772000\r
+fZoomExponent=2.301000\r
+fShader=0.000000\r
+zoom=1.059000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.290000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.500000\r
+wave_g=0.500000\r
+wave_b=0.500000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+ob_size=0.010000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.000000\r
+ib_size=0.010000\r
+ib_r=0.250000\r
+ib_g=0.250000\r
+ib_b=0.250000\r
+ib_a=0.000000\r
+per_frame_1=wave_x = wave_x + 0.080*( 0.60*sin(0.221*time) + 0.40*sin(0.121*time) );\r
+per_frame_2=wave_y = wave_y + 0.120*( 0.60*sin(0.142*time) + 0.40*sin(0.232*time) );\r
+per_frame_3=wave_r = wave_r + 0.500*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) );\r
+per_frame_4=wave_g = wave_g + 0.500*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) );\r
+per_frame_5=wave_b = wave_b + 0.500*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) );\r
+per_frame_6=zoom = zoom + 0.007*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) );\r
+per_frame_7=rot = rot + 0.02*( 0.60*sin(0.381*time) + 0.40*sin(0.539*time) );\r
+per_frame_8=cx = cx + 0.030*( 0.60*sin(0.374*time) + 0.40*sin(0.194*time) );\r
+per_frame_9=cy = cy + 0.037*( 0.60*sin(0.274*time) + 0.40*sin(0.394*time) );\r
+per_frame_10=dx = dx + 0.004*( 0.60*sin(0.334*time) + 0.40*sin(0.277*time) );\r
+per_frame_11=dy = dy + 0.004*( 0.60*sin(0.384*time) + 0.40*sin(0.247*time) );\r
+per_frame_12=sx = sx + 0.010*( 0.60*sin(0.313*time) + 0.40*sin(0.383*time) );\r
+per_pixel_1=rot=rot+rad*0.1*sin(0.6*time*0.439+0.4*time*0.338);\r
diff --git a/presets/Geiss - Microcosm.milk b/presets/Geiss - Microcosm.milk
new file mode 100644 (file)
index 0000000..867a3a1
--- /dev/null
@@ -0,0 +1,68 @@
+[preset00]\r
+fRating=3.000000\r
+fGammaAdj=1.998000\r
+fDecay=0.980000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=0\r
+nWaveMode=2\r
+bAdditiveWaves=0\r
+bWaveDots=0\r
+bWaveThick=1\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bRedBlueStereo=0\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=1.200000\r
+fWaveScale=1.981000\r
+fWaveSmoothing=0.900000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=2.853000\r
+fZoomExponent=1.000000\r
+fShader=0.000000\r
+zoom=1.064000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.000000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.600000\r
+wave_g=0.600000\r
+wave_b=0.600000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+ob_size=0.010000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.000000\r
+ib_size=0.010000\r
+ib_r=0.250000\r
+ib_g=0.250000\r
+ib_b=0.250000\r
+ib_a=0.000000\r
+nMotionVectorsX=12.000000\r
+nMotionVectorsY=9.000000\r
+mv_dx=0.000000\r
+mv_dy=0.000000\r
+mv_l=0.900000\r
+mv_r=1.000000\r
+mv_g=1.000000\r
+mv_b=1.000000\r
+mv_a=0.000000\r
+per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) );\r
+per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) );\r
+per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) );\r
+per_frame_4=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) );\r
+per_frame_5=zoom=max(0.98, min(0.15+0.8*bass_att, 1.75 ));\r
diff --git a/presets/Geiss - Quasilinear Submanifolds.milk b/presets/Geiss - Quasilinear Submanifolds.milk
new file mode 100644 (file)
index 0000000..886b88e
--- /dev/null
@@ -0,0 +1,47 @@
+[preset00]\r
+fGammaAdj=2.000000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.400000\r
+nVideoEchoOrientation=0\r
+fDecay=0.970000\r
+nWaveMode=2\r
+bAdditiveWaves=0\r
+bWaveDots=0\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bMotionVectorsOn=0\r
+nMotionVectorsX=12\r
+nMotionVectorsY=9\r
+fWaveAlpha=1.400000\r
+fWaveScale=1.605000\r
+fWaveSmoothing=0.700000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=2.853000\r
+fZoomExponent=1.000000\r
+fShader=0.000000\r
+zoom=1.064000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=2.762000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.500000\r
+wave_g=0.500000\r
+wave_b=0.500000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+per_frame_1=wave_r = wave_r + 0.500*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) );\r
+per_frame_2=wave_g = wave_g + 0.500*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) );\r
+per_frame_3=wave_b = wave_b + 0.500*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) );\r
+per_frame_4=zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) );\r
+per_frame_5=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) );\r
+per_frame_6=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) );\r
+per_frame_7=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) );\r
diff --git a/presets/Geiss - Scary.milk b/presets/Geiss - Scary.milk
new file mode 100644 (file)
index 0000000..2ed64f4
--- /dev/null
@@ -0,0 +1,71 @@
+[preset00]\r
+fRating=3.000000\r
+fGammaAdj=2.000000\r
+fDecay=0.980000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=0\r
+nWaveMode=2\r
+bAdditiveWaves=1\r
+bWaveDots=0\r
+bWaveThick=1\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bRedBlueStereo=0\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=1.004851\r
+fWaveScale=2.868000\r
+fWaveSmoothing=0.700000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=6.322000\r
+fWarpScale=3.138000\r
+fZoomExponent=2.600000\r
+fShader=0.000000\r
+zoom=1.031000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=-0.005000\r
+warp=5.560000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.000000\r
+wave_g=0.570000\r
+wave_b=1.000000\r
+wave_x=0.500000\r
+wave_y=0.530000\r
+ob_size=0.010000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.000000\r
+ib_size=0.010000\r
+ib_r=0.250000\r
+ib_g=0.250000\r
+ib_b=0.250000\r
+ib_a=0.000000\r
+nMotionVectorsX=12.000000\r
+nMotionVectorsY=9.000000\r
+mv_dx=0.000000\r
+mv_dy=0.000000\r
+mv_l=0.900000\r
+mv_r=1.000000\r
+mv_g=1.000000\r
+mv_b=1.000000\r
+mv_a=0.000000\r
+per_frame_1=wave_r = wave_r + 0.250*( 0.60*sin(2.137*time) + 0.40*sin(1.770*time) );\r
+per_frame_2=wave_g = wave_g + 0.300*( 0.60*sin(1.944*time) + 0.40*sin(1.541*time) );\r
+per_frame_3=wave_b = wave_b + 0.250*( 0.60*sin(1.251*time) + 0.40*sin(1.655*time) );\r
+per_frame_4=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) );\r
+per_frame_5=cx = cx + 0.410*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) );\r
+per_frame_6=cy = cy + 0.410*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) );\r
+per_frame_7=dx = dx + 0.010*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) );\r
+per_frame_8=dy = dy + 0.010*( 0.60*sin(0.284*time) + 0.40*sin(0.247*time) );\r
diff --git a/presets/Geiss - Sound And The Fury.milk b/presets/Geiss - Sound And The Fury.milk
new file mode 100644 (file)
index 0000000..246986c
--- /dev/null
@@ -0,0 +1,78 @@
+[preset00]\r
+fRating=3.000000\r
+fGammaAdj=1.980000\r
+fDecay=0.980000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=0\r
+nWaveMode=2\r
+bAdditiveWaves=0\r
+bWaveDots=0\r
+bWaveThick=1\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=0\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bRedBlueStereo=0\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=7.900000\r
+fWaveScale=0.769339\r
+fWaveSmoothing=0.900000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.000000\r
+fZoomExponent=1.000000\r
+fShader=0.000000\r
+zoom=1.135000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.280000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.000000\r
+wave_g=0.000000\r
+wave_b=0.000000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+ob_size=0.010000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.000000\r
+ib_size=0.010000\r
+ib_r=0.250000\r
+ib_g=0.250000\r
+ib_b=0.250000\r
+ib_a=0.000000\r
+nMotionVectorsX=12.000000\r
+nMotionVectorsY=9.000000\r
+mv_dx=0.000000\r
+mv_dy=0.000000\r
+mv_l=0.900000\r
+mv_r=1.000000\r
+mv_g=1.000000\r
+mv_b=1.000000\r
+mv_a=0.000000\r
+per_frame_1=wave_b = wave_b + min(1,max(0,(bass_att-1)*1.5));\r
+per_frame_2=wave_r = wave_b*0.4;\r
+per_frame_3=wave_g = wave_b*0.4;\r
+per_frame_4=zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) );\r
+per_frame_5=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) );\r
+per_frame_6=cx = cx + 0.005*( 0.60*sin(0.471*time) + 0.40*sin(0.297*time) );\r
+per_frame_7=cy = cy + 0.005*( 0.60*sin(0.379*time) + 0.40*sin(0.351*time) );\r
+per_frame_8=dx = dx + 0.009*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) );\r
+per_frame_9=\r
+per_frame_10=dx = dx + dx_residual;\r
+per_frame_11=dy = dy + dy_residual;\r
+per_frame_12=bass_thresh = above(bass_att,bass_thresh)*2.5 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.4)*0.98+1.4);\r
+per_frame_13=dx_residual = equal(bass_thresh,2.5)*0.016*sin(time*7) + (1-equal(bass_thresh,2.5))*dx_residual;\r
+per_frame_14=dy_residual = equal(bass_thresh,2.5)*0.012*sin(time*9) + (1-equal(bass_thresh,2.5))*dy_residual;\r
+per_pixel_1=zoom = zoom + 0.1*rad;\r
diff --git a/presets/Geiss - Swirlie 5.milk b/presets/Geiss - Swirlie 5.milk
new file mode 100644 (file)
index 0000000..5bb17e7
--- /dev/null
@@ -0,0 +1,68 @@
+[preset00]\r
+fRating=2.000000\r
+fGammaAdj=1.994000\r
+fDecay=0.990000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=0\r
+nWaveMode=7\r
+bAdditiveWaves=1\r
+bWaveDots=0\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bMotionVectorsOn=0\r
+bRedBlueStereo=0\r
+nMotionVectorsX=12\r
+nMotionVectorsY=9\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=0.000000\r
+fWaveScale=1.693514\r
+fWaveSmoothing=0.900000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=0.451118\r
+fWarpScale=3.928016\r
+fZoomExponent=2.100000\r
+fShader=0.000000\r
+zoom=0.961000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=7.397955\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.650000\r
+wave_g=0.650000\r
+wave_b=0.650000\r
+wave_x=0.500000\r
+wave_y=0.950000\r
+ob_size=0.030000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.500000\r
+ib_size=0.010000\r
+ib_r=0.340000\r
+ib_g=0.340000\r
+ib_b=0.340000\r
+ib_a=0.500000\r
+per_frame_1=wave_x = wave_x + 0.0200*( 0.60*sin(0.821*time) + 0.40*sin(0.621*time) );\r
+per_frame_2=wave_y = wave_y + 0.0200*( 0.60*sin(0.942*time) + 0.40*sin(0.722*time) );\r
+per_frame_3=wave_r = wave_r + 0.350*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) );\r
+per_frame_4=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) );\r
+per_frame_5=wave_b = wave_b + 0.350*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) );\r
+per_frame_6=rot = rot + 0.35*( 0.60*sin(0.21*time) + 0.30*sin(0.339*time) );\r
+per_frame_7=cx = cx + 0.30*( 0.60*sin(0.374*time) + 0.14*sin(0.194*time) );\r
+per_frame_8=cy = cy + 0.37*( 0.60*sin(0.274*time) + 0.10*sin(0.394*time) );\r
+per_frame_9=ib_r = ib_r + 0.2*sin(time*0.5413);\r
+per_frame_10=ib_g = ib_g + 0.2*sin(time*0.6459);\r
+per_frame_11=ib_b = ib_b + 0.2*sin(time*0.7354);\r
+per_frame_12=\r
diff --git a/presets/Geiss - Symmetry.milk b/presets/Geiss - Symmetry.milk
new file mode 100644 (file)
index 0000000..ee54a21
--- /dev/null
@@ -0,0 +1,53 @@
+[preset00]\r
+fGammaAdj=1.990000\r
+fDecay=0.980000\r
+fVideoEchoZoom=1.010000\r
+fVideoEchoAlpha=0.500000\r
+nVideoEchoOrientation=3\r
+nWaveMode=3\r
+bAdditiveWaves=0\r
+bWaveDots=0\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bMotionVectorsOn=0\r
+bRedBlueStereo=0\r
+nMotionVectorsX=12\r
+nMotionVectorsY=9\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=0.700000\r
+fWaveScale=0.948000\r
+fWaveSmoothing=0.900000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.948717\r
+fZoomExponent=1.000000\r
+fShader=1.000000\r
+zoom=1.031000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.651000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.350000\r
+wave_g=0.300000\r
+wave_b=0.250000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+per_frame_1=wave_r = wave_r + 0.050*( 0.60*sin(0.994*time) + 0.40*sin(0.941*time) );\r
+per_frame_2=wave_g = wave_g + 0.050*( 0.60*sin(0.990*time) + 0.40*sin(1.002*time) );\r
+per_frame_3=wave_b = wave_b + 0.050*( 0.60*sin(0.775*time) + 0.40*sin(1.071*time) );\r
+per_frame_4=zoom = zoom + 0.015*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) );\r
+per_frame_5=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) );\r
+per_frame_6=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) );\r
+per_frame_7=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) );\r
+fRating=2.000000\r
diff --git a/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk b/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk
new file mode 100644 (file)
index 0000000..d5c13f9
--- /dev/null
@@ -0,0 +1,77 @@
+[preset00]\r
+fRating=5.000000\r
+fGammaAdj=2.000000\r
+fDecay=0.900000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=0\r
+nWaveMode=2\r
+bAdditiveWaves=1\r
+bWaveDots=0\r
+bWaveThick=1\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bRedBlueStereo=0\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=10.140000\r
+fWaveScale=1.235000\r
+fWaveSmoothing=0.900000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.772000\r
+fZoomExponent=2.301000\r
+fShader=0.000000\r
+zoom=1.099000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.290000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.500000\r
+wave_g=0.500000\r
+wave_b=0.500000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+ob_size=0.010000\r
+ob_r=0.000000\r
+ob_g=0.000000\r
+ob_b=0.000000\r
+ob_a=0.000000\r
+ib_size=0.010000\r
+ib_r=0.250000\r
+ib_g=0.250000\r
+ib_b=0.250000\r
+ib_a=0.000000\r
+nMotionVectorsX=12.000000\r
+nMotionVectorsY=9.000000\r
+mv_dx=0.000000\r
+mv_dy=0.000000\r
+mv_l=0.900000\r
+mv_r=1.000000\r
+mv_g=1.000000\r
+mv_b=1.000000\r
+mv_a=0.000000\r
+per_frame_1=wave_x = wave_x + 0.250*( 0.60*sin(2.121*time) + 0.40*sin(1.621*time) );\r
+per_frame_2=wave_y = wave_y + 0.250*( 0.60*sin(1.742*time) + 0.40*sin(2.322*time) );\r
+per_frame_3=wave_r = wave_r + 0.500*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) );\r
+per_frame_4=wave_g = wave_g + 0.500*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) );\r
+per_frame_5=wave_b = wave_b + 0.500*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) );\r
+per_frame_6=zoom = zoom + 0.010*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) );\r
+per_frame_7=rot = rot + 0.035*( 0.60*sin(0.381*time) + 0.40*sin(0.539*time) );\r
+per_frame_8=cx = cx + 0.030*( 0.60*sin(0.374*time) + 0.40*sin(0.194*time) );\r
+per_frame_9=cy = cy + 0.037*( 0.60*sin(0.274*time) + 0.40*sin(0.394*time) );\r
+per_frame_10=q = time;\r
+per_frame_11=dx = dx + 0.019*( 0.60*sin(100.334*q)+ 0.40*sin(250.277*q));\r
+per_frame_12=dy = dy + 0.019*( 0.60*sin(200.384*q) + 0.40*sin(150.247*q));\r
+per_frame_13=sx = sx + 0.010*( 0.60*sin(0.313*time) + 0.40*sin(0.383*time) );\r
+per_pixel_1=rot=rot+rad*0.18*sin(0.6*time*0.439+0.4*time*0.338);\r
diff --git a/presets/Geiss - Three And A Half Kinds Of Amphetamines.milk b/presets/Geiss - Three And A Half Kinds Of Amphetamines.milk
new file mode 100644 (file)
index 0000000..c75987f
--- /dev/null
@@ -0,0 +1,55 @@
+[preset00]\r
+fGammaAdj=1.980000\r
+fDecay=0.960000\r
+fVideoEchoZoom=2.000000\r
+fVideoEchoAlpha=0.000000\r
+nVideoEchoOrientation=0\r
+nWaveMode=2\r
+bAdditiveWaves=1\r
+bWaveDots=0\r
+bModWaveAlphaByVolume=0\r
+bMaximizeWaveColor=1\r
+bTexWrap=1\r
+bDarkenCenter=0\r
+bMotionVectorsOn=0\r
+bRedBlueStereo=0\r
+nMotionVectorsX=12\r
+nMotionVectorsY=9\r
+bBrighten=0\r
+bDarken=0\r
+bSolarize=0\r
+bInvert=0\r
+fWaveAlpha=0.620000\r
+fWaveScale=0.691358\r
+fWaveSmoothing=0.400000\r
+fWaveParam=0.000000\r
+fModWaveAlphaStart=0.750000\r
+fModWaveAlphaEnd=0.950000\r
+fWarpAnimSpeed=1.000000\r
+fWarpScale=1.000000\r
+fZoomExponent=0.888000\r
+fShader=1.000000\r
+zoom=1.085000\r
+rot=0.000000\r
+cx=0.500000\r
+cy=0.500000\r
+dx=0.000000\r
+dy=0.000000\r
+warp=0.513000\r
+sx=1.000000\r
+sy=1.000000\r
+wave_r=0.650000\r
+wave_g=0.650000\r
+wave_b=0.650000\r
+wave_x=0.500000\r
+wave_y=0.500000\r
+per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.742*time) + 0.40*sin(1.021*time) );\r
+per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.703*time) + 0.40*sin(0.969*time) );\r
+per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(1.090*time) + 0.40*sin(0.963*time) );\r
+per_frame_4=zoom = zoom + 0.033*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) );\r
+per_frame_5=zoom = zoom + 0.5*max(0,bass_att-1.05);\r
+per_frame_6=zoom = zoom + rad*0.1;\r
+per_frame_7=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) );\r
+per_frame_8=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) );\r
+per_frame_9=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) );\r
+per_pixel_1=zoom=zoom+0.13*rad;\r
index 9a47078..6387624 100644 (file)
@@ -1,16 +1,16 @@
 /*
  * Milkymist VJ SoC (Software)
  * Copyright (C) 2007, 2008, 2009 Sebastien Bourdeauducq
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, version 3 of the License.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
index b837b71..c22d658 100644 (file)
@@ -31,21 +31,20 @@ static void setpixel(struct line_context *ctx, unsigned int x, unsigned int y)
 
                        cd = ctx->framebuffer[y*ctx->hres+x];
                        cs = ctx->color;
-                       /* Do not shift components to go faster */
                        if(ctx->alpha >= 64) {
-                               r = (cs & RMASK) + (cd & RMASK);
-                               g = (cs & GMASK) + (cd & GMASK);
-                               b = (cs & BMASK) + (cd & BMASK);
+                               r = GETR(cs) + GETR(cd);
+                               g = GETG(cs) + GETG(cd);
+                               b = GETB(cs) + GETB(cd);
                        } else {
-                               r = ((((cs & RMASK)*ctx->alpha) >> 6) & RMASK) + (cd & RMASK);
-                               g = ((((cs & GMASK)*ctx->alpha) >> 6) & GMASK) + (cd & GMASK);
-                               b = ((((cs & BMASK)*ctx->alpha) >> 6) & BMASK) + (cd & BMASK);
+                               r = (GETR(cs)*ctx->alpha >> 6) + GETR(cd);
+                               g = (GETG(cs)*ctx->alpha >> 6) + GETG(cd);
+                               b = (GETB(cs)*ctx->alpha >> 6) + GETB(cd);
                        }
                        /* Saturate in case of overflow */
-                       if(r > RMASK) r = RMASK;
-                       if(g > GMASK) g = GMASK;
-                       if(b > BMASK) b = BMASK;
-                       ctx->framebuffer[y*ctx->hres+x] = r|g|b;
+                       if(r > 31) r = 31;
+                       if(g > 63) g = 63;
+                       if(b > 31) b = 31;
+                       ctx->framebuffer[y*ctx->hres+x] = MAKERGB565(r, g, b);
                } else {
                        if(ctx->alpha >= 64)
                                ctx->framebuffer[y*ctx->hres+x] = ctx->color;
@@ -55,11 +54,10 @@ static void setpixel(struct line_context *ctx, unsigned int x, unsigned int y)
 
                                cd = ctx->framebuffer[y*ctx->hres+x];
                                cs = ctx->color;
-                               /* Do not shift components to go faster */
-                               r = ((((cs & RMASK)*ctx->alpha) >> 6) & RMASK) + (((cd & RMASK)*(64-ctx->alpha)) >> 6);
-                               g = ((((cs & GMASK)*ctx->alpha) >> 6) & GMASK) + (((cd & GMASK)*(64-ctx->alpha)) >> 6);
-                               b = ((((cs & BMASK)*ctx->alpha) >> 6) & BMASK) + (((cd & BMASK)*(64-ctx->alpha)) >> 6);
-                               ctx->framebuffer[y*ctx->hres+x] = r|g|b;
+                               r = (GETR(cs)*ctx->alpha >> 6) + (GETR(cd)*(64-ctx->alpha) >> 6);
+                               g = (GETG(cs)*ctx->alpha >> 6) + (GETG(cd)*(64-ctx->alpha) >> 6);
+                               b = (GETB(cs)*ctx->alpha >> 6) + (GETB(cd)*(64-ctx->alpha) >> 6);
+                               ctx->framebuffer[y*ctx->hres+x] = MAKERGB565(r, g, b);
                        }
                }
        }
index 8ee4aa3..a779545 100644 (file)
@@ -130,8 +130,8 @@ static int process_line(char *line)
        c = strstr(line, "//");
        if(c) *c = 0;
        
-       c = line + strlen(line);
-       while((c > line) && (*c == ' ')) *c-- = 0;
+       c = line + strlen(line) - 1;
+       while((c >= line) && (*c == ' ')) *c-- = 0;
        if(*line == 0) return 1;
 
        c = strchr(line, '=');
index 94bc685..5d268cf 100644 (file)
@@ -17,6 +17,7 @@
 
 /* Original code from projectM 1.2.0 */
 
+#include <stdio.h>
 #include <math.h>
 
 #include "line.h"
@@ -80,12 +81,13 @@ void wave_draw(unsigned short *framebuffer, unsigned int hres, unsigned int vres
        }
 
        ctx.color = float_to_rgb565(wave_r, wave_g, wave_b);
+       //printf("fc: %f %f %f / %d %d %d\n", &wave_r, &wave_g, &wave_b, GETR(ctx.color), GETG(ctx.color), GETB(ctx.color));
 
        /*
-        * HACK: Boost wave opacity (80 instead of 64).
+        * HACK: Boost wave opacity (100 instead of 64).
         * Line drawing code treats >= 64 as 64, no need to clamp
         */
-       ctx.alpha = 80.0*wave_o;
+       ctx.alpha = 100.0*wave_o;
 
        // Original code:
        // glLineStipple(2, 0xAAAA);