Changeset 2756 for GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp

Timestamp:

06/13/08 18:06:32 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp (modified) (36 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp

@@ -1 +1 @@
 // occquery.cpp : Defines the entry point for the console application.
 //
-#if TOIMPLEMENT
-
 #include <math.h>
 #include <time.h>
+#include "common.h"
 #include "glInterface.h"
 #include "RenderTraverser.h"
-
-
-
-bool arbQuerySupport = false;
-bool nvQuerySupport = false;
-
-double nearDist = 0.1; // eye near plane distance
+#include "SceneEntity.h"
+#include "Vector3.h"
+#include "Matrix4x4.h"
+#include "BinaryLoader.h"
+#include "Bvh.h"
+#include "Camera.h"
+#include "Geometry.h"
+
+
+using namespace std;
+using namespace CHCDemo;
+
+
+
+/// the renderable scene geometry
+SceneEntityContainer sceneEntities;
+// traverses and renders the hierarchy
+RenderTraverser *traverser;
+/// the hierarchy
+Bvh *bvh;
+/// the scene camera
+Camera *camera;
+/// the scene bounding box
+AxisAlignedBox3 sceneBox;
+
+// eye near plane distance
+float nearDist = 0.1f; 
 int winWidth, winHeight;
-int objectType = Geometry::TEAPOT;
-int nextObjectType = objectType;
 
 float visZoomFactor = 1.5f;
@@ -26 +43 @@
 bool showCreateParams = false;
 
-// traverses and renders the hierarchy
-RenderTraverser traverser;
-
-Vector3 eyePos = {0.0, 0.0, 3.0};  // eye position 
-Vector3 viewDir = {0.0, 0.0, -1.0};  // eye view dir 
-Vector3 lightDir = {0.0, 0.0, 1.0};  // light dir 
+
+Vector3 eyePos = Vector3(0.0f, 0.0f, 3.0f);    // eye position 
+Vector3 viewDir = Vector3(0.0f, 0.0f, -1.0f);  // eye view dir 
+Vector3 lightDir = Vector3(0.0f, 0.0f, 1.0f);  // light dir 
 
 Matrix4x4 eyeView; // eye view matrix
@@ -41 +56 @@
 //mouse navigation state
 int xEyeBegin, yEyeBegin, yMotionBegin, verticalMotionBegin, horizontalMotionBegin = 0;
-int renderMode = RenderTraverser::RENDER_COHERENT;
+//int renderMode = RenderTraverser::RENDER_COHERENT;
 
 // relative size of an object
@@ -51 +66 @@
 
 // this defines the volume where objects can be drawn
-Vector3 minTranslation = {-2.5f, -2.5f, -3.0f};
-Vector3 maxTranslation = {2.5f, 2.5f, -3.0 - zLength};
+Vector3 minTranslation(-2.5f, -2.5f, -3.0f);
+Vector3 maxTranslation(2.5f, 2.5f, -3.0 - zLength);
 
 const float minAngle = 0;
@@ -62 +77 @@
 int renderTimesValid = 0;
 
-typedef vector<Geometry *> GeometryList;
-GeometryList geometry;
-
 bool useOptimization = true;
-bool useArbQueries = false;
+
 
 Vector3 amb[2];
@@ -72 +84 @@
 Vector3 spec[2];
 
+void InitExtensions(void);
+void DisplayVisualization();
+void InitGLstate(void);
+void CleanUp(void);
+void SetupEyeView(void);
+void UpdateEyeMtx(void);
+
+
 void begin2D(void);
 void end2D(void);
-void output(const int x, const int y, const char *string);
-void initGLstate(void);
-void keyboard(const unsigned char c, const int x, const int y);
+void output(int x, int y, const char *string);
+void keyboard(const unsigned char c, int x, int y);
 void drawHelpMessage(void);
 void drawStatistics(void);
 void display(void);
-void special(const int c, const int x, const int y);
-void reshape(const int w, const int h);
+void special(int c, int x, int y);
+void reshape(int w, int h);
 void mouse(int button, int state, int x, int y);
-void initExtensions(void);
 void leftMotion(int x, int y);
-//void rightMotion(int x, int y);
 void middleMotion(int x, int y);
 void drawEyeView(void);
-void setupEyeView(void);
 void setupVisView(void);
-void updateEyeMtx(void);
 long calcRenderTime(void);
 void resetTimer(void);
-void cleanUp(void);
-void calcDecimalPoint(string &str, int d);
-
-HierarchyNode* generateHierarchy(int numObjects);
-Geometry *generateGeometry(Vector3 translateRatio, float xRotRatio, 
-                                                   float yRotRatio, float zRotRatio, int materialIdx);
-void displayVisualization();
-
-void deleteGeometry();
-
-#endif
+void calcDecimalPoint(std::string &str, int d);
+
+
+
+void SetupProjection(int w, int h, float angle, const AxisAlignedBox3 &sceneBox)
+{
+        glViewport(0, 0, w, h);
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+
+        gluPerspective(angle, 1.0, 1.0f, 2.0 * Magnitude(sceneBox.Diagonal()));
+        glMatrixMode(GL_MODELVIEW);
+}
+
 
 int main(int argc, char* argv[])
 {
-#if 0
-        glutInitWindowSize(800,600);
-        glutInit(&argc,argv);
+        glutInitWindowSize(800, 600);
+        glutInit(&argc, argv);
         glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
-        
+
         glutCreateWindow("Coherent Hierarchical Culling");
 
@@ -120 +137 @@
         glutMouseFunc(mouse);
         glutIdleFunc(display);
-        initExtensions();
-        initGLstate();
-
-        leftMotion(0,0);
-        middleMotion(0,0);
-        
-        HierarchyNode *hierarchy = generateHierarchy(numObjects);
-        traverser.SetHierarchy(hierarchy);
+        
+        InitExtensions();
+        InitGLstate();
+
+        leftMotion(0, 0);
+        middleMotion(0, 0);
+
+        BinaryLoader loader;
+
+        const string filename("house_test.dem");
+        //const string filename("city.dem");
+
+        camera = new Camera(800, 600);
+
+        if (loader.Load(filename, sceneEntities))
+                cout << "scene " << filename << " loaded" << endl;
+        else
+                cerr << "loading scene " << filename << " failed" << endl;
+
+        sceneBox.Initialize();
+
+        SceneEntityContainer::const_iterator it, it_end = sceneEntities.end();
+
+        for (it = sceneEntities.begin(); it != it_end; ++ it)
+                sceneBox.Include((*it)->GetBoundingBox());
+
+        Debug << "scene box: " << sceneBox << endl;
+
+        SetupProjection(800, 600, 60, sceneBox);
+        camera->LookAtBox(sceneBox);
+        //camera->LookInBox(sceneBox);
+        //camera->SetPosition(Vector3(0, 0, -3));
+        //camera->SetDirection(Vector3(0, 0, 1));
 
         /// initialise rendertime array
@@ -136 +178 @@
 
         // clean up
-        cleanUp();
-#endif
+        CleanUp();
+
         return 0;
 }
 
-#if 0
-void initGLstate(void) 
-{
-        glClearColor(0.6, 0.6, 0.8, 1.0);
+
+void InitGLstate(void) 
+{
+        glClearColor(0.0f, 1.0f, 0.0f, 0.0);
         
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
         glPixelStorei(GL_PACK_ALIGNMENT,1); 
         
-        glDepthRange(0.0, 1.0);
-        glClearDepth(1.0);
         glDepthFunc(GL_LESS);
 
         glEnable(GL_LIGHTING);
         glEnable(GL_LIGHT0);
-
+        //glDisable(GL_LIGHTING);
+
+        glColor3f(1.0f, 0.0f, 0.0f);
         glShadeModel(GL_SMOOTH);
         
-        GLfloat ambient[] = { 0.0, 0.0, 0.0, 1.0 };
-        GLfloat diffuse[] = { 1.0, 1.0, 1.0, 1.0 };
-        GLfloat specular[] = { 1.0, 1.0, 1.0, 1.0 };
-        GLfloat position[] = { 0.0, 3.0, 3.0, 0.0 };
+        GLfloat ambient[] = {0.5, 0.5, 0.5, 1.0};
+        GLfloat diffuse[] = {1.0, 1.0, 1.0, 1.0};
+        GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
+        GLfloat position[] = {0.0, 3.0, 3.0, 0.0};
     
-        GLfloat lmodel_ambient[] = { 0.2, 0.2, 0.2, 1.0 };
-        GLfloat local_view[] = { 0.0 };
+        GLfloat lmodel_ambient[] = {0.2, 0.2, 0.2, 1.0};
+        GLfloat local_view[] = {0.0};
 
         glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);
@@ -179 +221 @@
         glCullFace(GL_BACK);
         glEnable(GL_CULL_FACE);
-        
-        glClearColor(0.2, 0.2, 0.8, 0.0);
-
-        setupVisView();
+        //glDisable(GL_CULL_FACE);
+        
+        GLfloat ambientColor[] = {0.5, 0.5, 0.5, 1.0};
+        GLfloat diffuseColor[] = {1.0, 0.0, 0.0, 1.0};
+        GLfloat specularColor[] = {1.0, 1.0, 1.0, 1.0};
+
+        glMaterialfv(GL_FRONT, GL_AMBIENT, ambientColor);
+        glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuseColor);
+        glMaterialfv(GL_FRONT, GL_SPECULAR, specularColor);
+
+        glColor3f(1.0f, 0.0f, 0.0f);
+        //setupVisView();
 }
 
