Changeset 2697

Timestamp:

05/23/08 10:25:22 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_gvs_vps.sh (modified) (1 diff)
• src/GlRenderer.cpp (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (8 diffs)
• src/QtInterface/QtGlRenderer.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_vps.sh

@@ -37 +37 @@
 -gvs_samples_per_pass=1000000 \
 -gvs_initial_samples=16 \
--gvs_max_viewcells=20 \
+-gvs_max_viewcells=2000 \
 -gvs_min_contribution=50 \
 -gvs_per_viewcell=true \

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

@@ -135 +135 @@
                 mViewPoint = Vector3(1199.53, 257.677, -457.145);
                 mViewDirection = Vector3(-0.71206, -0, -0.702108);
+
+                mViewPoint = Vector3(1188.22, 187.427, -381.739);
+                mViewDirection = Vector3(-0.963031, -0, -0.269365);
         }
 

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

@@ -58 +58 @@
 
 
+void processHits (GLint hits, GLuint buffer[])
+{
+   unsigned int i, j;
+   GLuint names, *ptr;
+
+   cout << "hits = %d" << endl;;
+   ptr = (GLuint *) buffer;
+
+   for (i = 0; i < hits; i++) 
+   {
+           /*  for each hit  */
+           names = *ptr;
+
+           printf (" number of names for hit = %d\n", names); ptr++;
+           printf("  z1 is %g;", (float) *ptr/0x7fffffff); ptr++;
+           printf(" z2 is %g\n", (float) *ptr/0x7fffffff); ptr++;
+           printf ("   the name is ");
+
+           for (j = 0; j < names; j++) {     /*  for each name */
+                   printf ("%d ", *ptr); ptr++;
+           }
+           printf ("\n");
+   }
+}
+
+
 static inline bool ilt(Intersectable *obj1, Intersectable *obj2)
 {
@@ -538 +564 @@
         }
 
-        if (mPendingDynamicObject)
-                _RenderDynamicObject(mPendingDynamicObject);
+        // handle dynamic objects
+        dit, dit_end = mPendingDynamicObjects.end();
+
+        for (dit = mPendingDynamicObjects.begin(); dit != dit_end; ++ dit)
+        {
+                _RenderDynamicObject(*dit);
+        }
+
+        //_RenderDynamicObject(mPendingDynamicObject);
 #endif
 }
@@ -774 +807 @@
 
                         mPlacer->PlaceObject(pt);
-                        mPendingDynamicObject = mPlacer->GetCurrentObject();
+                        //mPendingDynamicObjects.push_back( mPlacer->GetCurrentObject());
                 }
         }
@@ -782 +815 @@
 void QtGlRendererWidget::mouseReleaseEvent(QMouseEvent *e)
 {
-
-  if (e->modifiers() & Qt::AltModifier) 
-        if (mCurrentDynamicObjectIdx >= 0) {
-          // preprocessor->ScheduleUpdateDynamicObjects();
+        int x = e->pos().x();
+        int y = e->pos().y();
+
+        mousePoint.x = x;
+        mousePoint.y = y;
+
+        if (e->modifiers() & Qt::AltModifier) 
+        {
+                const Vector3 pt = Unproject(x, y);
+
+                int num = FindDynamicObject(pt);
+                cout << "\n*****************\n" << "here4" << num << endl;
+                //processHits(buf);
+
+                /*if (mCurrentDynamicObjectIdx >= 0) {
+                preprocessor->ScheduleUpdateDynamicObjects();
+                }*/
         }
 }
@@ -812 +858 @@
                 mViewPoint.x += (x-mousePoint.x)*MOVE_SENSITIVITY / 2.0;
         }
-#if DYNAMIC_OBJECTS_HACK
+#if 0// DYNAMIC_OBJECTS_HACK
         else if (e->modifiers() & Qt::AltModifier)
         {
@@ -1095 +1141 @@
         mPlacer = new ObjectPlacer();
 
-        mPendingDynamicObject = NULL;
+        //mPendingDynamicObject = NULL;
 
         SetSceneCut(1000);
@@ -2634 +2680 @@
          glLoadName(1);
 
-        _RenderDynamicObject(mPendingDynamicObject);
+        _RenderDynamicObject(mPendingDynamicObjects[0]);
 
         glMatrixMode(GL_PROJECTION); 
@@ -2661 +2707 @@
 }
 
-void processHits (GLint hits, GLuint buffer[])
-{
-   unsigned int i, j;
-   GLuint names, *ptr;
-
-   cout << "hits = %d" << endl;;
-   ptr = (GLuint *) buffer;
-
-   for (i = 0; i < hits; i++) 
-   {
-           /*  for each hit  */
-           names = *ptr;
-
-           printf (" number of names for hit = %d\n", names); ptr++;
-           printf("  z1 is %g;", (float) *ptr/0x7fffffff); ptr++;
-           printf(" z2 is %g\n", (float) *ptr/0x7fffffff); ptr++;
-           printf ("   the name is ");
-
-           for (j = 0; j < names; j++) {     /*  for each name */
-                   printf ("%d ", *ptr); ptr++;
-           }
-           printf ("\n");
-   }
-}
-
-}
+
+}

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

@@ -250 +250 @@
 #if DYNAMIC_OBJECTS_HACK
 
-        SceneGraphLeaf *mPendingDynamicObject;
+        DynamicObjectsContainer mPendingDynamicObjects;
         DynamicObjectsContainer mDynamicObjects;