Changeset 2621 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

01/21/08 20:38:41 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HavranRayCaster.cpp (modified) (1 diff)
• HavranRayCaster.h (modified) (1 diff)
• Preprocessor.cpp (modified) (4 diffs)
• Preprocessor.h (modified) (1 diff)
• Preprocessor.vcproj (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (9 diffs)
• QtInterface/QtGlRenderer.h (modified) (1 diff)
• RayCaster.h (modified) (2 diffs)
• SceneGraph.cpp (modified) (5 diffs)
• SceneGraph.h (modified) (2 diffs)
• common.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/HavranRayCaster.cpp

@@ -516 +516 @@
 
 
+    /*
+  virtual void HavranRayCaster::AddDynamicObjecs(const ObjectContainer &objects, const Matrix4x4 &m);
+  virtual void UpdateDynamicObjects(const Matrix4x4 &m);
+  virtual void DeleteDynamicObjects);
+*/
 } // the namespace

GTP/trunk/Lib/Vis/Preprocessing/src/HavranRayCaster.h

@@ -37 +37 @@
   
   int Type() const { return HAVRAN_RAYCASTER; }
-  
+    
+  virtual void AddDynamicObjecs(const ObjectContainer &objects, const Matrix4x4 &m);
+  virtual void UpdateDynamicObjects(const Matrix4x4 &m);
+  virtual void DeleteDynamicObjects);
+
   virtual int CastRay(
                       const SimpleRay &simpleRay,

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

@@ -173 +173 @@
 bool Preprocessor::LoadBinaryObj(const string &filename,
                                                                  SceneGraphLeaf *root,
-                                                                 vector<FaceParentInfo> *parents)
+                                                                 vector<FaceParentInfo> *parents,
+                                                                 float scale)
 {
         //ifstream inStream(filename, ios::binary);
@@ -202 +203 @@
                 inStream.read(reinterpret_cast<char *>(tri.mVertices + 1), sizeof(Vector3));
                 inStream.read(reinterpret_cast<char *>(tri.mVertices + 2), sizeof(Vector3));
+
+                if (scale > 0.0f)
+                {
+                        tri.mVertices[0] *= scale;
+                        tri.mVertices[1] *= scale;
+                        tri.mVertices[2] *= scale;
+                }
 
                 // end of file reached
@@ -1227 +1235 @@
 
                                 float maxT, minT;
-                                        // test with bounding box
+                                
+                                // test with bounding box
                                 if (tmi->GetBox().GetMinMaxT(hRay, &minT, &maxT))
                                 {
@@ -1700 +1709 @@
         SceneGraphLeaf *leaf = new SceneGraphLeaf(dynamic);
 
-        if (LoadBinaryObj(filename, leaf, NULL))
+        if (LoadBinaryObj(filename, leaf, NULL, 100))
         {
                 mDynamicObjects.push_back(leaf);
+                leaf->RebuildKtbTree();
                 mSceneGraph->GetRoot()->mChildren.push_back(leaf);
-                return true
+                return true;
         }
 

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.h

@@ -275 +275 @@
         bool LoadBinaryObj(const std::string &filename,
                        SceneGraphLeaf *root,
-                                           std::vector<FaceParentInfo> *parents);
+                                           std::vector<FaceParentInfo> *parents,
+                                           float scale = -1.0f);
 
         bool ExportBinaryObj(const std::string &filename, SceneGraphLeaf *root);

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj

@@ -777 +777 @@
                         </File>
                         <File
+                                RelativePath=".\SimpleRay.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\Statistics.h">
                         </File>
@@ -1071 +1074 @@
                         </File>
                         <File
+                                RelativePath=".\sparsehash\src\windows\hash_fun.h">
+                        </File>
+                        <File
                                 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h">
-                        </File>
-                        <File
-                                RelativePath=".\sparsehash\src\windows\hash_fun.h">
                         </File>
                         <File

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -423 +423 @@
                 RenderIntersectable(*dit);
 #else
-                RenderDynamicObject(*dit);
+                _RenderDynamicObject(*dit);
 #endif
         }
@@ -679 +679 @@
                 {
                         Matrix4x4 tm;
-                        TransformedMeshInstance *tmi;
-#if USE_TRANSFORMED_MESH_INSTANCE_HACK
 
                         switch (mTrafoType)
@@ -687 +685 @@
                                 {
                                         const Vector3 transl(diffx, 0, diffy);
-                                        tmi = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
+                                        
                                         tm = TranslationMatrix(transl);
                                 }
@@ -696 +694 @@
                                         if (scalef < 0.9) scalef = 0.9f;
                                         else if (scalef > 1.1f) scalef = 1.1f;
-                                        tmi = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
                                         tm = ScaleMatrix(scalef, scalef, scalef);
                                 }
@@ -702 +699 @@
                         case 2:
                                 {
-                                        tmi = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
                                         tm = RotationXMatrix(diffx) * RotationYMatrix(diffy);
                                 }
@@ -710 +706 @@
                         }
 
