Support for Nvidia Ansel

Author: Xottab-DUTY

src/xrEngine/CameraBase.cpp

@@ -83,8 +83,11 @@ SCamEffectorInfo::SCamEffectorInfo()
     n.set(0, 1, 0);
 
     fFov = 90.0f;
+    fNear = VIEWPORT_NEAR;
     fFar = 100.0f;
     fAspect = 1.f;
+    offsetX = 0.f;
+    offsetY = 0.f;
     dont_apply = false;
     affected_on_hud = true;
 }

src/xrEngine/CameraDefs.h

@@ -19,8 +19,11 @@ struct ENGINE_API SCamEffectorInfo
     Fvector n;
     Fvector r;
     float fFov;
+    float fNear;
     float fFar;
     float fAspect;
+    float offsetX; // Required for Nvidia Ansel
+    float offsetY; // Required for Nvidia Ansel
     bool dont_apply;
     bool affected_on_hud;
     SCamEffectorInfo();
@@ -31,8 +34,11 @@ struct ENGINE_API SCamEffectorInfo
         n = other.n;
         r = other.r;
         fFov = other.fFov;
+        fNear = other.fNear;
         fFar = other.fFar;
         fAspect = other.fAspect;
+        offsetX = other.offsetX;
+        offsetY = other.offsetY;
         dont_apply = other.dont_apply;
         affected_on_hud = other.affected_on_hud;
         return *this;
@@ -52,6 +58,7 @@ enum ECameraStyle
 enum ECamEffectorType
 {
     cefDemo = 0,
+    cefAnsel,
     cefNext
 };
 

src/xrEngine/CameraManager.cpp

@@ -206,6 +206,7 @@ void CCameraManager::Update(const Fvector& P, const Fvector& D, const Fvector& N
     clamp(src, 0.f, 1.f);
     float dst = 1 - src;
     m_cam_info.fFov = m_cam_info.fFov * dst + fFOV_Dest * src;
+    m_cam_info.fNear = VIEWPORT_NEAR;
     m_cam_info.fFar = m_cam_info.fFar * dst + fFAR_Dest * src;
     m_cam_info.fAspect = m_cam_info.fAspect * dst + (fASPECT_Dest * aspect) * src;
     m_cam_info.dont_apply = false;
@@ -214,8 +215,8 @@ void CCameraManager::Update(const Fvector& P, const Fvector& D, const Fvector& N
 
     UpdatePPEffectors();
 
-    if (false == m_cam_info.dont_apply && m_bAutoApply)
-        ApplyDevice(VIEWPORT_NEAR);
+    if (!m_cam_info.dont_apply && m_bAutoApply)
+        ApplyDevice();
 
     UpdateDeffered();
 }
@@ -313,7 +314,7 @@ void CCameraManager::UpdatePPEffectors()
     pp_affected.validate("after applying pp");
 }
 
-void CCameraManager::ApplyDevice(float _viewport_near)
+void CCameraManager::ApplyDevice()
 {
     // Device params
     Device.mView.build_camera_dir(m_cam_info.p, m_cam_info.d, m_cam_info.n);
@@ -329,7 +330,7 @@ void CCameraManager::ApplyDevice(float _viewport_near)
 
     //--#SM+# Begin-- +SecondVP+
     // Пересчитываем FOV для второго вьюпорта [Recalculate scene FOV for SecondVP frame]
-    if (Device.m_SecondViewport.IsSVPFrame())
+    if (Device.m_SecondViewport.IsSVPFrame() && !Device.IsAnselActive)
     {
         // Для второго вьюпорта FOV выставляем здесь
         Device.fFOV *= g_pGamePersistent->m_pGShaderConstants->hud_params.y;
@@ -339,10 +340,14 @@ void CCameraManager::ApplyDevice(float _viewport_near)
     }
     else
         Device.m_SecondViewport.isCamReady = false;
-
-    Device.mProject.build_projection(deg2rad(Device.fFOV), m_cam_info.fAspect, _viewport_near, m_cam_info.fFar);
     //--#SM+# End--
 
+    Device.mProject.build_projection(deg2rad(Device.fFOV), m_cam_info.fAspect, m_cam_info.fNear, m_cam_info.fFar);
+    
+    // Apply offset required for Nvidia Ansel
+    Device.mProject._31 = -m_cam_info.offsetX;
+    Device.mProject._32 = -m_cam_info.offsetY;
+
     if (g_pGamePersistent && g_pGamePersistent->m_pMainMenu->IsActive())
         ResetPP();
     else

src/xrEngine/CameraManager.h

@@ -62,7 +62,7 @@ class ENGINE_API CCameraManager
         float fFAR_Dest, u32 flags);
     void UpdateFromCamera(const CCameraBase* C);
 
