From 7a118b84b5b686c3e61ac1e8cb67d576e5e32053 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Tue, 13 Sep 2016 20:55:20 +0200
Subject: [PATCH] Use 6 sided tunnel for better visualization of different
 texture filters

---
 android/texturemipmapgen/build.bat            |   2 +-
 data/models/tunnel_cylinder.dae               | 110 ++++++++++++++++++
 data/shaders/texturemipmapgen/texture.vert    |   2 +-
 .../shaders/texturemipmapgen/texture.vert.spv | Bin 3304 -> 3288 bytes
 texturemipmapgen/texturemipmapgen.cpp         |   4 +-
 5 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 data/models/tunnel_cylinder.dae

diff --git a/android/texturemipmapgen/build.bat b/android/texturemipmapgen/build.bat
index 3729f3f0..0b3b70d7 100644
--- a/android/texturemipmapgen/build.bat
+++ b/android/texturemipmapgen/build.bat
@@ -13,7 +13,7 @@ if %ERRORLEVEL% EQU 0 (
 	xcopy "..\..\data\textures\metalplate_nomips_rgba.ktx" "assets\textures" /Y
 
 	mkdir "assets\models"
-	xcopy "..\..\data\models\tunnel.dae" "assets\models" /Y
+	xcopy "..\..\data\models\tunnel_cylinder.dae" "assets\models" /Y
 	
 	mkdir "res\drawable"
 	xcopy "..\..\android\images\icon.png" "res\drawable" /Y
diff --git a/data/models/tunnel_cylinder.dae b/data/models/tunnel_cylinder.dae
new file mode 100644
index 00000000..d71b9c18
--- /dev/null
+++ b/data/models/tunnel_cylinder.dae
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.77.0 commit date:2016-03-18, commit time:12:34, hash:22a2853</authoring_tool>
+    </contributor>
+    <created>2016-09-13T20:41:46</created>
+    <modified>2016-09-13T20:41:46</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_images/>
+  <library_effects>
+    <effect id="Material_001-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color sid="ambient">0 0 0 1</color>
+            </ambient>
+            <diffuse>
+              <color sid="diffuse">0.64 0.64 0.64 1</color>
+            </diffuse>
+            <specular>
+              <color sid="specular">0.5 0.5 0.5 1</color>
+            </specular>
+            <shininess>
+              <float sid="shininess">50</float>
+            </shininess>
+            <index_of_refraction>
+              <float sid="index_of_refraction">1</float>
+            </index_of_refraction>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="Material_001-material" name="Material_001">
+      <instance_effect url="#Material_001-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Cylinder_003-mesh" name="Cylinder.003">
+      <mesh>
+        <source id="Cylinder_003-mesh-positions">
+          <float_array id="Cylinder_003-mesh-positions-array" count="36">0 2 -25 0 2 25 1.732051 1 -25 1.732051 1 25 1.732051 -1 -25 1.732051 -1 25 -1.74846e-7 -2 -25 -1.74846e-7 -2 25 -1.732051 -0.9999998 -25 -1.732051 -0.9999998 25 -1.732051 0.9999998 -25 -1.732051 0.9999998 25</float_array>
+          <technique_common>
+            <accessor source="#Cylinder_003-mesh-positions-array" count="12" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Cylinder_003-mesh-normals">
+          <float_array id="Cylinder_003-mesh-normals-array" count="21">0.5 0.8660255 0 1 0 0 0.4999999 -0.8660255 0 -0.5000001 -0.8660254 0 -1 0 0 -0.5000001 0.8660254 0 1 -1.52588e-7 0</float_array>
+          <technique_common>
+            <accessor source="#Cylinder_003-mesh-normals-array" count="7" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Cylinder_003-mesh-map-0">
+          <float_array id="Cylinder_003-mesh-map-0-array" count="72">0.4999928 19.25 0.3333439 -18.25 0.5000072 -18.25 0.3333227 19.25 0.1666701 -18.25 0.3333439 -18.25 1.166663 19.25 0.9999928 -18.25 1.16667 -18.25 1.000007 19.25 0.8333227 -18.25 0.9999928 -18.25 0.833344 19.25 0.6666632 -18.25 0.8333227 -18.25 0.6666702 19.25 0.5000072 -18.25 0.6666632 -18.25 0.4999928 19.25 0.3333227 19.25 0.3333439 -18.25 0.3333227 19.25 0.1666631 19.25 0.1666701 -18.25 1.166663 19.25 1.000007 19.25 0.9999928 -18.25 1.000007 19.25 0.833344 19.25 0.8333227 -18.25 0.833344 19.25 0.6666702 19.25 0.6666632 -18.25 0.6666702 19.25 0.4999928 19.25 0.5000072 -18.25</float_array>
+          <technique_common>
+            <accessor source="#Cylinder_003-mesh-map-0-array" count="36" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Cylinder_003-mesh-vertices">
+          <input semantic="POSITION" source="#Cylinder_003-mesh-positions"/>
+        </vertices>
+        <polylist material="Material_001-material" count="12">
+          <input semantic="VERTEX" source="#Cylinder_003-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Cylinder_003-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Cylinder_003-mesh-map-0" offset="2" set="0"/>
+          <vcount>3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
+          <p>1 0 0 2 0 1 0 0 2 3 1 3 4 1 4 2 1 5 5 2 6 6 2 7 4 2 8 7 3 9 8 3 10 6 3 11 9 4 12 10 4 13 8 4 14 11 5 15 0 5 16 10 5 17 1 0 18 3 0 19 2 0 20 3 6 21 5 6 22 4 6 23 5 2 24 7 2 25 6 2 26 7 3 27 9 3 28 8 3 29 9 4 30 11 4 31 10 4 32 11 5 33 1 5 34 0 5 35</p>
+        </polylist>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_controllers/>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Cylinder" name="Cylinder" type="NODE">
+        <matrix sid="transform">-4.37114e-8 0 2 0 0 1 0 0 -1 0 -8.74228e-8 0 0 0 0 1</matrix>
+        <instance_geometry url="#Cylinder_003-mesh" name="Cylinder">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="Material_001-material" target="#Material_001-material"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>
\ No newline at end of file
diff --git a/data/shaders/texturemipmapgen/texture.vert b/data/shaders/texturemipmapgen/texture.vert
index e7fab8ea..7c61a76d 100644
--- a/data/shaders/texturemipmapgen/texture.vert
+++ b/data/shaders/texturemipmapgen/texture.vert
@@ -31,7 +31,7 @@ out gl_PerVertex
 
 void main() 
 {
-	outUV = inUV * vec2(50.0, 2.0);
+	outUV = inUV * vec2(2.0, 1.0);
 	outLodBias = ubo.lodBias;
 	outSamplerIndex = ubo.samplerIndex;
 
diff --git a/data/shaders/texturemipmapgen/texture.vert.spv b/data/shaders/texturemipmapgen/texture.vert.spv
index 90220e727106d7c32f966f0c57aced8142798dc1..2aa296c80a0dd4eeef0144d086030ea8dec9e85a 100644
GIT binary patch
literal 3288
zcmZ9NZFdt@5XWyH5|AQ_6~w2Sw&GK3tyr*%KwBSDG}4sPsHh~{WSeeDvT>7&FFD8K
z2hdNXega?kL3rsK&+-4;y%U#S&U9w}_dj#z&YcYt<MSt+8`Hm&E^*m9>&E3fH|2_{
zE?0IcOM_u+Y31@Vj5BT`CBk`1|5%ffZV>gbpO8#Ro{`K*79^{ZiliagmmEqa^lx1H
zPbHdERJl@Lzr9f(g#921hGBhh5VXRi9`7B7&Eep2j<%v+yWR<U?W3R_)>keq_k-qr
zS5T&WE%?+E9}RbF()iRC^-@=UA+1yUmAJJL1v;moy3UKUyRoGX6jNKS>nAalM6qsJ
z6blYL_%R9}ux}W5>c*|Glf&p3ylOlc@u;)o4=uVAX}*H6LD21Y!sKSJ75*eQt>=RD
z(OxXOnD$il?&N9Q<DxhZ;-u5!kTh;G?S0hC0AjBQZ+Gg|FsX&fFw4&!!CCCZgDAZu
zec;_#<mdf#?yWfK2HXv-AszKbP>MB$b)xpca8ySjeRFyYTnn2ij~NhFQ(J&s*}oMt
z!@}pS@aZ$Y%@qEoeBOXX-!}Ev{P`4p9Mhn?r&C@QM~-|PK5=Uj%LR5kj`z*S;S={z
zVsT*q$7OX*2!r>##CXgA*k3t}++cr8%6=Bf$NiauISI@B+00G3^y-Y?!$vHY?+~BG
z`S#}Yn8jIO#^=4^Q#WTdyl?w_$Lv!t`@APUcbZlfc(aNo9{aqkqI5~}oLKY+pS_a&
zlhSa(uX>+v7mWQ=(qj_a$ES9%1?`jTNr~2)`SilMhc^~gC2{;(!2u`dS!wbU%bEDh
z7#KB9OS8wFF6i&G(qQ=K^!J=}NkR=Xx&iYC$Hd|@-lTF`FS7ISc~g2o&G4R=ke~Wq
zkY<k>@L!guHh9#FZ*OGruL$E!;FqL{htGZHrO8DO_Ft8zFW?scnrwTM*S*bs;J+n3
zCV|iS_{<g9jIuI6+!^ls(wqYZ7oXn~Fgxo5*(~!vl1(n+Z%V_pd|!Cq&c<g(;qW%w
z((K`rk9*#hu&maGZ1UTFOSW^5{#X>7*iZsS96}uD>`TaN{-O7+?)%=SZhjl-A9Y{R
zOJMV!EOPuKg!dsA{l6%&nZ|E=|C;u}PfMmGzxWyEHw=tfzOIaXBVg;=XI@^EFjLGC
zIq1Vn5^(s;H$ME5^sEFva|54QnUjFSXTI>^GY@Y_;4>%inT<Ck;P~`$QL-S}Rt)FA
z?J=nlw&XG1!+7s_jGk3>dwRGmAs#;ae7nCYFMIDwI2(@Txa4uE5%!+P@@K7hEITWE
z|I5ONhtEFu=Y7EK{vXQb{>-l3|Eg?o<6M&shj}*6_0)FmH`PwhZb*m&x41Rg$9uaj
z4BX;2WD^T+{r*^XzTcn72V+@ZK9voY@4;st%lEr1jClC$=li`WpY!2RGvDavl2r-)
zpkMg#>`q_GK7OZL!octN`Pq^Uc3RUyZ>kdNoRhG(Eu1;pk+5gW@H+ww&+eD;cXK#*
zG=9zFa9M_bCEL!<=lME^=kt8yaWIzUxhtDI;Q2h?=5Y3^x)tBccM|T#J+hiJ{CoM-
zN?lnE8GcVbXLC-Lv#7J3t4qj592}dEKz2jIcf)ym61d>JS;b@6P1&KuV%xI$2FyQ@
z4d-W{E0PTdocMidFy6l--IehE{6>;vTDm6z-_rk?)DwFQoJG&*kDb|<O$~PD53-2?
O=S+T&!Twd`s^mY%^Wf+J

literal 3304
zcmZ9N+jbOH5QaNPP!L4~@q{4}Pl*vRAc{Z|4*`u3PVwx}WSYs4$xNIH;w5Xjd;onS
z^$EQ2LA><Fwfw&BU7=;ODpmFGziQX6UDJ#VPwmRGA^z>o23fWCXT$hewkI1e_0saS
z<=Me@b9V0JaT)uvk&-CqasIhRk<Gl_)qVuogFJ~GL8g&+k<XAEX(1cP2>*uBe~@UD
zsHNq`!qvsbpxDa$`F7D5tmn<5-{{@CQ><-MT%E&KyW47X@^0&H-YOb%CysCBYa7`Z
zta>f_*3-MYePb1^Z*A>v>Ee%-b+W(QYc95P&KaYwLvU^^UZw-%rHz|y^?O#*?s3a;
zSaR&a5AEWf`+<3<&0e$U)G#|HZ>2Zb;aO)V9Xg)vD)Wtj4f4&cPSL;EZ5BV`mh~J)
z-@Vnt9xr=Jz1QkA?{N&yy<Wf5^pG-cwCsJmTLH$t1K#R1R*L>=(ciA}dq;7Xd%Z!s
zyrg~b-CXAP{W$khufLglH!<I{-Q9sotO?d>x7N3J>KH5E+#U<B7HcKX830?QEkfB+
zdMjtfrSDtm+h_flDg6uhzJbfWUEpu{QziO;j6u(yD0x+!IqGrx#?2#<OYGq|-?tv8
zZ`^$(;=~@rRdtPk$@>ino--i!XALvA*k8y}nnm+@f9GHlafN@ha!ang+L!jUm57~A
zKB_!F-rOF$JWDM2zPIt#?OA#9W8dGg`_}8e@2T&d4v<COQKF64K7=)no<N?4Wq<VD
zo50_VmMeZH`Tlmr+<z23gv7qSwTn%&Z?4A>Znqe|y<pAHP^EExt>lQCb3fYr#(Ji{
zGbUz@2hi?$r^Ebx3N5C8kiQ4f6Noh&;Rep1oREmGc%$TuUR3Al`=<85n&mx%nBV%I
zMZ0GW`Y)iZO`i4Y#~Vfbi(tNq{0X%2^1aU#+Fa&v|0T425s&znvExl%Nw)Wq|2ldI
zk?;BX&Xrj7{0;0ZyMO)&r#Mgcz}VAh&lNLP-|vf9oc$iQEBv$A<~IHlwA{$IocyRo
z-<g%;TU|xFrysRl!*)gOIkx#@zi>1A`}Y~TWbAE3%s9n3&uJm%4d2<1bL_R>M}6zw
zMB7j6KE=yu`@SwY|A6>j=JGv`A-+lY&E%hDUwkj(-2a?r+Habevwe<?{$|7$*mr)O
zL!2?^${fD`^N6^7=Urd^1o|i<-#L=+eI^lc`OcfZeCOj;M80z)-&uJL5!atW&mhjp
z6=FPpHesk8?9GG?)v)6Uvu7*Z-X6Y%7%$&_=j|8rx_1KcY&mh(+X+YQU~>tppLH@}
z)mhd1p8_*pzWd(a_Ysf#pTYM2&TicQeQfdIoWqvmJO}4Iw)n5qZqMcs<HRFw0sG<J
zE|&Wb;y%EiN5rGwA7a=0{Sm&HEBf*=wphIfO9>lBN53y%8!zAedcQB?d%hfN_BZ+|
z;_upi*e`u~ai>ez58vrBnE3THKP%W`dzlt{a|N-^NyNP?;Lg$Y(&kTEf#1M4##P;~
z;;-Td?j3{wdBWwo0{^14s~q(_U)Jz?p05%v=88ODmv;3XsOR~nh8wfOt^B=wi+DHh
zVa<Vmhi$FaWetHhusz#z%qi~o?<Qg{<K)DA+``Tge>a}DhTKHNeKWtKV%mOxZX*%9
zj_q$C{5H0npHi+n*mA^;Z=uC}f4_xY#P|0bX%2t4Jw*I6|A$)7R>H(x_RRjoncrhu
UL!8;iHb&etH_&4L5_uZ=4_mY1!T<mO

diff --git a/texturemipmapgen/texturemipmapgen.cpp b/texturemipmapgen/texturemipmapgen.cpp
index 219de27a..201ba66a 100644
--- a/texturemipmapgen/texturemipmapgen.cpp
+++ b/texturemipmapgen/texturemipmapgen.cpp
@@ -421,7 +421,7 @@ public:
 
 	void loadAssets()
 	{
-		loadMesh(getAssetPath() + "models/tunnel.dae", &meshes.tunnel, vertexLayout, 1.0f);
+		loadMesh(getAssetPath() + "models/tunnel_cylinder.dae", &meshes.tunnel, vertexLayout, 1.0f);
 		loadTexture(getAssetPath() + "textures/metalplate_nomips_rgba.ktx", VK_FORMAT_R8G8B8A8_UNORM, false);
 	}
 
@@ -662,7 +662,7 @@ public:
 	{
 		uboVS.projection = camera.matrices.perspective;
 		uboVS.view = camera.matrices.view;
-		uboVS.model = glm::rotate(glm::mat4(), glm::radians((timer + 45.0f/360.0f) * 360.0f), glm::vec3(1.0f, 0.0f, 0.0f));
+		uboVS.model = glm::rotate(glm::mat4(), glm::radians(timer * 360.0f), glm::vec3(1.0f, 0.0f, 0.0f));
 		uboVS.viewPos = glm::vec4(camera.position, 0.0f) * glm::vec4(-1.0f);
 		VK_CHECK_RESULT(uniformBufferVS.map());
 		memcpy(uniformBufferVS.mapped, &uboVS, sizeof(uboVS));