Conjure/PillowFight
6
0
Fork 0
mirror of https://github.com/ConjureETS/PillowFight.git synced 2026-03-24 00:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

First attempt to hit with melee

Browse Source 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
This commit is contained in:
RosimInc 2015-08-23 14:22:13 -04:00
parent 2418d5dec8
commit 6ce7a9b8ab
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/Scripts/AutoTarget.cs
View File

@ -46,9 +46,15 @@ public class AutoTarget : MonoBehaviour
} }
public Transform GetTarget(Vector3 lookingAngle) public Transform GetTarget(Vector3 lookingAngle)
{
return GetTarget(lookingAngle, 2000);
}
public Transform GetTarget(Vector3 lookingAngle, float range)
{ {
Transform closest = null; Transform closest = null;
float minAngle = minAngleRange; float minAngle = minAngleRange;
float rangeSq = range * range;
//Debug.Log("looking direction:" + lookingAngle); //Debug.Log("looking direction:" + lookingAngle);
Debug.DrawRay(transform.position, lookingAngle * 2); Debug.DrawRay(transform.position, lookingAngle * 2);
@ -56,7 +62,9 @@ public class AutoTarget : MonoBehaviour
foreach (Transform t in targets) foreach (Transform t in targets)
{ {
Vector3 targetDirection = t.transform.position - transform.position; Vector3 targetDirection = t.transform.position - transform.position;
if (targetDirection.sqrMagnitude > rangeSq)
continue;
float realAngle = Mathf.Atan2(targetDirection.z, targetDirection.x) * Mathf.Rad2Deg; float realAngle = Mathf.Atan2(targetDirection.z, targetDirection.x) * Mathf.Rad2Deg;

4
Assets/Scripts/Child.cs
View File

@ -236,13 +236,13 @@ public class Child : MonoBehaviour
public void Swing() public void Swing()
{ {
//1. Determine if there is someone in front //1. Determine if there is someone in front
Transform t = null; //GetTarget Transform t = null;//_autoTarget.GetTarget(transform.forward, 0.9f);
if(t == null) if(t == null)
return; return;
//2. Apply force to the person //2. Apply force to the person
Vector3 direction = target.transform.position - transform.position; Vector3 direction = t.transform.position - transform.position;
direction = direction.normalized; direction = direction.normalized;

9
Assets/Scripts/ChildController.cs
View File

@ -94,9 +94,12 @@ public class ChildController : MonoBehaviour
} }
} }
if (input.Ranges.ContainsKey("Throw")) { //if (input.Ranges.ContainsKey("Throw")) {
_child.Throw(); // _child.Throw();
} //}
if (input.Ranges.ContainsKey("Throw"))
_child.Swing();
} }
private void HandlePlayerButtons(MappedInput input) private void HandlePlayerButtons(MappedInput input)