From 606d55999c6d118e4a0d1ba88b4b67ef97c84626 Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sat, 22 Aug 2015 02:23:39 -0400 Subject: [PATCH 1/2] Add the basic movements and jump for the child --- Assets/Prefabs/Child.prefab | Bin 8804 -> 10020 bytes Assets/Prefabs/InputManager.prefab | Bin 4460 -> 4460 bytes Assets/Scenes/PatScene.unity | Bin 17444 -> 17444 bytes Assets/Scripts/Child.cs | 43 ++++++++++++++++++++++++++--- Assets/Scripts/ChildController.cs | 15 ++++++++-- ProjectSettings/TagManager.asset | Bin 4236 -> 4316 bytes 6 files changed, 52 insertions(+), 6 deletions(-) diff --git a/Assets/Prefabs/Child.prefab b/Assets/Prefabs/Child.prefab index beacf7f4de78ee709575c576f2b523739e46f872..dd17061d840b6ad20efc8bd4ee5f1f39fe349135 100644 GIT binary patch delta 1192 zcmYjQTS${(7=HhMS{@dbYw5H#x3mM+Oew60nt2L|way2kuCblkaTr?|f`}|7N)6WwZ9^hRt)KW7FR&=f8fk zBj~_{w^bb&A&RepmIIUmlt-lC!@N7qbBPSU5n>x)2Fd_~S7`?ROQ3R|azK%JRC1dr z?l9bFX`1)>qWYHRKvy)Zi`NV7YxhPpEkJFtP^2ZS`!$mG%GUOfw(CT<=8tZrRy`a$ z6=)1<{*#lD-0PM#gGe>~_Q!TH8%%Z$9sYVPx$(3W+&Mr6_|&7N7TlNHE0rQqlV7e> ziJ9CI#Vsxu*Fb(&%<{eb8e0{-xbb|TL5^=U?iNmq#g06*6X1~xf$Wj1#BNK8jTeP^ zX#rpiu5d*BpcpTymMiwd!W9+*nN@zoYI>k@-bKt)1!}8u^)YDdU(9qCe-;|^7N)cK zK4{D@W*Yq7NKn(Y#&Azhm$+Ga#JZOQ>Rt&+g>(MY9jK1Z;&uNlig#|GYH!uNc{SB$q-GA8n&mf z?EuGrCtVJPaVMsvS04Ih8$YPQblZu}pSf)G!L}av7sP)trNr4~6XK5}ub!8|WAe$2 z&+&XRd0FPilJ#=M6US=t-C-8%9MdMOTR0t->i9PHJbG#SW4?)4&%j_ZOC<5maj+1Z zlm~T1t;;HW6~7c8EL+5^BUcPLj}|37L@yfIN&ci_q{1qGJKNB?*_r(#%QW~>jFhqu Ou2C*LuEiqHW&RJH+VnyI delta 411 zcmZ4D_r%4IfkB>ufk7z+Nbm#M3P75{RL@Y)D9w=J-~a#r899LhAjal~Dz$rY!b)$S zr)^&;-E-LT*_6l1eAx-#G`qe{YfovE1gbOH=-0`l@0pj9TEPI+@;`n3cJ0*_Umi+6 zUiQ@G@x>n2An*RvdDZ{I!!8=fzfsvG0o0?h(a)J_@*!4@%@S;Lgf~0O|~hn zf(b-{!9gI&2*&^ag9NOK*g+J-2_ObJodt{`axSNofjkBV1E7WuAT18Y5V-~Gj6hNh zI~XVXDM~SYV4R$#C>3S^v?u^5>IlXVm0z;fffO<{0OeeOG{`$eU=ap}b1NZoCxCJu zKrvA86oK8xz_1|wJ1a<;0Q2N;iu)$1^Gw!JzA`yMm1A;&ipJzWsyvhbs_{&AP}P|H hK;;4>!{m*sb0^!WYE3p!^Pz0RoeK4;m3qZmEa2F@s39A~{~r$DHB_?Q%9%?o$amYMXK>)&A_6GY)6Z=s2D|({qr4p}`)8Cns8I RY~EpWf|ZeDbEDH@MgZGO8)X0h delta 66 zcmZ3|!MLP@aYKfU#=%#8cGn&V?q?2(w%a3PXMgt08HcnqHb-OQ;sXo}4fZfRInhdE R^A4L6tc(ns8=V$20swqv7>ob_ diff --git a/Assets/Scripts/Child.cs b/Assets/Scripts/Child.cs index 9ff814d..cf312a4 100644 --- a/Assets/Scripts/Child.cs +++ b/Assets/Scripts/Child.cs @@ -5,27 +5,62 @@ using System.Collections; public class Child : MonoBehaviour { public float Speed = 10f; + public float JumpForce = 10f; + public GameObject GroundCheck; private Rigidbody _rb; + private bool _isGrounded = false; + private float _xValue; + private float _zValue; void Awake() { _rb = GetComponent(); } - public void Move(float xValue, float zValue) + void Update() + { + _isGrounded = IsGrounded(); + + Debug.Log(_isGrounded); + } + + void FixedUpdate() { // We move the child depending on the camera orientation Vector3 forwardDir = Camera.main.transform.forward; Vector3 rightDir = Camera.main.transform.right; - forwardDir.y = 0f; - forwardDir *= zValue * Speed; + forwardDir *= _zValue * Speed; + forwardDir.y = _rb.velocity.y; + rightDir *= _xValue * Speed; rightDir.y = 0f; - rightDir *= xValue * Speed; _rb.velocity = forwardDir + rightDir; } + + private bool IsGrounded() + { + Collider[] colliders = Physics.OverlapSphere(GroundCheck.transform.position, 0.5f, 1 << LayerMask.NameToLayer("Ground")); + + return colliders.Length > 0; + } + + public void Move(float xValue, float zValue) + { + _xValue = xValue; + _zValue = zValue; + } + + public void Jump() + { + if (_isGrounded) + { + _isGrounded = false; + + _rb.AddForce(new Vector3(0f, JumpForce, 0f)); + } + } } diff --git a/Assets/Scripts/ChildController.cs b/Assets/Scripts/ChildController.cs index cc9a375..54826bf 100644 --- a/Assets/Scripts/ChildController.cs +++ b/Assets/Scripts/ChildController.cs @@ -14,12 +14,13 @@ public class ChildController : MonoBehaviour void Awake() { InputManager.Instance.PushActiveContext("Gameplay", (int)PlayerNumber); - InputManager.Instance.AddCallback((int)PlayerNumber, HandlePlayerInput); + InputManager.Instance.AddCallback((int)PlayerNumber, HandlePlayerAxis); + InputManager.Instance.AddCallback((int)PlayerNumber, HandlePlayerButtons); _child = GetComponent(); } - private void HandlePlayerInput(MappedInput input) + private void HandlePlayerAxis(MappedInput input) { if (this == null) return; @@ -48,4 +49,14 @@ public class ChildController : MonoBehaviour _child.Move(xValue, zValue); } + private void HandlePlayerButtons(MappedInput input) + { + if (this == null) return; + + if (input.Actions.Contains("Jump")) + { + _child.Jump(); + } + } + } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index d015127354ba6c573e36c5f26537fcf455c2afb1..c5fdf55dac9c56aa73ac2e46a70049d4d03ab671 100644 GIT binary patch delta 163 zcmeBCyrU@2z`*p2fkEI70|Ns;kOoo=45oU98^s?oG2YqylZl@ZWJOBUy From 1b128fb232ab7750c34b455624640b33cc3ec3a2 Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sat, 22 Aug 2015 02:30:40 -0400 Subject: [PATCH 2/2] Remove the placeholder asset in the Art folder --- Assets/Art/Fuuu.prefab | Bin 6412 -> 0 bytes Assets/Art/Fuuu.prefab.meta | 8 -------- 2 files changed, 8 deletions(-) delete mode 100644 Assets/Art/Fuuu.prefab delete mode 100644 Assets/Art/Fuuu.prefab.meta diff --git a/Assets/Art/Fuuu.prefab b/Assets/Art/Fuuu.prefab deleted file mode 100644 index 2df6b9b01f86cafeb3b0fef4741e1a76442bf20c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6412 zcmdT|TZkOT6|J7xUCWYVIgujy6?b>Ns9%aZO zjlW8r1M57=UbIN6M0Adprm@Qr#!=!yv-x}3%|{CRVMGK zv*6!?G4#~^NV`o!x(daZb0MJ?|C##d=YT6!1;3*vu#!hpxm(hEy`Dr5jyL@zjK&ueFNpmx z*rDc*?D0EZZ8th~H)-q6SU5Ky240W=oN$-C2=_y7YbuHSpoM;|5eB&JcNg|~aob4L z;?YLpFL+wXzh2+^{ojAN`|MYa|8Cv>$A;g%4N5$gDw4pcg<#Y8|4*=Ohfx>OptXXn z;PiR0m6UDNJlGudK6n_kCfL-figu3EFx~^eX>2-CSDI?U*qX`3Ydq7 zV{O0Fj66p39z?&6^vN(x4n$4#x#>I3U3&7w6JBNA+SXk1__m3yz`l*N$IQp85Xe1Q z8nr86sJEh&}c*Y zl*miq%wx>G$xltGqKuvlWRaJ^F?!~wrtIhUQ#l5*+0P4@^BD{|F9Vqu_n!g#9QvGB zPEF#)dCjS50@lncfh;_y!T&Ni$X`K&3!sTUZ|JcJBfqrw&o!8I3 z*ozjt>BF3-hGHj5+#uOo!)Uadgwu!jxr@8~7+`~Z88#ZUkT&(|4PD)h+&K@ch*?Wr zi2|GgJqjmXC+Yes1tiIC!Un(di+A7r-cRoR;VVD?%bEZF^xWGF{&8+R8ZRc zBNaA5Yk2s~NpU7M!^4AzIGq^fF08d;7uLq+do(ZaP)Mm4-`aBV?*AM-ddD+QU%Ytu zZ?7|ZEub-Cc+p_{rHh_y_HqWJ(#si)Sz?gEz5x7_7|ihW8_e*m)L@3E-(ZHvHW(eY zhBnAxhNs_PhQ}C;E;@l7V0FH=gN7s650ivm-J}X0T`kuJH4DoQ-nK4dA{%TC|}a&E-lZUlN3Z;>KJ+pEyL#M zR@Q~`L+I1fhcmpSzjo}wnEcwKdzz>4RX}^R#-;8tUpvSp{6p$6`p43B(W6DrVYP(y z(lXSO9xd`CxL^&-NUdTNjE@!3d0PkOXdC4QCWH+pK1<}=_2 zp(FJqFFo4ke;i}-)1yWIBEPQls#o&UKEhMvr$-xp?!yxpb4_`jSKNoZ&KoJ%iykdJ zVy_=#Og-~DuUy!Nyv{4yE3fm0v|YFl)F=NsB43+~U0CNC{cXFj&J$ezKRk;udF(om z^`ha)>pZESjD0H>5C1=~{v*$(43|30@X+7QKG^!)p5c<={*aD0^IpXtzsQ?)XZD3n zf7Wlve>$8$#o?jI4dU4_nnMvHUu&-XmSevXgEgG@qGZWNRpLf1FH!U9GkykA3vQ?D zsc_~P$}3b^sQRQ7n)K$v1+STXAz}d~vx~wQvRK=Tn&^OjS*IU)mTJj}#dUr?Q-fST z!c8_w63mUq8NNzAh1Nuq#30X3o#YlN^mXmqrVa4p=_qvNa+BvNPq8f8=Z?74>; ze578+M0MOpbxS#0|6+botDq9!V?w-CmS@?SP62*m&aTLd!)}CP^~>GBPnM3%bWvLP z!4YpUiQG&|&a8CU@n<48T9OwkO_;dbNh%pp{!+1bD%DT+L7tgC;u?9GwR2s(%zEW$ zQOfKapOI%zx7%ehoDLEfXG4>C|K$K+>%WXX#BDp~a=o1|p84>#-5U>7Cw}|h8CYaz z-f}6sx6*mEPWaJx5bWGyv*dmAJV)5;?Iey1`nx@>UV88OJ9Dv>zL&p& To_=ZY-VEX^yqgZp{!{*cByyJz diff --git a/Assets/Art/Fuuu.prefab.meta b/Assets/Art/Fuuu.prefab.meta deleted file mode 100644 index b22c2fc..0000000 --- a/Assets/Art/Fuuu.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f6d5f460fe8d6bc479da1b6305919ede -timeCreated: 1440209848 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: