From 7961e6ffcc51a9a899e72ca5aefd72d40089608c Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Wed, 23 Jan 2013 10:55:46 +0000 Subject: [PATCH] Added Tactile fluids, fixed tactile buttons git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@100 47cf9a05-e0a8-4ed5-9e9b-101a649bc004 --- VDrift.suo | Bin 37376 -> 40448 bytes src/OutputHaptic.cpp | Bin 1939 -> 2472 bytes src/OutputHaptic.h | 9 +++++---- src/car.cpp | 2 +- src/kinectinput.cpp | 8 ++++---- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/VDrift.suo b/VDrift.suo index 4280804f41c325d4047ea9849596cf8df20d57af..cdd49f5aaec4ff58f855af221e48547e42ef66cc 100644 GIT binary patch delta 3619 zcmcInYgAO%6+UO?GIL=@oI&1*z=(>qWXwpZLR|#?MgQfn zzBzmEyYIQ@eEXce552>N-d7AGwT2amjIku(vzs?>CZL}VIDi>IGLQnK0%?Ho5tymV zG+^+g#Y0&Oz&_sAK)(Yh0b(iH9LJ-H8NBoi}@=D2zg@XydM?;hWs@#^L_#)1j=rt*aeD+!?B4i!2j~ZkrG}pK# zy4EPo);03QSIJ_Znnk15I!xEaXeC4CjIg!K!K*OFu)a(^dv%FXYtRG~GA__V(FHe7WMC^AIv2jndTic(YqO53xN*R)0I1&zf6P6dJ1b<14i<( zcGkwKm7HihOyaeOzq~itK==9oo{;XnI@Ujj@jj60&%X3gh05rPk zoJm7Ahg=4wRv5s75#;B6Lj2j4Z@q^5t^XJfFKzGA%~$i>9UMIT$e5A zt-2hEUIf{u>rv>Z30dLU3a7K~{AuonPIr5oue06bZRptOX?Hhx==i32v~_E2>_zR% z_`UM;kXZaIc^fyRbg&)ZEEI!ZHCc4AOKh$?;JP(Bq2QX#wk=pm%Pq+Q`)d%J#KKkd9s}H>$E{S(i5fa~o*tg*W_m1xs z#(KpRW=I8z$M0G0^sH`>DSU5JY&YDWK!;%)R z@^F_}qc~F%JdS8f*Mebp$Q95iZWYP(n>AFI8t(xHOsnm`LnH5wP3_@sA2cr7pUxD|Bnpn1npf88mP~w%Z-Jx zNX&Xm4T>6CZy@L|x?d6DAD5qlWHZx-j@an_5H88)( z5En|Dp_IVbe7JPNCBa|1lea0|r9Ir-f%TvfPj*sf`3Oy~kSSY|NvcRCYsCtVG(NME zuT;wiQ(mYzV5HZj>@abP%9ZYFB)~4}uH9`ahG8^GxludY%)doxb(MUGw$&v`!(#A( zy7Y{lW8vg5j5dNVUHP-T=fyf!{zL1x^EJbo*KK zzXN^`oYQUZp#KAKUf176{~qvnfI2p0*M9)vAHY9>PXICaW%M8E@_*4^1+D{Qz`ue2 z0HKL|4Ectxe~SKpfE{$AwyMQD@Qq#`9>K~ijG5WfNYXxOOM|zGK5WdSYxT#t$lHA) zIq;+6p{2E@t;y|cY3tbG6FwjiRwK%Rss)7hrNu$`j@p`yYi4}=P_Epm;*c7B!8fS$TQxw~x-m5eZ zFXUW^#S>>=6#Ij57ddzWa;k6<%g**UzZS+pky>Asv1Ti$Lyg5>AOnYgYfxNzLM@(g z!+6qxF*W!Weyu>UAS!|H7Zr-5E&4$8uzFnW6DwvHc)=O-6b!YQ{oZVfaM}37)Hk(< zf;)mKle22qvt>&L?S%)+183XQPdG1`#NnT^n&pGpyHJI3qoL>HVg|D%vxI36fB^MK zXDF_Fg9dVVvt}|Tu9>2VJ`)f(8STJoJ*PA&&WPkh3%m(SGuT`_7o&xm@O^1CD&KQz z)PACfJ(XUXERM=n8{8xEP+z`i;^=7q-cCZr>3)l__pIqEbY-;^}m*9JUC4U7$Rf{@C+%HCv1%LKWL(Zt~TQlre3x-d^MM?P+7oj{j1?rD^!S3 bc6c*rK*C{9>U9dnJf1~;dG}NQ;-dcp5kUGK delta 2261 zcmc&#Urdu%6u-AErNvT8kWvekQmP_S@)eLqMAm;)1rg9@PF80TDpX5bp}HxIHf{_R zjHPETF;T~eFZ-hdzByxJTn))GlT9#N;+FZ~UiP$XJn*o%M0RffkZkc~F4^wQ@4M%m zd%kbk}Q;}(#lJ#okBJRAyu1X2TBXl z|17EIrF0E)>XbxWjYNp>PuJ86bC66miX-J;(qsrF%oF*@Ce6?;2qk9Zm`j)hLi$!I z*@;|XTC${{hdHN_Us~5dx7MI^kXT3+agau0A~pCm;u)+7x*91Xc01vavLxm#NO9OL zeBXvqDt-qSkW+YC)|9YhLuwcCStQ;Q!>Nr;l3XNNc$ht_m@|=P4Zhf12s+0w9fuDb z0pR-7{PcFM0QPLM!kU9}`0}DZR%w?wP&JRKCyrAY$@m8|c@9cMD)?oW7W6H8dKiqQt(t8ZG!HpMj*}iTMD`Ic@snx{Ga*|D z$KPzZAe1PONjwj9Y{p(>y7`ms%K|*nN#~%L-4|;<|J1oYlTJa2tCe1ZW3IyF(}=qC zWh|1js5Fh3K`@@-Go){(_**!_V^@uVO{CjbD7>FiNXyvx0A=$`KG9yNdW6LH&ryQl z0dB(So_#Gs;hra$Q%?dUh$r=v29iy(VCH-YG&!`=ED{wHA|f9G?Fm6^XDt}q*TYw- zy^g~^XsL2Enra%22CJ#2+F&%=IfJFqXfbe{g|ltp91e%A`pu#G7Vkip!|U@5Gz{75 zTy6b zy+cETcCOI~>h6;8rT^3hOVGQry=Akl)&Rxb8|jKys0b#j+;HJgLBdDbTa`+5`bxuB zlDH!Fk5g{UhELs_0M(#WlncY9Wl*)DXd}ye&%bV4Nf+rPK2k|~Q702-VtEkv#NpnN zy1c)Ij%^Cp$Ew3@vHvkppzL19PUtwyEJ`&Wj_eWI|8ewUy>l=p!gSj!qvn5goiLP; z+g+aUe&k3z-@h?9XdF0^82ZQRAnuF8?cEBR zfmN`Wo`ZY7@RUDO6U0K}#dxt;t$K7x5WY3lJX-8m{~lUAB47m*6ys5dACJT2c$_!C z9v6Vl)WBaoZ>4->5V={+E?A7Hz<$9s8{Q!lv3i`$+NWESJ~%C-U>(&-*=1n$wih0b zzY2Fp#-E0qv61u^^Ta3cwH8VU{a#L9c74l> zY=oT)*SCWKEB33ebDiw5$%(}SpIx?VyKSRs*3W83dmX5Nj{|5YJ>|q`mCS~5(Ntlh z&^SMJI6cS!THBw$I?kP?Q#`{Jc0VSr#!BphvBO#ET3RT&RLCBH2iHhRbrMtw;v zm&(TP+5Mafju#LPiQVD!*lXrd(h9O<^$CS;0%P+_5njyp<9GH;0&Ayh$+y@`d%Jehxj>_-1crpZ5;v>8n&>oS{9{=#gx*_CBAUpdate(dynamics.GetSpeed(), GetLastSteer()); + _outputhaptic->Update(dynamics.GetSpeed(), GetLastSteer(), dynamics.GetBrake(FRONT_LEFT).GetBrakeFactor()); } diff --git a/src/kinectinput.cpp b/src/kinectinput.cpp index 6a59cfe..8e0faac 100644 --- a/src/kinectinput.cpp +++ b/src/kinectinput.cpp @@ -131,9 +131,9 @@ float KinectInput::processSteerLeft() float b = pos[NUI_SKELETON_POSITION_HAND_RIGHT].y - pos[NUI_SKELETON_POSITION_HAND_LEFT].y; float n = sqrt(a * a + b * b); _laststeerleft = b / n; - stringstream strs; +/* stringstream strs; strs << "Left " << _laststeerleft << endl; - OutputDebugString(strs.str().c_str()); + OutputDebugString(strs.str().c_str());*/ //SDL_Log("Left %f\n", _laststeerleft); return _laststeerleft; } @@ -166,9 +166,9 @@ float KinectInput::processSteerRight() float n = sqrt(a * a + b * b); _laststeerright = b / n; //SDL_Log("Right %f\n", _laststeerright); - stringstream strs; +/* stringstream strs; strs << "Right " << _laststeerright << endl; - OutputDebugString(strs.str().c_str()); + OutputDebugString(strs.str().c_str());*/ return _laststeerright; } -- 2.30.2