From d8149ffaa237dc5d369de6f14f29d72de848cd6d Mon Sep 17 00:00:00 2001 From: Regalis Date: Wed, 27 Jan 2016 22:58:30 +0200 Subject: [PATCH] aesrvw --- Subsurface/Source/Map/Hull.cs | 11 ++++------- Subsurface/Source/Screens/EditMapScreen.cs | 16 +++++++++------- Subsurface_Solution.v12.suo | Bin 928768 -> 928768 bytes 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Subsurface/Source/Map/Hull.cs b/Subsurface/Source/Map/Hull.cs index e1b02a814..2ebdbca9e 100644 --- a/Subsurface/Source/Map/Hull.cs +++ b/Subsurface/Source/Map/Hull.cs @@ -278,9 +278,6 @@ namespace Barotrauma { Oxygen -= OxygenDetoriationSpeed * deltaTime; - - surface = MathHelper.Lerp(surface, GetSurfaceY(), deltaTime * 10.0f); - if (EditWater) { Vector2 position = cam.ScreenToWorld(PlayerInput.MousePosition); @@ -447,13 +444,13 @@ namespace Barotrauma { if (renderer.PositionInBuffer > renderer.vertices.Length - 6) return; - ////calculate where the surface should be based on the water volume + //calculate where the surface should be based on the water volume float top = rect.Y+Submarine.DrawPosition.Y; float bottom = top - rect.Height; - //float surfaceY = bottom + Volume / rect.Width; + float surfaceY = bottom + Volume / rect.Width; - ////interpolate the position of the rendered surface towards the "target surface" - //surface = surface + ((surfaceY - Submarine.DrawPosition.Y) - surface) / 10.0f; + //interpolate the position of the rendered surface towards the "target surface" + surface = surface + ((surfaceY - Submarine.DrawPosition.Y) - surface) / 10.0f; float drawSurface = surface + Submarine.DrawPosition.Y; Matrix transform = cam.Transform * Matrix.CreateOrthographic(GameMain.GraphicsWidth, GameMain.GraphicsHeight, -1, 1) * 0.5f; diff --git a/Subsurface/Source/Screens/EditMapScreen.cs b/Subsurface/Source/Screens/EditMapScreen.cs index cd1212b51..b43963d04 100644 --- a/Subsurface/Source/Screens/EditMapScreen.cs +++ b/Subsurface/Source/Screens/EditMapScreen.cs @@ -485,15 +485,17 @@ namespace Barotrauma if (dummyCharacter.SelectedConstruction != null) { - if (dummyCharacter.SelectedConstruction == dummyCharacter.ClosestItem) - { + //if (dummyCharacter.SelectedConstruction == dummyCharacter.ClosestItem) + //{ dummyCharacter.SelectedConstruction.DrawHUD(spriteBatch, dummyCharacter); - } - else - { - dummyCharacter.SelectedConstruction = null; - } + //} + //else + //{ + // dummyCharacter.SelectedConstruction = null; + //} + + if (PlayerInput.KeyHit(InputType.Select) && dummyCharacter.ClosestItem != dummyCharacter.SelectedConstruction) dummyCharacter.SelectedConstruction = null; } } diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo index ae415765edc9f100331162c7c367458c9b31d6f3..06bf73b6b9f8b20d28e466b688f7ddd20c5c3f1f 100644 GIT binary patch delta 3426 zcmd6qdvMg%70377dv`axNni;ip%9j3vq2sbLqH%S$i{Sd%|ap|1|8lV{^1|pna`Ya z&pqed$M62m?{4t;kl^tl<$3Wl$YQw@lz`Wk6{ONFHKnJ?8qD0dIlHbeEBi;PnJB=WelCq|`Gs8RIiB8MvD z>_pLx{qt;H^x(VbbiDRfQ48^j3-%Fu#9Vr7K&Wz>;td@skBcUXTnF8TiBAFi=Nyq3 ziY9gBbFg#cF_Fm++$5d|KQ2AmQ%zAB&R310#@(6x&wMq`VYwSYvwsj+G+9+~WoJ^_ zx1E}k!vQgbn6m;Rl~!^=KwQ_Z9BZux{eWF?Bp|%>FWwsv-Dv=S7!dcmUcmm9q4xmf zP?LSeSdpR5U$}6AS3rxaL|*`XFkIlHW5w0HZk*_(J2lan-5J%s!C+JaUXvgiIQl#sPvM%2{L*xa1`k)w|_Ao+nK>%z;q7p#gO?V<~5xB~9-*66tHDEq4xhFu51i$p$CH?r^J&oX=g6|nC`Y4m|;^}jKfBJ3`e0Z!#uRkC* zh@an$j7z&=u}r{BpT#mJU|CtvyFfNzkQC@|gAHak%s~IOTgk48@a<%P-^Ewqse{7b zuP-b=wQkv*2G4_;fDv;DxZsxwxgNG1kTsA^U^wh8 zWU*daeN`)^WOak-IJ)8?&7PctJ`GF(#o%^u4f+N{nw36^bPlxlFrA|0-p14c&EDva z1y1N&A;*LLAOWN!M% z5aWYA3Vk19AB5fjT|o9n+vMk+rzpj`2G;TX_fwQg#hjf)nS96|GfF@Bjd(PcYn2?t zE!W06**{knxVkRget(m{#5!#J{kId&qq}c*GaF5&`&%ypC^#PN* zSjI%Y5`z3pM^pxX{H(*JvmcR-j+DOG2vcs&)_h-Xjs7#`w${&~8p~%s;+@7=W zE47sQs}$RH7|(nH76DT)+ZJ1M!p!d%6k86}(JWq@X6vW>mCGaXG?S^n7{%M>3ZJWG z*THKR+H%ZUODGm$N7IO zT{ZVa$>;kw>%wBS6gPt^v+1?6xjoJ0(pTgt4xX{L(>GVEEfnr$61^&;_WH2uPVNu7 z&3k7|<`Y|AFSNc?&$bxnK$=iz@8pH$hs$1f^6 zU2pu=3l2YbiuzuuFeA0kshX{q-qAUDM`;C@>bM7ab=cw7D-+b64laDamdK;iP&%?o z)J$^eH>MZwT9o(A$+FkZ%sFCT#H9=3lDX_TIWXc@?r?i^#%_>4Qn$8!gj|#(b0rmA zdDd}zQ4vkqH^2JLiUi-VR;6%szCBg@{i-3pzFPVOH=MR6u>VslE@F9VhdnY$ii&gI zP2O9SO?zjeOhu-v&bW1A*l}tNImmpp?r%GGTu}^eO_v6;7*F<1Rcjn%&a%0dU8#TP zrm8ri=}e==aP4298j{1u;(Q#vE+&Bw&9^1#z&1IXT&Hv1bXBCg-)$Z-CVXGki{El~ zp-AMDH8Lf#0#~AiU)y_e`FpWGzJ8O#rpMQ-YGQwq?8Z}V&VlUSWR24Wj*aFSf> zdfwM{@~Z09%Z@Fczxc?=0a>~xN#;^ygHr5%Q#zJa+Cq856#GjlhF{JRzu|!`a;$mR zhwFwG>8D6LCBm~LmS3e%PCu3+vQ62-U#W6kK2*h!m?XGxkLb9pasv0?Ee0(Q*qqwG zLp2aD+#2h@q=s&MGKr&;tV(y;samb|dsH5|x`n(8cdgq~`MQ48z0I4pnWs&mPF%EC zl|^1vG4&r`yzVtA{KXimR*<;k@;J1FOY`LeT)EEK<+1X^3Rr;+*g*_%04InAak~6) I{2wR(2mDCi^#A|> delta 3731 zcmc(i3viUx7035J_RH=jfz4x+$RpWoHb@%500F}A+Q=)xn1qMH0zn5*KtdTHS_qG9 zq%1QQB+1GiN*xIi7N~$Efm}vt2ShFE!a$TZW7C*wpjgnNQd)VX{~Ik6+e(>EXSy@L zIp>~x&Ueqb-}jyGuD3bM+niNd7}=khOizI?O(xUYs^S#ZyRPCAGZ)TD$@MfW;S+dN z2Y%U@wSjyv#s7|cFRBeOW^OVqgk>(6?%!$twfT(mstz-zarQlK4LhxirFkx*7gOB` z7T=K3tzC2(ug!>78PV)YxZjy8mHPrqVpgV87>dQ{_!#c+x5dR!=^xo%zw;}2IN8lX z{+d~`!9A;mH5M_a-Cy%4?1`*}QMQBkCeI3^hZ;JcU5ZpLyKH6jaYxvAHGVn!5P|dI z`mA>KzAD_xy`QxRX9em>M}}*_1n?EcyTS9|7E&Q+9*Hb@6_ERSaxS-a^G<6#>J8IOeg zo5Ui&H_fG72U%;p-`mqgu0+vC4usF0O;@FfVgsYvd>*S}PqWMM_GnBm0%NgE=f>Et z^Mvx*uq?oZ`+_(1|1#+RU0!P7l_`C)A8Yls2 z;0$bb_~~oCjqzcO>mVax8x2~SiFR3Jvb6?A?KG0kT4Ybh^B4{VI?Hv4vBLK}u^T)- zZ6JnG7$$;nxY!_Hg`5oD1BChh;1Xq9WzR`on9gCi8J`zSDOWXb9U6=iyfMUg z@PtFyl?$K)JF_46ZX@*09XwjeGmWjVj^K2ylJ}95F+zkweluk7k<}H)ww@iJC)A-|Jtc^Mm|*ceVt0r-+QOBiPrEyt=w)OTsXKm zBds{*Bd4u0>1N{Vs;*WRus~nt^gEBBy(fqkbK@-T=VZMr>oC;i_118 z^d2^!D$2P-t$0_gXT(#DJeBvfI2alDm2lIsOXgnWv54aCkvsRwm07P%o1Q!+DQetC z|Jfmqsv67YO>%&`ZV?6xmI+HBo#CTC1b4jgCqmkk%n>&kZBI4&seYB>{Yc%?l87^fmS{S&+K5wm0lAFX*Z<;|qt?4-#cin` zbLF*d7aynWCEP*nBzpy()l1hSki0`V)TuaSR2N{mH$`h0c@y<vPlo)$J@WrjmJ zKF9afz9rfES=r^k^m}>6C-*OXZ`|ip_h(T+$ydzC`9txW7$rioH&;#xW}ZU_mUFkgsNOs8!H9FFFAmLYrle#C-_GO@8yZejcyqa`PK zOjXU4;8e~jd%NsSZL7mll*c2FMUr>5L|J8W8?$yEMV5B0JG|6_GZfwg{3v;cC0FGX z%EQ=v1d+R*ZS$Xq#V4y?f3g-Ja9P)2Ds9kb%;{3Or_0-Ba;=ivt(`B1KHuH>vZ<@9 zWCUYth#lwobS4y@p~`2=ig@+}Wls`00hf_r|8zy*hdGPO2F~3R(Xli0EvH&?Kx{%? z&lnEMO~u18td}fdc5{9G?>x7D`f>aF?Ny;`y}eYiCL*3T>=T)6HnChjT6xyUWATk4 zk;D?;UR*W&cIti4O&hWFZ+|*lovmxsH&Fjfb{cs~oCt1_Jh&gcB#ppHDM>cU4Xj;N zU6)~u=kYrmyF<#xQIc`R8YMA4^Uh45L_c49acE}C2}k1`@?JJ~Q`6oMdsy&*H2fZ4 zU#k2h+)bl)Sq(LLtK84X^NGmXoNri^=de7+bOQcK8{??0$ShTlqw<28-bgfJDYji^ z(3@Ye0qU7{nU7O`1}d=YJN1uKe)uJcbCNzlnM|tVgk%;6M+4Cn3P{~d%)lT=vq(v^ ze>)Wg84Y4UEO3B05DyYSUpl^8jAj{HB$W?sK(AUj}EC7XusoXRP%49GFOa+gEA}|d+ z26VtVEcWoXi}Z(l1UvxS6PQnfz7hHy=ubjE37HJrJjnTA0hkT@LdX)J51N;-p#$L4 z(c#gxb#yGn#4=C{o&nE-AA{v!1t{SmRFu+z9#8wGW(hgUsIT`$>M9W`kHLMrf^?VM6fAx`riTB Cxg_iW