From 8f92e7a3372651314bffdc13135e86b7d5679e26 Mon Sep 17 00:00:00 2001 From: Askou Date: Wed, 9 Jun 2021 10:28:28 +0200 Subject: [PATCH] replace stairs by bumper and add assets for it --- assets/map/bumper.png | Bin 2739 -> 26301 bytes sources/Map/Map.cpp | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/map/bumper.png b/assets/map/bumper.png index a86b67f2fdd6f701f1b353ad512b3b3b7386c135..63632844a4d7fbee363388dbf6af8090188d29f7 100644 GIT binary patch literal 26301 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

9yJ72F91@7NU3e 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 Ef=c^C2><{9 literal 2739 zcma);X*3l28^?b$%-FJ|W|XdMqs7!@EDa_Z8Cx=ntXaa4Z5TU=8IzPH$}WsG*HWV_ z$#zjHBF378iW`kBp$1v5`|khl{$G5b=bYy}=X_s0-*cW%>_w7+u%M(M06^HtkZ88s z>Hmr!zFS|Ob?O2D;_IQSd(p$i1%PAsgYM&vd35&Q(#Clb<&W2hJvA(FE|3v)KEAgm z7Kvq4x>YY8dEsLhybm=ZcpAyL?X!Nm|98HwD9G-Tsiu?JTcvM z0GH1)3T>x0H!WpSolkyOoDlcHRc%x)6;NA_^6mf2?0Q3cZ=8xkq}BYxrAv&9dMMZ*P>?Ad+Nh z8FEZ@W%8?!r#y8U9+;i%Ggj zGp6fl&-^C&>sNu*FN2Io&}DpW8RmHE=m}QPsLwm6XM~y;Zws{#=NORftvZqm`YM9+8zttc@XVgvC#b zx{=!7j|?sjyd@xZ-2njrC=mNMCcHpqHy-~rQcZD{oxz za~W^K+|y`@-xF!3M?NGq4V#bY8`y@Z9tB;wG=Its%eD%(@{A;+baE#i{`pqF-*w9J z6W@|CkKV>@744quH+%NuUT?ockhI^0_}>2O*~DUz{9q0^kbdobC-*soUs=n^vCz^t zInE($w5|8?)1Av3&6pXtzr9w*@$crKh=Y zr~#Mu7W=XBkiCFx?q~CsF@3{&ic?>dMtB*@Hg#??rLWih68{~hqwc3?&ANDFgDwBW z@!NJ5n_A}5)#1&Q?xM35c>%=X6Q%6WMs@SnXO`v8P`l8Z*D;fI8u|5WjlG>E`l! zpr&p?ZvY?1pO1sRCXq-2cTZFiU0a^B&a%G|L%v&NWGn0OELa% zi1NAmO_kR$vQ(fxR3=*Pg2>~_)xOTjl94>4eeV7|(z7E)cKV6(nq!Tsy;3FbkJ3tB z_1vA#sNJnA&NIcWdnvT|oHl?uy{ZFrKXYJyp z%33bZ8XYW-8w@&VVd-*&%PHRLKN?!->HOXTQyjNF1#VGb}#8^3ZymVT+&CH;irAbu-oaa z19(0$1dl8~%E9jZVKN16U@F*bwxJN*J4}HTYPKfS0*4r+j7jRaef@>%rdam-XQ?D~ zw|OWa1o@-T!0vvNWGLL1^40m9myld~-U@Hc=};3nT^HC2(X{`Y_9+P^UC5IEI;#dO zx#zF3XURF8dCzsOB9Qn=0KKsN8GG%QsyL|HG^&Uc zK31AMJA-fm0$3k?E$=I3xQ;U<@xHlkxUGw0Cmb9e^;XP#sJD1gX}zu5%L$egpnN97 zG2E1pjt<>mw3ZKlkYJ3RJ-B))$mP5^dBB$bwdYeO7*W|sJFRFyG$=QbwMm2)CMzUA zhkO{L=~-`wzmQ0Z^U=Fv-y38g*$bmS=-t( z?I6~YM?NOXjJBYmBkGJ3JG#;0{g?!MOq!t^x1*F=hW4*85BSjE(Sp$R-Tj6u5aIv^ z?)oNj7z--uTmwwFm(+GRV@OM$LyGWHw*xCPWFI<@_Te3Es+!#1dCiQQkKG`IAt%tqxz(GfQcC-yxFMh`ZdXRYnBDt1A0?y#WhYlWLBsb7?id3w+AQEC9 z+aJ{PMr}1533nEGQM&cHy&CuoQHi{<7_-2oEs*EGe27!vQnEWRk4 z^h(Z2Lb}Ib;-r$2FQ^)A5|qfl*rr^ajo*Dl(QACo=52Rt;`uN#f%B}o+iI7^_<^BE z4y*i0w$*84u@SaWL5`(VZB$@5he#zCBpGP`$xNrTjT=@-DkFJAU;+bAu(gb#FHo!MC!vm!2&lr_x%MEJTEVp`CI0R7 z^-9`E8-@AuZ zKJMTGL{i#r6&`MOGi|9&@R1Z+5q%i4aCUBQYIY$@?rnPcVPNf^d;@{78Z^!n^zn!6 lg35nV!2ibz|GVW$*b=f7upO1vL}c$e03$sTk#+7W;~xMg(OUoj diff --git a/sources/Map/Map.cpp b/sources/Map/Map.cpp index 5e8a9a2e..5bf045a5 100644 --- a/sources/Map/Map.cpp +++ b/sources/Map/Map.cpp @@ -75,7 +75,7 @@ namespace BBM .addComponent(Vector3f((width + 1) / 2, 0, -1)) .addComponent( WAL::Callback(), - &MapGenerator::wallCollide, 0.25, .75) + &MapGenerator::wallCollide, Vector3f(-(width + 1) / 2 , 0.25, 0.25), Vector3f(width + 1, 2, 0.75)) .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj), RAY::Vector3(width + 3, 1, 1)); @@ -83,7 +83,7 @@ namespace BBM .addComponent(Vector3f((width + 1) / 2, 0, height + 1)) .addComponent( WAL::Callback(), - &MapGenerator::wallCollide, 0.25, .75) + &MapGenerator::wallCollide, Vector3f(-(width + 1) / 2 , 0.25, 0.25), Vector3f(width + 1, 2, 0.75)) .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj), RAY::Vector3(width + 3, 1, 1)); @@ -91,7 +91,7 @@ namespace BBM .addComponent(Vector3f(width + 1, 0, height / 2)) .addComponent( WAL::Callback(), - &MapGenerator::wallCollide, 0.25, .75) + &MapGenerator::wallCollide, Vector3f(0.25, 0.25, -(height + 1) / 2 ), Vector3f(0.75, 2, height + 1)) .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj), RAY::Vector3(1, 1, height + 1)); @@ -99,7 +99,7 @@ namespace BBM .addComponent(Vector3f(-1, 0, height / 2)) .addComponent( WAL::Callback(), - &MapGenerator::wallCollide, 0.25, .75) + &MapGenerator::wallCollide, Vector3f(0.25, 0.25, -(height + 1) / 2 ), Vector3f(0.75, 2, height + 1)) .addComponent(unbreakableObj, std::make_pair(MAP_DIFFUSE, unbreakablePnj), RAY::Vector3(1, 1, height + 1)); @@ -273,10 +273,10 @@ namespace BBM map[std::make_tuple(i, 1, 0)] = map[std::make_tuple(i, 0, 0)]; map[std::make_tuple(i, 0, 0)] = UPPERFLOOR; } - map[std::make_tuple(0, 0, height - 1)] = STAIRS; - map[std::make_tuple(0, 0, 1)] = STAIRS; - map[std::make_tuple(width, 0, height - 1)] = STAIRS; - map[std::make_tuple(width, 0, 1)] = STAIRS; + map[std::make_tuple(0, -1, height - 1)] = BUMPER; + map[std::make_tuple(0, -1, 1)] = BUMPER; + map[std::make_tuple(width, -1, height - 1)] = BUMPER; + map[std::make_tuple(width, -1, 1)] = BUMPER; map[std::make_tuple(width / 2, -1, height - 1)] = BUMPER; map[std::make_tuple(width / 2, -1, 1)] = BUMPER; } @@ -289,10 +289,10 @@ namespace BBM map[std::make_tuple(i, 0, j)] = UPPERFLOOR; } } - map[std::make_tuple(width / 2 - width / 8, 0, height / 2 + height / 4 + 1)] = STAIRS; - map[std::make_tuple(width / 2 + width / 8, 0, height / 2 - height / 4 - 1)] = STAIRS; - map[std::make_tuple(width / 2 - width / 4 - 1, 0, height / 2 - height / 8)] = STAIRS; - map[std::make_tuple(width / 2 + width / 4 + 1, 0, height / 2 + height / 8)] = STAIRS; + map[std::make_tuple(width / 2 - width / 8, -1, height / 2 + height / 4 + 1)] = BUMPER; + map[std::make_tuple(width / 2 + width / 8, -1, height / 2 - height / 4 - 1)] = BUMPER; + map[std::make_tuple(width / 2 - width / 4 - 1, -1, height / 2 - height / 8)] = BUMPER; + map[std::make_tuple(width / 2 + width / 4 + 1, -1, height / 2 + height / 8)] = BUMPER; } return map; }