Changeset 3126

Timestamp:

11/13/08 18:48:41 (16 years ago)

Author:

mattausch

Message:

started to include normal mapping

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/Geometry.cpp (modified) (5 diffs)
• src/Geometry.h (modified) (4 diffs)
• src/RenderState.cpp (modified) (2 diffs)
• src/ResourceManager.cpp (modified) (2 diffs)
• src/SceneEntityConverter.cpp (modified) (1 diff)
• src/ShaderManager.cpp (modified) (1 diff)
• src/shaders/combineSsao.cg (modified) (1 diff)
• src/shaders/mrt.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -764 +764 @@
                         </File>
                         <File
+                                RelativePath=".\src\shaders\normalMapping.cg"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\shaderenv.h"
                                 >

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

@@ -23 +23 @@
                                    Texcoord2 *texcoords,
                                    int numVertices,
-                                   bool delData):
+                                   bool delData,
+                                   Vector3 *tangents):
 mVertices(vertices), 
 mNormals(normals), 
 mTexCoords(texcoords),
+mTangents(tangents),
 mNumVertices(numVertices), 
 mVboId(-1)
 {
         mHasTexture = (mTexCoords != NULL);
+        mHasTangents = (mTangents != NULL);
 
         Prepare();
@@ -39 +42 @@
                 DEL_ARRAY_PTR(mNormals);
                 DEL_ARRAY_PTR(mTexCoords);
+                DEL_ARRAY_PTR(mTangents);
         }
 }
@@ -48 +52 @@
         DEL_ARRAY_PTR(mNormals);
         DEL_ARRAY_PTR(mTexCoords);
+        DEL_ARRAY_PTR(mTangents);
 
         // delete vbo
@@ -60 +65 @@
         int dataSize = mNumVertices * 6;
 
-        if (mTexCoords)
-                dataSize += mNumVertices * 2;
+        if (mTexCoords) dataSize += mNumVertices * 2;
         
+        if (mTangents) dataSize += mNumVertices * 3;
+
         float *data = new float[dataSize];
 
@@ -71 +77 @@
         }
 
+        float *currentPData = data + mNumVertices * 6;
+
+        if (mTangents)
+        {
+                for (int i = 0; i < mNumVertices; ++ i)
+                        ((Vector3 *)data)[mNumVertices * 3 + i] = mTangents[i];
+
+                currentPData += mNumVertices * 3;
+        }
+
         if (mTexCoords)
         {
                 for (int i = 0; i < mNumVertices; ++ i)
-                        ((Texcoord2 *)data)[mNumVertices * 3 + i] = mTexCoords[i];
+                        ((Texcoord2 *)currentPData)[i] = mTexCoords[i];
         }
+
 
         glGenBuffersARB(1, &mVboId);
         glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
 
+        int currentPVbo = 0;
+
         glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);
-        glNormalPointer(GL_FLOAT, 0, (char *)NULL + mNumVertices * sizeof(Vector3));
+
+        currentPVbo += mNumVertices * sizeof(Vector3);
+        glNormalPointer(GL_FLOAT, 0, (char *)NULL + currentPVbo);
+
+        currentPVbo += mNumVertices * 2 * sizeof(Vector3);
+
+        if (mTangents)
+        {
+                glColorPointer(3, GL_FLOAT, 0, (char *)NULL + currentPVbo);
+                currentPVbo += mNumVertices * sizeof(Vector3);
+        }
 
         if (mTexCoords)
         {
-                glTexCoordPointer(2, GL_FLOAT, 0, (char *)NULL + 2 * mNumVertices * sizeof(Vector3));
+                glTexCoordPointer(2, GL_FLOAT, 0, (char *)NULL + currentPVbo);
         }
 
-        glBufferDataARB(GL_ARRAY_BUFFER_ARB, 
-                            dataSize * sizeof(float), 
-                            (float *)data, 
-                                        GL_STATIC_DRAW_ARB);
+        glBufferDataARB(GL_ARRAY_BUFFER_ARB, dataSize * sizeof(float), 
+                            (float *)data, GL_STATIC_DRAW_ARB);
 
         glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);

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

@@ -21 +21 @@
 
 public:
