From e903ed4b02d31a218d98db04f5ccfdd44cfea8c2 Mon Sep 17 00:00:00 2001
From: korenkonder <admin@mysterious-home.net>
Date: Wed, 3 Jan 2024 02:55:57 +0300
Subject: [PATCH] DoF fixes

---
 src/CRE/pv_param.cpp     | 10 +++++++---
 src/CRE/renderer/dof.cpp |  4 ++--
 src/CRE/shader_ft.cpp    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/CRE/pv_param.cpp b/src/CRE/pv_param.cpp
index a39a2274..b1645cde 100644
--- a/src/CRE/pv_param.cpp
+++ b/src/CRE/pv_param.cpp
@@ -1093,8 +1093,8 @@ namespace pv_param_task {
         frame = -1.0f;
     }
 
-    static void get_autofocus_data(float_t distance, float_t fov, float_t& focus,
-        float_t& focus_range, float_t& fuzzing_range, float_t& ratio) {
+    static void get_autofocus_data(float_t distance, float_t fov, bool& enable,
+        float_t& focus, float_t& focus_range, float_t& fuzzing_range, float_t& ratio) {
         float_t v5 = tanf(fov * DEG_TO_RAD_FLOAT * 0.5f);
         float_t v6 = distance * 1000.0f;
         float_t v7 = 36.0f / (v5 * 2.0f);
@@ -1121,12 +1121,14 @@ namespace pv_param_task {
             if (_fuzzing_range < 0.01f)
                 _fuzzing_range = 0.01f;
 
+            enable = true;
             focus = distance;
             focus_range = _focus_range;
             fuzzing_range = _fuzzing_range;
             ratio = _ratio;
         }
         else {
+            enable = false;
             focus = 0.0f;
             focus_range = 0.0f;
             fuzzing_range = 0.0f;
@@ -1145,6 +1147,7 @@ namespace pv_param_task {
         float_t auto_focus;
         float_t auto_focus_range;
 #endif
+        bool enable = true;
         bool autofocus = data.data.chara_id != -1;
 #if DOF_FIX
         if (true) {
@@ -1168,7 +1171,7 @@ namespace pv_param_task {
 
             float_t distance = vec3::distance(trans, view_point);
 
-            get_autofocus_data(distance, fov, focus, focus_range, fuzzing_range, ratio);
+            get_autofocus_data(distance, fov, enable, focus, focus_range, fuzzing_range, ratio);
 
             if (autofocus) {
                 data.data.focus = focus;
@@ -1226,6 +1229,7 @@ namespace pv_param_task {
 
         dof_pv pv;
         dof_pv_get(&pv);
+        pv.enable = enable;
         pv.f2.focus = focus;
         pv.f2.focus_range = focus_range;
         pv.f2.fuzzing_range = fuzzing_range;
diff --git a/src/CRE/renderer/dof.cpp b/src/CRE/renderer/dof.cpp
index 41957029..7b91cfc1 100644
--- a/src/CRE/renderer/dof.cpp
+++ b/src/CRE/renderer/dof.cpp
@@ -39,8 +39,8 @@ static const dof_pv dof_pv_default = {
     },
 };
 
-dof_debug dof_debug_data;
-dof_pv dof_pv_data;
+dof_debug dof_debug_data = dof_debug_default;
+dof_pv dof_pv_data = dof_pv_default;
 
 extern render_context* rctx_ptr;
 
diff --git a/src/CRE/shader_ft.cpp b/src/CRE/shader_ft.cpp
index 6b9ad45f..01b66ee6 100644
--- a/src/CRE/shader_ft.cpp
+++ b/src/CRE/shader_ft.cpp
@@ -2499,7 +2499,7 @@ static const std::pair<uniform_name, bool> SPRITE_uniform[] = {
 };
 
 static const std::pair<uniform_name, bool> DOF_uniform[] = {          // Added
-    { U_DOF          , false },
+    { U_DOF          , true  },
 };
 
 static const std::pair<uniform_name, bool> TRANSPARENCY_uniform[] = { // Added