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

Timestamp:

06/14/08 19:04:01 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -13 +13 @@
 #include "Camera.h"
 #include "Geometry.h"
+#include "BvhLoader.h"
+#include "FrustumCullingTraverser.h"
+
 
 
@@ -30 +33 @@
 /// the scene bounding box
 AxisAlignedBox3 sceneBox;
+/// the current render state
+RenderState state;
 
 // eye near plane distance
 float nearDist = 0.1f; 
-int winWidth, winHeight;
+int winWidth = 1024;
+int winHeight = 768;
 float winAspectRatio = 1.0f;
 
@@ -44 +50 @@
 bool showCreateParams = false;
 
-
-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 visView; // visualisation view matrix
+int currentFrame = -1;
+
+// visualisation view matrix
+Matrix4x4 visView; 
 
 //mouse navigation state
 int xEyeBegin, yEyeBegin, yMotionBegin, verticalMotionBegin, horizontalMotionBegin = 0;
 //int renderMode = RenderTraverser::RENDER_COHERENT;
-
 
 const int renderTimeSize = 100;
@@ -100 +103 @@
 int main(int argc, char* argv[])
 {
-        camera = new Camera(800, 600);
-
-        glutInitWindowSize(800, 600);
+        camera = new Camera(winWidth, winHeight);
+
+        glutInitWindowSize(winWidth, winHeight);
         glutInit(&argc, argv);
         glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
@@ -124 +127 @@
 
         //const string filename("house_test.dem");
-        const string filename("city_demo.dem");
+        //const string filename("city_demo.dem");
+        const string filename("city.dem");
 
         if (loader.Load(filename, sceneEntities))
@@ -131 +135 @@
                 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());
-
-        cout << "scene box: " << sceneBox << endl;
-
+        BvhLoader bvhLoader;
+        bvh = bvhLoader.Load("city.bvh", sceneEntities);
+
+        sceneBox = bvh->GetBox();
+
+        traverser = new FrustumCullingTraverser();
+        traverser->SetHierarchy(bvh);
+        traverser->SetRenderState(&state);
 
         //SetupProjection(800, 600, 60, sceneBox);
@@ -162 +165 @@
 void InitGLstate(void) 
 {
-        glClearColor(0.0f, 0.0f, 0.0f, 0.0);
+        glClearColor(0.5f, 0.5f, 0.8f, 0.0);
         
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -171 +174 @@
         SetupLighting();
 
-        glColor3f(1.0f, 0.0f, 0.0f);
+        glColor3f(1.0f, 1.0f, 1.0f);
         glShadeModel(GL_SMOOTH);
-        
         
         glMaterialf(GL_FRONT, GL_SHININESS, 64);
@@ -190 +192 @@
         glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuseColor);
         glMaterialfv(GL_FRONT, GL_SPECULAR, specularColor);
-
-        glColor3f(1.0f, 0.0f, 0.0f);
         //setupVisView();
 }
@@ -277 +277 @@
         GLfloat ambient[] = {0.2, 0.2, 0.2, 1.0};
         GLfloat diffuse[] = {1.0, 1.0, 1.0, 1.0};
+        //GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
         GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
             
@@ -286 +287 @@
         glLightfv(GL_LIGHT0, GL_SPECULAR, specular);
 
-        GLfloat position[] = {0.0, 3.0, 3.0, 0.0};
+        GLfloat position[] = {1.0, 1.0, 1.0, 0.0};
         glLightfv(GL_LIGHT0, GL_POSITION, position);
 
@@ -293 +294 @@
         //-- second light
 
-        GLfloat ambient1[] = {0.2, 0.2, 0.2, 1.0};
+        GLfloat ambient1[] = {0.5, 0.5, 0.5, 1.0};
+        //GLfloat diffuse1[] = {1.0, 1.0, 1.0, 1.0};
         GLfloat diffuse1[] = {0.5, 0.5, 0.5, 1.0};
-        GLfloat specular1[] = {0.0, 0.0, 0.0, 1.0};
+        GLfloat specular1[] = {0.5, 0.5, 0.5, 1.0};
 
         glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);
@@ -314 +316 @@
 void SetupEyeView(void)
 {
-        
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
@@ -323 +324 @@
         glLoadIdentity();       
 
-        GLfloat position[] = {0.0f, 3.0f, 3.0f, 0.0f};
+        camera->SetupCameraView();
+
+        GLfloat position[] = {0.8f, 1.0f, 1.5f, 0.0f};
         glLightfv(GL_LIGHT0, GL_POSITION, position);
 
-        GLfloat position1[] = {sceneBox.Center().x, sceneBox.Center().y, sceneBox.Center().z, 1.0f};
+        GLfloat position1[] = {sceneBox.Center().x, sceneBox.Max().y, sceneBox.Center().z, 1.0f};
+        //GLfloat position1[] = {-2.0f, 1.0f, 0.0f, 0.0f};
         glLightfv(GL_LIGHT1, GL_POSITION, position1);
-
-        camera->SetupCameraView();
-
-
 }
 
@@ -374 +374 @@
 */
         
+        ++ currentFrame;
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -380 +381 @@
         SetupEyeView();
 
+        bvh->InitFrame(camera, currentFrame);
+
+
         InitTiming();
 
@@ -389 +393 @@
         glEnableClientState(GL_NORMAL_ARRAY);
 
+        traverser->Render();
+/*
         bool usesTextures = false;
 
@@ -412 +418 @@
                 entity->Render();
         }
-
+*/
         glDisableClientState(GL_VERTEX_ARRAY);
         glDisableClientState(GL_NORMAL_ARRAY);
@@ -568 +574 @@
 {
         // used to avoid vertical motion with the keys
-        Vector3 hvec = Vector3(viewDir[0], 0, viewDir[2]);
+        //Vector3 hvec = Vector3(viewDir[0], 0, viewDir[2]);
         
         switch(c)