[STCoP] * hud_adjust: Activating hud_adjust.

- It's not working yet. * [Commit](mortany/stcop_engine_public@c5a9330) | * [Commit](mortany/stcop_engine_public@f7f3155) | * [Commit](mortany/stcop_engine_public@0215b19) | * [Commit](mortany/stcop_engine_public@0494c20) | * [Commit](mortany/stcop_engine_public@1728560) |
Roman-n · Sep 19, 2022 · 19bd272 · 19bd272
1 parent d8276fa
commit 19bd272
Show file tree

Hide file tree

Showing 27 changed files with 104 additions and 159 deletions.
diff --git a/src/Include/xrRender/DebugRender.h b/src/Include/xrRender/DebugRender.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#ifdef DEBUG
-
 #include "xrCore/xr_types.h"
 #include "DebugShader.h"
 
@@ -46,9 +44,6 @@ class IDebugRender
     virtual void SetDebugShader(dbgShaderHandle shdHandle) = 0;
     virtual void DestroyDebugShader(dbgShaderHandle shdHandle) = 0;
 
-#ifdef DEBUG
     virtual void dbg_DrawTRI(Fmatrix& T, Fvector& p1, Fvector& p2, Fvector& p3, u32 C) = 0;
-#endif //	DEBUG
 };
 
-#endif // DEBUG
diff --git a/src/Layers/xrRender/R_Backend.h b/src/Layers/xrRender/R_Backend.h
@@ -139,7 +139,6 @@ class ECORE_API CBackend
 #   error No graphics API selected or enabled!
 #endif
 
-#ifdef DEBUG
     LPCSTR ps_name;
     LPCSTR vs_name;
 #ifndef USE_DX9
@@ -153,7 +152,6 @@ class ECORE_API CBackend
 #   ifdef USE_OGL
     pcstr pp_name;
 #   endif
-#endif // DEBUG
 
     u32 stencil_enable;
     u32 stencil_func;
@@ -536,7 +534,6 @@ class ECORE_API CBackend
     void dbg_DIP(D3DPRIMITIVETYPE pt, ref_geom geom, u32 baseV, u32 startV, u32 countV, u32 startI, u32 PC);
     void dbg_SetRS(D3DRENDERSTATETYPE p1, u32 p2);
     void dbg_SetSS(u32 sampler, D3DSAMPLERSTATETYPE type, u32 value);
-#ifdef DEBUG
     void dbg_Draw(D3DPRIMITIVETYPE T, FVF::L* pVerts, int vcnt, u16* pIdx, int pcnt);
     void dbg_Draw(D3DPRIMITIVETYPE T, FVF::L* pVerts, int pcnt);
 
@@ -554,7 +551,6 @@ class ECORE_API CBackend
     void dbg_DrawTRI(Fmatrix& T, Fvector& p1, Fvector& p2, Fvector& p3, u32 C);
     void dbg_DrawLINE(Fmatrix& T, Fvector& p1, Fvector& p2, u32 C);
     void dbg_DrawEllipse(Fmatrix& T, u32 C);
-#endif
     void dbg_OverdrawBegin();
     void dbg_OverdrawEnd();
 

diff --git a/src/Layers/xrRender/R_Backend_DBG.cpp b/src/Layers/xrRender/R_Backend_DBG.cpp
@@ -33,7 +33,6 @@ void CBackend::dbg_DIP(D3DPRIMITIVETYPE pt, ref_geom geom, u32 baseV, u32 startV
     Render(pt, baseV, startV, countV, startI, PC);
 }
 
-#ifdef DEBUG
 
 void CBackend::dbg_Draw(D3DPRIMITIVETYPE T, FVF::L* pVerts, int vcnt, u16* pIdx, int pcnt)
 {
@@ -231,7 +230,6 @@ void CBackend::dbg_DrawEllipse(Fmatrix& T, u32 C)
     dbg_Draw(D3DPT_TRIANGLELIST, verts, vcnt, gFaces, 224);
     RCache.set_FillMode(D3DFILL_SOLID);
 }
-#endif
 
 void CBackend::dbg_OverdrawBegin()
 {

diff --git a/src/Layers/xrRender/R_DStreams.h b/src/Layers/xrRender/R_DStreams.h
@@ -8,9 +8,7 @@ class ECORE_API _VertexStream
     u32 mSize{}; // size in bytes
     u32 mPosition{}; // position in bytes
     u32 mDiscardID{}; // ID of discard - usually for caching
-#ifdef DEBUG
     u32 dbg_lock{};
-#endif
 
 public:
     VertexBufferHandle old_pVB{};

diff --git a/src/Layers/xrRender/dxDebugRender.cpp b/src/Layers/xrRender/dxDebugRender.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
 
-#ifdef DEBUG
-
 #include "dxDebugRender.h"
 #include "dxUIShader.h"
 
@@ -166,4 +164,3 @@ struct RDebugRender : public dxDebugRender, public pureRender
 } rdebug_render_impl;
 dxDebugRender* rdebug_render = &rdebug_render_impl;
 
-#endif //	DEBUG
diff --git a/src/Layers/xrRender/dxDebugRender.h b/src/Layers/xrRender/dxDebugRender.h
@@ -1,8 +1,6 @@
-#ifndef dxDebugRender_included
 #define dxDebugRender_included
 #pragma once
 
-#ifdef DEBUG
 
 #include "Include/xrRender/DebugRender.h"
 
@@ -28,9 +26,7 @@ class dxDebugRender : public IDebugRender
     virtual void SetDebugShader(dbgShaderHandle shdHandle);
     virtual void DestroyDebugShader(dbgShaderHandle shdHandle);
 
-#ifdef DEBUG
     virtual void dbg_DrawTRI(Fmatrix& T, Fvector& p1, Fvector& p2, Fvector& p3, u32 C);
-#endif //	DEBUG
 
 private:
     void try_render(u32 const& vertex_count, u32 const& index_count);
@@ -56,6 +52,4 @@ class dxDebugRender : public IDebugRender
 
 extern dxDebugRender DebugRenderImpl;
 extern dxDebugRender* rdebug_render;
-#endif // DEBUG
 
-#endif //	dxDebugRender_included
diff --git a/src/Layers/xrRenderPC_GL/xrRender_GL.cpp b/src/Layers/xrRenderPC_GL/xrRender_GL.cpp
@@ -51,9 +51,7 @@ class RGLRendererModule final : public RendererModule
         GEnv.RenderFactory = &RenderFactoryImpl;
         GEnv.DU = &DUImpl;
         GEnv.UIRender = &UIRenderImpl;
-#ifdef DEBUG
         GEnv.DRender = &DebugRenderImpl;
-#endif
         xrRender_initconsole();
     }
 } static s_rgl_module;

diff --git a/src/Layers/xrRenderPC_R1/xrRender_R1.cpp b/src/Layers/xrRenderPC_R1/xrRender_R1.cpp
@@ -53,9 +53,7 @@ class R1RendererModule final : public RendererModule
         GEnv.RenderFactory = &RenderFactoryImpl;
         GEnv.DU = &DUImpl;
         GEnv.UIRender = &UIRenderImpl;
-#ifdef DEBUG
         GEnv.DRender = &DebugRenderImpl;
-#endif
         xrRender_initconsole();
     }
 } static s_r1_module;

diff --git a/src/Layers/xrRenderPC_R2/xrRender_R2.cpp b/src/Layers/xrRenderPC_R2/xrRender_R2.cpp
@@ -68,9 +68,7 @@ class R2RendererModule final : public RendererModule
         GEnv.RenderFactory = &RenderFactoryImpl;
         GEnv.DU = &DUImpl;
         GEnv.UIRender = &UIRenderImpl;
-#ifdef DEBUG
         GEnv.DRender = &DebugRenderImpl;
-#endif
         xrRender_initconsole();
     }
 } static s_r2_module;

diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.cpp b/src/Layers/xrRenderPC_R4/xrRender_R4.cpp
@@ -63,9 +63,7 @@ class R4RendererModule final : public RendererModule
         GEnv.RenderFactory = &RenderFactoryImpl;
         GEnv.DU = &DUImpl;
         GEnv.UIRender = &UIRenderImpl;
-#ifdef DEBUG
         GEnv.DRender = &DebugRenderImpl;
-#endif
         xrRender_initconsole();
     }
 } static s_r4_module;

diff --git a/src/xrEngine/CameraManager.h b/src/xrEngine/CameraManager.h
@@ -35,9 +35,7 @@ class ENGINE_API CCameraManager
     void OnEffectorReleased(SBaseEffector* e);
 
 public:
-#ifdef DEBUG
     u32 dbg_upd_frame;
-#endif
 
     BENCH_SEC_SCRAMBLEMEMBER2
 

diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
@@ -1,5 +1,5 @@
 #include "StdAfx.h"
-#include <dinput.h>
+// #include <dinput.h>
 #include "Actor.h"
 #include "Torch.h"
 #include "trade.h"
@@ -39,7 +39,12 @@ bool g_bAutoClearCrouch = true;
 void CActor::IR_OnKeyboardPress(int cmd)
 {
     if (hud_adj_mode && pInput->iGetAsyncKeyState(SDL_SCANCODE_LSHIFT))
-        return;
+	{
+		if (pInput->iGetAsyncKeyState(SDL_SCANCODE_RETURN) || pInput->iGetAsyncKeyState(SDL_SCANCODE_BACKSPACE) ||
+			pInput->iGetAsyncKeyState(SDL_SCANCODE_DELETE))
+			g_player_hud->tune(Ivector().set(0, 0, 0));
+		return;
+	}
 
     if (Remote())
         return;
@@ -52,11 +57,11 @@ void CActor::IR_OnKeyboardPress(int cmd)
     if (load_screen_renderer.IsActive())
         return;
 
-    if (pInput->iGetAsyncKeyState(DIK_ADD))
+    if (pInput->iGetAsyncKeyState(SDL_SCANCODE_KP_MEMADD)) // old DIK_ADD
         inventory().Action((u16)kWPN_ZOOM_INC, CMD_START);
-    else if (pInput->iGetAsyncKeyState(DIK_SUBTRACT))
+    else if (pInput->iGetAsyncKeyState(SDL_SCANCODE_KP_MEMSUBTRACT)) // old DIK_SUBTRACT
         inventory().Action((u16)kWPN_ZOOM_DEC, CMD_START);
-    else if (pInput->iGetAsyncKeyState(DIK_HOME))
+    else if (pInput->iGetAsyncKeyState(SDL_SCANCODE_AC_HOME)) // old DIK_HOME
         inventory().Action((u16)kWPN_NV_CHANGE, CMD_START);
 
     bool quickSlot = false;
@@ -284,7 +289,17 @@ void CActor::IR_OnKeyboardRelease(int cmd)
 void CActor::IR_OnKeyboardHold(int cmd)
 {
     if (hud_adj_mode && pInput->iGetAsyncKeyState(SDL_SCANCODE_LSHIFT))
-        return;
+	{
+		if (pInput->iGetAsyncKeyState(SDL_SCANCODE_UP)) // old DIK_UP
+			g_player_hud->tune(Ivector().set(0, -1, 0));
+		if (pInput->iGetAsyncKeyState(SDL_SCANCODE_DOWN)) // old DIK_DOWN
+			g_player_hud->tune(Ivector().set(0, 1, 0));
+		if (pInput->iGetAsyncKeyState(SDL_SCANCODE_LEFT)) // old DIK_LEFT
+			g_player_hud->tune(Ivector().set(-1, 0, 0));
+		if (pInput->iGetAsyncKeyState(SDL_SCANCODE_RIGHT)) // old DIK_RIGHT
+			g_player_hud->tune(Ivector().set(1, 0, 0));
+		return;
+	}
 
     if (Remote() || !g_Alive())
         return;

diff --git a/src/xrGame/Level.cpp b/src/xrGame/Level.cpp
@@ -51,13 +51,13 @@
 #include "xrNetServer/NET_Messages.h"
 #include "xrEngine/GameFont.h"
 
-#ifdef DEBUG
 #include "level_debug.h"
 #include "ai/stalker/ai_stalker.h"
 #include "debug_renderer.h"
 #include "PhysicObject.h"
 #include "PHDebug.h"
 #include "debug_text_tree.h"
+#ifdef DEBUG
 #include "LevelGraphDebugRender.hpp"
 #endif
 
@@ -95,11 +95,11 @@ CLevel::CLevel()
         m_space_restriction_manager = xr_new<CSpaceRestrictionManager>();
         m_client_spawn_manager = xr_new<CClientSpawnManager>();
         m_autosave_manager = xr_new<CAutosaveManager>();
-#ifdef DEBUG
         m_debug_renderer = xr_new<CDebugRenderer>();
+#ifdef DEBUG
         levelGraphDebugRender = xr_new<LevelGraphDebugRender>();
-        m_level_debug = xr_new<CLevelDebug>();
 #endif
+        // m_level_debug = xr_new<CLevelDebug>();
     }
     m_ph_commander = xr_new<CPHCommander>();
     m_ph_commander_scripts = xr_new<CPHCommander>();
@@ -145,9 +145,9 @@ CLevel::~CLevel()
     xr_delete(m_seniority_hierarchy_holder);
     xr_delete(m_client_spawn_manager);
     xr_delete(m_autosave_manager);
+    xr_delete(m_debug_renderer);
 #ifdef DEBUG
     xr_delete(levelGraphDebugRender);
-    xr_delete(m_debug_renderer);
 #endif
     if (!GEnv.isDedicatedServer)
         GEnv.ScriptEngine->remove_script_process(ScriptProcessor::Level);
@@ -614,7 +614,7 @@ void CLevel::OnRender()
 
     if (!Device.IsAnselActive)
         HUD().RenderUI();
-
+    debug_renderer().render();
 #ifdef DEBUG
     draw_wnds_rects();
     physics_world()->OnRender();

diff --git a/src/xrGame/Level.h b/src/xrGame/Level.h
@@ -41,9 +41,7 @@ class demoplay_control;
 class demo_info;
 class CStreamReader;
 
-#ifdef DEBUG
 class CDebugRenderer;
-#endif
 
 extern ENGINE_API float g_fov;
 
@@ -111,9 +109,9 @@ class CLevel : public IGame_Level, public IPureClient
     CSeniorityHierarchyHolder* m_seniority_hierarchy_holder = nullptr;
     CClientSpawnManager* m_client_spawn_manager = nullptr;
     CAutosaveManager* m_autosave_manager = nullptr;
+    CDebugRenderer* m_debug_renderer = nullptr;
 #ifdef DEBUG
     LevelGraphDebugRender* levelGraphDebugRender = nullptr;
-    CDebugRenderer* m_debug_renderer = nullptr;
 #endif
     CPHCommander* m_ph_commander = nullptr;
     CPHCommander* m_ph_commander_scripts = nullptr;
@@ -349,9 +347,7 @@ class CLevel : public IGame_Level, public IPureClient
     IC CSeniorityHierarchyHolder& seniority_holder();
     IC CClientSpawnManager& client_spawn_manager();
     IC CAutosaveManager& autosave_manager();
-#ifdef DEBUG
     IC CDebugRenderer& debug_renderer();
-#endif
     void script_gc(); // GC-cycle
     IC CPHCommander& ph_commander();
     IC CPHCommander& ph_commander_scripts();
@@ -463,13 +459,11 @@ IC CAutosaveManager& CLevel::autosave_manager()
     return *m_autosave_manager;
 }
 
