Merge https://github.com/cybereality/Perception

Conflicts: DxProxy/DxProxy/D3DProxyDevice.cpp
jimrandomh · May 12, 2015 · cddb6d9 · cddb6d9
2 parents 73feebe + b6de03a
commit cddb6d9
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 36 deletions.
diff --git a/DxProxy/DxProxy/D3DProxyDevice.h b/DxProxy/DxProxy/D3DProxyDevice.h
@@ -224,6 +224,7 @@ class D3DProxyDevice : public BaseDirect3DDevice9
 		REALV_ARMA = 401,          /**<  !! */
 		UNITY = 500,               /**< Unity is a cross-platform game engine with a built-in IDE developed by Unity Technologies. */
 		UNITY_SLENDER = 501,       /**<  !! */
+		UNITY_AMONG_THE_SLEEP = 502, /**<  !! */
 		CRYENGINE = 550,           /**< CryEngine is a game engine designed by the German/Turkish game developer Crytek. */
 		CRYENGINE_WARHEAD = 551,   /**< CryEngine is a game engine designed by the German/Turkish game developer Crytek (modified for Warhead). */
 		GAMEBRYO = 600,            /**< Gamebryo 3D and LightSpeed engines are owned by Gamebase Co., Ltd. and Gamebase USA and have been used by several video game developers. */

