Modify default camera settings

USTC-CG · Apr 17, 2024 · e4ff6b3 · e4ff6b3
1 parent 467d462
commit e4ff6b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Framework3D/source/GUI/free_camera.cpp b/Framework3D/source/GUI/free_camera.cpp
@@ -129,6 +129,8 @@ std::pair<bool, pxr::GfMatrix4f> FirstPersonCamera::AnimateRoll(pxr::GfMatrix4f
 
 void FirstPersonCamera::Animate(float deltaT)
 {
+    SetPerspectiveFromAspectRatioAndFieldOfView(
+        m_ViewportSize[0] / m_ViewportSize[1], 130/2, FOVHorizontal);
     // track mouse delta
     pxr::GfVec2f mouseMove = mousePos - mousePosPrev;
     mousePosPrev = mousePos;
@@ -168,6 +170,9 @@ void FirstPersonCamera::Animate(float deltaT)
 
 void FirstPersonCamera::AnimateSmooth(float deltaT)
 {
+    SetPerspectiveFromAspectRatioAndFieldOfView(
+        m_ViewportSize[0] / m_ViewportSize[1], 130/2, FOVHorizontal);
+
     const float c_DampeningRate = 7.5f;
     float dampenWeight = exp(-c_DampeningRate * deltaT);
 

diff --git a/Framework3D/source/RCore/hd_USTC_CG/integrator.cpp b/Framework3D/source/RCore/hd_USTC_CG/integrator.cpp
@@ -183,7 +183,7 @@ bool Integrator::Intersect(const GfRay& ray, SurfaceInteraction& si)
         texcoord = { 0.5, 0.5 };
     }
 
-    si.geometricNormal = shadingNormal;
+    si.geometricNormal = geometricNormal;
     si.shadingNormal = shadingNormal;
     si.position = hitPos;
     si.barycentric = { rayHit.hit.u, rayHit.hit.v };