Changeset 3034 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShaderProgram.cpp

Timestamp:

10/16/08 19:51:16 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShaderProgram.cpp (modified) (13 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShaderProgram.cpp

@@ -46 +46 @@
 void GPUProgramParameters::SetTexture(int idx, unsigned int tex)
 {
+        mTextures.push_back(IntParam(idx, tex));
 }
 
@@ -56 +57 @@
 void GPUProgramParameters::SetValue1f(const string &name, float val)
 {
-        SetValue1f(mProgram->GetParameter(name), val);
-}
-
-
-void ShaderProgram::SetValue2f(const string &name, float val1, float val2)
-{
-        SetValue2f(mProgram->GetParameter(name), val1, val2);
+        SetValue1f(mProgram->GetParamIdxByName(name), val);
+}
+
+
+void GPUProgramParameters::SetValue2f(const string &name, float val1, float val2)
+{
+        SetValue2f(mProgram->GetParamIdxByName(name), val1, val2);
 }
 
@@ -68 +69 @@
 void GPUProgramParameters::SetValue3f(const string &name, float val1, float val2, float val3)
 {
-        SetValue3f(mProgram->GetParameter(name), val1, val2, val3);
+        SetValue3f(mProgram->GetParamIdxByName(name), val1, val2, val3);
 }
 
@@ -74 +75 @@
 void GPUProgramParameters::SetArray1f(const string &name, float *vals, int numElements)
 {
-        SetArray1f(mProgram->GetParameter(name), numElements, (const float *)vals);
-}
-
-
-void GPUProgramParameters::GetParameter(const string &name, float *vals, int numElements)
-{
-        SetArray2f(mProgram->GetParameter(name, numElements, (const float *)vals);
+        SetArray1f(mProgram->GetParamIdxByName(name), vals, numElements);
+}
+
+
+void GPUProgramParameters::SetArray2f(const string &name, float *vals, int numElements)
+{
+        SetArray2f(mProgram->GetParamIdxByName(name), vals, numElements);
 }
 
@@ -86 +87 @@
 void GPUProgramParameters::SetArray3f(const string &name, float *vals, int numElements)
 {
-        SetArray3f(mProgram->GetParameter(name), numElements, (const float *)vals);
+        SetArray3f(mProgram->GetParamIdxByName(name), vals, numElements);
 }
 
@@ -92 +93 @@
 void GPUProgramParameters::SetMatrix(const string &name, Matrix4x4 *mat)
 {
-        SetMatrix(mProgram->GetParameter(name), mat);
+        SetMatrix(mProgram->GetParamIdxByName(name), mat);
 }
 
@@ -98 +99 @@
 void GPUProgramParameters::SetTexture(const string &name, unsigned int tex)
 {
-        SetTexture(mProgram->GetOrCreateParameter(name), tex);
-}
+        SetTexture(mProgram->GetParamIdxByName(name), tex);
+}
+
+
+void GPUProgramParameters::UpdateParameters()
+{
+        for (size_t i = 0; i < mFloats.size(); ++ i)
+        {
+                const FloatParam &p = mFloats[i];
+
+                switch (p.mNumComponents)
+                {
+                case 1:
+                        mProgram->SetValue1f(p.mIndex, p.mValues[0]);
+                        break;
+                case 2:
+                        mProgram->SetValue2f(p.mIndex, p.mValues[0], p.mValues[1]);
+                        break;
+                case 3:
+                        mProgram->SetValue3f(p.mIndex, p.mValues[0], p.mValues[1], p.mValues[2]);
+                        break;
+                default:
+                        mProgram->SetValue1f(p.mIndex, p.mValues[0]);
+                }
+        }
+
+        for (size_t i = 0; i < mTextures.size(); ++ i)
+        {
+                const IntParam &p = mTextures[i];
+                mProgram->SetTexture(p.mIndex, p.mValue);
+        }
+
+        for (size_t i = 0; i < mMatrices.size(); ++ i)
+        {
+                const MatrixParam &p = mMatrices[i];
+                mProgram->SetMatrix(p.mIndex, *p.mValue);
+        }
+}
+
+
+
+/********************************************************/
+/*             ShaderProgram implementation             */
+/********************************************************/
 
 
@@ -116 +159 @@
         if (mProgram) cgGLLoadProgram(mProgram);
 
-        mParameters.resize(64);
-
-        for (int i = 0; i < 64; ++ i)
+        const int maxParams = 64;
+        mParameters.resize(maxParams);
+
+        for (int i = 0; i < maxParams; ++ i)
         {
                 mParameters[i] = NULL;
@@ -151 +195 @@
         CGparameter p = GetOrCreateParameter(name);
 
+        mParamHash[name] = idx;
         mParameters[idx] = p;
+
         return p;
 }
@@ -164 +210 @@
         {
                 p = cgGetNamedParameter(mProgram, name.c_str());
-                mParamHash[name] = i;
         }
         else
@@ -178 +223 @@
 CGparameter ShaderProgram::GetParameter(int idx) const
 {
-        CGparameter p = mParameters[idx];
-        return p;
+        return mParameters[idx];
 }
 
@@ -231 +275 @@
         cgGLSetTextureParameter(p, tex);
         cgGLEnableTextureParameter(p);
+}
+
+
+void ShaderProgram::SetValue1f(const string &name, float val)
+{
+        cgGLSetParameter1f(GetOrCreateParameter(name), val);
+}
+
+
+void ShaderProgram::SetValue2f(const string &name, float val1, float val2)
+{
+        cgGLSetParameter2f(GetOrCreateParameter(name), val1, val2);
+}
+
+
+void ShaderProgram::SetValue3f(const string &name, float val1, float val2, float val3)
+{
+        cgGLSetParameter3f(GetOrCreateParameter(name), val1, val2, val3);
+}
+
+
+void ShaderProgram::SetArray1f(const string &name, float *vals, int numElements)
+{
+        cgGLSetParameterArray1f(GetOrCreateParameter(name), 0, numElements, (const float *)vals);
+}
+
+
+void ShaderProgram::SetArray2f(const string &name, float *vals, int numElements)
+{
+        cgGLSetParameterArray2f(GetOrCreateParameter(name), 0, numElements, (const float *)vals);
+}
+
+
+void ShaderProgram::SetArray3f(const string &name, float *vals, int numElements)
+{
+        cgGLSetParameterArray3f(GetOrCreateParameter(name), 0, numElements, (const float *)vals);
+}
+
+
+void ShaderProgram::SetMatrix(const string &name, const Matrix4x4 &mat)
+{
+        cgGLSetMatrixParameterfc(GetOrCreateParameter(name), (const float *)mat.x);
+}
+
+
+void ShaderProgram::SetTexture(const string &name, unsigned int tex)
+{
+        CGparameter p = GetOrCreateParameter(name);
+
+        cgGLSetTextureParameter(p, tex);
+        cgGLEnableTextureParameter(p);
 
         mTextureParams.push_back(p);
@@ -236 +331 @@
 
 
-int ShaderProgram::GetParameter(const std::string &name)
-{
-        return mParamHash[name];
+int ShaderProgram::GetParamIdxByName(const std::string &name) const
+{
+        CGParameterMap::const_iterator it = mParamHash.find(name);
+        return (*it).second;
 }