Changeset 2567 for GTP

Timestamp:

12/11/07 18:27:03 (17 years ago)

Author:

mattausch

Message:

worked on visualization

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_demo_arena (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (1 diff)
• src/QtInterface/QtGlViewer.cpp (modified) (2 diffs)
• src/QtInterface/QtGlViewer.h (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_demo_arena

@@ -11 +11 @@
 
 #-rss_distributions=mutation+object_direction+spatial \
+
 $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--rss_distributions=direction \
+-rss_distributions=spatial \
 -view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
 -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \

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

@@ -1299 +1299 @@
                                 importance = mTransferFunction * ((float)vc->GetNumPiercingRays() / relativeArea) / maxRelativeRays;
                         }
-                        else // pvs size
+                        else if (mShowPvsSizes) // pvs size
                         {
                                 //importance = 5.0f*mTransferFunction * ((float)vc->GetPvs().CountObjectsInPvs() / (float)maxPvs);
                                 importance = mTransferFunction *
                                         ((float)vc->GetPvs().GetSize() / (float)maxPvs);
-                        }
+                        } // weighted render cost
+                /*      else
+                        {
+                                ObjectPvs basePvs = viewCell->GetPvs();
+                                ObjectPvsIterator pit = basePvs.GetIterator();
+
+                                // first mark all objects from this pvs
+                                while (pit.HasMoreEntries())    
+                                {
+                                        if (pit.Next()->Mail();
+                                }
+                        }*/
 
                         // c = RgbColor(importance, 1.0f - importance, 0.0f);

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

@@ -28 +28 @@
         scale = 1.0f;
         mWireframe = false;
+        mModelMatrix = IdentityMatrix();
+
         trackball(manipulatorLastQuat, 0.0f, 0.0f, 0.0f, 0.0f);
         //connect(renderer, SIGNAL(PvsUpdated()), this, SLOT(updateGL()));
@@ -126 +128 @@
         glTranslatef(t.x, t.y, t.z);
 
-        mDummyViewPoint = -t;
+        /*mDummyViewPoint = -t;
         mDummyViewPoint /= s;
 
         //glGetFloatv(GL_MODELVIEW_MATRIX, m1);
-
+*/
         m.Invert();
 
-        mDummyViewPoint = m * mDummyViewPoint;
+        mModelMatrix *= m;
+        mDummyViewPoint = mModelMatrix * Vector3(0, 0, 0);
+
+        //mDummyViewPoint 
+        //cout << "view point: " << mDummyViewPoint << endl;
         RenderScene();
 }

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

@@ -4 +4 @@
 #include <QtOpenGL>
 #include "Vector3.h"
+#include "Matrix4x4.h"
+
 
 namespace GtpVisibilityPreprocessor 
@@ -49 +51 @@
         Vector3 mDummyViewPoint;
 
+        Matrix4x4 mModelMatrix;
+
 private: