From 064e2eadd008a0fa37efa100392ce2449fc6ad25 Mon Sep 17 00:00:00 2001 From: Regalis11 Date: Sat, 26 Dec 2015 19:33:23 +0200 Subject: [PATCH] Round end cinematic, CoroutineManager deltatime --- .vs/Subsurface_Solution/v14/.suo | Bin 733696 -> 750592 bytes Subsurface/Barotrauma.csproj | 9 ++- Subsurface/Content/Items/Weapons/railgun.xml | 2 +- Subsurface/Source/Characters/Character.cs | 4 +- Subsurface/Source/CoroutineManager.cs | 4 + Subsurface/Source/GUI/GUI.cs | 17 +++- .../GameSession/GameModes/SinglePlayerMode.cs | 17 +++- Subsurface/Source/Map/Levels/Level.cs | 18 +++-- Subsurface/Source/Map/Levels/LevelRenderer.cs | 5 +- .../Source/Map/{ => Levels}/WaterRenderer.cs | 0 Subsurface/Source/Map/{ => Map}/Location.cs | 0 .../Source/Map/{ => Map}/LocationType.cs | 0 Subsurface/Source/Map/{ => Map}/Map.cs | 0 Subsurface/Source/Map/TransitionCinematic.cs | 73 ++++++++++++++++++ Subsurface/Source/Physics/Physics.cs | 2 +- Subsurface/Source/Screens/LobbyScreen.cs | 10 +-- Subsurface/Source/Screens/NetLobbyScreen.cs | 7 +- Subsurface/Source/Sprite.cs | 8 +- 18 files changed, 138 insertions(+), 38 deletions(-) rename Subsurface/Source/Map/{ => Levels}/WaterRenderer.cs (100%) rename Subsurface/Source/Map/{ => Map}/Location.cs (100%) rename Subsurface/Source/Map/{ => Map}/LocationType.cs (100%) rename Subsurface/Source/Map/{ => Map}/Map.cs (100%) create mode 100644 Subsurface/Source/Map/TransitionCinematic.cs diff --git a/.vs/Subsurface_Solution/v14/.suo b/.vs/Subsurface_Solution/v14/.suo index 33c17251cc68a1c9a4c101047d9a1dc2a7f4ef1e..4eb89efd5db3d5d6afb00107fe719f5439d16e69 100644 GIT binary patch delta 16580 zcmdU$30zgx+W*hmd+qT69uN=_@o+>W2Sh_NoQ{e^=76N;fCD%rrbvimrZ{9~YT(iH zIERSGp)#jfWu|CWzU6D??e=!dOs%Y2W@a{7$^W;{0mZU=Z}0H=-2dkDfl+i`sX*CfRItZ8qEW%F0Rz8w1|~JKXDm!7z`4>;uMu+29c{2egrBUInkW zyXZl-LYf#{@@4IHZ+3c{wZQ3k*k+^359EPCR&kJNv#ka+Y8!Wo!qajx(=B(y4!0LR zlMevb!XpIGHK z9nx~Ie&}dB?u@Z)55s46Rj4_TbF0iNQm;zf^n9OsJ!K+_pn(I$V3hH4y!U> zFP_)%|DXh@@NpjR@x2tiw`2IDvcc-eHd}o_hr3D39C_g<|NlVBJQdcZLe@<9-ZK%F2ND1p0`fIOJfKnt)PZhawJfwN#6!ViY*23i9StdBK= z9Eh+jk^ec6yJ`n>&~ndNr~ zS28;jhpr`F#OvJ2^b`cXtL6(-VDP2o1DK0bXJpmLe?SQbNS>X0l31bV!#yn|Me>B~oe(u10n6d{ICu*rfegIkDcbASufSj_ zl;^#@iRG7=(FPeYpOrDi?k}L9 zlBA}dvLvVe6hf8M45{o1l*w~a<9KpUxp2)~#Gy zkM}fQDI=cAMiGM@74d2EFZXzyvrz_7Rv9dsE7cOUisVK* z?~PibwyWiyNs%xGA?7oXhr#!t5-b3#Ksu`BG-L(Hk!j~@Ia-<^(;KVhUdjVVXdSA% zM(&{uLokiTu95q79|~hULXSnPTOkhu2i#ggmH`9izK|Kfs_;^TTLPYeeGK>;Xe^0q zYh+gxIi{Dq3LZ^c4>9w-zH@-5gMO5-s+nCJ@moBDFAM=RdT-y{|rY+x=Wy`TG zC)R;=@;%L&cPVoT*E>=v(_@g%q?&~q{JD0sJS&N9lRF7_xm?l6dyy3cnJB?iNRaiw zAzqYSWSOk|jO+>_*HE6opQ{;{Qh~bJ4v(ui!E-FUnUaYDEe^P}cInR|^fR}- zu?cVZ0{%-f6wRtI@zYnb#zVhD-Yq?DWo7kXr)<^?qAP>G%WU{}jZ*&x&vy!dY@R+@j#7LJDB%aRKa; zAag-?n1dxc__mS|Q$7C8hWjJHQrEel5O_Lws7>y9Os9>{O1dY#L#Rl(Dj(OpKU;b~ zi8=Lp2o(ozbZS&kz|r_BT5*(vkAAv_&MAH>FVSNW%2_jHa3!YsI|B7$n@ESRv7WSR zh7>O*U6=Q29_Rg>;v3)-JMoe=4&L~L;zNP23l#Vh8Or^zy+LmuWB0D)3jN11CZy-> z*197)XfeDV2g`xKzo+(tcvO~EMAow!&TD{G1nVH50vo`_D!1yQDTRG=m7D)X{M!oq zwko$BkcU9EUnM<1h&N5VVTIuUyk7MS1Bl#}ojge!d3>(G9$f?oGpa~06 zkZmC6LB0l=4mn1q{1|yh#}A+t17MGUyS2<~488(BP#equ?GeTe?<`cxx3H&yzk*na zhSrzcL}bH#5&ZuXT!H&&u#L9V$58Vzy;@&x96ksxkHB{Tq=wi$kQDc$(N45`hQG?Z zUnuX=xzDsF*1FF|#l6+`VT0d-F5wwHB{OgQ%qcmer%-6T+Em`h(!68UMEd5e7R3Tx zMY*oL!em?6&2caGFPOJK<$vF1n~o1!)shQ2A1nwgP>YK+buxlXtzNIzVXly>pjPne z2i?q#N?u<5s-3m+>|Rt`{T46$ zz^9Y5jTSG~$MZ2pc^Y@Ks9X%9qtXBUW&4SjQj^n-q3X|HUFmi35z5MB;S~NiIh^HE z=MtVt&Q)p<}vnM_19zSKSo(kN)Z%(Np2>f4HXI%$~?aP0Dq5a z^{qL!0x;Q@YwHS`i;jH~`dZ6vbk)~;lar!x;(*52#f9)xBr(hgI8+ljkAL%zqk)I=dPz#cvs6Q|2u<| z?jM{iRf%cA(`t-Qz5dzwWYt~u_+*(&Q8i1zt>Y6q6h_zU@&ti*uzwUnF0Chgi{iJ$cn-$45e2>ZQrR1$ zy6JkQtkDy5B|9DJ#xX~v&L$sDgpwYZ{c)j8x9UA3t ziwWzrSjYR5x?lQq`FmdsKDtWz&J5i^aSf$N@j^Q9$=D*Ax0^pmXAh|{V(}HZEhDL= z9!Zfycq1hn-NMxJSbm7H*QlZacl(xL0LtZ3t<9tEZXVU>yU0%OrWNcT;_>T=Xqd@A zWWH>!miJZNOt0>qsb@d6Ejr{oqH_G5x21cR4?P0&6qwRpW)q3E!)$H>=ic>vu-XKr zcemo-AuKK$7F>?Sxd1PK>$~SQU{uQ|JA@;TUzW?y@oCA2nz@ldW zwr)nFC~q`uDi~-r_)&1PCQ>)t?FAU5JyveucW&$Hrr6%j4b(p!O=%2w(5 zt9hSMty-0ymi9X%ZrETLj_@O_cZ%md<}2j7Zxol<(m?Ix{-T9btLs`TZ=U89r$(ST zc}MW(j=!$|wEyTA7anKznzw1XYS-ib9+|={|7p~D2*!i@{dq(0K(&J0{dqmQd_{{f z_Q!`V44LqmB>R?golb7k+t7%uY7AwZ;YsA~rLJ%c$$zk3+DgaihmKw!GoXL|F@F)- zZ+7B=F_j8G;)VXbGm2k~ncQR)&Xk%3L{}H{bk9)I_O$j#M zypVCeV8a_p-6vr_kG^3h<>ncx?=WYfPN+c5viUchAlIv|+uKZ#DXY?KN)?+mC-vGR zA9VD4GR^P)UJSqnv4N7j0j$}Y-feA_LhSn!p+ zwEQ$rWBM4l&%D*|Lq34#*K`W*hsZVsw9;1OpH6tEYtdpw8PCO-kDX2`E0*H9HK)I! z%2co)DsGz&w;46vgN9><^-NV{UjK^pC9I4dt{H|3Ub1HPQp+I1my4?c(>$3sq>x@_ zGdJW_7f2R~#nSXKYb*XM|9p006ej~>^Iz`R? z>&En@$Ll2}CtkeRY>&UJ80O2}^wy1k+b!DA(^fsaA_AtyAZ;IYj!|cXP8pp)c5LpH z%m=b2jrE(!5wA9@72E^%`}}^G4tAm90cynmZ-aWBmjA{Bx_{Io$8dE_OwFG2w{<6q zDtI3A?cof=s(%E?GfhXW%8_3`I6>R~B4G#A2BfR@eacWk9+h9X-Gs} z+Em6P$agOvO09aU;UfGXKg;Y}&`X^D9CLGYG?jnjcesM!VD;+3khQAJRxcU~a~KGh zsn`2_9J|v$!!oU%4J-H$tZFWxg;|>#mQ(c;SH0M3LA^iV;UU!<9G1Ttcr6%4Yp=s{ znp7RUpYJ^9zRMV3tA;XnD(mZAr#Yx3OOJO@((a6_eaolI-~D=Vi=46F-&&%RQ@XWH z>)f^FBf4^D28xa@PG3_nBMDqQ}xwT{K zC@u2^JFh_0(;z1*j0Gb5?rBnst9a_V&4Y&)m1$To~&c$SZZ)6rkQ1uR6RTuim9+e==ONhh z!4yycrUA=+W|g$evtWK0%=dq5?gAJWf=9t3@EBMO9tTUn6JRM=29|>-K@lhhD}V>A z1gn4-5LgY?fVE&9SPwRUjo>Lz0ycqCj>FK+FqDBUzz4R1ZD2dt0iFiWfM>x@@Eq6$ zc7r`&FW3j32jxJ37r={PKR5uae7_8N5F7#(;3I%7+ePp2$l{_=p=V(|2hM|!!L_Q& zanJo3wqL-n;5w)T)*#J*1Z2R00#u*@9T>m_b`S)DK?tY?93T{gf!ZJ(M1V+82SkCo zAX>4tv(@ci2ik)Upd;u6+@Le) z0=j}U&<%74JwQ)z59kH%1-(HZ&=>Rr>7YNz0QZ3bU?3O-?gxVv+i2Sm7>0sjAQKD+ zBfv;73S@z7FdB>jW5GD^02mK)zy$Chutu#(khx$o$OF&c$gA%!~N9Yt=fG;^xUg z)gQB@$aC`|R(?cb60y_reZ>nMG-ex*v97`tvT}#QRDl~XqZzie{|~Nn_)g#;62&iY zisNFswRh7T8LqL|`IWDK-l1G(l>L!zogOJ?Sb2<6azB+!Q5{C~aA;eX`?|KJxI(2L z=>@7w{pjc$t=DxB$pz|3ETT4I4O_AYhm=ibtM4kb>nSyic5TzbXw(dq)7rUe5><>f zV<~+RtY171-}F4AiP*PL?Nx{7Y=!;gGBt{($G4x;#-!q>{!87tMC4 z?`U+k9v1t~a`h~uU7DFfi=I>4(&h0ik(|R3X!U+|jzl|VR7ZDJ*5m1HoWkkAA~nqW z3{KM=2aHJS{W1>M3PY@OvTOVd+nW8ds{5Q=qQV|Zs#yQ3`Wo};cq{vLbt9>NReMrQ zXT?F6e^ym7;tjQwQP3M|kO(@V4$`WY`wpq3=Bcv4sd5k^{;R6`LKKOzKR`^&^A)^w z1~2&>3g4RjscQPd6&@<1KC0Kw*pj#XFR$%8{7(+QX3@)UD~T>uZ(i z*2%qyKgvs(ZtW?S-lAStU**lLV=7PC38(%Xyl-<#b?foW*6bft$-m=!49E93P8z9n zwwzJpnDL))@Vca(H z1Vs|rObcVwKa&rlilJsl^2Mn`g?pv)7m5C&YXcdhI}ELpj7b=M^r9R=g@#s$O9i^< zxmx*=`4Sart9vb~|5Pg_O{6tZ4%Dal8!NYrdL*v9CQ<$drMu|9QQ05NhEnGha&Jn0!Uz$=dTU#l?->M2M_gSr zHxusXlrH9Nmqfz%qB2xRdu7?0m)XRBWNUXRbaJs~3Nv5(p84KGMxCE3ag3`+#zld6J}{@^Cd$rk3%%n;14y8zcpZl;wZ>va|Cf^vFiP{$1(%rwiyu z*&d6#r?nA*X*+7|ODxw5rWQ=j&&irdCmO3Q=*e^1%sP{@@-hqZvvQ~86y!|K9i5Xq zc2ZVB&S?K3A-Q8zY>J-OOty#44b^9Alk+D}Ey&5G*~9cZ+4KI*jhnD=z7e>gwY_T`jCpSG68MRZc?PRMin3Zm6cJQ*$yOn3@wv)xv0XCf##U z>uTj7pW08-@1c1O)mV;~as$E0%)>G)%>pqgIR22=MsJFG6q|L}^JA?t&* zJ=k{pLW#8gg;SF+6tDe#oXA>r%5A&-#b2xHRQHzC-Kt#HP(C{BQm5;qYt~;x?XFeU zv3;^~vmO|mkL0_lb6-8F_8)oZ)gE+apz5NMq556s9Y_rlWlQtx!${vH43p;?s&)TB zF`C!vZ7Ir)ZLqFZfiz|NUW($? zmUa4|G5u*ztM((UJOmzI;e;U(r1@LW%$mBdt33wZgKE0VDzqeX;60f&?P|d8FPhMB ztLyMTyrLz{i2^xW&x}sh&Z6=gOg=G@?hBW`R=%eRw53EADAh2y_5f*g@=NUi-TRex zA#!8&yEb02x61tI_dJ_NR@dk6_d}b9{oc=?p9a>QsldZ4y20EA7MujxFn6#Xnm0}V z*mq6gY$NsGqV=b|N;8J?N{kSCayTx9VL2>Vo<5rSu46ozFB>kg=pp?KD^n%uO&jIT zSEq^7Q}o5G{5>ra197&INV|fK?zC_i#@JTV|M$J+67JueifOU3p zsG-@PDz@lh^wba@iRGzRrou4YNhkA+1RAx^(CN(tDM~yuL-%P~&7EVm&EM7)Tp`FQ zptl>V&8Sy5K6)$e2{3xL8}D5U1;VNeD97#Z8pf8_S51k`ZoG{vbIR20DO2;uWsM%2 zIc4(He2Cli8=TwH{WQ7^-4xHvy-%YG6;3 z;y%|B=s-6f!P?z4)6`*VSGFQ>`hPheXUOjy;LVt~iR$*mN#RnOzb>0tcLna{4^h!P zHJ&1ys$a0h)VYz`$vRxDux{n_tx?-{<36kAt?{Le^`+*fUlT0*Yu2eCqIp_vLlx82 zC>98y1_Jm?IC#yCTsbSAr-yR&+BEMQt^MuXr}a^nh>ZFAPL14lZK9Z1reBcRI>E-P zm5iKqjaD>#I*%5;XQ}&eW9mQkW>m2gbCdKe9w{cwSG~;JPRGIXHWe$!5qWw~3VTz} zBu8(fJx<%d*`$xOPMaK*yI6IJclW4GWGY#uC3?~yjuu^BP!BRXFjMym?=f`(qp)>) z`ppJ|ChVoq80{`fZ=!`*P1`BP99P#f+)h*5)8z$vs+e|KU4mpz&|LV85iQ!Q+EGTU zmzcdMZ;Kuy#+lk$_)k|=Pso^#A}vHa8BAB6*7_0-l%ny4Y zSql>*;DMN+bMic#{HdLp^Y%{F30iWUB>Q}0gc`_bSB zyET`{*rsQ&Tfat|wxdJ}PZ+(uFLDsKBZIA26nD3;{ z$z5N|6q)bpWo*TVSgpQ~K8((8)p`@ozvBf`S0K}oNG;yGQEeqoy0v6XAsjrM9Dmn? z$k|gHO4*gTrE@cHDHrrz3U%ovM^XCcdbD_^r*?vQRy;aLq+ZfrLoQRaM3Hz^e@_Wq zy-8G!0|v$Rlaj@bUfLi=shZ)Ug(r0vrK`qbalEgV!l$aq2$O$4rq|pqcvCPih%h1=TeQ z#HHC9E~q6pG;l0AU&FEF^`{M!%%$2jS~t=<7G*y7k;o zWG8xTg1V|u%ECr^GL1i|ogvpKKEQwMO6g8Rr9EpgI-LDkYs(&|;u%J}-=&ALHtF}# zk#DthI_WUND0cx4zz;N6!o>TBv;e3}OgJ*E$*-aX7n#o9N! zMw_N74Yw}rfvP-W=m~W2149?Tr0DN3DqCW@#cTH%2W48JnS({bUHUdgu4URFa;Ipq z;>SJ))^qbm@<=*U%M22i+gfVhrH|Y59f~5& z5E{N;i56Eo>f^APbwEj@yaanJCC}5tSx2h$7$a|1F=j)Aq`p9%@6o1vS74ky`7-VW z9LO+Ibm!whsN(nQ{#3ZJkxnT}(TUeQH&qjMZ)#E6)5 zy(1R;hc&loGu)_9#Lx_Vt42@OF(!%JO#Pxvr%KF)bh$q|C+}$EG^dqUv^liUhlNeW zdQ4iA+i2MO$}vhcYv$n5odL2NtD-7PY}&avoG{{4cd0$Vl#tE zqU}j^QJ5xsf*yLs^!T$%$SM~Jq2~2yTJf4bfu7u|M4Dj>3ykaq7g$*H=2*f>gu}*XFKztPGL_Q$<`gbXi=7} zXKLPWF&j%-qAykg@g*NI+e^hV6}_fU^rrwV6?Y0NBJ~V%pE43fQjvba{QVa&AsZ?3 z*6Bq$rEf7?QC@d5UJTlyF9`~?YoqeQ}G{e77_#@Hi8ZJ2|H5 z*|@HPR2{|++wvJkK4PzBU})Hh563Sw-oXek$_N)%`j{v9?XrUMSt*nIg3-})d6G)U z%hAU~-e-P68MD+BDrsOuk+Vd{us6*-nM_wVVFVA1+8AP_wdez%Fykrjk~x72-B6XY zTg_AP6t>-bM;u>ll(65t!Pc(oZy!m{7tLsKeu*(Zn!3bbO?%L3#(I4Q7hfDVF}4+$ zk|%T_e&(=}V{p&YTM6?m^GstZc*XRqdM_k;gG{^D82Gu#2B?4GWj#r({K5QDwc1Qy zt51%xj)EO*Jw3I-zzU!?Qkl6_b)n`~QSo(cB)Ml}Kuzv|UFq0L^E{`DkBz>fuWH|8 zP(?B(4bG2@NYOUTek_7Y7DFSdZ|OFpeJivsls*A&uD;rMYtjPM_}O%^=@b{FPone% z42^XGq92uG;x|U0ndy`sfgT$(9S1G-=sJs|;SZRf(NR+kM(q(eh(#$ zGvB9pO-~{Bb*+iDFCI^&D%wM`Fq4&KNWbn6w=vH=N~quzO3p(N^a5y{lg-(bpKD&E zcTO28-pyJwDtVSU$-P-qm81B?TH5W@r&8f-W`gvd6d1p7r5ZDt{(2Ns2tC0_?*Yt0 zD<+yMg(uiiv_te(_U8C(;ORn}rkaiEr55%e@)Vd($_TZm(%6>vG<2X?h$hhGu9B`| zRXk?$BzmikRM)W9A}Qcr>(w}F(ZX)0)-COC(#{-9_X|wu{&O4T(11@2x5s1RdLt_O zVmIc^9k~4!MrXQWw&HZy3t8&T09v1%DO0dtMI|{hju{;G5j3=g{cifY0S~2Gq4sa6 z=xfXoM-5XWXiE-06J1A25JMB~e`A!F%2Mb|nC1}Mwitt>X;hq<=4p`^A~N1E!W193 zOLG@sP4XD9PNNn=J_;6r#lQm|2TQ;cU@2GzmV+lj5hw;Lz-q7(tO8yTxV4GS3Fft6 z9as-GfQ{fOP@>o}Y@1*x1)D(`*aCcDE7%6MgB{>$V4V{@3%L_K2X=woU=P>}_5s`p zZNavVc?;8sO`&$DKzW`;r}48fj*7n3nux3aWlRXA(hWx6-?W;K8X4V0$=?mk(+@YX z*P-UaaCQEc67?D0Jw^dJ4STG}{K_cPDLKmCOf(x{wyA$piKS(-wVgkO&K_f9@N?l% zD#5n3@>>;o{&nqM8ug(TWNB0gof(7nlou&++TPNB|DVtug6@o@<<0GV#d>ZZ^Dk-9 z`*+wo-B6%M{OV1gh1%=>kt!9kKhXYqwEPZxGM$*D+i7Q<6lz%$>BA<_asOslpt;bm zP3;MSHMK93sBRN`x?hV$>m++4Mwhs~10B4>9%E_sQu?oBY?8m=ZvEGj?rdT|aoaeD Y@IOpj55cmMzZ delta 17084 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 - + + @@ -200,8 +201,8 @@ - - + + @@ -239,7 +240,7 @@ - + diff --git a/Subsurface/Content/Items/Weapons/railgun.xml b/Subsurface/Content/Items/Weapons/railgun.xml index 5a4579d94..449b464bd 100644 --- a/Subsurface/Content/Items/Weapons/railgun.xml +++ b/Subsurface/Content/Items/Weapons/railgun.xml @@ -6,7 +6,7 @@ linkable="true" pickdistance="150"> - + > Coroutines = new List>(); + public static float DeltaTime; + // Starting a coroutine just means adding an enumerator to the list. // You might also want to be able to stop coroutines or delete them, // which might mean putting them into a dictionary @@ -42,6 +44,8 @@ namespace Barotrauma // Updating just means stepping through all the coroutines public static void Update(float deltaTime) { + DeltaTime = deltaTime; + for (int i = Coroutines.Count-1; i>=0; i--) { if (Coroutines[i].Current != null) diff --git a/Subsurface/Source/GUI/GUI.cs b/Subsurface/Source/GUI/GUI.cs index 7fde62533..45bc4b489 100644 --- a/Subsurface/Source/GUI/GUI.cs +++ b/Subsurface/Source/GUI/GUI.cs @@ -20,12 +20,12 @@ namespace Barotrauma { public static GUIStyle Style; - static Texture2D t; + private static Texture2D t; public static SpriteFont Font, SmallFont, LargeFont; private static Sprite cursor; - private static GraphicsDevice graphicsDevice; + private static GraphicsDevice graphicsDevice; private static List messages = new List(); @@ -34,6 +34,8 @@ namespace Barotrauma private static bool pauseMenuOpen; private static GUIFrame pauseMenu; + public static Color ScreenOverlayColor; + public static void Init(ContentManager content) { GUI.Font = ToolBox.TryLoadFont("SpriteFont1", content); @@ -60,8 +62,7 @@ namespace Barotrauma // create 1x1 texture for line drawing t = new Texture2D(graphicsDevice, 1, 1); - t.SetData( - new Color[] { Color.White });// fill the texture with white + t.SetData(new Color[] { Color.White });// fill the texture with white Style = new GUIStyle("Content/UI/style.xml"); } @@ -294,6 +295,14 @@ namespace Barotrauma public static void Draw(float deltaTime, SpriteBatch spriteBatch, Camera cam) { + if (ScreenOverlayColor.A>0.0f) + { + DrawRectangle( + spriteBatch, + new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), + ScreenOverlayColor, true); + } + spriteBatch.DrawString(Font, "FPS: " + (int)GameMain.FrameCounter.AverageFramesPerSecond, new Vector2(10, 10), Color.White); diff --git a/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs b/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs index 46928b823..77bf3e58d 100644 --- a/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs +++ b/Subsurface/Source/GameSession/GameModes/SinglePlayerMode.cs @@ -234,10 +234,25 @@ namespace Barotrauma private bool EndShift(GUIButton button, object obj) { - End(""); + var cinematic = new TransitionCinematic(Submarine.Loaded, GameMain.GameScreen.Cam); + + CoroutineManager.StartCoroutine(EndCinematic(cinematic)); + return true; } + private IEnumerable EndCinematic(TransitionCinematic cinematic) + { + while (cinematic.Running) + { + yield return CoroutineStatus.Running; + } + + End(""); + + yield return CoroutineStatus.Success; + } + public void Save(XElement element) { //element.Add(new XAttribute("day", day)); diff --git a/Subsurface/Source/Map/Levels/Level.cs b/Subsurface/Source/Map/Levels/Level.cs index 632c7257f..f9d3fee8a 100644 --- a/Subsurface/Source/Map/Levels/Level.cs +++ b/Subsurface/Source/Map/Levels/Level.cs @@ -87,6 +87,12 @@ namespace Barotrauma private set; } + public Body[] ShaftBodies + { + get; + private set; + } + public Level(string seed, float difficulty, int width, int height, int siteInterval) { this.seed = seed; @@ -333,14 +339,14 @@ namespace Barotrauma } + ShaftBodies = new Body[2]; for (int i = 0; i < 2; i++) { - Body shaftBody = BodyFactory.CreateRectangle(GameMain.World, 100.0f, 10.0f, 5.0f); - shaftBody.BodyType = BodyType.Kinematic; - shaftBody.CollisionCategories = Physics.CollisionLevel; - shaftBody.SetTransform(ConvertUnits.ToSimUnits((i == 0) ? startPosition : endPosition), 0.0f); - shaftBody.SleepingAllowed = false; - bodies.Add(shaftBody); + ShaftBodies[i] = BodyFactory.CreateRectangle(GameMain.World, 100.0f, 10.0f, 5.0f); + ShaftBodies[i].BodyType = BodyType.Static; + ShaftBodies[i].CollisionCategories = Physics.CollisionLevel; + ShaftBodies[i].SetTransform(ConvertUnits.ToSimUnits((i == 0) ? startPosition : endPosition), 0.0f); + bodies.Add(ShaftBodies[i]); } foreach (VoronoiCell cell in cells) diff --git a/Subsurface/Source/Map/Levels/LevelRenderer.cs b/Subsurface/Source/Map/Levels/LevelRenderer.cs index d74c6c64f..2b0105859 100644 --- a/Subsurface/Source/Map/Levels/LevelRenderer.cs +++ b/Subsurface/Source/Map/Levels/LevelRenderer.cs @@ -175,13 +175,11 @@ namespace Barotrauma basicEffect.TextureEnabled = false; basicEffect.CurrentTechnique = basicEffect.Techniques["BasicEffect_VertexColor"]; basicEffect.CurrentTechnique.Passes[0].Apply(); - - + graphicsDevice.DrawPrimitives(PrimitiveType.TriangleList, 0, (int)Math.Floor(bodyVertices.VertexCount / 3.0f)); for (int side = 0; side < 2; side++) { - for (int i = 0; i < 2; i++) { graphicsDevice.SetVertexBuffer(level.WrappingWalls[side, i].BodyVertices); @@ -189,7 +187,6 @@ namespace Barotrauma graphicsDevice.DrawPrimitives( PrimitiveType.TriangleList, 0, (int)Math.Floor(level.WrappingWalls[side, i].BodyVertices.VertexCount / 3.0f)); - } } diff --git a/Subsurface/Source/Map/WaterRenderer.cs b/Subsurface/Source/Map/Levels/WaterRenderer.cs similarity index 100% rename from Subsurface/Source/Map/WaterRenderer.cs rename to Subsurface/Source/Map/Levels/WaterRenderer.cs diff --git a/Subsurface/Source/Map/Location.cs b/Subsurface/Source/Map/Map/Location.cs similarity index 100% rename from Subsurface/Source/Map/Location.cs rename to Subsurface/Source/Map/Map/Location.cs diff --git a/Subsurface/Source/Map/LocationType.cs b/Subsurface/Source/Map/Map/LocationType.cs similarity index 100% rename from Subsurface/Source/Map/LocationType.cs rename to Subsurface/Source/Map/Map/LocationType.cs diff --git a/Subsurface/Source/Map/Map.cs b/Subsurface/Source/Map/Map/Map.cs similarity index 100% rename from Subsurface/Source/Map/Map.cs rename to Subsurface/Source/Map/Map/Map.cs diff --git a/Subsurface/Source/Map/TransitionCinematic.cs b/Subsurface/Source/Map/TransitionCinematic.cs new file mode 100644 index 000000000..acd4cd5b9 --- /dev/null +++ b/Subsurface/Source/Map/TransitionCinematic.cs @@ -0,0 +1,73 @@ +using FarseerPhysics; +using Microsoft.Xna.Framework; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace Barotrauma +{ + class TransitionCinematic + { + public bool Running + { + get; + private set; + } + + public TransitionCinematic(Submarine submarine, Camera cam) + { + Vector2 targetPos = submarine.Position; + + if (submarine.AtEndPosition) + { + targetPos = Level.Loaded.EndPosition + Vector2.UnitY * 500.0f; + } + else if (submarine.AtStartPosition) + { + targetPos = Level.Loaded.StartPosition + Vector2.UnitY * 500.0f; + } + + Running = true; + CoroutineManager.StartCoroutine(UpdateTransitionCinematic(submarine, cam, targetPos)); + } + + private IEnumerable UpdateTransitionCinematic(Submarine sub, Camera cam, Vector2 targetPos) + { + Character.Controlled = null; + GameMain.LightManager.LosEnabled = false; + + Vector2 diff = targetPos - sub.Position; + float targetSpeed = 10.0f; + + Level.Loaded.ShaftBodies[0].Enabled = false; + Level.Loaded.ShaftBodies[1].Enabled = false; + + cam.TargetPos = Vector2.Zero; + float duration = 5.0f; + float timer = 0.0f; + + while (timer < duration) + { + Vector2 cameraPos = sub.Position; + cameraPos.Y = ConvertUnits.ToDisplayUnits(Level.Loaded.ShaftBodies[0].Position.Y) - cam.WorldView.Height/2.0f; + + GUI.ScreenOverlayColor = Color.Lerp(Color.TransparentBlack, Color.Black, timer/duration); + + cam.Translate((cameraPos - cam.Position) * CoroutineManager.DeltaTime); + + cam.Zoom = Math.Max(0.2f, cam.Zoom - CoroutineManager.DeltaTime * 0.1f); + sub.ApplyForce((Vector2.Normalize(diff) * targetSpeed - sub.Velocity) * 500.0f); + + timer -= CoroutineManager.DeltaTime; + + yield return CoroutineStatus.Running; + } + + Running = false; + + yield return CoroutineStatus.Success; + } + } +} diff --git a/Subsurface/Source/Physics/Physics.cs b/Subsurface/Source/Physics/Physics.cs index 90e44be4e..2196f0d79 100644 --- a/Subsurface/Source/Physics/Physics.cs +++ b/Subsurface/Source/Physics/Physics.cs @@ -19,7 +19,7 @@ namespace Barotrauma public const Category CollisionLevel = Category.Cat7; public static double accumulator; - public static double step = 1.0f/60.0f; + public static double step = 1.0/60.0; public const float DisplayToSimRation = 100.0f; diff --git a/Subsurface/Source/Screens/LobbyScreen.cs b/Subsurface/Source/Screens/LobbyScreen.cs index 30c984d72..1e0d3d971 100644 --- a/Subsurface/Source/Screens/LobbyScreen.cs +++ b/Subsurface/Source/Screens/LobbyScreen.cs @@ -153,6 +153,8 @@ namespace Barotrauma { base.Select(); + GUI.ScreenOverlayColor = Color.Transparent; + gameMode = GameMain.GameSession.gameMode as SinglePlayerMode; foreach (GUIComponent component in topPanel.children) @@ -163,8 +165,6 @@ namespace Barotrauma button.Enabled = GameMain.GameSession.Map.CurrentLocation.Type.HasHireableCharacters; break; } - //hireButton.Enabled = location.Type.HasHireableCharacters; - UpdateCharacterLists(); } @@ -201,11 +201,7 @@ namespace Barotrauma c.Salary.ToString(), null, null, Alignment.TopRight, GUI.Style, frame); - } - } - else - { - //(topPanel.FindChild(PanelTab.CurrentLocation) as GUIButton).Enabled = false; + } } } diff --git a/Subsurface/Source/Screens/NetLobbyScreen.cs b/Subsurface/Source/Screens/NetLobbyScreen.cs index 0f3b75914..e56595e34 100644 --- a/Subsurface/Source/Screens/NetLobbyScreen.cs +++ b/Subsurface/Source/Screens/NetLobbyScreen.cs @@ -282,8 +282,8 @@ namespace Barotrauma public override void Select() { GameMain.LightManager.LosEnabled = false; - - //infoFrame.ClearChildren(); + + GUI.ScreenOverlayColor = Color.Transparent; textBox.Select(); @@ -297,8 +297,7 @@ namespace Barotrauma serverMessage.Enabled = GameMain.Server != null; autoRestartBox.Enabled = GameMain.Server != null; ServerName = (GameMain.Server==null) ? "Server" : GameMain.Server.Name; - - + infoFrame.RemoveChild(infoFrame.children.Find(c => c.UserData as string == "startButton")); infoFrame.RemoveChild(infoFrame.children.Find(c => c.UserData as string == "settingsButton")); infoFrame.RemoveChild(infoFrame.children.Find(c => c.UserData as string == "spectateButton")); diff --git a/Subsurface/Source/Sprite.cs b/Subsurface/Source/Sprite.cs index d36dec81d..1d520df66 100644 --- a/Subsurface/Source/Sprite.cs +++ b/Subsurface/Source/Sprite.cs @@ -197,13 +197,13 @@ namespace Barotrauma public void Draw(SpriteBatch spriteBatch, Vector2 pos, Color color, Vector2 origin, float rotate, Vector2 scale, SpriteEffects spriteEffect = SpriteEffects.None, float? depth = null) { - //for (int x = -1; x < 3; x+=2 ) + //for (int x = -1; x < 3; x += 2) //{ - // for (int y = -1; y < 3; y+=2 ) + // for (int y = -1; y < 3; y += 2) // { - // spriteBatch.Draw(texture, pos + offset + new Vector2(x, y)*1.0f, sourceRect, Color.Black, rotation + rotate, origin, scale, spriteEffect, (depth == null ? this.depth : (float)depth)+0.0001f); - // } + // spriteBatch.Draw(texture, pos + offset + new Vector2(x, y) * 1.0f, sourceRect, Color.Black, rotation + rotate, origin, scale, spriteEffect, (depth == null ? this.depth : (float)depth) + 0.0001f); + // } //} spriteBatch.Draw(texture, pos + offset, sourceRect, color, rotation + rotate, origin, scale, spriteEffect, depth == null ? this.depth : (float)depth);