Revert "* FIX: Volumetric-light for torch on actor"

Giperion · Giperion · commit 6530020e32dd · 2018-07-16T23:31:20.000+03:00
This reverts commit 5210fef.
diff --git a/code/engine.vc2008/Include/xrRender/RenderDeviceRender.h b/code/engine.vc2008/Include/xrRender/RenderDeviceRender.h
@@ -53,4 +53,5 @@ class IRenderDeviceRender
 	virtual void	ClearTarget() = 0;
 	virtual void	SetCacheXform(Fmatrix &mView, Fmatrix &mProject) = 0;
 	virtual void	OnAssetsChanged() = 0;
+	virtual void	ResizeWindowProc(WORD h, WORD w) = 0;
 };
diff --git a/code/engine.vc2008/xrEngine/Device_wndproc.cpp b/code/engine.vc2008/xrEngine/Device_wndproc.cpp
@@ -28,7 +28,23 @@ bool CRenderDevice::on_message	(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 			result			= 1;
 			return			(true);
 		}
+							/*case WM_SIZING:
+							{
+								if (result = TRUE)
+									bool windowActive = false;
+								else
+									bool windowActive = true;
+							}*/
+		//case WM_SIZE : 
+		//{
+		//	if (windowActive)
+		//	{
+		//		WORD height = HIWORD(lParam);
+		//		WORD width = LOWORD(lParam);
 
+		//		//Device.ResizeProc(height, width);
+		//	}
+		//}
 		case WM_SYSCOMMAND : {
 #ifdef INGAME_EDITOR
 			if (editor())
diff --git a/code/engine.vc2008/xrEngine/device.cpp b/code/engine.vc2008/xrEngine/device.cpp
@@ -302,6 +302,12 @@ void CRenderDevice::on_idle		()
 		Sleep		(1);
 }
 
+void CRenderDevice::ResizeProc(DWORD height, DWORD  width)
+{
+	if(g_bL)
+		m_pRender->ResizeWindowProc(height, width);
+}
+
 #ifdef INGAME_EDITOR
 void CRenderDevice::message_loop_editor	()
 {
diff --git a/code/engine.vc2008/xrEngine/device.h b/code/engine.vc2008/xrEngine/device.h
@@ -281,7 +281,8 @@ class ENGINE_API CRenderDevice: public CRenderDeviceBase
 		return frame_timer.GetElapsed_ms();
 	}
 public:
-			void xr_stdcall		on_idle				();
+			void xr_stdcall		on_idle				();
+			void				ResizeProc			(DWORD height, DWORD width);
 			bool xr_stdcall		on_message			(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &result);
 
 private:
diff --git a/code/engine.vc2008/xrGame/Torch.cpp b/code/engine.vc2008/xrGame/Torch.cpp
@@ -355,6 +355,7 @@ void CTorch::UpdateCL()
 			offset.mad(M.j, TORCH_OFFSET.y);
 			offset.mad(M.k, TORCH_OFFSET.z);
 			light_render->set_position(offset);
+			light_render->set_volumetric(false);
 
 			offset = M.c;
 			offset.mad(M.i, OMNI_OFFSET.x);
diff --git a/code/engine.vc2008/xrGame/ui/UIActorMenu.cpp b/code/engine.vc2008/xrGame/ui/UIActorMenu.cpp
@@ -807,6 +807,13 @@ void CUIActorMenu::ResetMode()
     GameUI()->UIMainIngameWnd->ShowZoneMap(true);
 }
 
