diff --git a/presets/Geiss - Cartographie.milk b/presets/Geiss - Cartographie.milk deleted file mode 100755 index d2a74ceb3..000000000 --- a/presets/Geiss - Cartographie.milk +++ /dev/null @@ -1,51 +0,0 @@ -[preset00] -fGammaAdj=1.350000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -fDecay=1.000000 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -fWaveAlpha=3.699999 -fWaveScale=1.300000 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000415 -fShader=1.000000 -zoom=1.006882 -rot=0.040000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.057228 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.742*time) + 0.40*sin(1.021*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.703*time) + 0.40*sin(0.969*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(1.090*time) + 0.40*sin(0.963*time) ); -per_frame_4=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=decay=decay-0.025*pow(0.5+0.5*sin(time*1.5),4.8); -per_pixel_1=dx=0.05*sin(x*80+y*94+rad*97+ang*22+time*0.733); -per_pixel_2=dy=0.05*sin(x*60+y*114+rad*77+ang*32+time*0.83); -per_pixel_3=zoom=zoom+0.05*rad; -fRating=2.000000 diff --git a/presets/Geiss - Fog Tunnel.milk b/presets/Geiss - Fog Tunnel.milk deleted file mode 100755 index 871e6361d..000000000 --- a/presets/Geiss - Fog Tunnel.milk +++ /dev/null @@ -1,70 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.800000 -fDecay=0.980000 -fVideoEchoZoom=1.289000 -fVideoEchoAlpha=0.400000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.794075 -fWaveScale=0.387000 -fWaveSmoothing=0.400000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=3.400000 -fShader=0.000000 -zoom=1.042000 -rot=-0.020000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=-0.010000 -warp=0.122000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.440000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.850*time) + 0.40*sin(1.007*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.705*time) + 0.40*sin(0.998*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.715*time) + 0.40*sin(0.938*time) ); -per_frame_4=rot = rot + 0.003*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=warp = warp + 0.231*( 0.60*sin(0.324*time) + 0.40*sin(0.347*time) ); diff --git a/presets/Geiss - Happy Drops.milk b/presets/Geiss - Happy Drops.milk deleted file mode 100755 index 64ea6486a..000000000 --- a/presets/Geiss - Happy Drops.milk +++ /dev/null @@ -1,72 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.994000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.420000 -fWaveScale=0.691358 -fWaveSmoothing=0.400000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.888000 -fShader=1.000000 -zoom=0.999710 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.298816 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.742*time) + 0.40*sin(1.021*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.703*time) + 0.40*sin(0.969*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(1.090*time) + 0.40*sin(0.963*time) ); -per_frame_4=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.279*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_pixel_1=dr = 0.01 + 0.03*min(max(bass_att-1,0.0), 0.5)*sin(rad*15); -per_pixel_2=dx = dx + dr*cos(ang)*0.75; -per_pixel_3=dy = dy + dr*sin(-ang); diff --git a/presets/Geiss - Hurricane.milk b/presets/Geiss - Hurricane.milk deleted file mode 100755 index 414288525..000000000 --- a/presets/Geiss - Hurricane.milk +++ /dev/null @@ -1,70 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.300000 -fWaveScale=1.170370 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=3.600000 -fShader=0.000000 -zoom=1.014000 -rot=-0.160000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.309000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.470000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=zoom = zoom + 0.023*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.02*equal(frame%40,0); -per_pixel_1=rot=rot+0.1/(rad+0.1); diff --git a/presets/Geiss - Many Colors 1.milk b/presets/Geiss - Many Colors 1.milk deleted file mode 100755 index 0087149fe..000000000 --- a/presets/Geiss - Many Colors 1.milk +++ /dev/null @@ -1,46 +0,0 @@ -[preset00] -fGammaAdj=2.700000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -fDecay=0.980000 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -fWaveAlpha=1.000000 -fWaveScale=0.000000 -fWaveSmoothing=0.100000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.014000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.467000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); diff --git a/presets/Geiss - Many Colors 2.milk b/presets/Geiss - Many Colors 2.milk deleted file mode 100755 index 50559f23f..000000000 --- a/presets/Geiss - Many Colors 2.milk +++ /dev/null @@ -1,49 +0,0 @@ -[preset00] -fGammaAdj=2.700000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -fDecay=0.970000 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -fWaveAlpha=1.000000 -fWaveScale=0.032033 -fWaveSmoothing=0.100000 -fWaveParam=-0.300000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.100549 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.198054 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=zoom=zoom+0.05+0.05*sin(time*0.133); -per_pixel_1=zoom=(zoom-1)*rad+1; -fRating=4.000000 diff --git a/presets/Rocke - Answer.42.milk b/presets/Rocke - Answer.42.milk deleted file mode 100755 index 2e2c2a6aa..000000000 --- a/presets/Rocke - Answer.42.milk +++ /dev/null @@ -1,67 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.998000 -fDecay=0.993000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=5.900000 -fWaveScale=0.750110 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.961900 -rot=-0.010000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.900000 -wave_g=0.450000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=1.000000 -ib_g=1.000000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=19.200005 -mv_l=5.000000 -mv_r=0.500000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.100000 -per_frame_1=wave_r = wave_r + 0.1*(0.6*sin(0.933*time) + 0.4*sin(1.072*time)); -per_frame_2=wave_g = wave_g + 0.05*(0.6*sin(0.888*time) + 0.4*sin(0.918*time)); -per_frame_3=wave_b = wave_b + 0.2*(0.6*sin(0.335*time) + 0.4*sin(0.4*time)); -per_frame_4=wave_mystery = 0.5*sin(0.35*bass); -per_frame_5=decay = decay - 0.01*equal(frame%50,0); -per_pixel_1=zoom = zoom + (0.1*rad); -per_pixel_2=rot = rot - 0.15*sin(ang); diff --git a/presets/Rocke - Answer42.milk b/presets/Rocke - Answer42.milk deleted file mode 100755 index 025dd5bfc..000000000 --- a/presets/Rocke - Answer42.milk +++ /dev/null @@ -1,67 +0,0 @@ -[preset00] -fRating=5 -fGammaAdj=1.998 -fDecay=0.993 -fVideoEchoZoom=2 -fVideoEchoAlpha=0 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=5.9 -fWaveScale=0.75011 -fWaveSmoothing=0.9 -fWaveParam=0 -fModWaveAlphaStart=0.75 -fModWaveAlphaEnd=0.95 -fWarpAnimSpeed=1 -fWarpScale=2.853 -fZoomExponent=1 -fShader=0 -zoom=0.9619 -rot=-0.01 -cx=0.5 -cy=0.5 -dx=0 -dy=0 -warp=0 -sx=1 -sy=1 -wave_r=0.9 -wave_g=0.45 -wave_b=0 -wave_x=0.5 -wave_y=0.5 -ob_size=0.01 -ob_r=0 -ob_g=0 -ob_b=0 -ob_a=1 -ib_size=0.01 -ib_r=1 -ib_g=1 -ib_b=0.25 -ib_a=0 -nMotionVectorsX=64 -nMotionVectorsY=19.200005 -mv_l=5 -mv_r=0.5 -mv_g=0 -mv_b=1 -mv_a=0.1 -per_frame_1=wave_r = wave_r + 0.1*(0.6*sin(0.933*time) + 0.4*sin(1.072*time)); -per_frame_2=wave_g = wave_g + 0.05*(0.6*sin(0.888*time) + 0.4*sin(0.918*time)); -per_frame_3=wave_b = wave_b + 0.2*(0.6*sin(0.335*time) + 0.4*sin(0.4*time)); -per_frame_4=wave_mystery = 0.5*sin(0.35*bass); -per_frame_5=decay = decay - 0.01*equal(frame%50,0); -per_pixel_1=zoom = zoom + (0.1*rad); -per_pixel_2=rot = rot - 0.15*sin(ang); diff --git a/presets/Rovastar & Sperl - Tuxflower.prjm b/presets/Rovastar & Sperl - Tuxflower.prjm index 7adc0dcc5..e8986ec01 100755 --- a/presets/Rovastar & Sperl - Tuxflower.prjm +++ b/presets/Rovastar & Sperl - Tuxflower.prjm @@ -113,7 +113,7 @@ wavecode_3_r=1.000000 wavecode_3_g=1.000000 wavecode_3_b=1.000000 wavecode_3_a=1.000000 -shapecode_0_enabled=1 +shapecode_0_enabled=0 shapecode_0_sides=100 shapecode_0_additive=0 shapecode_0_thickOutline=0 @@ -145,7 +145,7 @@ shape_0_per_frame6=b = 0.25+0.25*sin(time*0.7339); shape_0_per_frame7=r2 = 0.25+0.25*sin(time*0.6979); shape_0_per_frame8=g2 = 0.25+0.25*sin(time*0.849); shape_0_per_frame9=b2 = 0.25+0.25*sin(time*0.8079); -shapecode_1_enabled=1 +shapecode_1_enabled=0 shapecode_1_sides=100 shapecode_1_additive=0 shapecode_1_thickOutline=0 @@ -177,7 +177,7 @@ shape_1_per_frame6=b = 0.25+0.25*sin(time*0.9339); shape_1_per_frame7=r2 = 0.25+0.25*sin(time*0.779); shape_1_per_frame8=g2 = 0.25+0.25*sin(time*0.707); shape_1_per_frame9=b2 = 0.25+0.25*sin(time*0.747); -shapecode_2_enabled=1 +shapecode_2_enabled=0 shapecode_2_sides=100 shapecode_2_additive=0 shapecode_2_thickOutline=0 @@ -217,7 +217,7 @@ shapecode_3_textured=1 shapecode_3_imageURL=Tux.tga shapecode_3_x=0.500000 shapecode_3_y=0.500000 -shapecode_3_rad=0.20068 +shapecode_3_rad=0.150068 shapecode_3_ang=0.000000 shapecode_3_tex_ang=0.000000 shapecode_3_tex_zoom=0.7100000 diff --git a/presets/Scanner (@ztec)2.milk b/presets/Scanner (@ztec)2.milk deleted file mode 100755 index 2990c8753..000000000 --- a/presets/Scanner (@ztec)2.milk +++ /dev/null @@ -1,135 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.998999 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.886994 -fWaveSmoothing=0.630000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.055000 -ob_r=1.000000 -ob_g=1.000000 -ob_b=0.000000 -ob_a=0.200000 -ib_size=0.003500 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=38.399994 -nMotionVectorsY=24.000004 -mv_dx=0.000000 -mv_dy=0.000002 -mv_l=5.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.700000 -mv_a=0.000000 -per_frame_1=high_bass = above(bass_att,2); -per_frame_2=high_treb = above(treb, 2); -per_frame_3= -per_frame_4=wave_b = if(high_treb,0,1); -per_frame_5= -per_frame_6=//mv_rr = if(high_bass,.5 ,mv_rr*.9); -per_frame_7=//mv_r = mv_rr; -per_frame_8=//mv_b = if(high_treb*high_bass,0,1); -per_frame_9=//mv_g = if(high_treb*high_bass,0,.1*sin(time*.302)+.1); -per_frame_10=//mv_a = if(above(bass_att,1.5),.6,mv_a); -per_frame_11=//mv_x = bits *3; -per_frame_12=//mv_y = mv_x *.8; -per_frame_13= -per_frame_14=ob_r = sin(time*.3)/2+.5; -per_frame_15=ob_g= sin(time*.34)/2+.5; -per_frame_16=ob_b = sin(time*.3714)/2+.5; -per_frame_17= -per_frame_18=boomnow = if(high_bass,time,boomnow); -per_frame_19=brightness = min(sqr(time-boomnow-.866)+.25,1); -per_frame_20=av_bass=if(high_bass,av_bass*.8+.2*bass,av_bass); -per_frame_21=count=count+above(bass,av_bass*1.2); -per_frame_22= -per_frame_23=ob_r = ob_r*brightness; -per_frame_24=ob_g = ob_g*brightness; -per_frame_25=ob_b = ob_b*brightness; -per_frame_26= -per_frame_27=w_dx = (above((w_y*bits)%2,0)*.01-.005)*sin(time); -per_frame_28=w_dy = (above((w_x*bits)%2,0)*.01-.005)*cos(time); -per_frame_29= -per_frame_30=w_x = w_x+w_dx; -per_frame_31=w_y = w_y +w_dy; -per_frame_32=monitor = bits; -per_frame_33=q1 = bits; -per_frame_34=w_x = if(above(abs(w_x-.5),.5),rand(10)/10,w_x); -per_frame_35=w_y = if(above(abs(w_y-.5),.5),rand(10)/10,w_y); -per_frame_36= -per_frame_37=wave_x = w_x; -per_frame_38=wave_y = w_y; -per_frame_39= -per_frame_40=monitor = brightness; -per_frame_41=monitor = av_bass; -per_frame_42=monitor = count; -per_pixel_1=//---- Rotation Angle -per_pixel_2=v_ang=time*.2*(x+y)*(.005+.003*(sin(time*.1)+cos(time*.14))); -per_pixel_3= -per_pixel_4=v_ang = time+sin(x*(sin(time*.32)*3+4)+y*(sin(time*.42)*3+4)); -per_pixel_5= -per_pixel_6=//---- Initialisation: X, Y, ANG, CX, CY, DX, DY, SX, SY -per_pixel_7=//---- to these: VX, VY, VANG, CVX, CVY, DVX, DVY, SVX, SVY -per_pixel_8=vx = (x-.5)*cos(v_ang) - (y-.5)*sin(v_ang)+.5; -per_pixel_9=vy = (x-.5)*sin(v_ang) +(y-.5)*cos(v_ang)+.5; -per_pixel_10=vang=atan((vy-.5)/(vx+.000001-.5))+below(vx,.5)*sign(vy-.5)*3.14159; -per_pixel_11=cvx = (cx-.5)*cos(v_ang) - (cy-.5)*sin(v_ang)+.5; -per_pixel_12=cvy = (cx-.5)*sin(v_ang) +(cy-.5)*cos(v_ang)+.5; -per_pixel_13=svx=sx; svy=sy; dvx=dx; dvy=dy; -per_pixel_14=cang=atan((vy-cvy)/(vx+.000001-cvx)) -per_pixel_15=+below(vx,cvx)*sign(vy-cvy)*3.14159; //Bonus var: angle about (cvx,cvy) -per_pixel_16= -per_pixel_17=//---- Preset Code -per_pixel_18= -per_pixel_19=dx=above(vx,sin(time*.5)*.7+.5)*1.0002; -per_pixel_20=dy = above(vy,(cos(time*.5)*.6+.5)); -per_pixel_21= -per_pixel_22=//---- Realisation of virtual variables -per_pixel_23=cx = (cvx-.5)*cos(-v_ang) - (cvy-.5)*sin(-v_ang)+.5; -per_pixel_24=cy = (cvx-.5)*sin(-v_ang) +(cvy-.5)*cos(-v_ang)+.5; -per_pixel_25=dvx = dvx + (vx-cvx)*(svx-1); -per_pixel_26=dvy = dvy - (vy-cvy)*(svy-1); -per_pixel_27=//dx = dvx*cos(v_ang) - dvy*sin(v_ang); -per_pixel_28=//dy = -dvx*sin(v_ang) - dvy*cos(v_ang); -per_pixel_29=//---- End Virtual Axis Code -per_frame_init_1=bits = rand(7)+7; diff --git a/presets/Telek - Globetrotting (Sailors Delight Mix).milk b/presets/Telek - Globetrotting (Sailors Delight Mix).milk deleted file mode 100755 index 1998b56b5..000000000 --- a/presets/Telek - Globetrotting (Sailors Delight Mix).milk +++ /dev/null @@ -1,230 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.168096 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001519 -fWaveScale=1.330283 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.240000 -fModWaveAlphaEnd=1.300001 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999998 -fShader=0.000000 -zoom=0.951950 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=-0.010000 -warp=0.005536 -sx=1.040604 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.300000 -ib_size=0.000000 -ib_r=0.340000 -ib_g=0.340000 -ib_b=0.340000 -ib_a=0.210000 -nMotionVectorsX=27.859959 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=200 -wavecode_0_sep=0 -wavecode_0_bSpectrum=1 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=0.101300 -wavecode_0_smoothing=0.500000 -wavecode_0_r=0.000000 -wavecode_0_g=0.000000 -wavecode_0_b=0.000000 -wavecode_0_a=1.000000 -wave_0_per_frame1=t1 = 0; -wave_0_per_frame2=t7 = 0.5; -wave_0_per_frame3=t8 = 0; -wave_0_per_point1=tx = max(0,value1-0.005); -wave_0_per_point2=ty = sample*1.1; -wave_0_per_point3= -wave_0_per_point4=t1 = pow(t1*.95,.7)*.35 + tx; -wave_0_per_point5=y = .1+t1+pow(sin(sample*(3+.5*sin(time*5))+time*1.07)*sin(sample*5.24-time*1.012),2)*.05; -wave_0_per_point6=x = ty; -wave_0_per_point7=tt=y-.1; -wave_0_per_point8=g = min(tt*tt*100,1); -wave_0_per_point9=b = if(above(tt,.3),min(tt*15-.3,1),1-g); -wave_0_per_point10=r = if(above(tt,.3),min(tt*15-.3,1),0); -wavecode_1_enabled=1 -wavecode_1_samples=339 -wavecode_1_sep=0 -wavecode_1_bSpectrum=1 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=0.101411 -wavecode_1_smoothing=0.500000 -wavecode_1_r=0.000000 -wavecode_1_g=0.000000 -wavecode_1_b=0.000000 -wavecode_1_a=1.000000 -wave_1_per_frame1=t1 = 0; -wave_1_per_frame2=t7 = 0.5; -wave_1_per_frame3=t8 = 0; -wave_1_per_point1=tx = max(0,value2-0.005); -wave_1_per_point2=ty = (1-sample)*1.4; -wave_1_per_point3= -wave_1_per_point4=t1 = pow(t1*.95,.7)*.29 + tx; -wave_1_per_point5=//y = .1+t1; -wave_1_per_point6=y = .1+t1+pow(sin(sample*(3+.5*sin(time*4))+time*1.254)*sin(sample*5.24-time*.975),2)*.05; -wave_1_per_point7=x = ty-.15; -wave_1_per_point8= -wave_1_per_point9=g = min(t1*t1*100,1); -wave_1_per_point10=b = if(above(t1,.3),min(t1*15-.3,1),1-g); -wave_1_per_point11=r = if(above(t1,.3),min(t1*15-.3,1),0); -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=25 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.180000 -shapecode_0_y=0.700000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.400000 -shapecode_0_r2=0.800000 -shapecode_0_g2=0.400000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.200000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=x = (time*.05-int(time*.05)); -shape_0_per_frame2=y = sin(x*3.141)*.25+.65; -shape_0_per_frame3=a =.8-.8*pow(1-sin(x*3.141),.5); -shape_0_per_frame4=border_a=a; -shape_0_per_frame5=a2=a; -shape_0_per_frame6= -shape_0_per_frame7= -shape_0_per_frame8=x = (x-.5)*1.33+.5; -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.545000 -shapecode_1_rad=1.468148 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=0.819544 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.212000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=dx = dx+.004*sin(time*.2)+.008*sin(time*.105+sin(time*.55)); diff --git a/src/projectM-engine/ChangeLog b/src/projectM-engine/ChangeLog index 6bb8558ce..d18d5bc97 100644 --- a/src/projectM-engine/ChangeLog +++ b/src/projectM-engine/ChangeLog @@ -16,6 +16,8 @@ This release includes months of refactoring. The code changes are immense. The l *projectM-engine, projectM-xmms, projectM-jack, and projectM-test build system converted to CMake +*3D Song title animation + *New Configuration File (more options, more flexible) New for version 0.99 diff --git a/src/projectM-engine/Makefile.am b/src/projectM-engine/Makefile.am deleted file mode 100755 index 88b9f0087..000000000 --- a/src/projectM-engine/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -lib_LTLIBRARIES = libprojectM.la - -libprojectM_la_SOURCES=\ -PCM.cc \ -beat_detect.cc \ -browser.cc \ -builtin_funcs.cc \ -console_interface.cc \ -custom_shape.cc \ -custom_wave.cc \ -editor.cc \ -eval.cc \ -fftsg.cc \ -func.cc \ -glConsole.cc \ -init_cond.cc \ -menu.cc \ -param.cc \ -parser.cc \ -pbuffer.cc \ -per_frame_eqn.cc \ -per_pixel_eqn.cc \ -preset.cc \ -projectM.cc \ -splaytree.cc \ -timer.cc \ -tree_types.cc \ -wipemalloc.cc - -libprojectMincludedir = $(includedir)/projectM -libprojectMinclude_HEADERS = projectM.h pbuffer.h event.h console_interface.h PCM.h - -libprojectM_la_LDFLAGS = -version-info 0:0:0 - -AM_LIBS = @GL_LIBS@ @FTGL_LIBS@ -AM_CXXFLAGS= -DLINUX -D__CPLUSPLUS @GL_CFLAGS@ @FTGL_CFLAGS@ - -libprojectM_la_LIBADD = $(AM_LIBS) - -libprojectMconfigdir = $(datadir)/projectM -libprojectMconfig_DATA = share/config share/config.fastcomputers share/config.slowcomputers - -libprojectMfontdir = $(datadir)/projectM/fonts -libprojectMfont_DATA = share/fonts/*.ttf - -libprojectMpresetdir = $(datadir)/projectM/presets -libprojectMpreset_DATA= share/presets/*.milk - diff --git a/src/projectM-engine/Makefile.dist b/src/projectM-engine/Makefile.dist deleted file mode 100644 index 1b8b8d0ae..000000000 --- a/src/projectM-engine/Makefile.dist +++ /dev/null @@ -1,24 +0,0 @@ -# -# projectM -- Milkdrop-esque visualisation SDK -# Copyright (C)2003-2007 projectM Team -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# See 'LICENSE.txt' included within this release - -clean: - rm -rf Debug - rm -rf Release - rm projectM.ncb - rm projectM.opt diff --git a/src/projectM-engine/Makefile.in b/src/projectM-engine/Makefile.in deleted file mode 100755 index 0f72972a2..000000000 --- a/src/projectM-engine/Makefile.in +++ /dev/null @@ -1,621 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src -DIST_COMMON = $(libprojectMinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ - $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(libprojectMconfigdir)" \ - "$(DESTDIR)$(libprojectMfontdir)" \ - "$(DESTDIR)$(libprojectMpresetdir)" \ - "$(DESTDIR)$(libprojectMincludedir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libprojectM_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libprojectM_la_OBJECTS = PCM.lo beat_detect.lo browser.lo \ - builtin_funcs.lo console_interface.lo custom_shape.lo \ - custom_wave.lo editor.lo eval.lo fftsg.lo func.lo glConsole.lo \ - init_cond.lo menu.lo param.lo parser.lo pbuffer.lo \ - per_frame_eqn.lo per_pixel_eqn.lo preset.lo projectM.lo \ - splaytree.lo timer.lo tree_types.lo wipemalloc.lo -libprojectM_la_OBJECTS = $(am_libprojectM_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libprojectM_la_SOURCES) -DIST_SOURCES = $(libprojectM_la_SOURCES) -libprojectMconfigDATA_INSTALL = $(INSTALL_DATA) -libprojectMfontDATA_INSTALL = $(INSTALL_DATA) -libprojectMpresetDATA_INSTALL = $(INSTALL_DATA) -DATA = $(libprojectMconfig_DATA) $(libprojectMfont_DATA) \ - $(libprojectMpreset_DATA) -libprojectMincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libprojectMinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FTGL_CFLAGS = @FTGL_CFLAGS@ -FTGL_LIBS = @FTGL_LIBS@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -POW_LIB = @POW_LIB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -acx_pthread_config = @acx_pthread_config@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -lib_LTLIBRARIES = libprojectM.la -libprojectM_la_SOURCES = \ -PCM.cc \ -beat_detect.cc \ -browser.cc \ -builtin_funcs.cc \ -console_interface.cc \ -custom_shape.cc \ -custom_wave.cc \ -editor.cc \ -eval.cc \ -fftsg.cc \ -func.cc \ -glConsole.cc \ -init_cond.cc \ -menu.cc \ -param.cc \ -parser.cc \ -pbuffer.cc \ -per_frame_eqn.cc \ -per_pixel_eqn.cc \ -preset.cc \ -projectM.cc \ -splaytree.cc \ -timer.cc \ -tree_types.cc \ -wipemalloc.cc - -libprojectMincludedir = $(includedir)/projectM -libprojectMinclude_HEADERS = projectM.h pbuffer.h event.h console_interface.h PCM.h -libprojectM_la_LDFLAGS = -version-info 0:0:0 -AM_LIBS = @GL_LIBS@ @FTGL_LIBS@ -AM_CXXFLAGS = -DLINUX -D__CPLUSPLUS @GL_CFLAGS@ @FTGL_CFLAGS@ -libprojectM_la_LIBADD = $(AM_LIBS) -libprojectMconfigdir = $(datadir)/projectM -libprojectMconfig_DATA = share/config share/config.fastcomputers share/config.slowcomputers -libprojectMfontdir = $(datadir)/projectM/fonts -libprojectMfont_DATA = share/fonts/*.ttf -libprojectMpresetdir = $(datadir)/projectM/presets -libprojectMpreset_DATA = share/presets/*.milk -all: all-am - -.SUFFIXES: -.SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libprojectM.la: $(libprojectM_la_OBJECTS) $(libprojectM_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libprojectM_la_LDFLAGS) $(libprojectM_la_OBJECTS) $(libprojectM_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PCM.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/beat_detect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/browser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/builtin_funcs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/console_interface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/custom_shape.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/custom_wave.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fftsg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/func.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glConsole.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_cond.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/param.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pbuffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/per_frame_eqn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/per_pixel_eqn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectM.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splaytree.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree_types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wipemalloc.Plo@am__quote@ - -.cc.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cc.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-libprojectMconfigDATA: $(libprojectMconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(libprojectMconfigdir)" || $(mkdir_p) "$(DESTDIR)$(libprojectMconfigdir)" - @list='$(libprojectMconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libprojectMconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libprojectMconfigdir)/$$f'"; \ - $(libprojectMconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libprojectMconfigdir)/$$f"; \ - done - -uninstall-libprojectMconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(libprojectMconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libprojectMconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(libprojectMconfigdir)/$$f"; \ - done -install-libprojectMfontDATA: $(libprojectMfont_DATA) - @$(NORMAL_INSTALL) - test -z "$(libprojectMfontdir)" || $(mkdir_p) "$(DESTDIR)$(libprojectMfontdir)" - @list='$(libprojectMfont_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libprojectMfontDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libprojectMfontdir)/$$f'"; \ - $(libprojectMfontDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libprojectMfontdir)/$$f"; \ - done - -uninstall-libprojectMfontDATA: - @$(NORMAL_UNINSTALL) - @list='$(libprojectMfont_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libprojectMfontdir)/$$f'"; \ - rm -f "$(DESTDIR)$(libprojectMfontdir)/$$f"; \ - done -install-libprojectMpresetDATA: $(libprojectMpreset_DATA) - @$(NORMAL_INSTALL) - test -z "$(libprojectMpresetdir)" || $(mkdir_p) "$(DESTDIR)$(libprojectMpresetdir)" - @list='$(libprojectMpreset_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libprojectMpresetDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libprojectMpresetdir)/$$f'"; \ - $(libprojectMpresetDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libprojectMpresetdir)/$$f"; \ - done - -uninstall-libprojectMpresetDATA: - @$(NORMAL_UNINSTALL) - @list='$(libprojectMpreset_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libprojectMpresetdir)/$$f'"; \ - rm -f "$(DESTDIR)$(libprojectMpresetdir)/$$f"; \ - done -install-libprojectMincludeHEADERS: $(libprojectMinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libprojectMincludedir)" || $(mkdir_p) "$(DESTDIR)$(libprojectMincludedir)" - @list='$(libprojectMinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libprojectMincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libprojectMincludedir)/$$f'"; \ - $(libprojectMincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libprojectMincludedir)/$$f"; \ - done - -uninstall-libprojectMincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libprojectMinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libprojectMincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libprojectMincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libprojectMconfigdir)" "$(DESTDIR)$(libprojectMfontdir)" "$(DESTDIR)$(libprojectMpresetdir)" "$(DESTDIR)$(libprojectMincludedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libprojectMconfigDATA \ - install-libprojectMfontDATA install-libprojectMincludeHEADERS \ - install-libprojectMpresetDATA - -install-exec-am: install-libLTLIBRARIES - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-libprojectMconfigDATA uninstall-libprojectMfontDATA \ - uninstall-libprojectMincludeHEADERS \ - uninstall-libprojectMpresetDATA - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-libprojectMconfigDATA \ - install-libprojectMfontDATA install-libprojectMincludeHEADERS \ - install-libprojectMpresetDATA install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES uninstall-libprojectMconfigDATA \ - uninstall-libprojectMfontDATA \ - uninstall-libprojectMincludeHEADERS \ - uninstall-libprojectMpresetDATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp index 06ee85f0b..efcb2e045 100644 --- a/src/projectM-engine/Renderer.cpp +++ b/src/projectM-engine/Renderer.cpp @@ -85,10 +85,17 @@ Renderer::Renderer(int width, int height, int gx, int gy, int texsize, BeatDetec title_font = new FTGLPixmapFont(title_fontURL.c_str()); other_font = new FTGLPixmapFont(menu_fontURL.c_str()); + other_font->UseDisplayList(true); + title_font->UseDisplayList(true); + poly_font = new FTGLExtrdFont(title_fontURL.c_str()); + + poly_font->UseDisplayList(true); poly_font->Depth(20); poly_font->FaceSize(72); + + poly_font->UseDisplayList(true); #endif /** USE_FTGL */ @@ -395,7 +402,7 @@ void Renderer::reset(int w, int h) glShadeModel( GL_SMOOTH); glCullFace( GL_BACK ); - glFrontFace( GL_CCW ); + //glFrontFace( GL_CCW ); glClearColor( 0, 0, 0, 0 ); @@ -417,7 +424,7 @@ void Renderer::reset(int w, int h) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable( GL_LINE_SMOOTH ); - glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); + glEnable(GL_POINT_SMOOTH); glClear(GL_COLOR_BUFFER_BIT); @@ -428,7 +435,10 @@ void Renderer::reset(int w, int h) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); + + //glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); + //glHint(GL_POINT_SMOOTH_HINT, GL_NICEST); + //glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); if (!this->renderTarget->useFBO) { @@ -1200,11 +1210,11 @@ void Renderer::draw_title_to_screen(bool flip) { setUpLighting(); - glEnable( GL_CULL_FACE); - glEnable( GL_DEPTH_TEST); - glClear( GL_DEPTH_BUFFER_BIT); + //glEnable(GL_POLYGON_SMOOTH); + //glEnable( GL_CULL_FACE); + glEnable(GL_DEPTH_TEST); + glClear(GL_DEPTH_BUFFER_BIT); - int draw; if (drawtitle>=80) draw = 80; else draw = drawtitle; @@ -1220,7 +1230,7 @@ void Renderer::draw_title_to_screen(bool flip) { title_y *= .6; } glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - // glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); + //glBlendFunc(GL_SRC_ALPHA_SATURATE,GL_ONE); glColor4f(1.0,1.0,1.0,1.0); glMatrixMode (GL_PROJECTION); @@ -1239,7 +1249,7 @@ void Renderer::draw_title_to_screen(bool flip) { poly_font->Render(this->title.c_str() ); - //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); this->drawtitle++; @@ -1255,6 +1265,7 @@ void Renderer::draw_title_to_screen(bool flip) { glDisable(GL_COLOR_MATERIAL); glDisable(GL_LIGHTING); + glDisable(GL_POLYGON_SMOOTH); } #endif /** USE_FTGL */ } diff --git a/src/projectM-engine/config b/src/projectM-engine/config deleted file mode 100644 index bf066ae2f..000000000 --- a/src/projectM-engine/config +++ /dev/null @@ -1,22 +0,0 @@ -projectM Config file (ONLY CHANGE THE NUMBERS!!!!!!) ------------------------------------------------------- -Texture Size (Must be power of 2) [256,512,1024,2048, etc] -512 -Grid X Dimension (Higher is Better but much slower) 12-60 -32 -Grid Y Dimension (Higher is Better but much slower) 8-45 -24 -Windowed Width (Initial window width) -512 -Windowed Height (Initial window width) -512 -Fullscreen Width (set to your native screen resolution) -1024 -Fullscreen Height (set to your native screen resolution) -768 -FPS (Higher the Better) 30-90 is realisitc -35 -Fullscreen on Startup (1=yes, 0=no) -0 -X Server to Display projectM default is ":0.0" -:0.0 diff --git a/src/projectM-engine/libprojectM/Debug/libprojectM.pch b/src/projectM-engine/libprojectM/Debug/libprojectM.pch deleted file mode 100755 index e8c8d9c27..000000000 Binary files a/src/projectM-engine/libprojectM/Debug/libprojectM.pch and /dev/null differ diff --git a/src/projectM-engine/libprojectM/Debug/vc60.idb b/src/projectM-engine/libprojectM/Debug/vc60.idb deleted file mode 100755 index 0f48fc1bb..000000000 Binary files a/src/projectM-engine/libprojectM/Debug/vc60.idb and /dev/null differ diff --git a/src/projectM-engine/libprojectM/Debug/vc60.pdb b/src/projectM-engine/libprojectM/Debug/vc60.pdb deleted file mode 100755 index 6e47e71d2..000000000 Binary files a/src/projectM-engine/libprojectM/Debug/vc60.pdb and /dev/null differ diff --git a/src/projectM-engine/libprojectM/libprojectM.plg b/src/projectM-engine/libprojectM/libprojectM.plg deleted file mode 100755 index 1f8cd9f10..000000000 --- a/src/projectM-engine/libprojectM/libprojectM.plg +++ /dev/null @@ -1,16 +0,0 @@ - - -
-

