From 970201520ec8c084e49f2a35d8510f8beab49f22 Mon Sep 17 00:00:00 2001 From: tleety Date: Mon, 19 Oct 2015 16:32:14 +0200 Subject: [PATCH] Fixed so oilshooter shoots the new particle --- assets/Textures/Particles/OilShot.png | Bin 6812 -> 7611 bytes assets/Textures/Particles/OilShot.psd | Bin 74862 -> 78783 bytes include/Game/ProjectileSystem.h | 1 + src/game/Game/LevelSystem.cpp | 2 +- src/game/Game/ProjectileSystem.cpp | 10 ++++++---- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/assets/Textures/Particles/OilShot.png b/assets/Textures/Particles/OilShot.png index 618716d2de8f83cf53b779455c77f620833db603..7b755be91d203e6424ebab34fc25d3fb5661e435 100755 GIT binary patch delta 4802 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 delta 4017 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 y?f;+St*#E>B(0U?1g!;6CnV#KY3 ztGfN}yRTp0P~<&R?6sGDs@^x;QRZ5ZGha`PCb_yfyNX`2S)Gz|nM=MKXGIF9yHPTh*0ykknW|pyLZN@$dHp|xQ zD3qN%Md4AFi_Hu5+>eZ1vaW`^o;7?Eu8cfkmzdce=2EB^4z)dTtvsv#%dNXN#yezM z%-uF*mN<8bM%aQrY~S-d-gx9*W`(bxzg^mu%@aHiMb{iniK!DxYMKq6zD<@Cc9++V zt37Dj-(%d@YooN9=<-{hHERk^tABa6Gg8d&NY8&i?9xBdM>%ipcwDJjd6|MX;;e2e z1+(N6KL%g~hWcE5Shw@Xs_KL|clQwM$y2k>U5ijT2o%%?p*H5hh1_X(*GGRh!O_bt zVZPVMl#vNuV;1C5u<~4av`~M)CO5BXM#_wXqvi%p{_|jmGC$q-Wi`{w)VF5bKCcLO z|2bPV`u4G3ONu7F`0nM4@^K;Uj>)Mn=Ijs4Ik%$BHaLsinK5VH$6n|-;o}6ak^3po z`%TLeyd1<+O9u;&FE)D%KD7hmysC0vS=%_L9w_qI{|N=Zl#Dfvb=uAHfj62D_P3)9OgD#u&!{zEf^;)>vrivFoKpeX^z;1; z{v;0u8>9ku+YLX!hE+)bd(L2=M|G;Pek+KP=ccqH`C?trBQeB(E1%V?>ipO9g+vRn z&fi}3O@Lg%RuV^vyVlNJW{%F5V`rO)1tUrUWFt@pQ1jeS?9gMRCiCniK0`CQc zvLpCqh5h$FdWoz3CiF6178)28Z0{nPuU_arGki73H=!neKHLy#AG9uJ&A+qR;r72{ z>^iX#(P5~bEbb2R?2KJFZettA%=8D*0M9`_ zTSKQBpcagbc6A7pIvU_5kU`hmDJ(O{^hm z0UCk0wV|ie6I-AO1Y%sIr=)VG4kz$6ibX30f3k zcN-;_fO|Jz5C`{WaEqs9zxFK7|Bt-zFdMhT$<0w7zoC$|1 z_2t3^+GN56SuxG5VPiE7;NzP%OEwan!=-0zq%nMGoxq1;!Uov!lzlrr1&z4AAaIpN z>dq!ssaO9GE+KU188i|;pZ;??38p-gx-FmHl}*=^;RuZ0Wm+9Opj4=P|*VN>DMJ^Eogu!4yMq*QP|!BMvC}Hk~CZk6#&~$(Bl;1 z@Bwa<(=Ne$EtCVqrP3q{+YpYw*(O1v7Rs=8{6v!}96;z+EEpv6Xi7c&25=yarcjb2 zZv`^5yj3Ewv4D=Z_i&5|s8 z=I0a_~cw$yKO*61EjcUa=y&a6!ASI559K?`@x^^0j)|O{b zfV<-mPYLmD63LKr=$u3Gzru7$NChuR;pR?D}KTUNiJDxs~xU)loz12+7?F`Mv8m>erTt+&DQDUq=ix>)8 zL19uYNxxLVU4R14l2CIpDz4=$iL-dr^Oht{f6n4L^KS+DI!QXFVW$2Zc_R8=l9qDh z$q|NKo+AC$hamwRIkRpBS)O#bk{Mcag7=&3hUCpjUrrQAimLi?qF@B?;Ii}zxC49{ zk3*!;3g$ui)&r>=!$GHmL8y^OI2gz^oLcd{^s91aGLD1y@t|YNbE|rjLK86{%2Hh1 flHHS{Jt^9gq7-^kw5N*pRMDO)`rlO1-GlxKDoza+ delta 2463 zcmeH{ZBSHY6vxlATsB?|CNW?sVABOcAq8h8D4-!3XDKj2oj_odX$@jfD8Xt5S4N{W z27>F5GtRWy^5Wvc?s9n%KTzsSIx#^l;DUe)S{NaGKo)R`J>C1DP1Eh z|9S46IrDt~fSJ9;d@Xg$aJ-tJNM?cn*x3SK7e)sB6D2hz*$L|)&$0VNa$)Dri*$s2 z?EDg^Vk$(O)}=)LtP6FD1Ou#RUyk#axRR$2&|Emp@fBQ7+>~dK2Mw+hf^O;ji}35h z>LTMn!gzFxU8gHFd?R6~lG^@TU??niZR95%fvx+~7TlRmy zYU%3vs!qpPc8(%ArEV^j4c}u`KN$SOdcQNKCuUO2RJ|4GJNo*u(Z$FY~}iy=HYvv?CyEDE;iA zcXA%)ONw_c6d(59?qE~XY#Wp0LnB)XDk3c>CN&#np|W~ejUtrqE=p3fPHCIe!^KfzgV7P-#751=F8j7**ysoR+;%Cr#j+KT*}`C`1~O*a(`y-C(dzKAAjJ< z8kAD@y#x=oE3b_WQJ$pHXwIN4S}jNy3b@3BP7KWyvdOA9xV&8d)$Hk~cCITgYBhB6 zNr>Sj`JEza>ZGRU5ASxOvX@F-(UTtcctZd;_0i5!nm%v2~zX1J6Atv`_JAb zQcuDJkj+C{)FA2b_#ODk^XRC<3rNl}zkwA9bFLmQB9z~QF@W+0{0^aX0!9H!8&QjJ zY8*xYPF=z}gjy@y0jSksJra|XAc&Kx2^)}%dftU$zO&^rHX>Py9D^Ysp>ujvHzMSZ zf(1aS$4dzM5x5PYYepTC=?#J)8>U-$1qbfHAV5Y7HX*rA1VPAk171e55-|(|K(?(I zc?Ata&=1gHL_Lz_5J8aOWfQMJX8|+cn{p)O2$LF{5pLXuUjc5k3aq4@-HI(p=3E6q zT<17mLERwy0-&XwLOGd31Cj+-K@iu4HeNy30Q3P|p6xx zZr>~%`tM>tnvl? #include diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp index b602417..9a493fb 100755 --- a/src/game/Game/LevelSystem.cpp +++ b/src/game/Game/LevelSystem.cpp @@ -1011,7 +1011,7 @@ void dd::Systems::LevelSystem::GetNextLevel() 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 2, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, + 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0}; color = {w, w, w, w, w, w, w, diff --git a/src/game/Game/ProjectileSystem.cpp b/src/game/Game/ProjectileSystem.cpp index 7e73f86..81cd5e6 100644 --- a/src/game/Game/ProjectileSystem.cpp +++ b/src/game/Game/ProjectileSystem.cpp @@ -31,9 +31,11 @@ void dd::Systems::ProjectileSystem::Initialize() physics->Mask = static_cast(CollisionLayer::Type::Pad | CollisionLayer::Type::Brick | CollisionLayer::Type::Wall); physics->Calculate = true; ctransform->Position = glm::vec3(0.f, 0.f, -10.f); - ctransform->Scale = glm::vec3(0.1f, 0.1f, 0.1f); - auto cModel = m_World->AddComponent(ent); - cModel->ModelFile = "Models/Test/Ball/Sid.obj"; + ctransform->Scale = glm::vec3(0.6f, 0.6f, 0.6f); +// auto cModel = m_World->AddComponent(ent); +// cModel->ModelFile = "Models/Test/Ball/Sid.obj"; + auto cSprite = m_World->AddComponent(ent); + cSprite->SpriteFile = "Textures/Particles/OilShot.png"; auto projectile = m_World->AddComponent(ent); m_World->CommitEntity(ent); @@ -117,7 +119,7 @@ bool dd::Systems::ProjectileSystem::OnActionButton(const dd::Events::ActionButto m_World->RemoveComponent(ent); auto transform = m_World->GetComponent(ent); transform->Position = event.Position; - transform->Velocity = glm::vec3(0, 5, 0); + transform->Velocity = glm::vec3(0, 7, 0); m_Shots--; if (m_Shots <= 0) { auto ball = m_World->GetComponent(m_AttachedSquid);