Changeset 2778 for GTP/trunk/App/Demos/Vis/CHC_revisited/SceneQuery.cpp

Timestamp:

06/19/08 18:07:09 (16 years ago)

Author:

mattausch

Message:

updated the camera model

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/SceneQuery.cpp (modified) (5 diffs)

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

@@ -3 +3 @@
 #include "Vector3.h"
 #include "Camera.h"
+#include "SceneQuery.h"
+#include "RenderTraverser.h"
 
 
@@ -20 +22 @@
 
 
-SceneQuery::SceneQuery(const AxisAlignedBox3 &sceneBox): 
+SceneQuery::SceneQuery(const AxisAlignedBox3 &sceneBox, RenderTraverser *renderer): 
 mSceneBox(sceneBox)
 {
-        Prepare();
+        Prepare(renderer);
 }
 
@@ -45 +47 @@
 }
 
-void SceneQuery::Prepare()
+
+void SceneQuery::Prepare(RenderTraverser *renderer)
 {
         cout << "Preparing scene queries" << endl;
@@ -56 +59 @@
         pos.z = mSceneBox.Center(2);
 
-        Camera *orthoCam = new Camera();
-        //orthoCam->SetOrtho(true);
-
-        // contain match scene bounding box;
-
         // for ortho cam this is the width
         const Vector3 len = mSceneBox.Size();
-/*
-        orthoCam->SetFov(len.x);
-        orthoCam->SetAspect(len.x / len.y);
+
+        Camera *orthoCam = new Camera(len.x, len.y);
+        orthoCam->SetOrtho(true);
 
         orthoCam->SetNear(0.0f);
@@ -72 +70 @@
         orthoCam->SetPosition(pos);
 
-        OUT1("fov: " << orthoCam->GetFov());
-        OUT1("near: " << orthoCam->GetNear());
-        OUT1("far: " << orthoCam->GetFar());
-        OUT1("aspect: " << orthoCam->GetAspect());
+        cout << "fov: " << orthoCam->GetFov() << endl;
+        cout << "near: " << orthoCam->GetNear() << endl;
+        cout << "far: " << orthoCam->GetFar() << endl;
+        cout << "aspect: " << orthoCam->GetAspect() << endl;
 
-        OUT1("pos: " << orthoCam->GetPosition());
-        OUT1("view: " << orthoCam->GetViewDirection());
-        OUT1("up: " << orthoCam->GetViewUpVector());
+        cout << "pos: " << orthoCam->GetPosition() << endl;
+        cout << "view: " << orthoCam->GetDirection() << endl;
+        cout << "up: " << orthoCam->GetUpVector() << endl;
 
-        const float pitch = 0;
-        const float yaw = YA_PI * 0.5f;
+        //orthoCam->SetDirection(Vector3(0, 1, 0));
+        orthoCam->Yaw(M_PI * 0.5f);
         
-        OffscreenRenderArea *of = new OffscreenRenderArea();
+        renderer->SetCamera(orthoCam);
 
-        of->Init(viewport[2], viewport[3]);
-        of->SetRenderAction(new GLRenderAction);
-        
-        of->SetCamera(orthoCam);
-        of->SetSceneRoot(mSceneRoot);
-        
-        of->Render();
+        //OffscreenRenderArea *of = new OffscreenRenderArea();
+        //of->Init(viewport[2], viewport[3]);
 
-        sDepth = of->GetDepthFloat();
-        */
+        renderer->RenderScene();
+        //sDepth = of->GetDepthFloat();
+
+        delete orthoCam;
 }