-    void ApplyDevice(float _viewport_near);
+    void ApplyDevice();
     static void ResetPP();
 
     CCameraManager(bool bApplyOnUpdate);

src/xrEngine/FDemoRecord.cpp

@@ -423,7 +423,7 @@ void CDemoRecord::IR_OnKeyboardPress(int dik)
     if (dik == SDL_SCANCODE_ESCAPE)
         fLifeTime = -1;
 
-#ifdef DEBUG // ndef MASTER_GOLD // Xottab_DUTY: Teleport to demo cam in Debug configuration
+#ifndef MASTER_GOLD
     if (dik == SDL_SCANCODE_RETURN)
     {
         if (g_pGameLevel->CurrentEntity())
@@ -527,12 +527,12 @@ void CDemoRecord::IR_OnMouseHold(int btn)
         return;
     }
     Fvector vT_delta = Fvector().set(0, 0, 0);
-    switch (btn)
+    switch (MouseButtonToKey[btn])
     {
-    case 0:
+    case MOUSE_1:
         vT_delta.z += 1.0f;
         break; // Move Backward
-    case 1:
+    case MOUSE_2:
         vT_delta.z -= 1.0f;
         break; // Move Forward
     }

src/xrEngine/Stats.cpp

@@ -68,7 +68,7 @@ static optimizer vtune;
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
-BOOL g_bDisableRedText = FALSE;
+ENGINE_API BOOL g_bDisableRedText = FALSE;
 CStats::CStats()
 {
     statsFont = nullptr;

src/xrEngine/device.cpp

@@ -266,6 +266,7 @@ void CRenderDevice::on_idle()
         vCameraRight.crossproduct(vCameraTop, vCameraDirection);
         mView.build_camera_dir(vCameraPosition, vCameraDirection, vCameraTop);
     }
+
     // Matrices
     mFullTransform.mul(mProject, mView);
     GEnv.Render->SetCacheXform(mView, mProject);
@@ -520,9 +521,10 @@ void CRenderDevice::Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason)
     {
         if (!Paused())
         {
-            bShowPauseString = editor() ? FALSE : TRUE;
+            if (bShowPauseString && editor())
+                bShowPauseString = FALSE;
 #ifdef DEBUG
-            if (xr_strcmp(reason, "li_pause_key_no_clip") == 0)
+            else if (xr_strcmp(reason, "li_pause_key_no_clip") == 0)
                 bShowPauseString = FALSE;
 #endif
         }

src/xrEngine/device.h

@@ -71,6 +71,7 @@ class ENGINE_API CRenderDeviceData
     u32 dwPrecacheFrame;
     BOOL b_is_Ready;
     BOOL b_is_Active;
+    bool IsAnselActive;
 
     // Engine flow-control
     u32 dwFrame;
@@ -313,6 +314,7 @@ class ENGINE_API CRenderDevice : public CRenderDeviceBase
     using finalize_function_ptr = XRay::Editor::finalize_function_ptr;
 
     XRay::Module m_editor_module;
+
     initialize_function_ptr m_editor_initialize;
     finalize_function_ptr m_editor_finalize;
     XRay::Editor::ide_base* m_editor;

src/xrEngine/xr_input.cpp

@@ -333,11 +333,15 @@ void CInput::OnFrame(void)
     stats.FrameTime.Begin();
     dwCurTime = RDEVICE.TimerAsync_MMT();
 
-    if (Device.dwPrecacheFrame == 0)
+    if (Device.dwPrecacheFrame == 0 && !Device.IsAnselActive)
     {
         KeyUpdate();
         MouseUpdate();
     }
+    else
+    {
+        SDL_FlushEvents(SDL_KEYDOWN, SDL_MOUSEWHEEL);
+    }
 
     stats.FrameTime.End();
     stats.FrameEnd();

src/xrGame/ActorCameras.cpp

@@ -395,9 +395,10 @@ void CActor::cam_Update(float dt, float fFOV)
     if (Level().CurrentEntity() == this)
     {
         Level().Cameras().UpdateFromCamera(C);
-        if (eacFirstEye == cam_active && !Level().Cameras().GetCamEffector(cefDemo))
+        const bool allow = !Level().Cameras().GetCamEffector(cefDemo) && !Level().Cameras().GetCamEffector(cefAnsel);
+        if (eacFirstEye == cam_active && allow)
         {
-            Cameras().ApplyDevice(_viewport_near);
+            Cameras().ApplyDevice();
         }
     }
 }