From f4acbaacdcdc0b453e5f6612dea4af7918d77b9f Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 26 Apr 2018 20:07:19 -0700 Subject: [PATCH] Added camera click --- content/sounds/SWITCH3.wav | Bin 0 -> 4628 bytes main.cpp | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 content/sounds/SWITCH3.wav diff --git a/content/sounds/SWITCH3.wav b/content/sounds/SWITCH3.wav new file mode 100644 index 0000000000000000000000000000000000000000..195138e013c413d77b7d683aa4f0160409eb29e3 GIT binary patch literal 4628 zcmYjU349hsvhSJi%Vi)TAOu(t!YPJBR8B?2a6AzV56>N>l-dR~66XU{6t zjTzW&K#y^grZ%i*jIjVosm3%KV2o|5nQYLV0l5hNt(PO{pDGCMmk7Wc}hCTAaHd8w3er(52!7qy|j^3P}%~2Na{%wU@av8 zDYc}kBuSj4NDVP^f{$`-P^!pPZY1e4m0*_Xsq+$lr4d`71Z)iM)kh{Q{v1{?j?s1f%i?E9Hk;}Ilm_}_-T2aH*-z1oUhVQ(^R7QuZF!8 zs%5s*Eg@OVPe^Ce&eWr2l4ZuqN3z&kKxd?tRbK}2K{G~{Tl=}dJ7~qrA`uBv4p)~Z zW|zq~lVt_HB(_PBO|+U0^JvMG&!{2wkt{pSy2#JUMM{@Bu=o}?;9S_h(hRY7@O99x z+1aw+X+T@tT)T@sEL7y3r1#AtD>i(J)|d~Ghb_*}ZiqLUCry~H@IFa173Nv%oVU8BDuv?gAD^uaYX$DJ!Ve;{_1T|cmWBE9v0X3Kuyfk%q|JpN6=w$r*IX9pL=DPci(ghv+#A70^l(XH zU`0N(Y)A-xU*&RV&0WTce~NL=xuf~?{^lLI&rJa z%{!Z{JI-opDI+hvJ}9FM6+8>71rva>6YW zi`PYkoc4FuMT?zA4}}j!_loZjY8;hAcZ*Fp=!`ahlXl+HviIfXxJ2_j|5Wz2JH+ZP z#r8RBBiEfj1$M`-4j-5Gfd{NKuY;E#+-w(`G@2xz8glc!oAPy_g_9Th3;!UWS<&uy zbkekx4K#_GNk-WwH#v}O&QSNVWZLS5E0*$)?iNZ5A1}Y;g~Ex>3a_5m#@Xrga8^2f zz0A-kw~J)C4~7!G0<+K=<@7V%c)IhwSJ&Rm8SYVUG(Te=;+`_pT1DI4nWk^xVW}?1 zt+(u9_7dxuRm19F?Y8FyRtI|r_u8F;&0+=z+Xt3JO|hfwpM$f56N9ONWcx_)jbL4S zMX+Ts#V!hL4y0OnW<%ipKo|3hb<$pIH@Ehf1$GG+UX+REtkuqpGo{vfoSNw-R_4mnrV($D z1nY5mLh|GS&&H`w`~q*Md>X(jxF&y2CDfJTygig7%jueX!}|vN=rNptGrU9IDUUph z24jz{qrZ52+(q6r>O((zncigYmiHkorBr%?HhOQ-WZvr8w3+khzvu#;r+L(yns7`0 zlupwws>5A5jWVedd%&OMfi#|Sc@}?9yQ!3hqh8eKTzZ=ykV)K;8*>t0;u`WJ&7uYT z8BYC6z`npaew5;9IBkTaH>oz|d#}?LilGbMU{If=`80u^r|tAH&4kvSw3v>Dbj)kVkMME&2esfo@mrk8 z^$@==_&pxT&+$q=g!m1I4rxISG~MThz#A zsK*_pF6!tgSs`6esYl80Wtq$e^(EOMt7HHw(lk&$m)WT8@5%vLE$<+ApU4rpC_9nw zka%)OqD(ZZTzm7lX=I)@FPWZb>1Ghxo8~pFg15~SGtta6Ip+5!+ssFsXL8M4U`v3_ zF-y^#X=a!#Gu2EtnP!9;Xoi><%u}YLX=PfN6!UymO1%$${}1P(k}u-9JRQ-P#p5}P7xJ4t6?K0O`YRB@ z#i;%pQO{TLdcXq2?K8wJ4-wr6+G_qMZ{h9yFT^h&(wQr`1l2xTgcGE;SQ0Odp_#E# zs(=>4-9r%LB7CF3RSi`jg!4UCJkTnDg|PPT@#6h?-ipMl;uejRNT zxTgRc4W3DmGKyaV&v3NKJOQ+Heid^w@EwD(5#Y#%?rB($OQ1U&x>sU-=Agd}{VZtL zoXp|*uxAErT#Q^yfqg4LnUCIl^k?Dy2XIY`@MU9;&X|kuY)HxhwgkCd23Uza-;5oy9c>5J`(8xs2qO6tVt1U6;U0Jak^B`IxQg$2M7jXfe<9|_5bI<7Bj5-i zAMrnqb{<@p`3@WG7b8LBGzPcG1Y|Y=xlM|+nmCE8p(UZ!lm~IQttE9LP!G4?-vR1N z1FV)>5j+{IwKiH^(CSC{>!4o~Py^Buv5tb!6$4E+z{1+HL~p$U8w}oRgSL3woD(8i z6Y+i!^J_z1eaQ9oHO9(pBu#O5O$9uPdv#m1$8bk&6~S9#L|b$4q(tV`fmP~Dby%XH zGVg=>RU@LWIy_Nt>PF-@hx9g(*b(>tZqglp3H{_{c@_T!Lu3SQ^&@0B-ug|K4B*2f zlwpzgP#KE;um}v6fq(({zfgDyQu@h@*x@h8^VsD*@aNGDe*(`${yIA2@1i6AHQJ-5 zs9%r5g4XaR75=o4hXKuTDl`FT3{s?FB-WY>jkS8I-e|^jhbADB`WF%pcmUZ|hy}zT z?h2X@&AvvTv41^)i~Z_D7<)a0ovgdN9DBO-KcEDAy#%XAzxq}v{eS$>YZ$+F50v*hX50YyGJIUAHzGXud9Pyb70^_M z%JM;R-4&IfqZhGXE&?v$t2;+A)vegY$XBgUi+np&he}Z^ZbYo}F||eQ@O@IQs}XC} zI-RL>ovGL@fYNV8@WOj<^-0GHA>|g%$=irt5qd?D*!_n16-VN%u~yJHmmnh*k(}sh zTZ-oAr?OXmFIUQ~px?4c7ImJEDyN>>n%fXEuDRBCII;qC75IJ4zk>GM2v-=G%JA2R zQkAY8ejV^->8P$FtsIK!+VcKmrs`GDd1{5$3?I}UA9SXI_Ebh?U%xu9a(()mH6A{w zR2}!_t5tU+-l}BnX)A|3-#Y!O2filX>dGCUUhBS4AHB#Paqso%9?iE@wN=JYy{wdc zUz$p=x$W2IC3_6=;;pC$G66}MeWitl~XxGdwwo8OMaA8Z>5iF zudiEkth&{1-(QMIsg!5oj5cV2$SGmN0DoLHGVD?9%BvQu9V)BRem`1#kLp{gy!SC* hfOF>AB_4!SFrJ{|86z;KTp` literal 0 HcmV?d00001 diff --git a/main.cpp b/main.cpp index 4e827cd..3893fcd 100644 --- a/main.cpp +++ b/main.cpp @@ -37,6 +37,7 @@ static G3D::RealTime messageTime = 0; static G3D::RealTime inputTime = 0; static int FPSVal[8] = {10, 20, 30, 60, 120, 240, INT_MAX,1}; static int index = 2; +static std::string cameraSound = ""; static float TIMERVAL = 60.0F; static int SCOREVAL = 0; static AudioPlayer soundSystem; @@ -250,6 +251,7 @@ public: void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button) { + soundSystem.PlaySound(cameraSound); CoordinateFrame frame = usableApp->debugCamera.getCoordinateFrame(); if(button->name == "CenterCam") centerCam = true; @@ -878,11 +880,13 @@ void Demo::onUserInput(UserInput* ui) { if(ui->keyPressed(SDL_MOUSE_WHEEL_UP_KEY)) { + soundSystem.PlaySound(cameraSound); CoordinateFrame frame = app->debugCamera.getCoordinateFrame(); cameraPos = cameraPos + frame.lookVector()*2; } if(ui->keyPressed(SDL_MOUSE_WHEEL_DOWN_KEY)) { + soundSystem.PlaySound(cameraSound); CoordinateFrame frame = app->debugCamera.getCoordinateFrame(); cameraPos = cameraPos - frame.lookVector()*2; } @@ -1371,6 +1375,7 @@ void App::main() { cursor = Texture::fromFile(GetFileInPath("/content/cursor2.png")); fntdominant = GFont::fromFile(GetFileInPath("/content/font/dominant.fnt")); fntlighttrek = GFont::fromFile(GetFileInPath("/content/font/lighttrek.fnt")); + cameraSound = GetFileInPath("/content/sounds/SWITCH3.wav"); sky = Sky::create(NULL, ExePath() + "/content/sky/"); cursorid = cursor->openGLID(); applet->run();