xrEngine/device.h: renamed ***_saved -> ***Saved

And added new saved objects Layers/xrRender/DetailManager.cpp: removed unused View_old
OpenXRay · Apr 4, 2018 · e47ed69 · e47ed69
1 parent 575d30f
commit e47ed69
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/src/Layers/xrRender/DetailManager.cpp b/src/Layers/xrRender/DetailManager.cpp
@@ -239,14 +239,10 @@ extern ECORE_API float r_ssaDISCARD;
 
 void CDetailManager::UpdateVisibleM()
 {
-    Fvector EYE = RDEVICE.vCameraPosition_saved;
+    Fvector EYE = Device.vCameraPositionSaved;
 
     CFrustum View;
-    View.CreateFromMatrix(RDEVICE.mFullTransform_saved, FRUSTUM_P_LRTB + FRUSTUM_P_FAR);
-
-    CFrustum View_old;
-    Fmatrix Viewm_old = RDEVICE.mFullTransform;
-    View_old.CreateFromMatrix(Viewm_old, FRUSTUM_P_LRTB + FRUSTUM_P_FAR);
+    View.CreateFromMatrix(Device.mFullTransformSaved, FRUSTUM_P_LRTB + FRUSTUM_P_FAR);
 
     float fade_limit = dm_fade;
     fade_limit = fade_limit * fade_limit;
@@ -425,7 +421,7 @@ void __stdcall CDetailManager::MT_CALC()
     if (m_frame_calc != RDEVICE.dwFrame)
         if ((m_frame_rendered + 1) == RDEVICE.dwFrame) // already rendered
         {
-            Fvector EYE = RDEVICE.vCameraPosition_saved;
+            Fvector EYE = RDEVICE.vCameraPositionSaved;
 
             int s_x = iFloor(EYE.x / dm_slot_size + .5f);
             int s_z = iFloor(EYE.z / dm_slot_size + .5f);

diff --git a/src/xrEngine/device.cpp b/src/xrEngine/device.cpp
@@ -260,10 +260,15 @@ void CRenderDevice::on_idle()
     mFullTransform.mul(mProject, mView);
     GEnv.Render->SetCacheXform(mView, mProject);
     mInvFullTransform.invert(mFullTransform);
-    vCameraPosition_saved = vCameraPosition;
-    mFullTransform_saved = mFullTransform;
-    mView_saved = mView;
-    mProject_saved = mProject;
+
+    vCameraPositionSaved = vCameraPosition;
+    vCameraDirectionSaved = vCameraDirection;
+    vCameraTopSaved = vCameraTop;
+    vCameraRightSaved = vCameraRight;
+
+    mFullTransformSaved = mFullTransform;
+    mViewSaved = mView;
+    mProjectSaved = mProject;
 
     renderProcessFrame.Set(); // allow render thread to do its job
     syncProcessFrame.Set(); // allow secondary thread to do its job

diff --git a/src/xrEngine/device.h b/src/xrEngine/device.h
@@ -91,11 +91,14 @@ class ENGINE_API CRenderDeviceData
     Fmatrix mFullTransform;
 
     // Copies of corresponding members. Used for synchronization.
-    Fvector vCameraPosition_saved;
-
-    Fmatrix mView_saved;
-    Fmatrix mProject_saved;
-    Fmatrix mFullTransform_saved;
+    Fvector vCameraPositionSaved;
+    Fvector vCameraDirectionSaved;
+    Fvector vCameraTopSaved;
+    Fvector vCameraRightSaved;
+
+    Fmatrix mViewSaved;
+    Fmatrix mProjectSaved;
+    Fmatrix mFullTransformSaved;
 
     float fFOV;
     float fASPECT;