Merge master into ai_cleanup.

Author: nitrocaster

Proposed engine changes.txt

@@ -7,6 +7,10 @@ The original engine is used in S.T.A.L.K.E.R. Call of Pripyat game released by G
 It is a place to share ideas on what to implement, gather people that want to work on the engine,
 and work on the source code.
 
+Current task list: [doc/design/task_list.txt](doc/design/task_list.txt)
+
+Task history: [doc/design/task_history.txt](doc/design/task_history.txt)
+
 Build instructions can be found [here](https://github.com/openxray/xray-16/blob/master/doc/howto/build.txt).
 
 If you find a bug or have an enhancement request, file an [Issue](https://github.com/openxray/xray-16/issues).

README.md

@@ -16,12 +16,23 @@ nitrocaster: Pavel Kovalenko
 - get the entire solution compiled with ForceConformanceInForLoopScope=false
 - get rid of atimgpu, use amd ags instead (will also eliminate LNK4098)
 - scan solution with PVS-Studio and fix found bugs
+o get rid of any borland specific code
+  o write new or use existing controls instead of ones from VCL/ElPack/AlexMX
+  o adopt/rewrite editors
+    - LevelEditor
+    - ActorEditor
+    - ShaderEditor
+    - ParticleEditor
+    o PPEditor
 - Modules
-  - subdivide xrGame into multiple modules (so changed code could be compiled faster)
-  - merge xrCPU_Pipe into xrCore
-  - merge xrAPI into xrCore
+  * subdivide xrGame into multiple modules
+    * xrScriptEngine
+    - xrAI
+  + merge xrCPU_Pipe into xrCore
+  c merge xrAPI into xrCore
   - merge xrXMLParser into xrCore
   - merge crypto into xrCore
+  + delete xrCoreStatic, plugins should use xrCore
 - 3rd party libraries
   - decouple/update ODE
     - dig through current ODE and analyze changes that were made by GSC
@@ -35,6 +46,7 @@ nitrocaster: Pavel Kovalenko
 - bugs/issues
   - generic
     - (bytes_need<=mSize) && vl_Count
+    + primary/secondary thread syncronization does not work properly
   - UI
     c clip cursor in windowed mode with enabled input capture
     - dragging music volume slider doesn't make any effect until one presses 'Apply' button
@@ -50,17 +62,24 @@ nitrocaster: Pavel Kovalenko
     - alpha transparency works improperly - objects like steelworks and meshes quickly lose details and become
       invisible when camera moves away (r1 looks better)
     - R1: incorrect sun path
-    - make saturation dependent on exposure (see ArmA series)
-    - improve night vision
+    - glow material doesn't cast shadows (causes artifacts on actor shadow)
+    - no actor shadow in R2/R3/R4 (works in R1)
+    - big world shadow appears and disappears depending on the sun direction
   - physics
     - falling actor can continue being in falling state under specific conditions
+    + small bullet manager time factor leads to crash
+  - gameplay
+    - ammo switching
   - plugins
     - update plugins for new 3DS Max versions
 - improvements
   - common/unsorted
-    - review and refactor code
+    * review and refactor code
     - fix log messages format (normally, the 'color' character should be followed by a space)
     - add registry entries (player name, cdkey, etc) if not exist
+    - x86_64 support
+    - better multithreading
+    - 'stuttering' problem (likely due to old luajit)
   - UI
     - close sleep dialog by ESC key
   - multiplayer
@@ -74,19 +93,47 @@ nitrocaster: Pavel Kovalenko
       - remove topmost startup logo window
       - Linux support
   - xrCore
-    - get rid of old blackbox code
-    - refactor xrDebug
+    - debug
+      - get rid of old BlackBox code
+      - hide all process windows on crash
     - logger
       - don't keep log in std::vector, write to log file immediately
       - tweak CConsole to use new logger
   - render
+    - debug render is extremely slow, have to be optimized
     - FXAA
     - SMAA
     - PCSS (or some other alternative)
-    - glow material doesn't cast shadows (causes artefacts on actor shadow)
-  - consider disabling accel when falling (more realistic)
+    - precompiled shaders should be recompiled once sources are updated
+    - wallmark normal/bump mapping
+    - ideas to consider
+      - improve night vision
+      - make saturation dependent on exposure (see ArmA series)
+      - re-enable fov and hud_fov console commands
+      - grass shadows
+      - particle shadows
+      - SSAO/HDAO improvements
+      - add grass draw distance to render settings
+      - 3D shell casings
+      - allow .seq files to be given a stop frame/point (animated blood puddles underneath bodies)
+      - DirectX 12
+      - remove old R1
+  - sound
+    - occlusion
+  - physics
+    - ideas to consider
+      - vegetation collision
+  - editors
+    - level editor
+      - visible level-loaded decals and the ability to see decals that aren't just 'wallmarkblend' type
+      - undo function performance
+  - AI
+    - NPCs don't react to enemies shooting around until see them or get shot
   - xrLC
     - try to optimize memory requirements (use disk cache for intermediate data?)
+  - gameplay
+    - ideas to consider
+      - stealth mechanics
 
 STALKER_2010: Andrew Boyarshin
 * detach/update LuaJIT

doc/design/task_list.txt

@@ -2,11 +2,8 @@
 #include "IDirect3D9.h"
 #include "IDirect3DDevice9.h"
 #include "xrD3D9-Null_OutProc.h"
+#include <stdio.h>
 
-#include <stdlib.h>
-#include <objbase.h>
-#include <windows.h>
-#include "stdio.h"
 
 const GUID DECLSPEC_SELECTANY IID_IDirect3D9;
 
@@ -22,7 +19,7 @@ ULONG	xrIDirect3D9::AddRef(void)
 {
 	APIDEBUG("xrIDirect3D9::AddRef");
 	m_refCount++;
-	return ULONG_Proc(m_refCount);
+	return m_refCount;
 }
 
 ULONG	xrIDirect3D9::Release(void)
@@ -32,9 +29,9 @@ ULONG	xrIDirect3D9::Release(void)
 	if (m_refCount < 0)
 	{
 		delete this;
-		return ULONG_Proc(-1);
+		return -1;
 	}
-	return ULONG_Proc(m_refCount);
+	return m_refCount;
 }
 
 HRESULT xrIDirect3D9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj)