Build Log

-

---------------------Configuration: libprojectM - Win32 Debug-------------------- -

-

Command Lines

- - - -

Results

-libprojectM.lib - 0 error(s), 0 warning(s) -
- - diff --git a/src/projectM-jack/ChangeLog b/src/projectM-jack/ChangeLog index e69de29bb..c80c00a49 100644 --- a/src/projectM-jack/ChangeLog +++ b/src/projectM-jack/ChangeLog @@ -0,0 +1 @@ +10/10/2007 FIRST RELEASE! \ No newline at end of file diff --git a/src/projectM-jack/INSTALL b/src/projectM-jack/INSTALL index 855f060f5..7ffa23754 100644 --- a/src/projectM-jack/INSTALL +++ b/src/projectM-jack/INSTALL @@ -1,3 +1,7 @@ -If from CVS, run autogen.sh first. +First install JACK and projectM 1.0 - ./configure, make, make install. +cmake . -DCMAKE_BUILD_TYPE=RELEASE +make +make install + +You may need to type ccmake . and change the PREFIX if your system prefers /usr instead of /usr/local. \ No newline at end of file diff --git a/src/projectM-jack/README b/src/projectM-jack/README index e69de29bb..92be3d365 100644 --- a/src/projectM-jack/README +++ b/src/projectM-jack/README @@ -0,0 +1 @@ +see INSTALL \ No newline at end of file diff --git a/src/projectM-jack/projectM-jack.cpp b/src/projectM-jack/projectM-jack.cpp index 0fa75aa33..21c7323ac 100644 --- a/src/projectM-jack/projectM-jack.cpp +++ b/src/projectM-jack/projectM-jack.cpp @@ -23,10 +23,7 @@ #include #include #include -#include -#include #include -#include #include "sdltoprojectM.h" #include "ConfigFile.h" @@ -225,7 +222,7 @@ process (jack_nframes_t nframes, void *arg) //memcpy (out, in,sizeof (jack_default_audio_sample_t) * nframes); - globalPM->beatDetect->pcm->addPCMfloat(in,nframes); + globalPM->pcm->addPCMfloat(in,nframes); //printf("%x %f\n",nframes,in[128]); diff --git a/src/projectM-libvisual/ChangeLog b/src/projectM-libvisual/ChangeLog index acf242b64..c7c24183a 100644 --- a/src/projectM-libvisual/ChangeLog +++ b/src/projectM-libvisual/ChangeLog @@ -1,3 +1,8 @@ +2007-10-10 Peter Sperl + + * Converted to cmake + * Updated to libprojectM 1.0 + 2006-01-31 Dennis Smit * actor_projectM.c: Again API updates, and set the GL attribs. diff --git a/src/projectM-libvisual/INSTALL b/src/projectM-libvisual/INSTALL index d33e5e4bd..a6d03be57 100644 --- a/src/projectM-libvisual/INSTALL +++ b/src/projectM-libvisual/INSTALL @@ -1,5 +1,7 @@ First install libvisual-0.4 and projectM 1.0 -cmake . +cmake . -DCMAKE_BUILD_TYPE=RELEASE make make install + +You may need to type ccmake . and change the PREFIX if your system prefers /usr instead of /usr/local. \ No newline at end of file diff --git a/src/projectM-libvisual/README b/src/projectM-libvisual/README index 965dfd3d9..92be3d365 100644 --- a/src/projectM-libvisual/README +++ b/src/projectM-libvisual/README @@ -1,17 +1 @@ -Go to src/projectM and run make to compile the projectM library, then do the standard ./configure, make , make install here in lv-xmms. - -Configuration: - ./configure - To set a prefix use --prefix, other options can be seen by - using ./configure --help - -Building: - make - This will compile the plugins - -Installing: - make install - This will install the plugins - - - +see INSTALL \ No newline at end of file diff --git a/src/projectM-xmms/INSTALL b/src/projectM-xmms/INSTALL index f3846d995..60fa587db 100755 --- a/src/projectM-xmms/INSTALL +++ b/src/projectM-xmms/INSTALL @@ -1,229 +1,7 @@ -Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Install libprojectM 1.0 and XMMS, then: - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +cmake . -DCMAKE_BUILD_TYPE=RELEASE +make +make install +You may need to type ccmake . and change the PREFIX if your system prefers /usr instead of /usr/local. \ No newline at end of file diff --git a/src/projectM-xmms/NEWS b/src/projectM-xmms/NEWS deleted file mode 100755 index e69de29bb..000000000 diff --git a/src/projectM-xmms/README b/src/projectM-xmms/README index 09c126a3b..63c0eafed 100755 --- a/src/projectM-xmms/README +++ b/src/projectM-xmms/README @@ -1,81 +1,6 @@ -PROJECTM README FILE --------------------------------- +see INSTALL -QUICK OVERVIEW ----------------------- -projectM started initially as a reimplementation of the Win32/DirectX based music visualizer Milkdrop under Linux/SDL/OpenGl/XMMS. -It currently supports up to Milkdrop 1.04b presets, but there are some bugs with certain presets containing 1.04 features This project -is 100% GPL'ed - feel free to use the code for whatever. - -WARNING ------------------------- -This is a beta release. There some known bugs, and likely unknown ones. -Please report bugs at the project web page at source forge: http://xmms-projectm.sourceforge.net - -INSTALL ------------------------- - -]1] Install SDL 1.3 branch - -(Un)fortunately there is a special feature in a development branch of SDL dubbed "branch_1_3_x" that projectM requires to handle -different texture sizes and window resizing. This code is under CVS at SDL's sourceforge site, and has not been thoroughly -tested. However, the developers have found it stable enough to merit installation. We provide a source tarball of a recent -CVS version on our website (http://xmms-projectm.sourceforge.net). - - -Once you have downloaded the tarball SDL-1.3.0.tar.gz do the following: - -As usual, run - -sh> ./configure - -followed by - -sh> make - -and as root - -sh> make install - -NOTE: this will install SDL in /usr/local, so when you compile projectM make sure that it finds SDL-1.3 and -not SDL-1.2 (which is likely in /usr with most distributions). Hopefully the configure script will verify this -automatically for you. To force SDL into /usr, type - -./configure --prefix=/usr - -followed by typical make and make install. - -[2] Install projectM - -If you haven't already, download the latest tarball release from http://xmms-projectm.sourceforge.net. - -Then run - -sh> ./configure - -followed by - -sh> make - -and as root - -sh> make install - -This will install projectM into XMMS's Visualization plugin directory. projectM's configuration -files, including the default packaged presets are in /etc/projectM. - -Enable projectM by loading XMMS and pressing CTRL-v. This will bring up the vis plugin menu. Highlight -projectM in the list (if it's not there something went wrong during installation), and click the enable -button. Sit back and enjoy the trippy visuals... - -CONFIGURE ----------- - -edit /etc/projectM/config - - -CREDIT / CONTACT ------------------- +projectM config file now stored at ~/.projectM/config.inp Main Developers: