상호작용을 위한 리팩토링

.gitignore

@@ -68,4 +68,6 @@ GraphicsSettings.asset
  
 ProjectSettings.asset
  
-ProjectVersion.txt
\ No newline at end of file
+ProjectVersion.txt
+
+.vs/
\ No newline at end of file

Assets/Scenes/Test.unity

@@ -1021,7 +1021,7 @@ MonoBehaviour:
   time: 0
   theobject: {fileID: 439858915}
   starttime: 10
-  otherclock: {fileID: 1094934749}
+  otherclock: {fileID: 0}
 --- !u!4 &535323109
 Transform:
   m_ObjectHideFlags: 0
@@ -2557,7 +2557,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1094934748}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0bf826b8a4774ba4b9c6a1cff6925667, type: 3}
+  m_Script: {fileID: 11500000, guid: 36bd4b20d3bc814459c577f508eda20c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   beta: 0

Assets/Scripts/ExtrudedMesh.cs

@@ -169,10 +169,10 @@ public class ExtrudedMesh : MonoBehaviour
 
     public void OnCollisionStay(Collision collision)
     {
-        if (transform.parent.GetComponent(typeof(Planemovement)) == null)
+        if (transform.parent.GetComponent(typeof(FlatlandMovement)) == null)
             return;
         else
-            transform.parent.GetComponent<Planemovement>().OnCollisionStaychild(collision);
+            transform.parent.GetComponent<FlatlandMovement>().OnCollisionStaychild(collision);
     }
 
 }

Assets/Scripts/FlatlandMovement.cs

@@ -252,4 +252,9 @@ public class FlatlandMovement : MonoBehaviour
             pathVelocitys.Enqueue(vel);
         }
     }
+
+    public virtual void OnCollisionStaychild(Collision collision)
+    {
+        
+    }
 }

Assets/Scripts/GrabableObject.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Assets.Scripts.Interface;
+
+public class GrabableObject : InteractiveObject
+{
+    public override string InteractType
+    {
+        get
+        {
+            return "grab";
+        }
+    }
+
+    public override void OnInteract()
+    {
+        return;
+    }
+}

Assets/Scripts/GrabableObject.cs.meta

+fileFormatVersion: 2
+guid: 36bd4b20d3bc814459c577f508eda20c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/InteractiveObject.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Assets.Scripts.Interface;
+
+public abstract class InteractiveObject : Planemovement, IInteractable
+{
+    public virtual string InteractType
+    {
+        get
+        {
+            return "grab";
+        }
+    }
+
+    public virtual void OnInteract()
+    {
+        return;
+    }
+}

Assets/Scripts/InteractiveObject.cs.meta

+fileFormatVersion: 2
+guid: c42ab80a332764446b31c16302ad8201
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Interface.meta

+fileFormatVersion: 2
+guid: 34e3ac463940bf448abef30831bed1aa
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Interface/IInteractable.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Interface
+{
+    interface IInteractable
+    {
+        void OnInteract();
+
+        string InteractType { get; }
+    }
+}

Assets/Scripts/Interface/IInteractable.cs.meta

+fileFormatVersion: 2
+guid: 0542cb93a4e6c4d4187b17db5d9a0faa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Interface/IInteractor.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Interface
+{
+    interface IInteractor
+    {
+        void OnInteract();
+    }
+}

Assets/Scripts/Interface/IInteractor.cs.meta

+fileFormatVersion: 2
+guid: 7b2adb4c50930bb4cafa449133a2174c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Planemovement.cs

@@ -139,7 +139,7 @@ public class Planemovement : FlatlandMovement
         time += Time.fixedDeltaTime * (float)(levelManager.player.gamma / gamma);
     }
 
-    public void OnCollisionStaychild(Collision collision)
+    public override void OnCollisionStaychild(Collision collision)
     {
         //Debug.Log("hit!");
         //if(collision.transform.parent.name != "AnObject(Clone)")

Assets/Scripts/PlayerMovement.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using UnityEngine;
 using MathNet.Numerics.LinearAlgebra;
 using MathNet.Numerics.LinearAlgebra.Double;
+using Assets.Scripts.Interface;
 
-public class PlayerMovement : FlatlandMovement
+public class PlayerMovement : FlatlandMovement,IInteractor
 {
     bool isinertial = true;
 
@@ -138,4 +139,24 @@ public class PlayerMovement : FlatlandMovement
     {
         return isinertial;
     }
+
+    public void OnInteract()
+    {
+        return;
+    }
+
+    public override void OnCollisionStaychild(Collision collision)
+    {
+        
+        if (collision.transform.parent != null)
+        {
+            Debug.Log("Collision");
+            var x = collision.transform.parent.gameObject.GetComponent<InteractiveObject>();
+            if (x)
+            {
+                //상호작용가능한 물건일때
+                Debug.Log(x.InteractType);
+            }
+        }
+    }
 }

Assets/Scripts/aaa.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class aaa : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/aaa.cs.meta

+fileFormatVersion: 2
+guid: c80a1e773f2174541b462e30fe5ae465
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Logs/Packages-Update.log

@@ -16,3 +16,12 @@ The following packages were added:
 The following packages were updated:
   com.unity.package-manager-ui from version 2.1.2 to 2.2.0
   com.unity.timeline from version 1.0.0 to 1.1.0
+
+=== Fri Aug 16 13:33:29 2019
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were added:
+  com.unity.multiplayer-hlapi@1.0.2
+  com.unity.xr.legacyinputhelpers@2.0.2

Packages/manifest.json

@@ -8,12 +8,14 @@
     "com.unity.ext.nunit": "1.0.0",
     "com.unity.ide.rider": "1.0.8",
     "com.unity.ide.vscode": "1.0.7",
+    "com.unity.multiplayer-hlapi": "1.0.2",
     "com.unity.package-manager-ui": "2.2.0",
     "com.unity.purchasing": "2.0.6",
     "com.unity.test-framework": "1.0.13",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.timeline": "1.1.0",
     "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.0.2",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",