Changeset 3238 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

01/02/09 03:37:07 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• RenderQueue.cpp (modified) (1 diff)
• ResourceManager.cpp (modified) (1 diff)
• Shape.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (7 diffs)

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

@@ -50 +50 @@
         if (tech->IsDepthWriteEnabled() != mBuckets[idx]->mDepthWriteEnabled) { return false; }
 
-        //if (tech->IsColorWriteEnabled()) cout << "x";
-
         const bool hasTexture = (tech->GetTexture() != NULL);
 

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

@@ -109 +109 @@
                         int shapeId;
                         str.read(reinterpret_cast<char *>(&shapeId), sizeof(int));
-cout<<"x";
 
                         Geometry *geom = mGeometryTable[shapeId];
-cout<<"y";
-
                         Material *mat = mMaterialTable[shapeId];
-cout<<"z";
                         // create shape
                         Shape *shape = new Shape(geom, mat);
-cout<<"w";
 
                         mShapes.push_back(shape);

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

@@ -15 +15 @@
 mGeometry(geometry), 
 mMaterial(mat)
-{       std::cout<<"i";
+{       
         mCenter = GetBoundingBox().Center();
-        std::cout<<"R";
+        
 }
 

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

@@ -58 +58 @@
 #include "WalkThroughRecorder.h"
 #include "StatsWriter.h"
-#include "Halton.h"
 
 
@@ -127 +126 @@
 string statsFilename("stats");
 
+string filename("city");
+
+
 /// the walkThroughRecorder
 WalkThroughRecorder *walkThroughRecorder = NULL;
@@ -428 +430 @@
                 env.GetStringParam(string("recordedFramesSuffix"), recordedFramesSuffix);
                 env.GetStringParam(string("statsFilename"), statsFilename);
+                env.GetStringParam(string("filename"), filename);
 
                 //env.GetStringParam(string("modelPath"), model_path);
@@ -458 +461 @@
                 cout << "recorded frames suffix: " << recordedFramesSuffix << endl;
                 cout << "stats filename: " << statsFilename << endl;
+                cout << "filename: " << filename << endl;
 
                 //cout << "model path: " << model_path << endl;
@@ -528 +532 @@
         //-- load the static scene geometry
 
-        LoadModel("city.dem", sceneEntities);
+        LoadModel(filename + ".dem", sceneEntities);
 
 
@@ -587 +591 @@
         //-- load the associated static bvh
 
-        const string bvh_filename = string(model_path + "city.bvh");
+        const string bvh_filename = string(model_path + filename + ".bvh");
 
         BvhLoader bvhLoader;
@@ -660 +664 @@
         frameTimer.Start();
 
-        Halton::TestHalton(7, 1);
-        Halton::TestHalton(7, 2);
-
-        HaltonSequence::TestHalton(15, 2);
-        HaltonSequence::TestHalton(15, 1);
-
-        Halton::TestPrime();
+        //Halton::TestHalton(7, 2);
+        //HaltonSequence::TestHalton(15, 2);
+        //Halton::TestPrime();
 
         // the rendering loop