-#ifdef DEBUG
 IC CDebugRenderer& CLevel::debug_renderer()
 {
     VERIFY(m_debug_renderer);
     return *m_debug_renderer;
 }
-#endif
 
 IC CPHCommander& CLevel::ph_commander()
 {

diff --git a/src/xrGame/UIGameSP.cpp b/src/xrGame/UIGameSP.cpp
@@ -59,12 +59,11 @@ void CUIGameSP::SetClGame(game_cl_GameState* g)
     m_game = smart_cast<game_cl_Single*>(g);
     R_ASSERT(m_game);
 }
-#ifdef DEBUG
+
 void attach_adjust_mode_keyb(int dik);
 void attach_draw_adjust_mode();
 void hud_adjust_mode_keyb(int dik);
 void hud_draw_adjust_mode();
-#endif
 
 void CUIGameSP::OnFrame()
 {
@@ -105,10 +104,8 @@ bool CUIGameSP::IR_UIOnKeyboardPress(int dik)
     if (Device.Paused())
         return false;
 
-#ifdef DEBUG
     hud_adjust_mode_keyb(dik);
     attach_adjust_mode_keyb(dik);
-#endif
 
     CInventoryOwner* pInvOwner = smart_cast<CInventoryOwner*>(Level().CurrentEntity());
     if (!pInvOwner)
@@ -174,14 +171,12 @@ bool CUIGameSP::IR_UIOnKeyboardPress(int dik)
 
     return false;
 }