diff --git a/DxProxy/DxProxy/GameHandler.cpp b/DxProxy/DxProxy/GameHandler.cpp
@@ -172,6 +172,10 @@ bool GameHandler::ShouldDuplicateRenderTarget(UINT Width, UINT Height, D3DFORMAT
 		// NOT TESTED NOW !
 		return true;
 
+	case D3DProxyDevice::ProxyTypes::UNITY_AMONG_THE_SLEEP:
+		// NOT TESTED NOW !
+		return true;
+
 	case D3DProxyDevice::ProxyTypes::CRYENGINE:
 	case D3DProxyDevice::ProxyTypes::CRYENGINE_WARHEAD:
 		// NOT TESTED NOW !
@@ -251,6 +255,10 @@ bool GameHandler::ShouldDuplicateDepthStencilSurface(UINT Width,UINT Height,D3DF
 		// NOT TESTED NOW !
 		return true;
 
+	case D3DProxyDevice::ProxyTypes::UNITY_AMONG_THE_SLEEP:
+		// NOT TESTED NOW !
+		return true;
+
 	case D3DProxyDevice::ProxyTypes::CRYENGINE:
 	case D3DProxyDevice::ProxyTypes::CRYENGINE_WARHEAD:
 		// NOT TESTED NOW !
@@ -390,6 +398,9 @@ bool GameHandler::ShouldDuplicateTexture(UINT Width,UINT Height,UINT Levels,DWOR
 				return true;
 			return IS_RENDER_TARGET(Usage);
 
+		case D3DProxyDevice::ProxyTypes::UNITY_AMONG_THE_SLEEP:
+			return false;
+
 		case D3DProxyDevice::ProxyTypes::CRYENGINE:
 		case D3DProxyDevice::ProxyTypes::CRYENGINE_WARHEAD:
 			// NOT TESTED NOW !
@@ -508,6 +519,10 @@ bool GameHandler::ShouldDuplicateCubeTexture(UINT EdgeLength, UINT Levels, DWORD
 			// NOT TESTED NOW !
 			return IS_RENDER_TARGET(Usage);
 
+		case D3DProxyDevice::ProxyTypes::UNITY_AMONG_THE_SLEEP:
+			// NOT TESTED NOW !
+			return false;
+
 		case D3DProxyDevice::ProxyTypes::CRYENGINE:
 		case D3DProxyDevice::ProxyTypes::CRYENGINE_WARHEAD:
 			// NOT TESTED NOW !

diff --git a/DxProxy/DxProxy/InGameMenus.cpp b/DxProxy/DxProxy/InGameMenus.cpp
@@ -1419,8 +1419,12 @@ void D3DProxyDevice::VPMENU_UpdateDeviceSettings()
 		m_deviceBehavior.whenToHandleHeadTracking = DeviceBehavior::WhenToDo::BEGIN_SCENE;
 		m_deviceBehavior.whenToRenderVPMENU = DeviceBehavior::WhenToDo::END_SCENE;
 		break;
+	case D3DProxyDevice::UNITY_AMONG_THE_SLEEP:
+		m_deviceBehavior.whenToHandleHeadTracking = DeviceBehavior::WhenToDo::BEGIN_SCENE;
+		m_deviceBehavior.whenToRenderVPMENU = DeviceBehavior::WhenToDo::BEGIN_SCENE;
+		break;
 	case D3DProxyDevice::CRYENGINE:
-	m_deviceBehavior.whenToHandleHeadTracking = DeviceBehavior::WhenToDo::BEGIN_SCENE;
+		m_deviceBehavior.whenToHandleHeadTracking = DeviceBehavior::WhenToDo::BEGIN_SCENE;
 		m_deviceBehavior.whenToRenderVPMENU = DeviceBehavior::WhenToDo::END_SCENE;
 		break;
 	case D3DProxyDevice::CRYENGINE_WARHEAD:

diff --git a/DxProxy/DxProxy/StereoView.cpp b/DxProxy/DxProxy/StereoView.cpp
@@ -125,6 +125,7 @@ StereoView::StereoView(ProxyConfig *config)
 		break;
 	case D3DProxyDevice::UNITY:
 	case D3DProxyDevice::UNITY_SLENDER:
+	case D3DProxyDevice::UNITY_AMONG_THE_SLEEP:
 		howToSaveRenderStates = HowToSaveRenderStates::STATE_BLOCK;
 		break;
 	case D3DProxyDevice::CRYENGINE:

diff --git a/DxProxy/DxProxy/ViewAdjustment.cpp b/DxProxy/DxProxy/ViewAdjustment.cpp
@@ -228,8 +228,9 @@ void ViewAdjustment::UpdatePosition(float yaw, float pitch, float roll, float xP
 	D3DXVec3TransformNormal(&positionTransformVec, &positionTransformVec, &rotationMatrixPitchYaw);
 
 	//Still need to apply the roll, as the "no roll" param is just whether we use matrix roll translation or if
-	//memory modification, either way, the view still rolls
-	D3DXVec3TransformNormal(&positionTransformVec, &positionTransformVec, &rotationMatrixRoll);
+	//memory modification, either way, the view still rolls, unless using the pixel shader roll approach
+	if (rollImpl != 2)
+		D3DXVec3TransformNormal(&positionTransformVec, &positionTransformVec, &rotationMatrixRoll);
 
 	//Now apply game specific scaling for the X/Y/Z
 	D3DXMATRIX gamescalingmatrix;

diff --git a/Release/Perception/cfg/VRboost_rules/ASAMU-Win32-Shipping.xml b/Release/Perception/cfg/VRboost_rules/ASAMU-Win32-Shipping.xml
@@ -16,7 +16,7 @@
 			<Comparisons>
 			<Compare type="BetweenIncl">
 					<MinValue>0000C000</MinValue>
-					<MaxValue>0000FFFF</MaxValue>
+					<MaxValue>0000FFFE</MaxValue>
 				</Compare>
 				<!-- OR -->
 				<Compare type="BetweenIncl">
@@ -33,8 +33,13 @@
 			<BaseAddressOffset>00000004</BaseAddressOffset>
 			<CheckForChanges>Changes</CheckForChanges>
 			<Comparisons>
-				<Compare type="NotEqual">
+				<Compare type="BetweenIncl">
 					<MinValue>00000000</MinValue>
+					<MaxValue>0000FFFF</MaxValue>
+				</Compare>
+				<Compare type="BetweenIncl">
+					<MinValue>FFFF0000</MinValue>
+					<MaxValue>FFFFFFFF</MaxValue>
 				</Compare>
 			</Comparisons>
 		</ScanRule>
@@ -65,7 +70,7 @@
 				<Comparisons>
 					<Compare type="BetweenIncl">
 						<MinValue>00002000</MinValue>
-						<MaxValue>00004000</MaxValue>
+						<MaxValue>00004800</MaxValue>
 					</Compare>
 				</Comparisons>
 			</Axis>
@@ -79,31 +84,11 @@
 				<AddressType>DWORD</AddressType>
 				<Comparisons>
 					<Compare type="BetweenIncl">
-						<MinValue>0000C000</MinValue>
+						<MinValue>0000BA00</MinValue>
 						<MaxValue>0000E000</MaxValue>
 					</Compare>
 				</Comparisons>
 			</Axis>
 		</ScanAssistStep>
-
-		<ScanAssistStep>
-			<TimeBeforeCheck>3000</TimeBeforeCheck>
-			<Pose>STRAIGHT-AHEAD</Pose>
-			<Axis>
-				<AxisName>TrackerPitch</AxisName>
-				<AddressType>DWORD</AddressType>
-				<Comparisons>
-					<Compare type="BetweenIncl">
-						<MinValue>0000E000</MinValue>
-						<MaxValue>0000FFFF</MaxValue>
-					</Compare>
-					<!-- OR -->
-					<Compare type="BetweenIncl">
-						<MinValue>00000000</MinValue>
-						<MaxValue>00002000</MaxValue>
-					</Compare>
-				</Comparisons>
-			</Axis>
-		</ScanAssistStep>
 	</ScanAssistSequence> 
 </Scanner>
diff --git a/Release/Perception/cfg/VRboost_rules/Crysis.xml b/Release/Perception/cfg/VRboost_rules/Crysis.xml
@@ -129,7 +129,7 @@
 		<ID>2</ID>
 		<BaseAddress>382D4078</BaseAddress>
 		<MemIncrement>00000010</MemIncrement>
-		<MemIncCount>00000001</MemIncCount>
+		<MemIncCount>00000010</MemIncCount>
 		<FailIfNotFound>False</FailIfNotFound>
 		<ScanRule>
 			<AxisName>PlayerFOV</AxisName>

diff --git a/Release/Perception/cfg/VRboost_rules/MirrorsEdge.xml b/Release/Perception/cfg/VRboost_rules/MirrorsEdge.xml
@@ -6,7 +6,7 @@
 			<ID>0</ID>
 			<BaseAddress>100000F4</BaseAddress>
 			<MemIncrement>00000100</MemIncrement>
-			<MemIncCount>03000000</MemIncCount>
+			<MemIncCount>00300000</MemIncCount>
 			<FailIfNotFound>True</FailIfNotFound>
 
 			<ScanRule>
@@ -18,11 +18,11 @@
 				<Comparisons>
 					<Compare type="BetweenIncl">
 						<MinValue>00000001</MinValue>
-						<MaxValue>00003FFF</MaxValue>
+						<MaxValue>00004000</MaxValue>
 					</Compare>
 					<!-- OR -->
 					<Compare type="BetweenIncl">
-						<MinValue>0000C000</MinValue>
+						<MinValue>0000BF00</MinValue>
 						<MaxValue>0000FFFF</MaxValue>
 					</Compare>
 				</Comparisons>
@@ -33,7 +33,7 @@
 				<AddressType>DWORD</AddressType>
 				<ModificationToApply>FloatUnrealCompass</ModificationToApply>
 				<BaseAddressOffset>00000004</BaseAddressOffset>
-				<CheckForChanges>ChangesLoWordWithCarry</CheckForChanges>
+				<CheckForChanges>Changes</CheckForChanges>
 				<Comparisons>
 					<Compare type="NotEqual">
 						<MinValue>00000000</MinValue>

diff --git a/Release/Perception/cfg/VRboost_rules/farcry3.xml b/Release/Perception/cfg/VRboost_rules/farcry3.xml
@@ -19,7 +19,7 @@
 			<Comparisons>
 				<Compare type="Between">
 					<MinValue>-1.225</MinValue>
-					<MaxValue>0.0</MaxValue>
+					<MaxValue>-0.2</MaxValue>
 				</Compare>
 			</Comparisons>
 		</ScanRule>