From f6ce5c0de3eb5ba353e483323e3becb3765f8419 Mon Sep 17 00:00:00 2001 From: milan Date: Mon, 28 Nov 2022 14:04:25 +0100 Subject: [PATCH] refactor player into general vr assembly --- Assets/Player/README.md | 3 --- Assets/Portal/Runtime/PortalCamera.cs | 1 + Assets/{Player.meta => VR.meta} | 0 Assets/{Player => VR}/Assets.meta | 0 Assets/{Player => VR}/Assets/Materials.meta | 0 Assets/{Player => VR}/Assets/Materials/Hand.mat | 0 Assets/{Player => VR}/Assets/Materials/Hand.mat.meta | 0 Assets/{Player => VR}/Assets/Prefabs.meta | 0 Assets/{Player => VR}/Assets/Prefabs/Hand.prefab | 0 Assets/{Player => VR}/Assets/Prefabs/Hand.prefab.meta | 0 Assets/{Player => VR}/Assets/Prefabs/XR Origin.prefab | 0 Assets/{Player => VR}/Assets/Prefabs/XR Origin.prefab.meta | 0 Assets/VR/README.md | 3 +++ Assets/{Player => VR}/README.md.meta | 0 Assets/{Player => VR}/Runtime.meta | 0 Assets/{Player => VR}/Runtime/PlayerCamera.cs | 2 +- Assets/{Player => VR}/Runtime/PlayerCamera.cs.meta | 0 Assets/{Player/Runtime/Player.asmdef => VR/Runtime/VR.asmdef} | 2 +- .../Runtime/Player.asmdef.meta => VR/Runtime/VR.asmdef.meta} | 0 Assets/{Player => VR}/package.json | 4 ++-- Assets/{Player => VR}/package.json.meta | 0 21 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 Assets/Player/README.md rename Assets/{Player.meta => VR.meta} (100%) rename Assets/{Player => VR}/Assets.meta (100%) rename Assets/{Player => VR}/Assets/Materials.meta (100%) rename Assets/{Player => VR}/Assets/Materials/Hand.mat (100%) rename Assets/{Player => VR}/Assets/Materials/Hand.mat.meta (100%) rename Assets/{Player => VR}/Assets/Prefabs.meta (100%) rename Assets/{Player => VR}/Assets/Prefabs/Hand.prefab (100%) rename Assets/{Player => VR}/Assets/Prefabs/Hand.prefab.meta (100%) rename Assets/{Player => VR}/Assets/Prefabs/XR Origin.prefab (100%) rename Assets/{Player => VR}/Assets/Prefabs/XR Origin.prefab.meta (100%) create mode 100644 Assets/VR/README.md rename Assets/{Player => VR}/README.md.meta (100%) rename Assets/{Player => VR}/Runtime.meta (100%) rename Assets/{Player => VR}/Runtime/PlayerCamera.cs (88%) rename Assets/{Player => VR}/Runtime/PlayerCamera.cs.meta (100%) rename Assets/{Player/Runtime/Player.asmdef => VR/Runtime/VR.asmdef} (94%) rename Assets/{Player/Runtime/Player.asmdef.meta => VR/Runtime/VR.asmdef.meta} (100%) rename Assets/{Player => VR}/package.json (79%) rename Assets/{Player => VR}/package.json.meta (100%) diff --git a/Assets/Player/README.md b/Assets/Player/README.md deleted file mode 100644 index 29ffbcc..0000000 --- a/Assets/Player/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Escape Room Engine Portals - -An implementation of portals for the VR escape room engine. \ No newline at end of file diff --git a/Assets/Portal/Runtime/PortalCamera.cs b/Assets/Portal/Runtime/PortalCamera.cs index 3ee8b1e..8c9abc7 100644 --- a/Assets/Portal/Runtime/PortalCamera.cs +++ b/Assets/Portal/Runtime/PortalCamera.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using EscapeRoomEngine.VR.Runtime; using UnityEngine; using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; diff --git a/Assets/Player.meta b/Assets/VR.meta similarity index 100% rename from Assets/Player.meta rename to Assets/VR.meta diff --git a/Assets/Player/Assets.meta b/Assets/VR/Assets.meta similarity index 100% rename from Assets/Player/Assets.meta rename to Assets/VR/Assets.meta diff --git a/Assets/Player/Assets/Materials.meta b/Assets/VR/Assets/Materials.meta similarity index 100% rename from Assets/Player/Assets/Materials.meta rename to Assets/VR/Assets/Materials.meta diff --git a/Assets/Player/Assets/Materials/Hand.mat b/Assets/VR/Assets/Materials/Hand.mat similarity index 100% rename from Assets/Player/Assets/Materials/Hand.mat rename to Assets/VR/Assets/Materials/Hand.mat diff --git a/Assets/Player/Assets/Materials/Hand.mat.meta b/Assets/VR/Assets/Materials/Hand.mat.meta similarity index 100% rename from Assets/Player/Assets/Materials/Hand.mat.meta rename to Assets/VR/Assets/Materials/Hand.mat.meta diff --git a/Assets/Player/Assets/Prefabs.meta b/Assets/VR/Assets/Prefabs.meta similarity index 100% rename from Assets/Player/Assets/Prefabs.meta rename to Assets/VR/Assets/Prefabs.meta diff --git a/Assets/Player/Assets/Prefabs/Hand.prefab b/Assets/VR/Assets/Prefabs/Hand.prefab similarity index 100% rename from Assets/Player/Assets/Prefabs/Hand.prefab rename to Assets/VR/Assets/Prefabs/Hand.prefab diff --git a/Assets/Player/Assets/Prefabs/Hand.prefab.meta b/Assets/VR/Assets/Prefabs/Hand.prefab.meta similarity index 100% rename from Assets/Player/Assets/Prefabs/Hand.prefab.meta rename to Assets/VR/Assets/Prefabs/Hand.prefab.meta diff --git a/Assets/Player/Assets/Prefabs/XR Origin.prefab b/Assets/VR/Assets/Prefabs/XR Origin.prefab similarity index 100% rename from Assets/Player/Assets/Prefabs/XR Origin.prefab rename to Assets/VR/Assets/Prefabs/XR Origin.prefab diff --git a/Assets/Player/Assets/Prefabs/XR Origin.prefab.meta b/Assets/VR/Assets/Prefabs/XR Origin.prefab.meta similarity index 100% rename from Assets/Player/Assets/Prefabs/XR Origin.prefab.meta rename to Assets/VR/Assets/Prefabs/XR Origin.prefab.meta diff --git a/Assets/VR/README.md b/Assets/VR/README.md new file mode 100644 index 0000000..e207588 --- /dev/null +++ b/Assets/VR/README.md @@ -0,0 +1,3 @@ +# Escape Room Engine VR + +Escape Room VR Player. \ No newline at end of file diff --git a/Assets/Player/README.md.meta b/Assets/VR/README.md.meta similarity index 100% rename from Assets/Player/README.md.meta rename to Assets/VR/README.md.meta diff --git a/Assets/Player/Runtime.meta b/Assets/VR/Runtime.meta similarity index 100% rename from Assets/Player/Runtime.meta rename to Assets/VR/Runtime.meta diff --git a/Assets/Player/Runtime/PlayerCamera.cs b/Assets/VR/Runtime/PlayerCamera.cs similarity index 88% rename from Assets/Player/Runtime/PlayerCamera.cs rename to Assets/VR/Runtime/PlayerCamera.cs index 7646107..c29d57a 100644 --- a/Assets/Player/Runtime/PlayerCamera.cs +++ b/Assets/VR/Runtime/PlayerCamera.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace EscapeRoomEngine.Portal.Runtime +namespace EscapeRoomEngine.VR.Runtime { public class PlayerCamera : MonoBehaviour { diff --git a/Assets/Player/Runtime/PlayerCamera.cs.meta b/Assets/VR/Runtime/PlayerCamera.cs.meta similarity index 100% rename from Assets/Player/Runtime/PlayerCamera.cs.meta rename to Assets/VR/Runtime/PlayerCamera.cs.meta diff --git a/Assets/Player/Runtime/Player.asmdef b/Assets/VR/Runtime/VR.asmdef similarity index 94% rename from Assets/Player/Runtime/Player.asmdef rename to Assets/VR/Runtime/VR.asmdef index 983b803..d96c424 100644 --- a/Assets/Player/Runtime/Player.asmdef +++ b/Assets/VR/Runtime/VR.asmdef @@ -1,5 +1,5 @@ { - "name": "Player", + "name": "VR", "rootNamespace": "EscapeRoomEngine", "references": [ "GUID:776d03a35f1b52c4a9aed9f56d7b4229" diff --git a/Assets/Player/Runtime/Player.asmdef.meta b/Assets/VR/Runtime/VR.asmdef.meta similarity index 100% rename from Assets/Player/Runtime/Player.asmdef.meta rename to Assets/VR/Runtime/VR.asmdef.meta diff --git a/Assets/Player/package.json b/Assets/VR/package.json similarity index 79% rename from Assets/Player/package.json rename to Assets/VR/package.json index 2c6a7de..e3415c6 100644 --- a/Assets/Player/package.json +++ b/Assets/VR/package.json @@ -1,6 +1,6 @@ { - "displayName": "Escape Room Engine Player", - "name": "wtf.milan.escape-room-engine.player", + "displayName": "Escape Room Engine VR Utilities", + "name": "wtf.milan.escape-room-engine.vr", "version": "0.0.1", "description": "Escape Room VR Player.", "unity": "2022.1", diff --git a/Assets/Player/package.json.meta b/Assets/VR/package.json.meta similarity index 100% rename from Assets/Player/package.json.meta rename to Assets/VR/package.json.meta