-#ifdef DEBUG
 void CUIGameSP::Render()
 {
     inherited::Render();
     hud_draw_adjust_mode();
     attach_draw_adjust_mode();
 }
-#endif
 
 void CUIGameSP::StartTrade(CInventoryOwner* pActorInv, CInventoryOwner* pOtherOwner)
 {

diff --git a/src/xrGame/UIGameSP.h b/src/xrGame/UIGameSP.h
@@ -39,9 +39,7 @@ class CUIGameSP : public CUIGameCustom
     void HideShownDialogs() override;
     void ReinitDialogs() override;
 
-#ifdef DEBUG
     virtual void Render();
-#endif
     CUITalkWnd* TalkMenu;
     CChangeLevelWnd* UIChangeLevelWnd;
 

diff --git a/src/xrGame/Weapon.cpp b/src/xrGame/Weapon.cpp
@@ -2124,9 +2124,16 @@ BOOL CWeapon::ParentIsActor()
 
 extern u32 hud_adj_mode;
 
+bool CWeapon::ZoomHideCrosshair()
+{
+	if (hud_adj_mode != 0)
+		return false;
+
+	return m_zoom_params.m_bHideCrosshairInZoom || ZoomTexture();
+}
+
 void CWeapon::debug_draw_firedeps()
 {
-#ifdef DEBUG
     if (hud_adj_mode == 5 || hud_adj_mode == 6 || hud_adj_mode == 7)
     {
         CDebugRenderer& render = Level().debug_renderer();
@@ -2140,7 +2147,6 @@ void CWeapon::debug_draw_firedeps()
         if (hud_adj_mode == 7)
             render.draw_aabb(get_LastSP(), 0.005f, 0.005f, 0.005f, color_xrgb(0, 255, 0));
     }
-#endif // DEBUG
 }
 
 const float& CWeapon::hit_probability() const

diff --git a/src/xrGame/Weapon.h b/src/xrGame/Weapon.h
@@ -272,7 +272,7 @@ class CWeapon : public CHudItemObject, public CShootingObject
     IC bool IsZoomed() const { return m_zoom_params.m_bIsZoomModeNow; };
     CUIWindow* ZoomTexture();
 
-    bool ZoomHideCrosshair() { return m_zoom_params.m_bHideCrosshairInZoom || ZoomTexture(); }
+    bool ZoomHideCrosshair();
     IC float GetZoomFactor() const { return m_zoom_params.m_fCurrentZoomFactor; }
     IC void SetZoomFactor(float f) { m_zoom_params.m_fCurrentZoomFactor = f; }
     virtual float CurrentZoomFactor();