Commit 9766618c authored by Chae Ho Shin's avatar Chae Ho Shin

ignore self-collisions or self-worldline-collisions

parent cf50696c
...@@ -3257,7 +3257,7 @@ MeshRenderer: ...@@ -3257,7 +3257,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: eb322bc5933761d4fb98f8561eadae28, type: 2} - {fileID: 2100000, guid: 7286fb01c3bf28349bf3a51860aefb00, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
......
...@@ -80,6 +80,7 @@ public class ExtrudedMesh : MonoBehaviour ...@@ -80,6 +80,7 @@ public class ExtrudedMesh : MonoBehaviour
clone.transform.GetChild(0).gameObject.AddComponent<RuntimeCSGFlatlandObject>(); clone.transform.GetChild(0).gameObject.AddComponent<RuntimeCSGFlatlandObject>();
clone.layer = 8; clone.layer = 8;
clone.transform.GetChild(0).gameObject.layer = 8; clone.transform.GetChild(0).gameObject.layer = 8;
Physics.IgnoreCollision(clone.GetComponentInChildren<MeshCollider>(), GetComponent<MeshCollider>());
Destroy(clone, 30); Destroy(clone, 30);
prevtime = sections[sections.Count - 1].time; prevtime = sections[sections.Count - 1].time;
} }
......
...@@ -44,6 +44,11 @@ public class FlatlandMovement : MonoBehaviour ...@@ -44,6 +44,11 @@ public class FlatlandMovement : MonoBehaviour
/// </summary> /// </summary>
Queue<float> pathVelocitys = new Queue<float>(); Queue<float> pathVelocitys = new Queue<float>();
protected void Start()
{
Physics.IgnoreLayerCollision(0, 1);
}
protected void FixedUpdate() protected void FixedUpdate()
{ {
if (isAutoMove) if (isAutoMove)
...@@ -200,7 +205,7 @@ public class FlatlandMovement : MonoBehaviour ...@@ -200,7 +205,7 @@ public class FlatlandMovement : MonoBehaviour
Vector3 finaldeltav = new Vector3((float)(deltav[1] / tt), 0.0f, (float)(deltav[2] / tt)); Vector3 finaldeltav = new Vector3((float)(deltav[1] / tt), 0.0f, (float)(deltav[2] / tt));
//this.v = finaldeltav; this.v = finaldeltav;
} }
...@@ -267,7 +272,7 @@ public class FlatlandMovement : MonoBehaviour ...@@ -267,7 +272,7 @@ public class FlatlandMovement : MonoBehaviour
/// <param name="collision"></param> /// <param name="collision"></param>
public virtual void OnCollisionEnterchild(Collision collision) public virtual void OnCollisionEnterchild(Collision collision)
{ {
Debug.Log("Collision! ~~~~~~~~~~~~~~~~" + theobject.transform.parent.name + "~~~~~~~~~~~~~~~~~~~~~~" + collision.transform.parent.name);
} }
/// <summary> /// <summary>
/// 나갔을때 호출 /// 나갔을때 호출
......
...@@ -11,6 +11,7 @@ public class Planemovement : FlatlandMovement ...@@ -11,6 +11,7 @@ public class Planemovement : FlatlandMovement
void Start() void Start()
{ {
base.Start();
//Renderer r = theobject.GetComponent<Renderer>(); //Renderer r = theobject.GetComponent<Renderer>();
//Color materialColor = r.material.color; //Color materialColor = r.material.color;
//r.material.color = Color.clear; //r.material.color = Color.clear;
......
...@@ -21,6 +21,7 @@ public class PlayerMovement : FlatlandMovement,IInteractor ...@@ -21,6 +21,7 @@ public class PlayerMovement : FlatlandMovement,IInteractor
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
base.Start();
v = new Vector3(0.0f, 0.0f, 0.0f); v = new Vector3(0.0f, 0.0f, 0.0f);
gamma = 1.0f; gamma = 1.0f;
cnt = 0; cnt = 0;
...@@ -32,6 +33,7 @@ public class PlayerMovement : FlatlandMovement,IInteractor ...@@ -32,6 +33,7 @@ public class PlayerMovement : FlatlandMovement,IInteractor
backgroundStartScale = background.transform.localScale; backgroundStartScale = background.transform.localScale;
interactiveObjects = new List<InteractiveObject>(); interactiveObjects = new List<InteractiveObject>();
} }
void Update() void Update()
...@@ -179,7 +181,6 @@ public class PlayerMovement : FlatlandMovement,IInteractor ...@@ -179,7 +181,6 @@ public class PlayerMovement : FlatlandMovement,IInteractor
if (collision.transform.parent != null) if (collision.transform.parent != null)
{ {
Debug.Log("Collision");
InteractiveObject x = collision.transform.parent.gameObject.GetComponent<InteractiveObject>(); InteractiveObject x = collision.transform.parent.gameObject.GetComponent<InteractiveObject>();
if (x) if (x)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment