From 48ecef07fa1b8fbf3a2e3179f37131bc2ccfaa3e Mon Sep 17 00:00:00 2001 From: saschawillems Date: Mon, 4 Jul 2016 19:28:43 +0200 Subject: [PATCH] Normal orientation, don't pause by default --- data/shaders/deferred/mrt.frag | 1 + data/shaders/deferred/mrt.frag.spv | Bin 2280 -> 2412 bytes deferred/deferred.cpp | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/shaders/deferred/mrt.frag b/data/shaders/deferred/mrt.frag index dcdd0ce7..5a8f5436 100644 --- a/data/shaders/deferred/mrt.frag +++ b/data/shaders/deferred/mrt.frag @@ -22,6 +22,7 @@ void main() // Calculate normal in tangent space vec3 N = normalize(inNormal); + N.y = -N.y; vec3 T = normalize(inTangent); vec3 B = cross(N, T); mat3 TBN = mat3(T, B, N); diff --git a/data/shaders/deferred/mrt.frag.spv b/data/shaders/deferred/mrt.frag.spv index 6ff397e85b1d701e950dcf2b6ba3b095775aaade..129538fdc15741bdefad7c0282e27c5dd8cd7442 100644 GIT binary patch literal 2412 zcmY+FYjadZ5QfKWHXwwX+{Md=sHk8>42UAIS(G4#5Fils%hrKx#nsK()b8?GtNd=2 zf5~6v7pr`pv(waZQl0L8`!et8nMoQmi~CY~ji3GLr!-y1(hPn|2h&`oSJ$4bEsZDJ zOUqX;n{hZbszh^+q(f;It?U;4(!lG;JaQ6gA>SbD$R_e5a+G@W*%+(AZYljuvso%v z*Saf@JKb?_uNW1RUU&R+vE3VWhtGfMy_k&upF^l$?sNx5x%0Bv>2;T{T;3~Q{F<6{ zs`F`r$Z7a;vN0U@C;edw(yTc4%dO#PunnF-8tDXiay2ghez`sz?G^*fD*i6o?=ap% z_sdPT@0F7ZYotYVC)*#PH#_TO&ZZmKlaf|dY+q`l$Hng6pf{Rs@SxZOs&buIzkK>^ z>NhJsaDPR_z2yM5GI-wG9#(a8=_xw*yfYjON7MS*YUcfN3awUCPU#(kEPc;P-&581 zyX)~*_MNHmHu^l`3V#86Cj0WYo+GW|&a>{zT|e^WUGJxFzo_@lME-HAtXrsV&a}rV z>^ZO&avFZ#D}DL4_`M(Pw~61#zV|`Q`~zt7_02zsc5iX>^_`K}MSOD)BPsoU+x+8L z_O9nUL-S7(KZ9-|F6;HrBF3$M6CIpmzgCW)A$|ed-ofufZ1cr~&nMWfv)uHXXgS)y zzQR98r&|QfbN|~pNzDEA+Zl5{9c=qKck}O{?Imu$zGp5LeC}bh+Lx%5`+dZjg;?jg zcsKm6@Vy)1%fq|iGVVEe7u@F>Z$LhtvCEo&K$>WCJ(ClNa|++LTlW`hzBBc`*5kfe z{hRdj8xA4fgGcP*JdR`x^$I(hF*!!wv5d)ggO2um1F_zGly{t3Gd3vwKotHUZBVzi#`4yy{{SMl@<(X`8pS-Jg z5p%>J@@fyDR}pc=<@fnLe^O)oJH#CS4*Zd^?=yZM9rtJr+gf`Y|10M{z?P?RzrnXC z7H9qtTP)_hfi30=>=Cw@{R4ZPvFYrmZ}AD3_2wIox44dNEavnK+rLNp&S?v&&*=wz QbHwGmi5B}82G^1Q0At9SDgXcg literal 2280 zcmY+F*;5li5XMI!fO3m+h(`c#5D@`U<#qVpSj8&kDCvuexsP%T`Shg zr$IHSmy5N}L8)9V#)n_ZNA=qO9EHN@xL66IR zjadrIRSwIgILT{G`t~)~<4Rm@ zrKtrDAD=q}vwm{2wN@vUN$=|tW?(`dbIwaRm-*ba`SiivvWPQR?v{P#^`_~EJ7baa zTS!J4E;Huav^&J-TTJ_Wd*+YI=1rLopKlOf2{CdwC%ENYlg<0FoDtcULyR0| z0d6@rWK+j{z8^T9>Xx(Ll2GH71TJyvFhgRNH!hnz^KZ+BWBwi4>|?XJCz~9WVfST& zrDyoSW6aQa4`oxIW!QvluypRE$I`ivgwYGja;Id2rE?#9tZ{dZx6D5^`le6%D)_s3 zBAcG*fjteMkKpdKWAtj@&4z69;S;y-CNGX-7UB PaC+wN4%i=cups#hhz*gV diff --git a/deferred/deferred.cpp b/deferred/deferred.cpp index 834c3505..9794d0fc 100644 --- a/deferred/deferred.cpp +++ b/deferred/deferred.cpp @@ -146,7 +146,6 @@ public: camera.position = { 2.15f, 0.3f, -8.75f }; camera.setRotation(glm::vec3(-0.75f, 12.5f, 0.0f)); camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f); - paused = true; } ~VulkanExample()