remove our stuff from VHS namespace

Stexe · Jul 20, 2020 · a41890b · a41890b
1 parent 84b8907
commit a41890b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/BOX-BUX/Assets/Scripts/PickableFace.cs b/BOX-BUX/Assets/Scripts/PickableFace.cs
@@ -2,28 +2,27 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Assertions;
+using VHS;
 
-namespace VHS {
-    public class PickableFace : InteractableBase
-    {
-        public ChangeType changeType;
-
-        private PickableFaceObj parent;
+public class PickableFace : InteractableBase
+{
+    public ChangeType changeType;
 
-        public void Awake()
-        {
-            parent = GetComponentInParent<PickableFaceObj>();
-            Assert.IsNotNull(parent);
-        }
+    private PickableFaceObj parent;
 
-        public override void OnInteract()
+    public void Awake()
+    {
+        parent = GetComponentInParent<PickableFaceObj>();
+        Assert.IsNotNull(parent);
+    }
+
+    public override void OnInteract()
+    {
+        bool inFacesZone = GlobalState.get().facesZone.GetComponent<Collider>().bounds.Intersects(parent.GetComponent<Collider>().bounds);
+        if (parent.holder.held == null && inFacesZone)
         {
-            bool inFacesZone = GlobalState.get().facesZone.GetComponent<Collider>().bounds.Intersects(parent.GetComponent<Collider>().bounds);
-            if (parent.holder.held == null && inFacesZone)
-            {
-                ModificationSystem.MakeChange(parent, changeType);
-            }
-            parent.OnFace();
+            ModificationSystem.MakeChange(parent, changeType);
         }
+        parent.OnFace();
     }
 }
diff --git a/BOX-BUX/Assets/Scripts/PickableFaceObj.cs b/BOX-BUX/Assets/Scripts/PickableFaceObj.cs
@@ -2,13 +2,10 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace VHS
+public class PickableFaceObj : Pickable
 {
-    public class PickableFaceObj : Pickable
+    public void OnFace()
     {
-        public void OnFace()
-        {
-            base.OnInteract();
-        }
+        base.OnInteract();
     }
 }