Changeset 2571 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Timestamp:

12/18/07 17:40:35 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Files:

• QtGlRenderer.cpp (modified) (8 diffs)
• QtGlViewer.cpp (modified) (3 diffs)

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

@@ -303 +303 @@
         glEnable(GL_LIGHT1);
 
-
         // set position of the light
         GLfloat infinite_light[] = {  1.0, 0.8, 1.0, 0.0  };
@@ -313 +312 @@
 
         glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-        //   glColorMaterial( GL_FRONT_AND_BACK, GL_SPECULAR);
+        // glColorMaterial( GL_FRONT_AND_BACK, GL_SPECULAR);
         glEnable(GL_COLOR_MATERIAL);
 
-        glShadeModel( GL_FLAT );
+        glShadeModel(GL_FLAT);
 }
 
@@ -712 +711 @@
                         glColor3f(0.6f, 0.6f, 0.6f);
                         RenderPvs();
+                }
+
+                if (1 && mShowRays) 
+                {
+                        RenderRays(mViewCellsManager->mVizBuffer.GetRays());
                 }
         }
@@ -1151 +1155 @@
         if (mViewCellsManager) 
         {
+                const float f = number / 1000.0f;
                 AxisAlignedBox3 box = mViewCellsManager->GetViewSpaceBox();
-                Vector3 p = box.Min() + (number/1000.0f)*box.Max();
+                Vector3 p = (1.0f - f) * box.Min() + f * box.Max();
                 mSceneCutPlane.mNormal = Vector3(0,-1,0);
                 mSceneCutPlane.mD = -DotProd(mSceneCutPlane.mNormal, p);
@@ -1278 +1283 @@
                 ViewCell *vc = viewcells[i];
 
-                if (mShowPvsSizes) // pv
+                if (mShowPvsSizes) // pvs size
                 {
                         //const int p = vc->GetPvs().CountObjectsInPvs();
@@ -1336 +1341 @@
         {
                 //glDisable(GL_CULL_FACE);
-                //glEnable(GL_CULL_FACE);
-                //glFrontFace(GL_CCW);  
                 //glCullFace(GL_BACK);
+
                 if (!mUseTransparency)
                 {
@@ -1346 +1350 @@
                 else
                 {
-                        //glCullFace(GL_BACK);
-                        //cout << "here29 " << mTransparency << endl;
                         glDisable(GL_DEPTH_TEST);
                         glEnable(GL_BLEND);
@@ -1410 +1412 @@
                 glEnable(GL_DEPTH_TEST);        
         }
+        
+        glEnable(GL_CULL_FACE);
+        glDisable(GL_CULL_FACE);
+
+        glDisable(GL_CLIP_PLANE0);
 
         mUseFalseColors = false;

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

@@ -16 +16 @@
 #include "RssPreprocessor.h"
 #include "SceneGraph.h"
+#include "ViewCellsManager.h"
 
 
@@ -50 +51 @@
   
 // This method has to be rendefined by all renderer implementations
-void
-QtGlViewer::RenderScene()
-{
+void QtGlViewer::RenderScene()
+{
+        GLfloat mat_ambient[] = {0.1, 0.1, 0.1, 1.0};
+
+        // mat_specular and mat_shininess are NOT default values
+        GLfloat mat_diffuse[] = {0.5, 1.0, 0.5, 1.0};
+        GLfloat mat_specular[] = {0.3, 0.3, 0.3, 1.0};
+        GLfloat mat_shininess[] = {1.0};
+
+        GLfloat light_ambient[] = {0.1, 0.1, 0.1, 1.0};
+        GLfloat light_diffuse[] = {0.5, 0.5, 0.5, 1.0};
+        GLfloat light_specular[] = {0.0, 0.0, 0.0, 1.0};
+
+        GLfloat lmodel_ambient[] = {0.2, 0.2, 0.2, 1.0};
+
+
+        // default material
+        /*glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient);
+        glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_diffuse);
+        glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular);
+        glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess);
+*/
+        // a light
+        glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
+        glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
+        glLightfv(GL_LIGHT0, GL_SPECULAR, light_specular);
+        glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
+
+        
+        //GLfloat infinite_light2[] = {-0.3, 1.5f, 1.0f, 0.0f};
+        //glLightfv (GL_LIGHT1, GL_POSITION, infinite_light2);
+        glColor3f(0.8f, 0.8f, 0.8f);
+        
+        glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+        glDisable(GL_COLOR_MATERIAL);
+        //glEnable(GL_COLOR_MATERIAL);
+
         ++ mRenderer->mFrame;
         
-        //glDisable(GL_DEPTH_TEST);
+        glEnable(GL_DEPTH_TEST);
+        glDepthMask(GL_TRUE);
+
+        glCullFace(GL_BACK);
+        glShadeModel(GL_FLAT);
+
+        glDisable(GL_BLEND);
 
         mRenderer->mDummyViewPoint = mDummyViewPoint;
-        glColor3f(0.8f, 0.8f, 0.8f);
+        
+        //glEnable(GL_LIGHTING);
+
         mRenderer->RenderPvs();
         
-//      if (mRenderer->mShowRays) {
-//        RssPreprocessor *p = (RssPreprocessor *)
-//                      mRenderer->mViewCellsManager->GetPreprocessor();
-//        if (p->mRssTree) {
-//                      VssRayContainer rays;
-//                      p->mRssTree->CollectRays(rays, 10000);
-//                      mRenderer->RenderRays(rays);
-//        }
-//      }
+        glDisable(GL_LIGHTING);
+
+        if (0 && mRenderer->mShowRays) 
+        {
+                mRenderer->RenderRays(mRenderer->mViewCellsManager->mVizBuffer.GetRays());
+        }
 
         if (mRenderer->mShowRenderCost) 
@@ -101 +141 @@
         << "Info: GL Extensions = "<<extString<<endl<<flush;
 
+
+        glEnable(GL_LIGHTING);
+        glEnable(GL_LIGHT0);
+        //glEnable(GL_LIGHT1);
+
+        // set position of the light
+        GLfloat infinite_light[] = {0, -1.0, 0, 1.0f};
+        glLightfv(GL_LIGHT0, GL_POSITION, infinite_light);
 
   return;