Changeset 2793 for GTP/trunk

Timestamp:

06/20/08 20:04:15 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• chc_revisited.vcproj (modified) (1 diff)
• src/AxisAlignedBox3.cpp (modified) (1 diff)
• src/BinaryLoader.cpp (modified) (1 diff)
• src/Geometry.h (modified) (3 diffs)
• src/RenderQueue.h (modified) (1 diff)
• src/SceneEntity.h (modified) (1 diff)
• src/chcdemo.cpp (modified) (7 diffs)

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

@@ -464 +464 @@
                                 </File>
                                 <File
-                                        RelativePath=".\Geometry.h"
+                                        RelativePath=".\src\Geometry.h"
                                         >
                                 </File>

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

@@ -243 +243 @@
                 {
                         cerr << "ERROR in AxisAlignedBox3::GetVertex N=" << N <<  "\n";
-                        exit(0);
                 }
         }

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

@@ -68 +68 @@
         {
                 trafo = new Matrix4x4();
-                //*trafo = IdentityMatrix();
                 str.read(reinterpret_cast<char *>(trafo->x), sizeof(Matrix4x4));
-                //str.read(reinterpret_cast<char *>(trafo), sizeof(Matrix4x4));
-                //cout << "m:\n" << *trafo<<endl;
         }
 

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

@@ -20 +20 @@
         */
         Geometry(Vector3 *vertices, Vector3 *normals, float *texcoords, int numVertices, bool delData);
+
         ~Geometry();
         /** Render the geometry
@@ -40 +41 @@
         //////////
 
-        unsigned int mVboId;
-
         Vector3 *mVertices;
 
@@ -47 +46 @@
 
         float *mTexCoords;
+
+        unsigned int mVboId;
 
         int mNumVertices;

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

@@ -35 +35 @@
         */
         void Clear();
-
+        /** Returns the number entities currently in the queue.
+        */
         int GetSize() const { return (int)mEntities.size(); }
 

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

@@ -16 +16 @@
 
 /** Class representing a scene entity.
-    A scene entity basicly consists of geometry, transformation, and a material
+    A scene entity basically consists of geometry, transformation, and a material
 */
 class SceneEntity

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

@@ -34 +34 @@
 /// the hierarchy
 Bvh *bvh = NULL;
+/// handles scene loading
+BinaryLoader *loader = NULL;
 /// the scene camera
 Camera *camera = NULL;
@@ -50 +52 @@
 int maxBatchSize = 50;
 
-const float keyForwardMotion = 1.0f;
+const float keyForwardMotion = 0.5f;
 const float keyRotation = 0.05f;
 
@@ -131 +133 @@
         int returnCode = 0;
 
-//#ifdef _CRT_SET
+#ifdef _CRT_SET
 
         //Now just call this function at the start of your program and if you're
@@ -142 +144 @@
         _CrtSetReportMode(_CRT_ASSERT,_CRTDBG_MODE_FILE);
         _CrtSetReportFile(_CRT_ASSERT,_CRTDBG_FILE_STDERR); 
-//#endif
+#endif
 
 
@@ -170 +172 @@
         MiddleMotion(0, 0);
 
-        BinaryLoader loader;
+
+        loader = new BinaryLoader();
 
         //const string filename("data/city/model/city.dem");
         const string filename = string(model_path + "city.dem");
 
-        if (loader.Load(filename, sceneEntities))
+        if (loader->Load(filename, sceneEntities))
                 cout << "scene " << filename << " loaded" << endl;
         else
@@ -183 +186 @@
                 exit(0);
         }
-        CleanUp();
-                exit(0);
 
         const string bvh_filename = string(model_path + "city.bvh");
@@ -974 +975 @@
         DEL_PTR(visualization);
         DEL_PTR(camera);
+
+        DEL_PTR(loader);
 }