+void CUIActorMenu::UpdateActorMP()
+{
+	m_ActorCharacterInfo->ClearInfo();
+	m_ActorMoney->SetText("");
+	return;
+}
+
 bool CUIActorMenu::CanSetItemToList(PIItem item, CUIDragDropListEx* l, u16& ret_slot)
 {
 	u16 item_slot = item->BaseSlot();
diff --git a/code/engine.vc2008/xrGame/ui/UIActorMenu.h b/code/engine.vc2008/xrGame/ui/UIActorMenu.h
@@ -275,6 +275,7 @@ class CUIActorMenu: public CUIDialogWnd, public CUIWndCallback
 	bool						TryUseItem					(CUICellItem* cell_itm);
 	bool						ToQuickSlot					(CUICellItem* itm);
 
+	void						UpdateActorMP				();
 	void						UpdateOutfit				();
 	void						MoveArtefactsToBag			();
 	bool						TryActiveSlot				(CUICellItem* itm);
diff --git a/code/engine.vc2008/xrRender/xrRender/HW.cpp b/code/engine.vc2008/xrRender/xrRender/HW.cpp
@@ -30,6 +30,29 @@ CHW::~CHW()
 {
 }
 
+void CHW::ResizeWindowProc(WORD h, WORD w)
+{
+#if 0
+	bool bWindowed = !psDeviceFlags.is(rsFullscreen) || strstr(Core.Params, "-editor");
+	///////////////////////////////////////
+	if (bWindowed)
+	{
+		DXGI_SWAP_CHAIN_DESC &cd = m_ChainDesc;
+		DXGI_MODE_DESC	&desc = m_ChainDesc.BufferDesc;
+		HRESULT R;
+		///////////////////////////////////////
+		memset(&cd, 0, sizeof(DXGI_SWAP_CHAIN_DESC));	// sc to NULL
+		memset(&desc, 0, sizeof(DXGI_MODE_DESC));
+		///////////////////////////////////////
+		desc.Width = w;
+		desc.Height = h;
+		desc.RefreshRate.Numerator = 60;
+		desc.RefreshRate.Denominator = 1;
+		m_pSwapChain->SetFullscreenState(FALSE, 0);
+		CHK_DX(m_pSwapChain->ResizeTarget(&desc));
+	}
+#endif
+}
 void CHW::Reset		(HWND hwnd)
 {
 #ifdef DEBUG
diff --git a/code/engine.vc2008/xrRender/xrRender/HW.h b/code/engine.vc2008/xrRender/xrRender/HW.h
@@ -31,6 +31,7 @@ class  CHW
 
 	void					selectResolution		(u32 &dwWidth, u32 &dwHeight, BOOL bWindowed);
 	D3DFORMAT				selectDepthStencil		(D3DFORMAT);
+	void					ResizeWindowProc		(WORD h, WORD w);
 	u32						selectPresentInterval	();
 	u32						selectGPU				();
 	u32						selectRefresh			(u32 dwWidth, u32 dwHeight, D3DFORMAT fmt);
diff --git a/code/engine.vc2008/xrRender/xrRender/dxRenderDeviceRender.cpp b/code/engine.vc2008/xrRender/xrRender/dxRenderDeviceRender.cpp
@@ -365,4 +365,9 @@ void  dxRenderDeviceRender::OnAssetsChanged()
 {
     Resources->m_textures_description.UnLoad();
     Resources->m_textures_description.Load();
-}
+}
+
+void dxRenderDeviceRender::ResizeWindowProc(WORD h, WORD w)
+{
+	HW.ResizeWindowProc(h, w);
+}
diff --git a/code/engine.vc2008/xrRender/xrRender/dxRenderDeviceRender.h b/code/engine.vc2008/xrRender/xrRender/dxRenderDeviceRender.h
@@ -63,6 +63,7 @@ class dxRenderDeviceRender : public IRenderDeviceRender
 	virtual void	ClearTarget();
 	virtual void	SetCacheXform(Fmatrix &mView, Fmatrix &mProject);
 	virtual void	OnAssetsChanged();
+	virtual void	ResizeWindowProc(WORD h, WORD w);
 
 public:
 	CResourceManager*	Resources;
diff --git a/code/engine.vc2008/xrRender/xrRenderDX10/dx10HW.cpp b/code/engine.vc2008/xrRender/xrRenderDX10/dx10HW.cpp
@@ -270,6 +270,31 @@ D3DFORMAT CHW::selectDepthStencil	(D3DFORMAT fTarget)
 	return D3DFMT_D24S8;
 }
 
