Changeset 3294 for GTP/trunk/App/Demos

Timestamp:

01/29/09 18:46:32 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• MainApp.vcproj (modified) (1 diff)
• plot_friendly (modified) (2 diffs)
• ps_memory_plot2 (modified) (1 diff)
• src/Bvh.cpp (modified) (2 diffs)
• src/Geometry.cpp (modified) (7 diffs)
• src/chcdemo.cpp (modified) (7 diffs)

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

@@ -156 +156 @@
                                 IgnoreAllDefaultLibraries="false"
                                 IgnoreDefaultLibraryNames="LIBCMT"
-                                GenerateDebugInformation="true"
+                                GenerateDebugInformation="false"
                                 SubSystem="1"
                                 LargeAddressAware="2"

GTP/trunk/App/Demos/Vis/FriendlyCulling/plot_friendly

@@ -9 +9 @@
 #PREFIX=pp_2
 PREFIX=myvienna
+PREFIX=vienna
+PREFIX=pp
 
 #FILES="$PREFIX-vfc.log $PREFIX_chc.log $PREFIX-vfc_pvs.log $PREFIX-chc++_b20.log $PREFIX-chc++_pvs_b20.log"
@@ -16 +18 @@
 #FILES="$PREFIX-chc.log $PREFIX-vfc_pvs.log $PREFIX-vfc_pvs_smaller.log $PREFIX-chc++.log $PREFIX-chc++_pvs.log $PREFIX-chc++_pvs_smaller.log"
 FILES="$PREFIX-vfc.log $PREFIX-vfc_pvs.log $PREFIX-chc++.log"
+FILES="$PREFIX-notindexed.log $PREFIX-indexed.log"
 #FILES="$PREFIX-vfc.log $PREFIX-chc++.log $PREFIX-vfc_pvs.log"
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/ps_memory_plot2

@@ -23 +23 @@
 #echo set xrange \[100:20000\] >> $FILE
 #echo set xrange \[4200:4600\] >> $FILE
-#echo set xrange \[100:400\] >> $FILE
-echo set xrange \[1600:2100\] >> $FILE
+echo set xrange \[100:400\] >> $FILE
+echo set xrange \[1000:1600\] >> $FILE
+#echo set xrange \[1600:2100\] >> $FILE
 #echo set xrange \[3000:3500\] >> $FILE
 #echo set xrange \[1600:2000\] >> $FILE

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

@@ -658 +658 @@
         {
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
-                //glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
+                //glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
 
                 // set the vertex pointer to the vertex buffer
@@ -862 +862 @@
                 state->SetCurrentVboId(mVboId);
         }
-
+        // update bounds of dynamic hierarchy
         glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0,
                                            bufferSize * sizeof(Vector3), 

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

@@ -37 +37 @@
         mHasTexture = (mTexCoords != NULL);
         mHasTangents = (mTangents != NULL);
-
+/*
+        mIndices = new unsigned int[mNumVertices];
+
+        for (int i = 0; i < mNumVertices; ++ i)
+        {
+                mIndices[i] = i;
+        }*/
+
+        // prepare vbos
         Prepare();
 
-        mIndices = new unsigned int[mNumVertices];
-
-        for (int i = 0; i < mNumVertices; ++ i)
-        {
-                mIndices[i] = i;
-        }
-
         if (delData)
         {
                 DEL_ARRAY_PTR(mVertices);
+                DEL_ARRAY_PTR(mIndices);
                 DEL_ARRAY_PTR(mNormals);
                 DEL_ARRAY_PTR(mTexCoords);
@@ -65 +67 @@
         DEL_ARRAY_PTR(mIndices);
 
-        // delete vbo
+        // delete vbos
         glDeleteBuffersARB(1, &mVboId);
+        glDeleteBuffersARB(1, &mVboId2);
 }
 
@@ -144 +147 @@
 
         glBufferDataARB(GL_ARRAY_BUFFER_ARB, dataSize * sizeof(float), 
-                            (float *)data, GL_STATIC_DRAW_ARB);
+                            data, GL_STATIC_DRAW_ARB);
 
         glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
 
-        glGenBuffersARB(1, &mVboId2);
-        
-        glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
-        glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mNumVertices * sizeof(unsigned int), 
-                            mIndices, GL_STATIC_DRAW_ARB);
-
-        int bufferSize;
-        glGetBufferParameterivARB(GL_ELEMENT_ARRAY_BUFFER_ARB, GL_BUFFER_SIZE_ARB, &bufferSize);
-        // cout << "Index Array in VBO: " << bufferSize << " bytes\n";
-
-        glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+
+        ///////////
+        //-- the index array
+
+        if (mIndices)
+        {
+                glGenBuffersARB(1, &mVboId2);
+
+                glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
+                glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mNumVertices * sizeof(unsigned int), 
+                        mIndices, GL_STATIC_DRAW_ARB);
+
+                int bufferSize;
+                glGetBufferParameterivARB(GL_ELEMENT_ARRAY_BUFFER_ARB, GL_BUFFER_SIZE_ARB, &bufferSize);
+                //cout << "Index Array in VBO: " << bufferSize << " bytes\n" << "id: " << mVboId2 << endl;
+
+                glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+        }
 
         // data handled by graphics driver from now on
