Changeset 2888

Timestamp:

08/31/08 15:27:31 (16 years ago)

Author:

mattausch

Message:

corrected views

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (1 diff)
• src/Bvh.cpp (modified) (1 diff)
• src/Camera.cpp (modified) (4 diffs)
• src/SceneQuery.cpp (modified) (2 diffs)
• src/SsaoShader.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (6 diffs)
• src/shaders/ssao.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -10 +10 @@
 winHeight=768
 camPosition=483.398f 242.364f 186.078f
-camDirection=-1 0 0
+camDirection=0 1 0
+//camDirection=1 0 0
 useFullScreen=0
 useLODs=1

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.cpp

@@ -368 +368 @@
 
         // store near plane
-        sNearPlane = Plane3(-mCamera->GetDirection(), mCamera->GetPosition());
+        sNearPlane = Plane3(mCamera->GetDirection(), mCamera->GetPosition());
 }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.cpp

@@ -169 +169 @@
 
 
-
 void Camera::ComputePoints(Vector3 &ftl, Vector3 &ftr, Vector3 &fbl, Vector3 &fbr,
                                                    Vector3 &ntl, Vector3 &ntr, Vector3 &nbl, Vector3 &nbr)
@@ -181 +180 @@
         const float h_far = w_far / GetAspect();
 
-        const Vector3 view = -GetDirection();
+        const Vector3 view = GetDirection();
         const Vector3 fc = mPosition + view * z_far; 
         
@@ -231 +230 @@
 void Camera::SetDirection(const Vector3 &dir)
 {
-        Normalize(dir);
+        Vector3 ndir = -Normalize(dir);
 
         //mPitch = atan2(dir.x, dir.z);
         //mYaw = atan2(dir.y, sqrt((dir.x * dir.x) + (dir.z * dir.z)));
 
-        mPitch = -atan2(dir.x, dir.y);
-        mYaw = atan2(dir.z, sqrt((dir.x * dir.x) + (dir.y * dir.y)));
+        //mPitch = atan2(dir.x, dir.y);
+        mPitch = -atan2(ndir.x, ndir.y);
+        mYaw = atan2(ndir.z, sqrt((ndir.x * ndir.x) + (ndir.y * ndir.y)));
 
         CalculateFromPitchAndYaw();
@@ -257 +257 @@
 Vector3 Camera::GetDirection() const
 { 
-        return Vector3(mViewOrientation.x[0][2], mViewOrientation.x[1][2], mViewOrientation.x[2][2]);
+        return -Vector3(mViewOrientation.x[0][2], mViewOrientation.x[1][2], mViewOrientation.x[2][2]);
 }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneQuery.cpp

@@ -103 +103 @@
 bool SceneQuery::CalcIntersection(Vector3 &pt)
 {
-        const int px = (pt.x - mSceneBox.Min(0)) * (texWidth - 1) / mSceneBox.Size(0);
-        const int py = (pt.y - mSceneBox.Min(1)) * (texHeight - 1) / mSceneBox.Size(1);
+        const int px = (mSceneBox.Max(0) - pt.x) * (texWidth - 1) / mSceneBox.Size(0);
+        const int py = (mSceneBox.Max(1) - pt.y) * (texHeight - 1) / mSceneBox.Size(1);
 
         float d = mDepth[px + py * texHeight];
@@ -137 +137 @@
 
         orthoCam->SetNear(0.0f);
-        orthoCam->SetDirection(Vector3(0, 0, 1));
+        orthoCam->SetDirection(Vector3(0, 0, -1));
 
         cout << orthoCam->GetDirection() << endl;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.cpp

@@ -576 +576 @@
 #if 1 // matT: debug this!!
         
-        bl = -Normalize(nbl - fbl);
-        br = -Normalize(nbr - fbr);
-        tl = -Normalize(ntl - ftl);
-        tr = -Normalize(ntr - ftr);
+        bl = Normalize(nbl - fbl);
+        br = Normalize(nbr - fbr);
+        tl = Normalize(ntl - ftl);
+        tr = Normalize(ntr - ftr);
 
 #else // just take camera direction

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -330 +330 @@
         camera = new Camera(winWidth, winHeight, fov);
         camera->SetNear(nearDist);
-        
+        camera->SetFar(1000);
+
         cout << "here2 " << Normalize(camDir) << endl;
 
         camera->SetDirection(camDir);
+
         cout << "here3 " << camera->GetDirection() << endl;
+        cout << "here3 " << camera->GetRightVector() << endl;
+        cout << "here3 " << camera->GetUpVector() << endl;
+
         camera->SetPosition(camPos);
 
@@ -829 +834 @@
 void KeyHorizontalMotion(float shift)
 {
-        Vector3 hvec = camera->GetDirection();
+        Vector3 hvec = -camera->GetDirection();
         hvec.z = 0;
 
@@ -1375 +1380 @@
         camera->Pitch(eyeXAngle);
 
-        pos -= horView * (yMotionBegin - y) * 0.2f;
+        pos += horView * (yMotionBegin - y) * 0.2f;
         
         camera->SetPosition(pos);
@@ -1417 +1422 @@
         rVec = rot * rVec;
         
-        pos += rVec * (x - horizontalMotionBegin) * 0.1f;
+        pos -= rVec * (x - horizontalMotionBegin) * 0.1f;
         pos[2] += (verticalMotionBegin - y) * 0.1f;
 
@@ -1539 +1544 @@
         glClear(GL_DEPTH_BUFFER_BIT);
 
+
         ////////////
         //-- visualization of the occlusion culling
@@ -1544 +1550 @@
         visualization->Render();
 
+        // coordinates
         glColor3f(0.0f, 1.0f, 0.0f);
         glBegin(GL_LINES);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/ssao.cg

@@ -95 +95 @@
 
         //return max(0.0f, 1.0f - total_ao);
-        return saturate(dot(currentViewDir, currentNormal));
+        //return saturate(dot(currentViewDir, currentNormal));
+        return saturate(dot(currentViewDir, float3(0, -1, 0)));
 }