Changeset 2753 for GTP/trunk

Timestamp:

06/10/08 23:21:11 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• Bvh.h (modified) (1 diff)
• Camera.cpp (added)
• Camera.h (added)
• OcclusionQuery.cpp (added)
• OcclusionQuery.h (added)
• RenderTraverser.h (modified) (1 diff)
• Vector3.h (modified) (1 diff)
• chc_revisited.vcproj (modified) (3 diffs)
• chcdemo.cpp (moved) (moved from GTP/trunk/App/Demos/Vis/CHC_revisited/occquery.cpp)
• common.cpp (modified) (3 diffs)
• common.h (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.h

@@ -559 +559 @@
         int PostProcessLeaves(BvhLeafContainer &leaves);
 
-        //bool CreateTighterBoundsForLeaf(BvhLeaf *leaf, Point3f *triangles, int triangleCount);
-
-        ///Point3f *CollectTriangles(BvhLeaf *leaf, int &triangleCount);
 
         int     IsWithinViewFrustumLocal(BvhNode *node);

GTP/trunk/App/Demos/Vis/CHC_revisited/RenderTraverser.h

@@ -14 +14 @@
 namespace CHCDemo
 {
-
-typedef stack<HierarchyNode *> TraversalStack;
-typedef queue<HierarchyNode *> QueryQueue;
-typedef priority_queue<HierarchyNode *, vector<HierarchyNode *>, myless<vector<HierarchyNode *>::value_type> > PriorityQueue;
 
 class RenderTraverser

GTP/trunk/App/Demos/Vis/CHC_revisited/Vector3.h

@@ -44 +44 @@
         Vector3() { }
 
-        Vector3(float x, float y, float z):
-        x(x), y(y), z(z)
-        {
-        }
-        Vector3(float v):
-        x(v), y(v), z(v)
-        {
-        }
+        Vector3(float x, float y, float z): x(x), y(y), z(z)
+        {}
+
+        Vector3(float v): x(v), y(v), z(v)
+        {}
         /** Copy constructor.
         */

GTP/trunk/App/Demos/Vis/CHC_revisited/chc_revisited.vcproj

@@ -193 +193 @@
                         </File>
                         <File
+                                RelativePath=".\Camera.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\chcdemo.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\Geometry.cpp"
                                 >
                         </File>
                         <File
-                                RelativePath=".\occquery.cpp"
+                                RelativePath=".\OcclusionQuery.cpp"
                                 >
                         </File>
@@ -211 +219 @@
                         </File>
                         <File
+                                RelativePath=".\Camera.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\Geometry.h"
                                 >
@@ -216 +228 @@
                         <File
                                 RelativePath=".\Material.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\OcclusionQuery.h"
                                 >
                         </File>

GTP/trunk/App/Demos/Vis/CHC_revisited/common.cpp

@@ -177 +177 @@
 }
 
-char *
-TimeString()
+char *TimeString()
 {
         time_t t;
         time(&t);
+
         return ctime(&t);
 }
 
-char *
-GetAbsPath(char *name)
+
+char *GetAbsPath(char *name)
 {
         //  char *url = new char[strlen(name)+1];
@@ -192 +192 @@
 
         // get the absolute path
-        int c = strlen(name);
-        int i = c-1;
+        size_t c = strlen(name);
+        int i = c - 1;
         bool wasDot = false;
+
         // search for double dot
-        for (;i>=0;i--) 
-                if (name[i]=='.') {
+        for (; i >= 0; -- i) 
+        {
+                if (name[i]=='.') 
+                {
                         if (wasDot)
                                 break;
                         wasDot = true;
-                } else
+                } 
+                else
                         wasDot = false;
-
-                if (i>0)
-                        i+=3;
-                if (i<0)
-                        i=0;
-
-                char *url = new char[c-i+1];
-                int j=0;
-                for (;i<c;i++,j++)
-                        url[j] = name[i];
-                url[j]=0;
-
-                return url;
+        }
+
+        if (i>0)
+                i+=3;
+        if (i<0)
+                i=0;
+
+        char *url = new char[c-i+1];
+
+        int j=0;
+
+        for (;i<c;i++,j++)
+                url[j] = name[i];
+
+        url[j]=0;
+
+        return url;
 }
 
@@ -230 +238 @@
 char *GetPath(const char *s)
 {
-        int i=strlen(s);
-        for (; i>0; i--) {
+        size_t i = strlen(s);
+        for (; i > 0; -- i) 
+        {
                 if (s[i]=='/' || s[i]=='\\')
                         break;

GTP/trunk/App/Demos/Vis/CHC_revisited/common.h

@@ -14 +14 @@
 #include <limits.h>
 #include <vector>
+#include <queue>
+
 
 
@@ -22 +24 @@
 class BvhNode;
 class BvhLeaf;
+class OcclusionQuery;
 
 
@@ -465 +468 @@
 typedef std::vector<Triangle3> TriangleContainer;
 
-
-}
-
-#endif
-
-
-
-
-
-
-
-
+typedef std::queue<OcclusionQuery *> QueryQueue;
+//typedef std::priority_queue<BvhNode *, vector<BvhNode *>, myless<vector<BvhNode *>::value_type> > TraversalQueue;
+
+}
+
+#endif
+
+
+
+
+
+
+
+