@@ -175 +185 @@
         {
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
-                //glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
 
                 int currentPointer;
@@ -182 +191 @@
                 if (mHasTangents)
                 {
-                        //glClientActiveTextureARB(GL_TEXTURE1_ARB);
-                        //glTexCoordPointer(2, GL_FLOAT, (char *)NULL + mNumVertices * sizeof(Vector3));
-
                         glColorPointer(3, GL_FLOAT, 0, (char *)NULL + mNumVertices * 2 * sizeof(Vector3));
                         currentPointer = mNumVertices * 3 * sizeof(Vector3);
-                        //glClientActiveTextureARB(GL_TEXTURE0_ARB);
-
                 }
                 else
@@ -201 +205 @@
 
                 glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);  
+                //glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mVboId2);
+
                 /// update state
                 state->SetCurrentVboId(mVboId);
@@ -206 +212 @@
 
         glDrawArrays(GL_TRIANGLES, 0, mNumVertices);
-        //glDrawElements(GL_TRIANGLES, mNumVertices, GL_UNSIGNED_INT, mIndices);
         //glDrawElements(GL_TRIANGLES, mNumVertices, GL_UNSIGNED_INT, 0); 
-
-        //glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-        //glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
 
         if (mHasTangents) glDisableClientState(GL_COLOR_ARRAY);

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

@@ -488 +488 @@
                 env.GetFloatParam(string("skyDomeScaleFactor"), skyDomeScaleFactor);
                 env.GetIntParam(string("visibilitySolutionInitialState"), visibilitySolutionInitialState);
+                env.GetIntParam(string("renderMode"), renderMode);
                 
                 //env.GetStringParam(string("modelPath"), model_path);
@@ -527 +528 @@
                 cout << "use skylight for illumination: " << useSkylightForIllum << endl;
                 cout << "sky dome scale factor: " << skyDomeScaleFactor << endl;
+                cout << "rendermode: " << renderMode << endl;
 
                 //cout << "model path: " << model_path << endl;
-                cout << "**** end parameters ****" << endl << endl;
+                cout << "==== end parameters ====" << endl << endl;
         }
 
@@ -617 +619 @@
         //LoadModel("sibenik.dem", dynamicObjects);
 
-        if (1) LoadPompeiiFloor();
+        if (0) LoadPompeiiFloor();
 
 #if 0
@@ -958 +960 @@
         tr->SetMaxBatchSize(maxBatchSize);
         tr->SetUseMultiQueries(useMultiQueries);
-        tr->SetUseTightBounds(useTightBounds);
+        tr->SetUseTightBounds((renderMode == RenderTraverser::CHCPLUSPLUS) && useTightBounds);
         tr->SetUseDepthPass((renderMethod == RENDER_DEPTH_PASS) || (renderMethod == RENDER_DEPTH_PASS_DEFERRED));
         tr->SetRenderQueue(renderQueue);
@@ -1331 +1333 @@
                 //      ((PvsCollectionRenderer *)traverser)->SetViewCell(usePvs ? viewCell : NULL);
 
-                //renderState.LockCullFaceEnabled(true);
-
                 // actually render the scene geometry using the specified algorithm
                 traverser->RenderScene();
@@ -1641 +1641 @@
         case 'B':
                 useTightBounds = !useTightBounds;
-                traverser->SetUseTightBounds(useTightBounds);
+                traverser->SetUseTightBounds((renderMode == RenderTraverser::CHCPLUSPLUS) && useTightBounds);
                 break;
         case 'v':
@@ -2332 +2332 @@
                                 {"forward", "depth pass + forward", "deferred shading", "depth pass + deferred"};
                         sprintf(msg[i ++], "multiqueries: %d, tight bounds: %d, render queue: %d", 
-                                        useMultiQueries, useTightBounds, useRenderQueue);
+                                        useMultiQueries, (renderMode == RenderTraverser::CHCPLUSPLUS) && useTightBounds, useRenderQueue);
                         sprintf(msg[i ++], "render technique: %s, use pvss: %d", renderMethodStr[renderMethod], usePvs);
                         sprintf(msg[i ++], "triangles per virtual leaf: %5d", trianglesPerVirtualLeaf);