@@ -44,20 +41,20 @@ HRESULT xrIDirect3D9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj)
 	{
 		*ppvObj = this;
 		AddRef();
-		return HRESULT_Proc(NOERROR);
+		return NOERROR;
 	}
-	return HRESULT_Proc(E_NOINTERFACE);
+	return E_NOINTERFACE;
 }
 
 HRESULT xrIDirect3D9::RegisterSoftwareDevice(void* pInitializeFunction)
 {
 	APIDEBUG("xrIDirect3D9::RegisterSoftwareDevice");
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 UINT xrIDirect3D9::GetAdapterCount()
 {
 	APIDEBUG("xrIDirect3D9::GetAdapterCount");
-	return ULONG_Proc(1);
+	return 1;
 };
 
 HRESULT xrIDirect3D9::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3DADAPTER_IDENTIFIER9* pIdentifier)
@@ -66,56 +63,56 @@ HRESULT xrIDirect3D9::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3DADAPTER_I
 	sprintf_s(pIdentifier->Driver, "Default Driver");
 	sprintf_s(pIdentifier->Description, "Default X-Ray Dedicated Adapter");
 	sprintf_s(pIdentifier->DeviceName, "Dedicated");
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 UINT xrIDirect3D9::GetAdapterModeCount( UINT Adapter,D3DFORMAT Format)
 {
 	APIDEBUG("xrIDirect3D9::GetAdapterModeCount");
-	return ULONG_Proc(1);
+	return 1;
 };
 
 HRESULT xrIDirect3D9::EnumAdapterModes(UINT Adapter,D3DFORMAT Format,UINT Mode,D3DDISPLAYMODE* pMode)
 {
 	APIDEBUG("xrIDirect3D9::EnumAdapterModes");
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 HRESULT xrIDirect3D9::GetAdapterDisplayMode( UINT Adapter,D3DDISPLAYMODE* pMode)
 {
 	APIDEBUG("xrIDirect3D9::GetAdapterDisplayMode");
 	pMode->Format = D3DFMT_A8R8G8B8;
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 HRESULT xrIDirect3D9::CheckDeviceType( UINT Adapter,D3DDEVTYPE DevType,D3DFORMAT AdapterFormat,D3DFORMAT BackBufferFormat,BOOL bWindowed)
 {
 	APIDEBUG("xrIDirect3D9::CheckDeviceType");
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 HRESULT xrIDirect3D9::CheckDeviceFormat( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT AdapterFormat,DWORD Usage,D3DRESOURCETYPE RType,D3DFORMAT CheckFormat)
 {
 	APIDEBUG("xrIDirect3D9::CheckDeviceFormat");
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 HRESULT xrIDirect3D9::CheckDeviceMultiSampleType( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT SurfaceFormat,BOOL Windowed,D3DMULTISAMPLE_TYPE MultiSampleType,DWORD* pQualityLevels)
 {
 	APIDEBUG("xrIDirect3D9::CheckDeviceMultiSampleType");
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 HRESULT xrIDirect3D9::CheckDepthStencilMatch( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT AdapterFormat,D3DFORMAT RenderTargetFormat,D3DFORMAT DepthStencilFormat)
 {
 	APIDEBUG("xrIDirect3D9::CheckDepthStencilMatch");
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 HRESULT xrIDirect3D9::CheckDeviceFormatConversion( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT SourceFormat,D3DFORMAT TargetFormat)
 {
 	APIDEBUG("xrIDirect3D9::CheckDeviceFormatConversion");
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 HRESULT xrIDirect3D9::GetDeviceCaps( UINT Adapter,D3DDEVTYPE DeviceType,D3DCAPS9* pCaps)
 {
 	APIDEBUG("xrIDirect3D9::GetDeviceCaps");
 	if (pCaps)
 		ZeroMemory(pCaps,sizeof(D3DCAPS9));
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
 HMONITOR xrIDirect3D9::GetAdapterMonitor( UINT Adapter)
 {
@@ -129,19 +126,5 @@ HRESULT xrIDirect3D9::CreateDevice	(UINT Adapter,D3DDEVTYPE DeviceType,HWND hFoc
 	*ppReturnedDeviceInterface = NULL;
 	xrIDirect3DDevice9* I = new xrIDirect3DDevice9(this, pPresentationParameters);
 	*ppReturnedDeviceInterface = I;
-	return HRESULT_Proc(S_OK);
+	return S_OK;
 };
-//-------------------------------------------------------------------
-/*
-HRESULT		xrIDirect3D9::HRESULT_Proc(HRESULT ret)
-{
-	return ret;
-}
-
-ULONG		xrIDirect3D9::ULONG_Proc(ULONG ret)
-{
-	return ret;
-}
-*/
-
-

src/xrD3D9-Null/IDirect3D9.cpp

@@ -1,9 +1,4 @@
-//---------------------------------
-#include <stdlib.h>
-#include <objbase.h>
-#include <windows.h>
-
-#include "d3d9.h"
+#include "stdafx.h"
 
 /*
 //---------------------------------