Changeset 3260

Timestamp:

01/09/09 04:50:49 (15 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter/ObjConverter.cpp (modified) (1 diff)
• FriendlyCulling.vcproj (modified) (4 diffs)
• VboFormatConverter.vcproj (modified) (2 diffs)
• default.env (modified) (1 diff)
• src/BvhExporter.cpp (modified) (1 diff)
• src/BvhExporter.h (modified) (2 diffs)
• src/Geometry.h (modified) (1 diff)
• src/ResourceManager.cpp (modified) (1 diff)
• src/SceneEntity.h (modified) (4 diffs)
• src/chcdemo.cpp (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.cpp

@@ -170 +170 @@
         geom->mMaterial = mat;
 
-        cout << "new geometry #vts=" << numElements << endl;
+        cout << "creating new geometry with " << numElements << " vertices" << endl;
 
         for (int i = 0; i < numElements; ++ i)

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

@@ -19 +19 @@
                         Name="Debug|Win32"
                         OutputDirectory="$(SolutionDir)/lib/$(ConfigurationName)"
-                        IntermediateDirectory="obj/$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)/obj/$(ConfigurationName)"
                         ConfigurationType="4"
                         CharacterSet="1"
@@ -83 +83 @@
                         Name="Release|Win32"
                         OutputDirectory="$(SolutionDir)/lib/$(ConfigurationName)"
-                        IntermediateDirectory="obj/$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)/obj/$(ConfigurationName)"
                         ConfigurationType="4"
                         CharacterSet="1"
@@ -515 +515 @@
                                 </File>
                                 <File
+                                        RelativePath=".\src\ObjExporter.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\src\OcclusionQuery.h"
                                         >
@@ -645 +649 @@
                                 </File>
                                 <File
+                                        RelativePath=".\src\ObjExporter.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\src\OcclusionQuery.cpp"
                                         >

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

@@ -19 +19 @@
                         Name="Debug|Win32"
                         OutputDirectory="$(SolutionDir)$\VboFormatConverter\(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)\VboFormatConverter"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -98 +98 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)$\$(ProjectName)\(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)\$(ProjectName)\$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
                         ConfigurationType="1"

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -115 +115 @@
 ## powerplant options
 
-filename=PowerPlantM
-keyForwardMotion=500.0f
-mouseMotion=3.0f
-visibilitySolution=power-plant-2c-xx-1000b-pgv2
-camPosition=-1320.57 -6306.34 3603
-camDirection=0.292156 0.9556 0.0383878
-viewCellsScaleFactor=0.05f
+#filename=PowerPlantM
+#keyForwardMotion=500.0f
+#mouseMotion=3.0f
+#visibilitySolution=power-plant-2c-xx-1000b-pgv2
+#camPosition=-1320.57 -6306.34 3603
+#camDirection=0.292156 0.9556 0.0383878
+#viewCellsScaleFactor=0.05f

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

@@ -76 +76 @@
 
 
-bool BvhExporter::ExportToFile(const string &filename, Bvh *bvh)
+bool BvhExporter::Export(const string &filename, Bvh *bvh)
 {
          cout << "Info: Exporting to file '" << filename.c_str() << "'" << endl;

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

@@ -1 @@
-#ifndef __PVS_H
-#define __PVS_H
+#ifndef __BVHEXPORTER_H
+#define __BVHEXPORTER_H
 
 #include "common.h"
@@ -16 +16 @@
 public:
 
-        bool ExportToFile(const std::string &filename, Bvh *bvh);
+        bool Export(const std::string &filename, Bvh *bvh);
 
 

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

@@ -62 +62 @@
 
 protected:
+
         /** Calculates the bounding box from the vertices.
         */

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

@@ -383 +383 @@
         }
 
-        const bool delGeometry = true;
+        //const bool delGeometry = true;
+        const bool delGeometry = false;
         return new Geometry(vertices, normals, texcoords, vertexCount, delGeometry, NULL);//tangents);
 }

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

@@ -19 +19 @@
 
 /** Class representing a scene entity.
-    A scene entity basically consists of geometry, transformation, and a material
+    A scene entity basically consists of one or more shapes and a transformation.
 */
 class SceneEntity
@@ -109 +109 @@
         //-- static functions
 
-        /** If false, the highest (most detailed) LOD level is used for all entities.
+        /** If false, the highest (=most detailed) LOD level is used for all entities.
         */
         static void SetUseLODs(bool useLODs);
@@ -119 +119 @@
         */
         static void SetCurrentVisibleId(int id);
-
+        /** Returns the id that indicates a visible object.
+        */
         static int GetCurrentVisibleId();
 
 
 protected:
-
 
         /** Internally updates current lod level.
@@ -159 +159 @@
         /// if LODs are used for rendering: otherwise we always take the highest lod
         static bool sUseLODs;
-
 };
 

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

@@ -61 +61 @@
 #include "ViewCellsTree.h"
 #include "PvsCollectionRenderer.h"
+#include "ObjExporter.h"
+#include "BvhExporter.h"
 
 
@@ -644 +646 @@
 
 
+        ObjExporter().Export(model_path + "mycity.obj", bvh);
+        BvhExporter().Export(model_path + "mycity.bvh", bvh);
+
+
+
         //////////////////
         //-- setup the skydome model