Changeset 2823 for GTP/trunk

Timestamp:

07/08/08 13:03:12 (16 years ago)

Author:

mattausch

Message:

debug version providing not instanted geometryx

Location:

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

Files:

• Geometry.h (modified) (1 diff)
• ResourceManager.cpp (modified) (4 diffs)
• SceneEntity.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (2 diffs)
• shaders/deferred.cg (modified) (1 diff)

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

@@ -16 +16 @@
 class Geometry
 {
+friend class ResourceManager;
+
 public:
         /** Constructor taking an array of triangles.
         */
-        Geometry(Vector3 *vertices, Vector3 *normals, float *texcoords, int numVertices, bool delData);
+        Geometry(Vector3 *vertices, 
+                     Vector3 *normals, 
+                         float *texcoords, 
+                         int numVertices, 
+                         bool delData);
 
         ~Geometry();

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

@@ -6 +6 @@
 #include "Texture.h"
 #include "gzstream.h"
+#include "Matrix4x4.h"
+#include "Vector3.h"
 
 
@@ -41 +43 @@
         Matrix4x4 *trafo;
         
+        SceneEntity *sceneGeom;
+
         if (!hasTrafo)
         {
                 trafo = NULL;
+                sceneGeom = new SceneEntity(geom, mat, trafo);
         }
         else
@@ -50 +55 @@
                 str.read(reinterpret_cast<char *>(trafo->x), sizeof(Matrix4x4));
                 mTrafos.push_back(trafo);
-        }
-
-        SceneEntity *sceneGeom = new SceneEntity(geom, mat, trafo);
+#if 0 // use instancing
+                Vector3 *vertices = new Vector3[geom->mNumVertices];
+
+                for (int i = 0; i < geom->mNumVertices; ++ i)
+                {
+                        Vector3 v = geom->mVertices[i];
+
+                        v = (*trafo) * v;
+                        vertices[i] = v;
+                }
+
+                Geometry *tgeom = new Geometry(vertices, geom->mNormals, geom->mTexCoords, geom->mNumVertices, false);
+
+                sceneGeom = new SceneEntity(tgeom, mat, NULL);
+#else
+                sceneGeom = new SceneEntity(geom, mat, trafo);
+#endif
+        }
 
         return sceneGeom;
@@ -175 +195 @@
         }
 
-        return new Geometry(vertices, normals, texcoords, vertexCount, true);
+        //return new Geometry(vertices, normals, texcoords, vertexCount, true);
+        return new Geometry(vertices, normals, texcoords, vertexCount, false);
 }
 

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

@@ -30 +30 @@
         if (mMaterial) mMaterial->Render(state);
 
+        static Matrix4x4 identity = IdentityMatrix();
+
         if (mTransform)
         {
@@ -37 +39 @@
                 mGeometry->Render(state);
 
+                cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)identity.x);
                 //glPopMatrix();
         }
         else
         {
-                static Matrix4x4 identity = IdentityMatrix();
-
-                cgGLSetMatrixParameterfc(sModelMatrixParam, (const float *)identity.x);
                 mGeometry->Render(state);
         }

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

@@ -82 +82 @@
 
 /// these values get scaled with the frame rate
-const static float keyForwardMotion = 50.0f;
-const static float keyRotation = 2.0f;
+const static float keyForwardMotion = 30.0f;
+const static float keyRotation = 1.5f;
 
 /// elapsed time in seconds
@@ -503 +503 @@
                 sColorsTexParam = cgGetNamedParameter(sCgDeferredProgram, "colors");  
                 sNormalsTexParam = cgGetNamedParameter(sCgDeferredProgram, "normals");  
-                //sNoiseTexParam = cgGetNamedParameter(sCgDeferredProgram, "noiseTexture");
-
-                //sSamplesParam = cgGetNamedParameter(sCgDeferredProgram, "samples");
-                //cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples);
         }
         else

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

@@ -96 +96 @@
     
     //sample noisetex; r stores costheta, g stores sintheta
-    float2 noise = tex2D(noiseTexture, IN.texCoord.xy).xy * 2.0f - 1.0f;
+    float2 noise = tex2D(noiseTexture, IN.texCoord.xy * 7.0f).xy * 2.0f - 1.0f;
         
     // rotation