Changeset 3147

Timestamp:

11/20/08 12:56:59 (16 years ago)

Author:

mattausch

Message:

updated shader loading

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• Camera.h (modified) (1 diff)
• FrameBufferObject.h (modified) (1 diff)
• Material.cpp (modified) (2 diffs)
• RenderTraverser.h (modified) (2 diffs)
• ShaderManager.cpp (modified) (1 diff)
• ShaderProgram.cpp (modified) (1 diff)
• ShaderProgram.h (modified) (4 diffs)
• Texture.h (modified) (3 diffs)
• shaders/antialiasing.cg (modified) (1 diff)

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

@@ -22 +22 @@
 public:
 
+        enum {LEFT_PLANE, RIGHT_PLANE, BOTTOM_PLANE, TOP_PLANE, NEAR_PLANE, FAR_PLANE};
+
         Frustum() {};
 
         Frustum(const Matrix4x4 &trafo);
-
-        enum { LEFT_PLANE, RIGHT_PLANE, BOTTOM_PLANE, TOP_PLANE, NEAR_PLANE, FAR_PLANE};
 
         /** Resizes the current frustum so that it fully encloses the given polyhedron

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

@@ -15 +15 @@
 public:
 
-        enum FORMAT { RGB_UBYTE, RGBA_UBYTE, RGB_FLOAT_16, RGBA_FLOAT_16, RGB_FLOAT_32, RGBA_FLOAT_32 };
-
-        enum WRAP_TYPE { WRAP_REPEAT, WRAP_CLAMP_TO_EDGE };
-        enum FILTER_TYPE { FILTER_NEAREST, FILTER_LINEAR };
+        enum FORMAT {RGB_UBYTE, RGBA_UBYTE, RGB_FLOAT_16, RGBA_FLOAT_16, RGB_FLOAT_32, RGBA_FLOAT_32};
+        enum WRAP_TYPE {WRAP_REPEAT, WRAP_CLAMP_TO_EDGE};
+        enum FILTER_TYPE {FILTER_NEAREST, FILTER_LINEAR};
 
 

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

@@ -74 +74 @@
 void Technique::SetFragmentProgram(ShaderProgram *p) 
 { 
+        if (p->GetProgramType() == ShaderProgram::VERTEX_PROGRAM)
+                cerr << "warning: assigning a vertex program as fragment program!" << endl;
+
         mFragmentProgram = p;
         mFragmentProgramParameters.Reset();
@@ -82 +85 @@
 void Technique::SetVertexProgram(ShaderProgram *p) 
 { 
-        mVertexProgram = p; 
+        if (p->GetProgramType() == ShaderProgram::FRAGMENT_PROGRAM)
+                cerr << "warning: assigning a fragment program as vertex program!" << endl;
+
+        mVertexProgram = p;
         mVertexProgramParameters.Reset();
         mVertexProgramParameters.SetProgram(p);

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

@@ -52 +52 @@
 public:
 
+        /// types of traversers
+        enum {CULL_FRUSTUM, STOP_AND_WAIT, CHC, CHCPLUSPLUS, NUM_TRAVERSAL_TYPES};
+
         /** Default constructor.
         */
@@ -62 +65 @@
         void RenderScene();
 
-        enum {CULL_FRUSTUM, STOP_AND_WAIT, CHC, CHCPLUSPLUS, NUM_TRAVERSAL_TYPES};
         /** Returns the type of the traversal.
             The type is one of

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

@@ -207 +207 @@
         const string fullName = "src/shaders/" + filename + ".cg";
         
-        ShaderProgram *p = 
-                new ShaderProgram(sCgContext, fullName, 
-                                  isFragment ? sCgFragmentProfile : sCgVertexProfile, funcName);
+        ShaderProgram *p;
+
+        if (isFragment)
+        {
+                p = new ShaderProgram(sCgContext, fullName, sCgFragmentProfile, funcName, ShaderProgram::FRAGMENT_PROGRAM);
+        }
+        else
+        {
+                p = new ShaderProgram(sCgContext, fullName, sCgVertexProfile, funcName, ShaderProgram::VERTEX_PROGRAM);
+        }
 
         if (GetShaderProgram(name))

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

@@ -360 +360 @@
                                                          const std::string &filename, 
                                                          CGprofile profile,
-                                                         const std::string &functionName)
+                                                         const std::string &functionName,
+                                                         PROGRAM_TYPE programType):
+mProgramType(programType)
 {
         mProgram = cgCreateProgramFromFile(context, 

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

@@ -220 +220 @@
 public:
 
+        enum PROGRAM_TYPE {FRAGMENT_PROGRAM, VERTEX_PROGRAM};
+
+
         ShaderProgram(CGprogram program): mProgram(program) {}
 
@@ -225 +228 @@
                           const std::string &filename, 
                                   CGprofile profile,
-                                  const std::string &functionName);
+                                  const std::string &functionName,
+                                  PROGRAM_TYPE type);
 
         ~ShaderProgram() { if (mProgram != NULL) cgDestroyProgram(mProgram); }
@@ -276 +280 @@
         */
         void Bind();
+        /** Releases all texture resources.
+        */
+        void Release();
+
         /** Returns true if this program is valid.
         */
-        inline bool IsValid() const { return mProgram != NULL; }
-        /** Releases all texture resources.
-        */
-        void Release();
+        inline bool IsValid() const {return mProgram != NULL;}
+        
+
+        /** Returns type of program (fragment program or vertex program}
+        */
+        inline PROGRAM_TYPE GetProgramType() const {return mProgramType;}
+        /** See get
+        */
+        inline void SetProgramType(PROGRAM_TYPE type) {mProgramType = type;}
 
 
@@ -301 +314 @@
         CGParameterArray mTextureParams;
         CGParameterArray mParameters;
+
+        PROGRAM_TYPE mProgramType;
 };
 

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

@@ -15 +15 @@
 {
 public:
+        
+        enum {FORMAT_INVALID, FORMAT_RGB, FORMAT_RGBA};
+        
+        enum {CLAMP, REPEAT};
+
+
         /** Constructor loading texture from file
         */
@@ -24 +30 @@
         */
         void *GetImage() const;
-        
-        enum { FORMAT_INVALID, FORMAT_RGB, FORMAT_RGBA };
-        
-        enum { CLAMP, REPEAT };
-
         /** Returns width of texture.
         */
@@ -41 +42 @@
         */
         std::string GetName() const;
-
+        /** Returns byte size of a row of the image.
+        */
         int GetRowLength() const;
-
+        /** Returns byte size of one pixel
+        */
         int GetPixelSize() const;
-        
+        /** Returns byte size of the image
+        */
         inline int GetByteSize() const;
         /** Bind the texture.
         */
         void Bind() const;
-
+        /** Sets the boundary mode for the s texture coordinate parameter.
+        */
         void SetBoundaryModeS(int mode) { mBoundaryModeS = mode; }
+        /** Sets the boundary mode for the T texture coordinate parameter.
+        */
         void SetBoundaryModeT(int mode) { mBoundaryModeT = mode; }
-
-        //void SetUseMipMap(bool useMipMap) { mUseMipMap = useMipMap; }
 
         int GetBoundaryModeS() const { return mBoundaryModeS; }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/antialiasing.cg

@@ -98 +98 @@
         //float4 col = float4(centerNormal * 0.5f + float3(0.5f), 0);
         //float4 col = float4(centerNormal, 0);
+
         // push through the current depth
         col.w = centerDepth.x;