From 68789d7c91c3102cfb5eea2dbdf9fad167e32550 Mon Sep 17 00:00:00 2001
From: turanszkij <turanszkij@gmail.com>
Date: Fri, 17 May 2019 12:59:36 +0100
Subject: [PATCH] temporal aa hotfix

---
 WickedEngine/wiRenderer.cpp    |   3 +--
 WickedEngine/wiSceneSystem.cpp |   2 ++
 WickedEngine/wiSceneSystem.h   |   1 +
 WickedEngine/wiVersion.cpp     |   2 +-
 models/water_test.wiscene      | Bin 11722 -> 12228 bytes
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp
index e348deef7..a91f0144a 100644
--- a/WickedEngine/wiRenderer.cpp
+++ b/WickedEngine/wiRenderer.cpp
@@ -3748,8 +3748,7 @@ void UpdatePerFrameData(float dt)
 		temporalAAJitterPrev = temporalAAJitter;
 		temporalAAJitter.x = jitter * (halton.x * 2 - 1) / (float)GetInternalResolution().x;
 		temporalAAJitter.y = jitter * (halton.y * 2 - 1) / (float)GetInternalResolution().y;
-		GetCamera().Projection.m[2][0] = temporalAAJitter.x;
-		GetCamera().Projection.m[2][1] = temporalAAJitter.y;
+		GetCamera().jitter = temporalAAJitter;
 	}
 	else
 	{
diff --git a/WickedEngine/wiSceneSystem.cpp b/WickedEngine/wiSceneSystem.cpp
index 76c9b02a5..263a67b37 100644
--- a/WickedEngine/wiSceneSystem.cpp
+++ b/WickedEngine/wiSceneSystem.cpp
@@ -933,6 +933,8 @@ namespace wiSceneSystem
 	void CameraComponent::UpdateCamera()
 	{
 		XMStoreFloat4x4(&Projection, XMMatrixPerspectiveFovLH(fov, width / height, zFarP, zNearP)); // reverse zbuffer!
+		Projection.m[2][0] = jitter.x;
+		Projection.m[2][1] = jitter.y;
 
 		XMVECTOR _Eye = XMLoadFloat3(&Eye);
 		XMVECTOR _At = XMLoadFloat3(&At);
diff --git a/WickedEngine/wiSceneSystem.h b/WickedEngine/wiSceneSystem.h
index 0c8f710c1..b4b69b7f0 100644
--- a/WickedEngine/wiSceneSystem.h
+++ b/WickedEngine/wiSceneSystem.h
@@ -730,6 +730,7 @@ namespace wiSceneSystem
 		XMFLOAT4X4 View, Projection, VP;
 		Frustum frustum;
 		XMFLOAT4X4 InvView, InvProjection, InvVP;
+		XMFLOAT2 jitter;
 
 		void CreatePerspective(float newWidth, float newHeight, float newNear, float newFar, float newFOV = XM_PI / 3.0f);
 		void UpdateCamera();
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index f043132f8..7cc884568 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 26;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 27;
+	const int revision = 28;
 
 
 	long GetVersion()
diff --git a/models/water_test.wiscene b/models/water_test.wiscene
index 15b757f21d00330e90a28019d8a72e406b571f72..d49996d90579d3924036b35857b493b1c6632ac3 100644
GIT binary patch
delta 964
zcmX>VeI%YyW+S5oW4(Xk*?0yZ=vlzx1fn~CE(-_IGPByMLA28~ZdMSTti0L{M0Z`R
z%?8mC3IA$9^d*69Tp;?`f-52*`bpw4B@mr9ajyo5zO?JDF^K*+OB*cC2I2t0e;@!-
zlXoy`>cH%VnT^X#kXe&?nMyc6{jaxYU}&)aG`WjO-hdHoAkYe+=wl#$1H`ZHOtvd%
zWVg4Oe`ha$w3q#yN-an60A|NWqKh3TA7Bxm{DH~ShZK83b}&ON!q5kDS1Ysm<X>!D
zVhv!I9bFn{A7-b!pX>T!8xWp+fmv<xVpfsKTr4V+wOKhQ&u8JB%&*HkS%FV|@^)6<
z$<{0qlmD=BOb%p~nf#4KVDdj8?qTPeY{13^R4W9=2=&5~j{wDpS1&l(6=*l{>Q%vN
zudu32{=+JP%N;7Pw1X?HfYQL`I5r+e7LdxxdF%?41=u+j_p$Rh!jcm-L>Z!>3|Ml5
z@nOjYW<>&29ou9^cInA|>>Qh42}_8vfNYw~rUf=%1eSzhNfeayCR=IAuz(~c%dv}1
zKE=WV^q>?EEJ8slCwFP7O#a6v0T%>og9?gZjq*=gA=o7t*<~h|X`c|mmXIe0>8OZy
xC%PVbqwRl)u~hDmj(@MypUe)YqRHJl(%7{K^7(-LI+;&*3&+jJK|Y{B001lf5RU)=

delta 886
zcmX>Se=3?$Y$KxuWBtu_7u*<tKq_A{8br&R?e+uFU7@p+K=c(!F&Pm3_06_;5G^B@
zPz0jSt$&;fqFwH<76#D)`6qcnbkVxq)*$*r+yX-o?Na(d3q+@fnt{dHKpY_W4+KDJ
z@(xB#9hluPvvHXTGHdby4w1=<ObMKy|JU0yFf`bIp4`PGZvZwENPGZ_J_h19K>Yg7
zWV?b!c6<BzclPo}d)a?otl=mg!0h-~bg|>)1`e^w@0q-ONU<Aa2{Y6t41FNCwKAKF
zG=E{RSC^W<kL&tk8xRJmpL~Z|jj6$YG7F2@<OUYi$z7}>lNSN;I#vOYupx`|<PB_`
zlS5hYNC{51W)s1!Q+TovyU=74cA3flbU7xkViiF$SOpfzxFQu4S(85i1D1#52Mb8?
zWDZV+#Ri-_mau4t`kEmM%77&c7#|j`FdGsk^Kwd0KETScd5Wln7z@~f4cZDKu;c|x
zKA>bV`Hi-WAWQ;g5&Psu4sjk>XoHkbZV(ljyg^3*E(q2O6%@f5A8&L*uuBB8$V@KK
zJt2ZErA_wHQ*mLw?t18#w*Mi%Qn^F*BE3$`SshN5M;AD4o?U)OW^&A-pSwB_`KDwz
d6>V#D;_vct!fMb)exFJDdpP`c{6j(B0suQM?W_O*