+#if USE_TRANSFORMED_MESH_INSTANCE_HACK
+                        TransformedMeshInstance *tmi = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
                         tmi->ApplyWorldTransform(tm);
+#else
+                        SceneGraphLeaf *l = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
+                        l->ApplyTransform(tm);
 #endif
                         updateGL();
@@ -1457 +1458 @@
         ComputeMaxValues(viewcells, maxPvs, maxPiercingRays, maxRelativeRays, maxRcCost);
         // matt: temp hack
-        //maxRcCost = 200.0f;
+        maxRcCost = 200.0f;
         //cout << "maxRcCost: " << maxRcCost << endl;
         int i;
@@ -2119 +2120 @@
         vbox->layout()->addWidget(button);
         connect(button, SIGNAL(clicked()), SIGNAL(StoreStatistics()));
+#endif
+
+#if DYNAMIC_OBJECTS_HACK
 
         button = new QPushButton("Load object", vbox);
@@ -2124 +2128 @@
         connect(button, SIGNAL(clicked()), SIGNAL(LoadObject()));
 #endif
+
         /*cb = new QCheckBox("Stats", vbox);
         vbox->layout()->addWidget(cb);

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.h

@@ -15 +15 @@
 #include "LogReader.h"
 #include "Material.h"
-
+#include "common.h"
 
 

GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.h

@@ -25 +25 @@
 struct SimpleRay;
 class RayPacket2x2;
+class Matrix4x4;
 
 /** This class provides an interface for ray casting.
@@ -104 +105 @@
 
 
+  virtual void AddDynamicObjecs(const ObjectContainer &objects, const Matrix4x4 &m) = 0;
+  virtual void UpdateDynamicObjects(const Matrix4x4 &m) = 0;
+  virtual void DeleteDynamicObjects() = 0;
+
   // pool of vss rays to be used in one pass of the sampling
   struct VssRayPool 

GTP/trunk/Lib/Vis/Preprocessing/src/SceneGraph.cpp

@@ -6 +6 @@
 #include "Intersectable.h"
 #include "IntersectableWrapper.h"
+#include "ktball.h"
 
 
@@ -234 +235 @@
 void SceneGraph::ExportScene(const string filename)
 {
-        
 }
 
@@ -279 +279 @@
 
 SceneGraphLeaf::SceneGraphLeaf(): mIsDynamic(false)
+#if DYNAMIC_OBJECTS_HACK
+, mKtbTree(NULL)
+#endif
 {
         mTrafo = IdentityMatrix();
+
 #if DYNAMIC_OBJECTS_HACK
         mIntersectable = new SceneGraphLeafIntersectable(this, mBox);
@@ -288 +292 @@
 
 SceneGraphLeaf::SceneGraphLeaf(bool isDynamic): mIsDynamic(isDynamic)
-{
-        mTrafo = IdentityMatrix();
+#if DYNAMIC_OBJECTS_HACK
+, mKtbTree(NULL)
+#endif
+{
+    mTrafo = IdentityMatrix();
 }
 
@@ -316 +323 @@
 }
 
-}
+
+#if DYNAMIC_OBJECTS_HACK
+
+
+void SceneGraphLeaf::RebuildKtbTree()
+{
+        if (mKtbTree)
+                delete mKtbTree;
+
+        mKtbTree = new CKTB();
+        mKtbTree->BuildUp(mGeometry);
+}
+
+#endif
+
+
+}

GTP/trunk/Lib/Vis/Preprocessing/src/SceneGraph.h

@@ -10 +10 @@
 
 class SceneGraphLeafIntersectable;
+class CKTB;
+
 
 /** Basic scene graph node, we are interested only in bounding boxes and topology
@@ -68 +70 @@
         virtual bool IsLeaf() const { return true; }
         virtual void UpdateBox();
-#if DYNAMIC_OBJECT_HACK
-        SceneGraphLeafIntersectable *GetIntersectable() { return mIntersectable;}
+
+#if DYNAMIC_OBJECTS_HACK
+        void RebuildKtbTree();
+        SceneGraphLeafIntersectable *GetIntersectable() { return mIntersectable; }
 #endif
+
         /// used as actual pvs entry
         ObjectContainer mGeometry;
 
 protected:
-#if DYNAMIC_OBJECT_HACK
+
+#if DYNAMIC_OBJECTS_HACK
+        
         SceneGraphLeafIntersectable *mIntersectable;
+        CKTB *mKtbTree;
+
 #endif
+
         bool mIsDynamic;
         Matrix4x4 mTrafo;

GTP/trunk/Lib/Vis/Preprocessing/src/common.h

@@ -23 +23 @@
 #include <vector>
 
-#define DYNAMIC_OBJECTS_HACK 0
-#define USE_TRANSFORMED_MESH_INSTANCE_HACK 1
+#define DYNAMIC_OBJECTS_HACK 1
+#define USE_TRANSFORMED_MESH_INSTANCE_HACK 0
 #define USE_HAVRAN_RAYCASTER