+void CHW::ResizeWindowProc(WORD h, WORD w)
+{
+#if 0
+	bool bWindowed = !psDeviceFlags.is(rsFullscreen) || strstr(Core.Params, "-editor");
+	///////////////////////////////////////
+	if (bWindowed)
+	{
+		DXGI_SWAP_CHAIN_DESC &cd			= m_ChainDesc;
+		DXGI_MODE_DESC	&desc				= m_ChainDesc.BufferDesc;
+		HRESULT R;
+		///////////////////////////////////////
+		memset								(&cd,	0, sizeof(DXGI_SWAP_CHAIN_DESC));	// sc to NULL
+		memset								(&desc, 0, sizeof(DXGI_MODE_DESC));
+		///////////////////////////////////////
+		desc.Width							= w;
+		desc.Height							= h;
+		desc.RefreshRate.Numerator			= 60;
+		desc.RefreshRate.Denominator		= 1;
+		m_pSwapChain->SetFullscreenState	(FALSE, 0);
+		CHK_DX						(m_pSwapChain->ResizeTarget(&desc));
+	}
+#endif
+}
+
+
 void CHW::selectResolution( u32 &dwWidth, u32 &dwHeight, BOOL bWindowed )
 {
 	fill_vid_mode_list			(this);
diff --git a/code/engine.vc2008/xrRender/xrRenderPC_R4/r4.cpp b/code/engine.vc2008/xrRender/xrRenderPC_R4/r4.cpp
@@ -597,6 +597,12 @@ void					CRender::rmNormal			()
 	//CHK_DX				(HW.pDevice->SetViewport(&VP));
 }
 
+void					CRender::ResizeWindowProc(WORD h, WORD w)
+{
+	HW.ResizeWindowProc(h, w);
+}
+
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
diff --git a/code/engine.vc2008/xrRender/xrRenderPC_R4/r4.h b/code/engine.vc2008/xrRender/xrRenderPC_R4/r4.h
@@ -344,6 +344,7 @@ class CRender	:	public R_dsgraph_structure
 	virtual void					rmNear						();
 	virtual void					rmFar						();
 	virtual void					rmNormal					();
+	virtual void					ResizeWindowProc			(WORD h, WORD w);
 	virtual u32                     active_phase                () { return phase; };
 
 	// Constructor/destructor/loader

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,12 @@ void CRenderDevice::on_idle ()`
`302`	`302`	`Sleep (1);`
`303`	`303`	`}`
`304`	`304`
	`305`	`+void CRenderDevice::ResizeProc(DWORD height, DWORD width)`
	`306`	`+{`
	`307`	`+ if(g_bL)`
	`308`	`+ m_pRender->ResizeWindowProc(height, width);`
	`309`	`+}`
	`310`	`+`
`305`	`311`	`#ifdef INGAME_EDITOR`
`306`	`312`	`void CRenderDevice::message_loop_editor ()`
`307`	`313`	`{`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,8 @@ class ENGINE_API CRenderDevice: public CRenderDeviceBase`
`281`	`281`	`return frame_timer.GetElapsed_ms();`
`282`	`282`	`}`
`283`	`283`	`public:`
`284`		`- void xr_stdcall on_idle ();`
	`284`	`+ void xr_stdcall on_idle ();`
	`285`	`+ void ResizeProc (DWORD height, DWORD width);`
`285`	`286`	`bool xr_stdcall on_message (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &result);`
`286`	`287`
`287`	`288`	`private:`
Original file line number	Diff line number	Diff line change
`@@ -807,6 +807,13 @@ void CUIActorMenu::ResetMode()`
`807`	`807`	`GameUI()->UIMainIngameWnd->ShowZoneMap(true);`
`808`	`808`	`}`
`809`	`809`
	`810`	`+void CUIActorMenu::UpdateActorMP()`
	`811`	`+{`
	`812`	`+ m_ActorCharacterInfo->ClearInfo();`
	`813`	`+ m_ActorMoney->SetText("");`
	`814`	`+ return;`
	`815`	`+}`
	`816`	`+`
`810`	`817`	`bool CUIActorMenu::CanSetItemToList(PIItem item, CUIDragDropListEx* l, u16& ret_slot)`
`811`	`818`	`{`
`812`	`819`	`u16 item_slot = item->BaseSlot();`