Changeset 2686 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

05/18/08 00:30:13 (16 years ago)

Author:

mattausch

Message:

fixed several problems

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (6 diffs)

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

@@ -90 +90 @@
         mSceneGraph->CollectObjects(mObjects);
 
-#if 1
-        viewCellsManager->GetViewPoint(mViewPoint);
-        mViewDirection = Vector3(0,0,1);
-#else
-
-        // for sg snapshot
-        mViewPoint = Vector3(32.8596, 9.86079, -1023.79);
-        mViewDirection = Vector3(-0.92196, 0, 0.387286);
-
-        // inside
-        mViewPoint = Vector3(14.1254, 10.9818, -1032.75);
-        mViewDirection = Vector3(-0.604798, 0, 0.796379);
-
-        // outside
-        mViewPoint = Vector3(35.092, 17.7078, -857.966);
-        mViewDirection = Vector3(-0.411287, 0, -0.911506);
-
-        // strange viewcell for error measurements (id 534)
-        mViewPoint = Vector3(1405.9, 218.284, -736.785);
-        mViewDirection = Vector3(0.989155, 0, 0.146877);
-
-#endif
+        if (0)
+        {
+                viewCellsManager->GetViewPoint(mViewPoint);
+                mViewDirection = Vector3(0,0,1);
+        }
+        else
+        {
+
+                // for sg snapshot
+                mViewPoint = Vector3(32.8596, 9.86079, -1023.79);
+                mViewDirection = Vector3(-0.92196, 0, 0.387286);
+
+                // inside
+                mViewPoint = Vector3(14.1254, 10.9818, -1032.75);
+                mViewDirection = Vector3(-0.604798, 0, 0.796379);
+
+                // outside
+                mViewPoint = Vector3(35.092, 17.7078, -857.966);
+                mViewDirection = Vector3(-0.411287, 0, -0.911506);
+
+                // strange viewcell for error measurements (id 534)
+                mViewPoint = Vector3(1405.9, 218.284, -736.785);
+                mViewDirection = Vector3(0.989155, 0, 0.146877);
+
+                // high error for city_full
+                mViewPoint = Vector3(842.521, 194.708, -136.708);
+                mViewDirection = Vector3(0.730514, 0, -0.682897);
+
+                // also high error for city_full
+                mViewPoint = Vector3(1038.7f, 192.4f, -471.0f);
+                mViewDirection = Vector3(-0.8f, 0.0f, -0.6f);
+        }
 
         mFrame = 0;
@@ -118 +128 @@
                                                       mDetectEmptyViewSpace);
 
-        mSnapErrorFrames = false;
-        //mSnapErrorFrames = true;
+        //mSnapErrorFrames = false;
+        mSnapErrorFrames = true;
 
         mSnapPrefix = "snap/";
@@ -1532 +1542 @@
 
         static bool first = true;
+
         if (first) {
-
 
                 bool exportRandomViewCells;
@@ -1900 +1910 @@
                 TriangleIntersectable *obj = static_cast<TriangleIntersectable *>(leaf->mGeometry[i]);
 
+                if (obj->GetId() != i)
+                        cerr << "****\n****riesenfehler" << endl;
                 Triangle3 tri = obj->GetItem();
                 const Vector3 n = tri.GetNormal();
@@ -1916 +1928 @@
         }
 
+        cout << "\n******** created vertex arrays **********" << endl;  
+
         if (mUseVbos)
         {
@@ -1933 +1947 @@
                 delete [] mData;
                 mData = NULL;
-        }
-
-        cout << "\n******** created vertex buffer objects **********" << endl;  
+
+                cout << "\n******** created vertex buffer objects **********" << endl;  
+        }
 }