-        /** Constructs a geometry from the given data. 
-                The vertices are interpreted as triangles.
-
-                If delData is true, the vertex / normal / texture is deleted when
-                after it was transferred into a vbo
+        /** Constructs a geometry from the given data. The vertices are 
+                interpreted as triangles. If delData is true, the 
+                vertex / normal / texture is deleted when after it was 
+                transferred into a vbo
         */
         Geometry(Vector3 *vertices, 
@@ -31 +30 @@
                          Texcoord2 *texcoords, 
                          int numVertices, 
-                         bool delData);
-
+                         bool delData,
+                         Vector3 *tangents);
+        /** Detructor destroying the opengl resources.
+        */
         ~Geometry();
         /** Render the geometry
         */
         void Render(RenderState *state);
-
-        int GetNumTriangles() const { return mNumVertices / 3; }
-
+        /** Return bounding box.
+        */
+        const AxisAlignedBox3& GetBoundingBox() const;
+        /** Returns the number of triangles in this geometry.
+        */
+        inline int GetNumTriangles() const { return mNumVertices / 3; }
+        /** Returns true if this geometry has a texture
+        */
         inline bool HasTexture() const { return mHasTexture; }
         
-        const AxisAlignedBox3& GetBoundingBox() const;
 
 protected:
-
+        /** Calculates the bounding box from the vertices.
+        */
         void CalcBoundingBox();
         /** Prepare vbos for rendering
@@ -58 +64 @@
         Vector3 *mNormals;
 
+        Vector3 *mTangents;
+
         Texcoord2 *mTexCoords;
 
@@ -67 +75 @@
 
         bool mHasTexture;
+
+        bool mHasTangents;
 };
 

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

@@ -236 +236 @@
 
 
+        // set texture for fixed function rendering
+        if (tex)
+        {
+                if (mCurrentTexId != tex->GetId())
+                {
+                        tex->Bind();
+                        mCurrentTexId = tex->GetId();
+                }
+        }
+        else
+        {
+                mCurrentTexId = -1;
+                glBindTexture(GL_TEXTURE_2D, 0);
+        }
+
+
         //////////////////
         //-- fragment and vertex programs
@@ -292 +308 @@
                 }
         }
-
-        if (!mFragmentProgramEnabled)
-        {
-                // set texture for fixed function rendering
-                if (tex)
-                {
-                        if (mCurrentTexId != tex->GetId())
-                        {
-                                tex->Bind();
-                                mCurrentTexId = tex->GetId();
-                        }
-                }
-                else
-                {
-                        mCurrentTexId = -1;
-                        glBindTexture(GL_TEXTURE_2D, 0);
-                }
-        }
 }
 

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

@@ -292 +292 @@
 
         if (deferred->GetTexture())
-        {
                 deferred->SetFragmentProgram(sDefaultFragmentTexProgramMrt);
-                deferred->GetFragmentProgramParameters()->SetViewMatrixParam(0);
-                deferred->GetFragmentProgramParameters()->SetTexture(1, tech->GetTexture()->GetId());
-        }       
         else
-        {
                 deferred->SetFragmentProgram(sDefaultFragmentProgramMrt);
-                deferred->GetFragmentProgramParameters()->SetViewMatrixParam(0);
-        }
+
+        deferred->GetFragmentProgramParameters()->SetViewMatrixParam(0);
 
         deferred->SetVertexProgram(sDefaultVertexProgramMrt);
@@ -361 +356 @@
         }
 
-        return new Geometry(vertices, normals, texcoords, vertexCount, true);
+        return new Geometry(vertices, normals, texcoords, vertexCount, true, NULL);
         //return new Geometry(vertices, normals, texcoords, vertexCount, false);
 }

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

@@ -41 +41 @@
         cout << "number of triangles in box: " << (int)triangles.size() << endl;
 
-        Geometry *geom = new Geometry(vertices, normals, NULL, 36, false);
+        Geometry *geom = new Geometry(vertices, normals, NULL, 36, false, NULL);
 
         Shape *shape = new Shape(geom, mat);

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

@@ -100 +100 @@
 
         // add a texture parameter
-        fragmentProgMrtTex->AddParameter("tex", 1);
+        //fragmentProgMrtTex->AddParameter("tex", 1);
 
 

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

@@ -124 +124 @@
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
                 //ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights, 1.0f / (1.0f + ao.y));
-                ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor / (scaleFactor + ao.y));
-                //ao.x = BilateralFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, 1.0f);
+                //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor / (scaleFactor + ao.y));
+                ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, 1.0f);
         }
 

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

@@ -75 +75 @@
 
 pixel fragtex(fragin IN, 
-                          uniform sampler2D tex,
+                          uniform sampler2D tex: TEXUNIT0,
                           uniform float4x4 viewMatrix
                           )