From a07d8acbecbdbdf771f6e1f21ea58e6db8328171 Mon Sep 17 00:00:00 2001
From: Anakin <Battlefrontler@t-online.de>
Date: Sat, 4 Feb 2017 17:42:44 +0100
Subject: [PATCH] update gui for camera mods

---
 QtMeshViewer/Resources/Resources.qrc     |   3 +++
 QtMeshViewer/Resources/StyleSheet.txt    |  12 ++++++++++++
 QtMeshViewer/Resources/freeCamera.png    | Bin 0 -> 964 bytes
 QtMeshViewer/Resources/orbitalCamera.png | Bin 0 -> 993 bytes
 QtMeshViewer/Resources/walkCamera.png    | Bin 0 -> 924 bytes
 QtMeshViewer/Source/MainWindow.cpp       |  10 +++++-----
 6 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 QtMeshViewer/Resources/freeCamera.png
 create mode 100644 QtMeshViewer/Resources/orbitalCamera.png
 create mode 100644 QtMeshViewer/Resources/walkCamera.png

diff --git a/QtMeshViewer/Resources/Resources.qrc b/QtMeshViewer/Resources/Resources.qrc
index 3e856a6..f55c121 100644
--- a/QtMeshViewer/Resources/Resources.qrc
+++ b/QtMeshViewer/Resources/Resources.qrc
@@ -21,5 +21,8 @@
         <file>light_on.png</file>
         <file>solid.png</file>
         <file>settings.png</file>
+        <file>freeCamera.png</file>
+        <file>orbitalCamera.png</file>
+        <file>walkCamera.png</file>
     </qresource>
 </RCC>
diff --git a/QtMeshViewer/Resources/StyleSheet.txt b/QtMeshViewer/Resources/StyleSheet.txt
index 19fbef5..904b9b1 100644
--- a/QtMeshViewer/Resources/StyleSheet.txt
+++ b/QtMeshViewer/Resources/StyleSheet.txt
@@ -37,6 +37,18 @@ QToolButton#screenshot {
 	image: url(:/images/toolbar/screenshot.png);
 }
 
+QToolButton#freeCamera {
+	image: url(:/images/toolbar/freeCamera.png);
+}
+
+QToolButton#orbitalCamera {
+	image: url(:/images/toolbar/orbitalCamera.png);
+}
+
+QToolButton#walkCamera {
+	image: url(:/images/toolbar/walkCamera.png);
+}
+
 QToolButton#wireframe {
 	image: url(:/images/toolbar/solid.png);
 }