@@ -226 +276 @@
         };
         
-        int i;
+        
         int x = 40, y = 42;
+
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         glEnable(GL_BLEND);
-        glColor4f(0.0,1.0,0.0,0.2);  // 20% green. 
+        glColor4f(0.0f, 1.0f , 0.0f, 0.2f);  // 20% green. 
 
         // Drawn clockwise because the flipped Y axis flips CCW and CW. 
@@ -237 +288 @@
         glDisable(GL_BLEND);
         
-
-        glColor3f(1.0,1.0,1.0);
-        for(i = 0; message[i] != 0; i++) {
-                if(message[i][0] == '\0') {
+        glColor3f(1.0f, 1.0f, 1.0f);
+        
+        for(int i = 0; message[i] != 0; i++) 
+        {
+                if(message[i][0] == '\0') 
+                {
                         y += 7;
-                } else {
-                        output(x,y,message[i]);
+                } 
+                else 
+                {
+                        output(x, y, message[i]);
                         y += 14;
                 }
@@ -250 +305 @@
 }
 
-// generates a teapot, all parameters between zero and one
-Geometry *generateGeometry(Vector3 translationRatio, float xRotRatio, 
-                                                   float yRotRatio, float zRotRatio, int materialIdx)
-{
-        float xRot = minAngle + xRotRatio * (maxAngle - minAngle);
-        float yRot = minAngle + yRotRatio * (maxAngle - minAngle);
-        float zRot = minAngle + zRotRatio * (maxAngle - minAngle);
-
-        Vector3 translation;
-        translation[0] = minTranslation[0] + translationRatio[0] * (maxTranslation[0] - minTranslation[0]);
-        translation[1] = minTranslation[1] + translationRatio[1] * (maxTranslation[1] - minTranslation[1]);
-        translation[2] = minTranslation[2] + translationRatio[2] * (maxTranslation[2] - minTranslation[2]);
-
-        Geometry *result = new Geometry(translation, xRot, yRot, zRot, objectSize, objectType);
-
-        result->SetAmbientColor(amb[materialIdx][0], amb[materialIdx][1], amb[materialIdx][2]);
-        result->SetDiffuseColor(dif[materialIdx][0], dif[materialIdx][1], dif[materialIdx][2]);
-        result->SetSpecularColor(spec[materialIdx][0], spec[materialIdx][1], spec[materialIdx][2]);
-
-        return result;
-}
-
-// generates a the scene hierarchy with random values
-HierarchyNode* generateHierarchy(int numObjects)
-{
-    HierarchyNode *hierarchy = new HierarchyNode();
-
-        // initialise materials
-        copyVector3Values(amb[0], 0.0215, 0.1745, 0.0215);
-        copyVector3Values(dif[0], 0.727811, 0.633, 0.6);
-        copyVector3Values(spec[0], 0.633, 0.727811, 0.633);
-
-        copyVector3Values(amb[1], 0.1745, 0.01175, 0.01175);
-        copyVector3Values(dif[1], 0.61424, 0.04136, 0.04136);
-        copyVector3Values(spec[1], 0.727811, 0.626959, 0.626959);
-
-        srand (time (0));
-        
-        printf("generating geometry with random position and orientation ... ");
-
-        for(int i=0; i < numObjects; i++)
-        {
-                float xRotRatio = rand() / (float) RAND_MAX;
-                float yRotRatio = rand() / (float) RAND_MAX;
-                float zRotRatio = rand() / (float) RAND_MAX;
-
-                Vector3 translationRatio = {rand() / (float) RAND_MAX, 
-                                                                        rand() / (float) RAND_MAX, 
-                                                                        rand() / (float) RAND_MAX};
-
-                int materialIdx = int(2 * rand() / (float) RAND_MAX);
-                        
-                Geometry *geo = generateGeometry(translationRatio, xRotRatio, 
-                                                                             yRotRatio, zRotRatio, materialIdx);
-                hierarchy->AddGeometry(geo);
-
-                // put into global geometry list for later deletion
-                geometry.push_back(geo);
-        }
-
-        printf("finished\n");
-        printf("generating new kd-tree hierarchy ... ");
-        HierarchyNode::InitKdTree(hierarchy);
-        hierarchy->GenerateKdTree();
-        printf("finished\n");
-
-        return hierarchy;
-}
-
-
-void updateEyeMtx(void) 
-{
-        const Vector3 up = {0.0, 1.0, 0.0};
+
+void UpdateEyeMtx(void) 
+{
+        /*const Vector3 up(0.0, 1.0, 0.0);
 
         look(eyeView, eyePos, viewDir, up);
         mult(eyeProjView, eyeProjection, eyeView); //eyeProjView = eyeProjection*eyeView
         invert(invEyeProjView, eyeProjView); //invert matrix
-}
-
-
-void setupEyeView(void)
-{
-        glMatrixMode(GL_PROJECTION);
-        glLoadMatrixd(eyeProjection);
-
+        */
+}
+
+
+void SetupEyeView(void)
+{
+        SetupProjection(800,600,60,sceneBox);
         glMatrixMode(GL_MODELVIEW);
-        glLoadMatrixd(eyeView);
+        camera->SetupCameraView();
+
+/*      glMatrixMode(GL_PROJECTION);
+        glLoadMatrixf((float *)eyeProjection.x);
+
+        glMatrixMode(GL_MODELVIEW);
+        glLoadMatrixf((float *)eyeView.x);
+        */
 }
 
@@ -353 +345 @@
         char msg8[100];
 
+/*
         sprintf_s(msg2, "Traversed: %4d, frustum culled: %4d, query culled: %4d (of %d nodes)",
                         traverser.GetNumTraversedNodes(), traverser.GetNumFrustumCulledNodes(),
                         traverser.GetNumQueryCulledNodes(), 
                         traverser.GetHierarchy()->GetNumHierarchyNodes());
-        
+
         char *optstr[2] = {"", ", using optimization"};
         char *querystr[2] = {"NV", "ARB"};
@@ -384 +377 @@
         sprintf_s(msg7, "Next object type: %s", objectTypeStr[nextObjectType]);
         sprintf_s(msg8, "Next object size: %3.3f", objectSize);
+*/
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-        updateEyeMtx(); // bring eye modelview matrix up-to-date
-        setupEyeView();
-
+        // bring eye modelview matrix up-to-date
+        UpdateEyeMtx(); 
+        SetupEyeView();
+
+        glEnableClientState(GL_VERTEX_ARRAY);
+        glEnableClientState(GL_NORMAL_ARRAY);
+
+        bool usesTextures = false;
+
+        SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
+
+        for (sit = sceneEntities.begin(); sit != sit_end; ++ sit)
+        {
+                SceneEntity *entity = *sit;
+
+                if (!usesTextures && entity->GetGeometry()->HasTexture())
+                {
+                        glEnable(GL_TEXTURE_2D);
+                        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+                        usesTextures = true;
+                }
+                else if (usesTextures && !entity->GetGeometry()->HasTexture())
+                {
+                        glDisable(GL_TEXTURE_2D);
+                        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+                        usesTextures = false;
+                }
+
+                entity->Render();
+        }
+
+        glDisableClientState(GL_VERTEX_ARRAY);
+        glDisableClientState(GL_NORMAL_ARRAY);
+
+        glDisable(GL_TEXTURE_2D);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+        /*
         traverser.SetViewpoint(eyePos);
         traverser.SetProjViewMatrix(eyeProjView);
         traverser.Render(renderMode);
-
         // cycle through rendertime array
         renderTimes[renderTimesIdx] = traverser.GetRenderTime();
@@ -402 +430 @@
 
         if(visMode)
-        {
                 displayVisualization();
-        }
+        */
+
         
         begin2D();
+        
         if(showHelp)
+        {       
                 drawHelpMessage();
+        }
         else
         {
                 glColor3f(1.0,1.0,1.0);
-                output(10,winHeight-10, msg[renderMode]);
+                //output(10, winHeight-10, msg[renderMode]);
 
                 if(showStatistics)
@@ -428 +459 @@
                 }
         }
+
         end2D();
 
@@ -437 +469 @@
 void keyboard(const unsigned char c, const int x, const int y) 
 {
-        int threshold;
-        HierarchyNode *hierarchy;
+        //int threshold;
+        //HierarchyNode *hierarchy;
 
         switch(c) 
@@ -446 +478 @@
                 break;
         case 32: //space
-                renderMode = (renderMode + 1) % RenderTraverser::NUM_RENDERMODES;
+        
+                //      renderMode = (renderMode + 1) % RenderTraverser::NUM_RENDERMODES;
                 
                 resetTimer();
-                traverser.Render(renderMode);           // render once so stats are updated
+                //traverser.Render(renderMode);         // render once so stats are updated
                 break;
         case 'h':
@@ -458 +491 @@
         case 'V':
                 showBoundingVolumes = !showBoundingVolumes;
-                HierarchyNode::SetRenderBoundingVolume(showBoundingVolumes);
+                //HierarchyNode::SetRenderBoundingVolume(showBoundingVolumes);
                 break;
         case 's':
@@ -465 +498 @@
                 break;
         case '+':
-                threshold = traverser.GetVisibilityThreshold() + 10;
-                traverser.SetVisibilityThreshold(threshold);
+                //threshold = traverser.GetVisibilityThreshold() + 10;
+                //traverser.SetVisibilityThreshold(threshold);
                 break;
         case '-':
-                threshold = traverser.GetVisibilityThreshold() - 10;
-                if(threshold < 0) threshold = 0;
-
-                traverser.SetVisibilityThreshold(threshold);            
+                //threshold = traverser.GetVisibilityThreshold() - 10;
+                //if(threshold < 0) threshold = 0;
+
+                //traverser.SetVisibilityThreshold(threshold);          
                 break;
         case '1':
@@ -495 +528 @@
         case 'G':
                 useOptimization = !useOptimization;
-                traverser.SetUseOptimization(useOptimization);
-                break;
-        case 'n':
-        case 'N':
-                useArbQueries = !useArbQueries;
-                traverser.SetUseArbQueries(useArbQueries);
-                break;
+                //traverser.SetUseOptimization(useOptimization);
+                break;
+                /*
         case 'c':
         case 'C':       
-                
                 hierarchy = traverser.GetHierarchy();
                 // delete old hierarchy
-                if(hierarchy) delete hierarchy; 
+                if (hierarchy) delete hierarchy; 
                 deleteGeometry();
 
@@ -522 +550 @@
                 resetTimer();
                 break;
-
+                */
         default:
                 return;
@@ -534 +562 @@
 {
         // used to avoid vertical motion with the keys
-        Vector3 hvec = {viewDir[0], 0, viewDir[2]};
+        Vector3 hvec = Vector3(viewDir[0], 0, viewDir[2]);
         
         switch(c) 
@@ -542 +570 @@
                 break;
         case GLUT_KEY_F2:
-                numNextObjects -= 100;
-                if(numNextObjects < 100) numNextObjects = 100;
+                //numNextObjects -= 100;
+                //if(numNextObjects < 100) numNextObjects = 100;
                 break;
         case GLUT_KEY_F3:
-        numNextObjects += 100;
+       // numNextObjects += 100;
                 break;
         case GLUT_KEY_F4:
@@ -563 +591 @@
                 break;
         case GLUT_KEY_F8:
-                nextObjectType = (nextObjectType + 1) % Geometry::NUM_OBJECTS;
+                //nextObjectType = (nextObjectType + 1) % Geometry::NUM_OBJECTS;
                 break;
         case GLUT_KEY_LEFT:
-                rotateVectorY(viewDir, 0.2);
+        //      rotateVectorY(viewDir, 0.2);
                 break;
         case GLUT_KEY_RIGHT:
-                rotateVectorY(viewDir, -0.2);
+                //rotateVectorY(viewDir, -0.2);
                 break;
         case GLUT_KEY_UP:
-                linCombVector3(eyePos, eyePos, hvec, 0.6);
+        //      linCombVector3(eyePos, eyePos, hvec, 0.6);
                 break;
         case GLUT_KEY_DOWN:
-                linCombVector3(eyePos, eyePos, hvec, -0.6);
+                //linCombVector3(eyePos, eyePos, hvec, -0.6);
                 break;
         default:
@@ -598 +626 @@
         if(w) winAspectRatio = (double) h / (double) w;
 
-        perspectiveDeg(eyeProjection, 60.0, 1.0/winAspectRatio, nearDist, 150.0);
+        //perspectiveDeg(eyeProjection, 60.0, 1.0/winAspectRatio, nearDist, 150.0);
 
         glutPostRedisplay();
@@ -631 +659 @@
         static double eyeXAngle = 0.0;
         // not move in the vertical direction
-        Vector3 horView = {viewDir[0], 0, viewDir[2]};
-        
-        eyeXAngle = 0.6 *  PI * (xEyeBegin - x) / 180.0;
+        Vector3 horView = Vector3(viewDir[0], 0, viewDir[2]);
+        
+        eyeXAngle = 0.6 *  M_PI * (xEyeBegin - x) / 180.0;
+
+        /*
         linCombVector3(eyePos, eyePos, horView, (yMotionBegin - y) * 0.1);
         
@@ -640 +670 @@
         xEyeBegin = x;
         yMotionBegin = y;
-
+        */
         glutPostRedisplay();
 }
@@ -649 +679 @@
         // the 90 degree rotated view vector 
         // y zero so we don't move in the vertical
-        Vector3 rVec = {viewDir[0], 0, viewDir[2]};
-        
-        rotateVectorY(rVec, PI / 2.0);
+        Vector3 rVec = Vector3(viewDir[0], 0, viewDir[2]);
+        
+        /*rotateVectorY(rVec, PI / 2.0);
         linCombVector3(eyePos, eyePos, rVec, (horizontalMotionBegin - x) * 0.1);
         
@@ -658 +688 @@
         horizontalMotionBegin = x;
         verticalMotionBegin = y;
-
+*/
         glutPostRedisplay();
 }
 
 
-void initExtensions(void) 
+void InitExtensions(void) 
 {
         GLenum err = glewInit();
+
         if (GLEW_OK != err) 
         {
@@ -672 +703 @@
                 exit(1);
         }
-
-        if (GLEW_ARB_occlusion_query) 
-                arbQuerySupport = true;
-        
-        if (GLEW_NV_occlusion_query) 
-                nvQuerySupport = true;
-        
-
-        if  (!arbQuerySupport && !nvQuerySupport)
-        {
-                printf("I require the GL_ARB_occlusion_query or the GL_NV_occlusion_query OpenGL extension to work.\n");
+        if  (!GLEW_ARB_occlusion_query)
+        {
+                printf("I require the GL_ARB_occlusion_query to work.\n");
                 exit(1);
         }
@@ -729 +752 @@
 }
 
-// explicitly deletes geometry generated for hierarchy 
-// (deleting the hierarchy does not delete the geometry)
-void deleteGeometry()
-{
-        for (GeometryList::iterator it = geometry.begin(); it != geometry.end(); it++)
-                if(*it) delete (*it);
-        
-        geometry.clear();
-}
-
 // displays the visualisation of the kd tree node culling
 void displayVisualization()
@@ -753 +766 @@
         glViewport(winWidth / 2, winHeight / 2, winWidth, winHeight);
         glPushMatrix();
-        glLoadMatrixd(visView);
+        glLoadMatrixf((float *)visView.x);
         
         glClear(GL_DEPTH_BUFFER_BIT);
 
         // --- visualization of the occlusion culling
-        HierarchyNode::SetRenderBoundingVolume(true);
+        /*HierarchyNode::SetRenderBoundingVolume(true);
         traverser.RenderVisualization();
         HierarchyNode::SetRenderBoundingVolume(showBoundingVolumes);
-
+*/
         glPopMatrix();
         glViewport(0, 0, winWidth, winHeight);
 }
 
-/**
-        sets up view matrix in order to get a good position 
+/** Sets up view matrix in order to get a good position 
         for viewing the kd tree node culling
 */
 void setupVisView()
 {
-        const Vector3 up = {0.0, 1.0, 0.0};
-        
-        Vector3 visPos = {24, 23, -6};
+        const Vector3 up(0.0, 1.0, 0.0);
+        
+        Vector3 visPos(24, 23, -6);
         
         visPos[0] *= visZoomFactor; 
@@ -780 +792 @@
         visPos[2] *= visZoomFactor;
 
-        Vector3 visDir = {-1.3,-1,-1};
-        
-        normalize(visDir);
-        look(visView, visPos, visDir, up);
+        Vector3 visDir = Vector3(-1.3, -1, -1);
+        
+        //normalize(visDir);
+        //look(visView, visPos, visDir, up);
 }
 
@@ -810 +822 @@
 
 // cleanup routine after the main loop
-void cleanUp()
-{
-        if(traverser.GetHierarchy()) 
-                delete traverser.GetHierarchy();
-
-        deleteGeometry();
-
-        Geometry::CleanUp();
+void CleanUp()
+{
+        CLEAR_CONTAINER(sceneEntities);
+        DEL_PTR(traverser);
+
+        DEL_PTR(bvh);
 }
 
@@ -846 +856 @@
         }
 }
-
-#endif