Changeset 3045 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Material.h

Timestamp:

10/19/08 23:42:15 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Material.h (modified) (6 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Material.h

@@ -4 +4 @@
 #include "glInterface.h"
 #include "common.h"
+#include "ShaderProgram.h"
 
 
@@ -22 +23 @@
 public:
 
-        float r, g, b, a;
-
         RgbaColor(): r(1), g(1), b(1), a(1)
         {}
@@ -31 +30 @@
 
         friend RgbaColor RandomColor(float a = 0.0f, float b = 1.0f);
+
+
+        /////////////////////
+
+        float r, g, b, a;
 };
 
@@ -50 +54 @@
         */
         Technique();
+
+        Technique(const Technique &tech);
 
         ~Technique();
@@ -88 +94 @@
         ShaderProgram *GetVertexProgram() { return mVertexProgram; }
 
-        void SetFragmentProgramParameters(GPUProgramParameters *p) { mGPUFragmentParameters = p; }
-        void SetVertexProgramParameters(GPUProgramParameters *p) { mGPUVertexParameters = p; }
+        //void SetFragmentProgramParameters(const GPUProgramParameters &p) { mGPUFragmentParameters = p; }
+        //void SetVertexProgramParameters(const GPUProgramParameters &p) { mGPUVertexParameters = p; }
 
-        GPUProgramParameters *GetFragmentProgramParameters() { return mGPUFragmentParameters; }
-        GPUProgramParameters *GetVertexProgramParameters() { return mGPUVertexParameters; }
+        /** Each technique has a distict set of parameters.
+        */
+        GPUProgramParameters * const GetFragmentProgramParameters() { return &mFragmentProgramParameters; }
+        GPUProgramParameters * const GetVertexProgramParameters() { return &mVertexProgramParameters; }
 
 
@@ -109 +117 @@
         Texture *mTexture;
 
-        GPUProgramParameters *mGPUVertexParameters;
-        GPUProgramParameters *mGPUFragmentParameters;
+        GPUProgramParameters mVertexProgramParameters;
+        GPUProgramParameters mFragmentProgramParameters;
 
         ShaderProgram *mFragmentProgram;