From be66f3290ecf21471671d4e65d1c2caa3686daa8 Mon Sep 17 00:00:00 2001
From: psperl <psperl@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Sat, 12 Jul 2008 23:41:21 +0000
Subject: [PATCH] starting to make progress again

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1095 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-engine/projectM.cg | 56 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/projectM-engine/projectM.cg b/src/projectM-engine/projectM.cg
index 04f06fb9e..247b38e71 100644
--- a/src/projectM-engine/projectM.cg
+++ b/src/projectM-engine/projectM.cg
@@ -20,6 +20,32 @@ sampler2D sampler_main;
 
 #define uv_orig uv
 
+uniform sampler2D sampler_arg : TEX0;
+             uniform sampler2D sampler_noise_lq;
+             uniform sampler2D sampler_noise_lq_lite;
+             uniform sampler2D sampler_noise_mq;
+             uniform sampler2D sampler_noise_hq;
+             uniform sampler3D sampler_noisevol_lq;
+             uniform sampler3D sampler_noisevol_hq;
+             uniform float4 texsize_noise_lq;
+             uniform float4 texsize_noise_lq_lite;
+             float time;
+             float4 rand_preset;
+             float4 rand_frame;
+             float  progress;
+             float  frame;
+             float  fps;
+             float  bass;
+             float  mid;
+             float  treb;
+             float  vol;
+             float  bass_att;
+             float  mid_att;
+             float  treb_att;
+             float  vol_att;
+             float4 texsize;
+             float4 aspect;
+
 #define sampler_pw_main sampler_main
 #define sampler_pc_main sampler_main
 #define sampler_fw_main sampler_main
@@ -47,39 +73,11 @@ ret += tex2D(sampler_main, float2(uv.x, uv.y - .001)).xyz;
 return ret * 0.2;
 }
 
-outtype projectm (float2 uv : TEXCOORD0,
-             uniform sampler2D sampler_arg : TEX0,
-             uniform sampler2D sampler_noise_lq,
-             uniform sampler2D sampler_noise_lq_lite,
-             uniform sampler2D sampler_noise_mq,
-             uniform sampler2D sampler_noise_hq,
-             uniform sampler3D sampler_noisevol_lq,
-             uniform sampler3D sampler_noisevol_hq,
-             uniform float4 texsize_noise_lq,
-             uniform float4 texsize_noise_lq_lite,
-             uniform float time,
-             uniform float4 rand_preset,
-             uniform float4 rand_frame,
-             uniform float  progress,
-             uniform float  frame,
-             uniform float  fps,
-             uniform float  bass,
-             uniform float  mid,
-             uniform float  treb,
-             uniform float  vol,
-             uniform float  bass_att,
-             uniform float  mid_att,
-             uniform float  treb_att,
-             uniform float  vol_att,
-             uniform float4 texsize,
-             uniform float4 aspect
-             )
+outtype projectm (float2 uv : TEXCOORD0)
 {
   outtype OUT;
   OUT.color.w=1;
   float3 ret;
 
-  sampler_main = sampler_arg;
-
   float rad = getrad;
   float ang = getang;