cailean/drecon-unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ciruclar loop added for bodies & camera updates

Browse Source
This commit is contained in:
cailean
2024-04-11 16:47:59 +01:00
parent d63ac5c4e8
commit 8c46a110bc
9 changed files with 393 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/8_Scripts/1_Managers/BodyManager.cs
View File

@@ -13,8 +13,10 @@ public class BodyManager : MonoBehaviour
public int m_DefaultPoolCapacity;
public int m_MaxPoolCapacity;
public Transform m_Parent;
public Transform m_SpawnParent;
private Vector3 m_PelvisPosition;
private void Awake()
{
if (_instance != null)
@@ -35,8 +37,8 @@ public class BodyManager : MonoBehaviour
private Body CreateBody()
{
Vector3 spawnPos = new Vector3(this.transform.position.x + Random.Range(-0.5f, 0.5f), this.transform.position.y, this.transform.position.z + Random.Range(-0.5f, .5f));
Body body = Instantiate(m_Rigidbody, spawnPos, new Quaternion(Random.Range(0, 180), Random.Range(0, 180), Random.Range(0, 180), Random.Range(0, 180)), m_Parent);
Vector3 spawnPos = new Vector3(this.transform.position.x + Random.Range(-0.2f, 0.2f), this.transform.position.y, this.transform.position.z + Random.Range(-0.2f, .2f));
Body body = Instantiate(m_Rigidbody, m_SpawnParent.position, new Quaternion(Random.Range(0, 180), Random.Range(0, 180), Random.Range(0, 180), Random.Range(0, 180)), m_Parent);
body.m_Pelvis.gameObject.GetComponent<Rigidbody>().AddForce(new Vector3(1, 1, 1));
m_PelvisPosition = body.m_Pelvis.position;
body.SetPool(m_Pool);
@@ -45,7 +47,7 @@ public class BodyManager : MonoBehaviour
private void OnTakeBodyFromPool(Body body)
{
body.m_Pelvis.transform.position = m_PelvisPosition;
body.m_Pelvis.transform.position = m_SpawnParent.position;
body.gameObject.SetActive(true);
}
@@ -61,7 +63,7 @@ public class BodyManager : MonoBehaviour
IEnumerator Spawn()
{
yield return new WaitForSecondsRealtime(Random.Range(3f, 7f));
yield return new WaitForSecondsRealtime(Random.Range(1f, 2.5f));
m_Pool.Get();
StartCoroutine(Spawn());

10
Assets/8_Scripts/1_Managers/CameraManager.cs
View File

@@ -77,7 +77,7 @@ public class CameraManager : MonoBehaviour
m_Camera.cullingMask = m_Bodies;
break;
case "vc_Environment":
m_Camera.cullingMask = m_Bodies;
m_Camera.cullingMask = m_Environment;
break;
default:
case "vc_Default":
@@ -153,7 +153,8 @@ public class CameraManager : MonoBehaviour
CinemachineBrain cmBrain = m_Brain.GetComponent<CinemachineBrain>();
float blendtime = (float)Random.Range(m_CameraBlendMin, m_CameraBlendMax);
if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent"))
if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Body")
|| AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body"))
blendtime = 0;
cmBrain.m_DefaultBlend.m_Time = blendtime;
@@ -185,7 +186,8 @@ public class CameraManager : MonoBehaviour
{
foreach(Transform child in parentObject.transform)
{
m_CameraObjects.Add(child.gameObject);
if(child.gameObject.activeSelf)
m_CameraObjects.Add(child.gameObject);
}
}
else
@@ -201,6 +203,8 @@ public class CameraManager : MonoBehaviour
{
Debug.LogError("CM Brain <GameObject> could not be found.");
}
Debug.Log(m_CameraObjects.Count);
}