diff --git a/QtMeshViewer/Resources/freeCamera.png b/QtMeshViewer/Resources/freeCamera.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfa08ee2480930562c32bbfeb3e88884617f1859
GIT binary patch
literal 964
zcmV;#13UbQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<N=ZaPRCwCNmqBYBHx$QzBWbh~+jNReQ)mvo7}8^*rqFMY5(oqg{ThKl*+36I
z6lw}R<!cxW1=D_pu%*2Q3?+vYn&P$_HumhyNYjHf9(g^R(QYsmh~3eQ^#8y2f0Euy
zet+H2(<JZ!*q<BjmX=Rzi?sgJ-WfpRe?<aHV6@=3k>ojW1pEk?Yjb)C+^;P^{9AJO
zO$8SQDhsx8eHnO2LL{!I0&YpzOyPaab0v5ToV<;|chi#bSplz0IIm%Dpbo&B0R~CZ
zkx&VYBy1>nPs2_Ix#kdf(tfXkx!;}@j9*>AKXaH>P=wY;fQKXmofk407-JdlWEkL^
z&;$3TB|rV~2LAHaU(^oV1eQnQlLVfStrXr1A7t>+Cghqgfu9v1E6dZf0{))Ew1o5O
zD)_1`l&X!LRzlgy@-!8EB7psA$?mlDZm-`BypN1&+?qx0Fs3C;OLl>M0X&#hokpvI
zAMCjvOJZ&u)~o{Hp(qSr6b8yQ!TbIXktmG|@WSx9s4RCX>$aNlTCEBmOTv1L+7qcP
zcT{cBEpW4f=m(RlpzZTuOf&%zixw?#L)UMrg%~XnwYY6oZLyXwdZC3=O-z(e;<OHB
z3Fq{!(HgGS3ADb&E@NRY-VokKpl^!}xqA`3@A>f8t7C%yxrvzII+(--+qGDkTwf<z
zg3AT=hR0&wFEb#SylR>kGx+n|T@r=4S(j%Lat$ADz{gu&g7*Gi>l}!<jFx3h074|)
zKoTUDH_<|j#OIAl2}+ruTOzAi-g^#ABGR?QB_>Kxid6726)u64{^hzy@DTVVuus!c
z!Ap@zo@ElW1SQ-Dv5pwpVvFwgR->g0#!T`|0moY@Uu`HiSeov-Y}WL|GVnG--cYcW
z0&pyVqg->EYd4sw)jbhwdFFw04Y}qNI1+$K1&?+z*dDo;o2koOQ_;mmvLa}!cPiXk
zn;v+3<O-Bj@CY#NNqCZL4r|L8&v+)TC#mZeCL`%A-yXs3TbI?*$>LG`WG4e97>}f{
z4{8?^?^2p+uX(<tH0vu)A6Ay{rzN{#d1jip>Zm<r!l3iIpQeJZf#ad-7(fH}gYx{d
m+IAUpWO<Gj{4!LY|2F_sYo;+i(%n@60000<MNUMnLSTZ1%dyq~

literal 0
HcmV?d00001

diff --git a/QtMeshViewer/Resources/orbitalCamera.png b/QtMeshViewer/Resources/orbitalCamera.png
new file mode 100644
index 0000000000000000000000000000000000000000..170abd754494fcef010915533ac7f4c2f0560a8a
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<XGugsRCwCNm)&aAKp2Lf%uIf47gt(;P!SOddMGG@cc2J@Q1CVcL00g<13?iy
z@-~EmQ1lw4iiZk<h^VMk-Ll>8CYgx`lWfLxvzy%(90-AAX5RPxerCSU`?!@cW=P;V
zusYP7jSc5hgEaZnu`2*Ce+v(kKnH@iq2xXA40sOcU2Db=xRx58{E0ccoxqNU#DK}{
zQwQ#n5T1Q}0S6>3`fw=Vy%O98)+Z5o*p2CI4qz*WehNbksRN!(Vc>Zs3FSd3VL`#c
z0G1<Y2Rs7q7W0*}_QB?W&W|1VJ%nBY16O?maF>Ljv_d2uF^0}^ga+=p7P!)ldGU1{
ze&*_TQVXsf<qh%i981W;6}c6TL~vpe+5uOAmkN-H;pyf8ehr};LqGW!eAeN*s)(J!
zg|c+ZQ(tgS0ju4Zm2RAyJ#7Yl|6<MejooB)1{k|{Pgs!$V^$7FtSaDoFDZRA4ZHxZ
z0!{i~kVuTh=%-ff;fNb*pt(HI5H|#`1Fl-2I@cu;Ya8GL%_Wf-PA0~tn$CSSFL;$m
z)lDYHNOK~I;iO0nK>?iY6Zj+&S>_Ni1gZeeD4$8-b-`Ebij8s)7o#Aes%gWV!8gl%
z_e@dKQq5J+GzH!Hb$b-TRTCvu@Nud}iZ4!&19ym~zMRGEv+N=G&qK_sY8IuF_E1f8
zxtdl@bKecZu{Y<&k1YGtgYSKNNepy-Cd`|Lu7F5FJAh*gaJrRSpt!%Ap7DEehg&rP
zcyE4|7Wgx?7RdJLD6X#catj;^OA81kh-F?x)>&bi-<zHxqjJr&g^3cx!WVq;g)JZp
zBKtvN9QX)0FVlR%7ZpifMUpdt1SRZ*y7Ie8FxLGq>O&<Ukk%EE<dp)}T0S=yl>Hd%
z^196C2*z>5+~PFK%k-8Hz?%1QE0c-g-RB-F-}<&N-A*9gLs43%e9?!c5RNavsTLo6
z!8rkFUvO(VvOn8_oft~Xcod*Bf)@Vvh23k>w|g&zwn6a)w*Xz7gzN2qN2#Gh&bTLb
z7pe0$CZV(@Ukc&qfl+s~UOkHME=QmQolxfeL26@SFRfXS`@CJ#nvH8tZzP7t-Ix`(
zJ=0mU?x;9b-Jok(^MCLKcYw8N-7!D_Tyxs<3#ln9=7#M#f#CJD_WbVvI_B+533>Ft
P00000NkvXXu0mjf!Fa!m

literal 0
HcmV?d00001

diff --git a/QtMeshViewer/Resources/walkCamera.png b/QtMeshViewer/Resources/walkCamera.png
new file mode 100644
index 0000000000000000000000000000000000000000..dee299a954b8fe7209dc5eeb54bb8c2d3de9d01b
GIT binary patch
literal 924
zcmV;N17rM&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<B1uF+RCwCNm)~j>F%-ssNoKQSTODyx(Sj%x^ir@0zJVeLLLWpBWCbsJAt-`Z
zzDA)S6nzG*;GGCX#S2BH>gu+gotb33NXCur)XwUz9tg{ZWWMkGNpe2%`ddkjDc}mQ
zFfg3XEN2UgvVLjp4nX){DIk&<EqUHnyabkjhk)6!r-s1g!gBv>#_5e5whZJJZ0W{s
z;2{Yq+-OPIr(n7T2Q@Dv$#r1mcLeVAGP>(2e9K_7fPsM`05A7oAjFVFB%rNeDuM$V
zIx!@gyTHwAeH84yy`IwjxCLJZ(9a<ay>9>>l8_9e5Uao$OScnafLmb%F7`4Wz1x6K
z-utb>ft$edhWLme5~@mtkHX;?j!#3Pxdc3p0F_%Ftf%mK0KE)0^IyS7wJ=px?NljL
z!?ZkTNzO=Mp_eh&%Y4|2zXPu$V@mhUv~U=`40;)Jz=8y>^z&hk#tB|WVqhFrKL_Bd
zObr)O1KEVY>qunA6?kemALW+W+`6M?e6H$jalRSQ;_A+Q)tvPhg(s3*W~0KQE8y}s
z;M+gED}i8b9qF<Rh*-3&fJ=sB99Bm<#HfhK?Z;+P;M=26!O2M!T+?)w_y~-hz<l$y
zlOeF$oWw*3j6xzBw?|?Ao9q)$KbGa&K7818cXVn-ukcasiC96R;ph~cm~l_`e=||l
zK=pqAGhh+)k5UXLM9^4H%3~2YECt9&k}3bEX%rUccNSOO+^+4KaE(bM$;68<<*PT}
zIrV<SbwrzmdnhJhO1K8~P#ca-!^!=;ma*bVtUxP>q+28=6n^hDTDj8@E1pPTd8Xx<
z#mY61<0cU{r?GF-XIcO(OJFI{tR>n_#?g2q5qchb;6y{BSp$|NU|N!Eo!I3j(N4*<
zgJ{SR$yCCm^1AKSQKB72Cx({f8epoccqP%?EiB!tSo(5jllrH^q^+FihuUyt-%oY4
zvi&W%*@+>Nblb}7gTghCe<RJb&v~+oG^-P*S98m~UdCJ~&rI1&9aWc1Sad$`Yc0tQ
yV0kZf44{F_fjmD~*kQ-qP@bbD&-Rk%KL!Aw(2`MNg3=uT0000<MNUMnLSTZOSf+yj

literal 0
HcmV?d00001

diff --git a/QtMeshViewer/Source/MainWindow.cpp b/QtMeshViewer/Source/MainWindow.cpp
index f28ecc3..156d242 100644
--- a/QtMeshViewer/Source/MainWindow.cpp
+++ b/QtMeshViewer/Source/MainWindow.cpp
@@ -102,11 +102,11 @@ void MainWindow::setupWidgets()
 	ui->mainToolBar->addWidget(orbitCamera);
 
 	// Move Camera
-	QToolButton *moveCamera = new QToolButton(this);
-	moveCamera->setObjectName("moveCamera");
-	moveCamera->setToolTip("move camera");
-	connect(moveCamera, &QToolButton::pressed, viewer, &OglViewerWidget::useMoveCamera);
-	ui->mainToolBar->addWidget(moveCamera);
+	QToolButton *walkCamera = new QToolButton(this);
+	walkCamera->setObjectName("walkCamera");
+	walkCamera->setToolTip("walk camera");
+	connect(walkCamera, &QToolButton::pressed, viewer, &OglViewerWidget::useMoveCamera);
+	ui->mainToolBar->addWidget(walkCamera);
 
 	//////////////////////////////////////////////////
 	ui->mainToolBar->addSeparator();