|
@@ -4,17 +4,13 @@ using UnityEngine.UI;
|
|
|
|
|
|
public class MoveChange : MonoBehaviour
|
|
|
{
|
|
|
- [SerializeField] private GameObject moveGame;
|
|
|
- [SerializeField] private Transform parent;
|
|
|
+ private GameObject mesh_test => SceneIOCContainer.Instance.Pull("mesh_test") as GameObject;
|
|
|
+ private Transform ARSpaceForAll=>(SceneIOCContainer.Instance.Pull("ARSpaceForAll")as GameObject).transform;
|
|
|
[SerializeField] private Toggle RotToggle;
|
|
|
private bool isDown;
|
|
|
- private float y;
|
|
|
+ private float y=> mesh_test.transform.position.y;
|
|
|
void Start()
|
|
|
{
|
|
|
- moveGame = GameObject.Find("ARSpaceForAll/mesh_test");
|
|
|
- parent = GameObject.Find("ARSpaceForAll").transform;
|
|
|
- y = moveGame.transform.position.y;
|
|
|
-
|
|
|
DispatcherBase.KeyDownDelegateRegister(keyDownEventDelegate);
|
|
|
DispatcherBase.KeyUpDelegateRegister(keyUpEventDelegate);
|
|
|
RotToggle.onValueChanged.AddListener(RotToggleOnValueChanged);
|
|
@@ -22,13 +18,13 @@ public class MoveChange : MonoBehaviour
|
|
|
}
|
|
|
private void keyUpEventDelegate(InputKeyCode keyCode, InputDevicePartBase part)
|
|
|
{
|
|
|
- if (keyCode != InputKeyCode.Enter || go==null)
|
|
|
+ if (keyCode != InputKeyCode.Enter || goRefrence==null)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
Debug.Log("keyDownEventDelegate===>" + keyCode);
|
|
|
- moveGame.transform.parent = parent;
|
|
|
- go.transform.parent = parent;
|
|
|
+ mesh_test.transform.parent = ARSpaceForAll;
|
|
|
+ goRefrence.transform.parent = ARSpaceForAll;
|
|
|
isDown = false;
|
|
|
}
|
|
|
|
|
@@ -38,17 +34,17 @@ public class MoveChange : MonoBehaviour
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
- if (!SetSceneActive.Instance.active|| go==null)
|
|
|
+ if (!SetSceneActive.Instance.active|| goRefrence==null)
|
|
|
return;
|
|
|
if(!IsRot)
|
|
|
{
|
|
|
- TempVector3 = OpenXRCamera.Instance.head.position-go.transform.position;
|
|
|
- moveGame.transform.parent = go.transform;
|
|
|
+ TempVector3 = OpenXRCamera.Instance.head.position-goRefrence.transform.position;
|
|
|
+ mesh_test.transform.parent = goRefrence.transform;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- TempVector3 = OpenXRCamera.Instance.head.eulerAngles-go.transform.eulerAngles;
|
|
|
- moveGame.transform.parent = go.transform;
|
|
|
+ TempVector3 = OpenXRCamera.Instance.head.eulerAngles-goRefrence.transform.eulerAngles;
|
|
|
+ mesh_test.transform.parent = goRefrence.transform;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -85,13 +81,13 @@ public class MoveChange : MonoBehaviour
|
|
|
{
|
|
|
if(!IsRot)
|
|
|
{
|
|
|
- go.transform.position = OpenXRCamera.Instance.head.position - TempVector3;
|
|
|
- go.transform.position = new Vector3(go.transform.position.x, y, go.transform.position.z);
|
|
|
+ goRefrence.transform.position = OpenXRCamera.Instance.head.position - TempVector3;
|
|
|
+ goRefrence.transform.position = new Vector3(goRefrence.transform.position.x, y, goRefrence.transform.position.z);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- go.transform.eulerAngles = OpenXRCamera.Instance.head.eulerAngles - TempVector3;
|
|
|
- go.transform.eulerAngles = new Vector3(0, go.transform.eulerAngles.y, 0);
|
|
|
+ goRefrence.transform.eulerAngles = OpenXRCamera.Instance.head.eulerAngles - TempVector3;
|
|
|
+ goRefrence.transform.eulerAngles = new Vector3(0, goRefrence.transform.eulerAngles.y, 0);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -100,7 +96,10 @@ public class MoveChange : MonoBehaviour
|
|
|
private bool IsRot;
|
|
|
private Vector3 TempVector3;
|
|
|
private Vector3 headPos;
|
|
|
- public GameObject go;
|
|
|
+ public GameObject goRefrence
|
|
|
+ {
|
|
|
+ get =>SceneIOCContainer.Instance.Pull("goRefrence")as GameObject;
|
|
|
+ }
|
|
|
private void RotToggleOnValueChanged(bool isOn)
|
|
|
{
|
|
|
if (isOn)
|