From c8178866725bf18d2256f2d31281b90ec89a8602 Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Mon, 12 Jul 2021 21:57:53 +0530 Subject: [PATCH] collision is bugged --- marblegame.hl | Bin 1788674 -> 1789111 bytes src/Settings.hx | 2 +- src/Util.hx | 4 ++-- src/collision/CollisionEntity.hx | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/marblegame.hl b/marblegame.hl index 71e5b113fc12a1d7c1c00602c053ad4757f14c4d..4cf37c629106b463cc70bb2693c75eaafb981171 100644 GIT binary patch delta 4302 zcmb7{OKcn06^8F)I5U@zp`IjXNL%kqN|r1;k|m0Xsh7ji!?I-A5*0ltk+Kp?ij6ct z)9i+xC~|BE0T)ID18osxnV><6xbW891YNYLlcr5tbP*IN5M@e|506Ag2y)Ey(|{c%zTt>I>@4pRgGD+ zHpca!kHzYBB^ni)u~f8v*Os_YTSWIX?(;KSV(wN>@1CpxQAmWT<290-7lW7tc}~pd=82fkFr@vL zYJx{oz|TIKq81Xw6i)1L3K7GGr5g1j@oD zm9Fc>>t-E~)*(~lF%2zc&i_BgjKR!4wU4^!ZvhY>Iq%ypBqhG!zek&FS=z0u6u(u;0TJSo1Ifrh@qp z)Mmiup`nc8G64>Fm;#5ZJl~Io&g7LLlo`mY8T9m^m1j?*XVQ89Gmg#uPud*$!8V`u z*nBoMoK209z0s5KyZDUupmQ9mSn#c_EsW4)blT&=k#C$p|v8kzP#bpAldKdv?U~8IBL-P5sk4;aXSD*lx z05cCGU?P~GhuoR4%+8;mQCud#{wk9Tl+8{~vbm`#Wp;Ls%}q~>om?aXvll6u!)SIc zBau0(U%b6B>z|vuXhCFtg3V3N=9M{iacVZNUS#vrvw1cz`yI0;gjvTf-}#T++n=3~ z1LkGEa2cOmD8FyY{F02!1-`t1)JvC^`Lc}p$^urGmsj|TO!(>oQCC)0`KnC$+5%Nq zSJ&9urAw@^ysWIP6wFzLZa~NN z^$orO9gEO$W24AR6NnYpN_=wyvr=JGDHeq$thDZEQo;kJqGc}f;v(XuMM#E((jw-Y ziC~i_HM#U0XR-*dm?Tw-zzJ`F)rc^2>7m?Ensz76*MF-HN z6wlwf)VZjcd0x!JxxHwpSYn_tXbf5gO}JI+B>?bi@)W+H>0-%n3*b$0RM7vppw#cl z?-%)+o1gXMXFd5@PkvV96M6+@Fuj5suUz4lV~TLFYKm~t>xppE<$*}?1d0^rw{+>& zXIsfFyqMfV3#ldF{B!0KFD;?G0?setyt>JsUm|(-Jbz({=KU`?_vkrskCI#DIerx$ z@HRZ)t5>(VwGB^r2cGcu_72~HC%g+!cxPvq?OwggUfkYRc6VQ7FYfG!UEjUEv76jt zyQynRa!b0#cROKMcVSnPTYj<2$t~Y5>e|BHOuRNxdq?KosX$onRBi~8js#2u2%qo^k3KIr<7Bxr z0z}*4AZM6%$bC{cM<=Soh<F+OJzb=1` zQQez$xcTl^;ubc&N>D4@E(rzqb8rX6w>XiKP;Nha@NH49ot%&mZb}nzha5TbSWY-{ z32L+1uI`=O{#0%shCO!@Cmu=Aw&}kJx;4W=Q2gb=47_s+<$IOimVaLPWBC`AN9AAM z`Dgjvn{SujgY`k>Vfn+#r{!N)J}ZAzzEi$m`O}SX`J)@x%lB{mq4K%iT=}!zS^0~7 z;!V>Yt9)Vqtn#J(e&sX!SCzloA5=cIzbN0a|911^k_=0MrNUyc{ICMBg0MocG+1F+ zHLz-7)xoNV)c~szRs>cQR_wvYCH?n%7Fv~GdrGF&KPJ+N-G_8)4rlO$Ls?`)4Q{lBFyp~|oq#hi@K5R-{ zmcUz|T#poA#D`T8ViI_(vHFLhDz|e4V|gM4(gLs0(RsaBXS4wH+mfVZnl1-KWP2Nm~TD! U{52zTu(juYG(7lCFg}z0KY%9joB#j- delta 3836 zcmb7`No*VE70172I2*~KHV#FJGDVsCNL#YCQL;o!q^yM_Yq2b98Ho}p(bnP^2;d$P z6h(lM7(t4qv|ukLax-!&&`W?Oa1K2@+r?UMHg}L zOZ484?q9!K_-Sctk&l*szR3T@ASx$$ovNr-dzr5a^{GB$=8-C-3YLcZd@3>XNEL>< zTC=6vrs+i3Wf^(W)cgA2!B3K zSyMfp2{#3=oe!(QWb1jJg(G{ztUBVv&Ct}!F0?wd3oLp8bu~u|A%nHFQmy4ojWtIJ z4&gY*E?&Smsw&au=yd2}lto)mEEFYtO`K;S{3aDx6eT=M^j_z@m*Qu*E1L0&m+&>Tpn+Mp{0mKHu z=Brl++28>Uj!$HM)iV|YF4;k8jVK8g&@!%`k3jgO~T zY7{fg!%3->CRj{>MH?evY%{mHUYKQJ-jqAab2*O0Lx`I zKp>M;ni?OMrc)_lYHC`V)->}ZGo){7hLUNFrl#W@nWp}kqm3zfdU^(g^q4d~KBWuO z(oAYf7iXj!+LSKc;N`McW2RS4H;=#P+dAW8yi>c$=5FH4bGyIPcs9!;ZH_I?A#rxr zSYk^&X8If!mzH#<^MozW5mDEd*)mVr${ZD!msg~f*;y&Gv?Q#oWTcF)Tc^``C9|^o zfTeFDw!$Npfr(JSGB9uz24*s=Y!wEs!NAqkHMRx=voLUNEz5FaNXo9{n6W;FrCerR z$YyhFeT+!C)pAa9xG$GAv^2}65zD2a8VYi0%+}M;kh2lFMZyX;hvBUD=3{#wM5}-~!1t&flMJO)J_w%g)1n+t5HZCqa%O z$B^@o6UYhV@HF!ja@wEGHCXkXw)#$6eW$Iy)2vsl`nX|hh}#OTVOe30qFubzkqdd zo!wd>x^#=(UZA>syZk{~G(Sj@JXvI$@P@bG4R3C4u`PJR+wg|Bwzkq!`s_C z($40lbZ2Wz*x9)w-PztYPyf!*#!e(J?L^-YB6;o&w$loyxC5sc$;(kQ;Ujs+4q|y6 zmCWx=)EtU`7`e=d7H9}v53u-$gQJ1c7aM$wq2i`H0>XhG2;$3Wim$*u0iD5*?XYWy z_v}yl}Y4qP{x7B6iwnFTt7<;n{-sUc2G%9mDA)&<XeAouTGbdD30ECd00<&{J!l@=XJvL4pIWSCZ04xA^9H*cEE6%^;a9&#@;*6~)>N zE}bf;$rBvBhy&liJI1c^|qZ%Bj;!x@!k%K)u32^gQ-w*_^ zvXetN*l&JjtaSJ+ohYZn9C9TR7u)Zq4kl9vJPxj1#(_^c1ZMw$%t0^*njdrMU~+Pj zk4+w=CJ*>vu_SKt>U^sB+4bV@CyP&~j{iD)_&`5=uv&baEk4T?pKt6Q=Zk;X{q^pz z_8NCT-up@MtGzFZf86`J`1Rh4_qDz6ihnAEi!Tbx#pi`g@y~_T;Q#v0<^?dECaM?-#6 z7(g09>FPpELf)S#E+wx7&pk1cy?d<(AH7 z!8mVaS=ci0%9g&@xAauD93#vcEuD-$+1h2_+HKpqI{wfPPSHXPjZz0Ufzgdr=@;Mn zLzpW)`PSbEu2u}C@_unVFC>CAt2kAy|xXTj-*Q*m@ xYtDQ+&cTVqe7a9w`dct}_~NDi(TkT2=@vXv`s}R+uXU)nU{dX)yGr9s;$IsNunqtK diff --git a/src/Settings.hx b/src/Settings.hx index 302c1d7c..dc3c207b 100644 --- a/src/Settings.hx +++ b/src/Settings.hx @@ -80,7 +80,7 @@ class Settings { invertYAxis: false }; - public static var progression = [24, 24, 52]; + public static var progression = [0, 0, 0]; public static var highscoreName = ""; public static function applySettings() { diff --git a/src/Util.hx b/src/Util.hx index 22bd4637..2c2ad2e5 100644 --- a/src/Util.hx +++ b/src/Util.hx @@ -38,8 +38,8 @@ class Util { } public static function rotateImage(bitmap:BitmapData, angle:Float) { - var curpixels = bitmap.getPixels().clone(); bitmap.lock(); + var curpixels = bitmap.getPixels().clone(); if (angle == Math.PI / 2) for (x in 0...curpixels.width) { for (y in 0...curpixels.height) { @@ -62,8 +62,8 @@ class Util { } public static function flipImage(bitmap:BitmapData, hflip:Bool, vflip:Bool) { - var curpixels = bitmap.getPixels().clone(); bitmap.lock(); + var curpixels = bitmap.getPixels().clone(); if (hflip) for (x in 0...curpixels.width) { for (y in 0...curpixels.height) { diff --git a/src/collision/CollisionEntity.hx b/src/collision/CollisionEntity.hx index 8b0d206a..47b97937 100644 --- a/src/collision/CollisionEntity.hx +++ b/src/collision/CollisionEntity.hx @@ -92,8 +92,11 @@ class CollisionEntity implements IOctreeObject { var invMatrix = transform.clone(); invMatrix.invert(); var sphereBounds = new Bounds(); + var localPos = position.clone(); + localPos.transform(invMatrix); sphereBounds.addSpherePos(position.x, position.y, position.z, radius * 1.1); sphereBounds.transform(invMatrix); + sphereBounds.addSpherePos(localPos.x, localPos.y, localPos.z, radius * 1.1); var surfaces = octree.boundingSearch(sphereBounds); var tform = transform.clone();