diff --git a/Assets/Escape Room Engine.meta b/Assets/Desert/Assets/Modules/Portal.meta similarity index 77% rename from Assets/Escape Room Engine.meta rename to Assets/Desert/Assets/Modules/Portal.meta index 25efa77..dcf020e 100644 --- a/Assets/Escape Room Engine.meta +++ b/Assets/Desert/Assets/Modules/Portal.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1872235c0ed1e874b80b4bcf2e134b3f +guid: 184f6b94f1880f04e8eabcc9e2b2aee1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Escape Room Engine/Test Assets/Models/Room.blend b/Assets/Escape Room Engine/Test Assets/Models/Room.blend deleted file mode 100644 index 3c265d2..0000000 Binary files a/Assets/Escape Room Engine/Test Assets/Models/Room.blend and /dev/null differ diff --git a/Assets/Player.meta b/Assets/Player.meta new file mode 100644 index 0000000..5570879 --- /dev/null +++ b/Assets/Player.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e80714153b6a4a70a186680a1f220cb9 +timeCreated: 1669380528 \ No newline at end of file diff --git a/Assets/Player/Assets.meta b/Assets/Player/Assets.meta new file mode 100644 index 0000000..fbee5c2 --- /dev/null +++ b/Assets/Player/Assets.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: eb43c7c195464d7094b5c6d90884a53f +timeCreated: 1669380667 \ No newline at end of file diff --git a/Assets/Escape Room Engine/Player/Materials.meta b/Assets/Player/Assets/Materials.meta similarity index 100% rename from Assets/Escape Room Engine/Player/Materials.meta rename to Assets/Player/Assets/Materials.meta diff --git a/Assets/Escape Room Engine/Player/Materials/Hand.mat b/Assets/Player/Assets/Materials/Hand.mat similarity index 100% rename from Assets/Escape Room Engine/Player/Materials/Hand.mat rename to Assets/Player/Assets/Materials/Hand.mat diff --git a/Assets/Escape Room Engine/Player/Materials/Hand.mat.meta b/Assets/Player/Assets/Materials/Hand.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Player/Materials/Hand.mat.meta rename to Assets/Player/Assets/Materials/Hand.mat.meta diff --git a/Assets/Escape Room Engine/Player/Prefabs.meta b/Assets/Player/Assets/Prefabs.meta similarity index 100% rename from Assets/Escape Room Engine/Player/Prefabs.meta rename to Assets/Player/Assets/Prefabs.meta diff --git a/Assets/Escape Room Engine/Player/Prefabs/Hand.prefab b/Assets/Player/Assets/Prefabs/Hand.prefab similarity index 100% rename from Assets/Escape Room Engine/Player/Prefabs/Hand.prefab rename to Assets/Player/Assets/Prefabs/Hand.prefab diff --git a/Assets/Escape Room Engine/Player/Prefabs/Hand.prefab.meta b/Assets/Player/Assets/Prefabs/Hand.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Player/Prefabs/Hand.prefab.meta rename to Assets/Player/Assets/Prefabs/Hand.prefab.meta diff --git a/Assets/Escape Room Engine/Player/Prefabs/XR Origin.prefab b/Assets/Player/Assets/Prefabs/XR Origin.prefab similarity index 100% rename from Assets/Escape Room Engine/Player/Prefabs/XR Origin.prefab rename to Assets/Player/Assets/Prefabs/XR Origin.prefab diff --git a/Assets/Escape Room Engine/Player/Prefabs/XR Origin.prefab.meta b/Assets/Player/Assets/Prefabs/XR Origin.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Player/Prefabs/XR Origin.prefab.meta rename to Assets/Player/Assets/Prefabs/XR Origin.prefab.meta diff --git a/Assets/Player/README.md b/Assets/Player/README.md new file mode 100644 index 0000000..29ffbcc --- /dev/null +++ b/Assets/Player/README.md @@ -0,0 +1,3 @@ +# Escape Room Engine Portals + +An implementation of portals for the VR escape room engine. \ No newline at end of file diff --git a/Assets/Player/README.md.meta b/Assets/Player/README.md.meta new file mode 100644 index 0000000..523c010 --- /dev/null +++ b/Assets/Player/README.md.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c6ae145e62e00f146ae28e12e464fd14 +timeCreated: 1668943800 \ No newline at end of file diff --git a/Assets/Player/Runtime.meta b/Assets/Player/Runtime.meta new file mode 100644 index 0000000..7e16f9d --- /dev/null +++ b/Assets/Player/Runtime.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d1fab5c482f04d4896e367ebf2da1b5f +timeCreated: 1669380538 \ No newline at end of file diff --git a/Assets/Player/Runtime/Player.asmdef b/Assets/Player/Runtime/Player.asmdef new file mode 100644 index 0000000..983b803 --- /dev/null +++ b/Assets/Player/Runtime/Player.asmdef @@ -0,0 +1,16 @@ +{ + "name": "Player", + "rootNamespace": "EscapeRoomEngine", + "references": [ + "GUID:776d03a35f1b52c4a9aed9f56d7b4229" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Escape Room Engine/Player.meta b/Assets/Player/Runtime/Player.asmdef.meta similarity index 57% rename from Assets/Escape Room Engine/Player.meta rename to Assets/Player/Runtime/Player.asmdef.meta index 3c6c62e..ea838fd 100644 --- a/Assets/Escape Room Engine/Player.meta +++ b/Assets/Player/Runtime/Player.asmdef.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 2b83099548b748347a77376e8d08fd0a -folderAsset: yes -DefaultImporter: +guid: 8804073475ba36c47830e8e19dc699ce +AssemblyDefinitionImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Portal/Runtime/PlayerCamera.cs b/Assets/Player/Runtime/PlayerCamera.cs similarity index 100% rename from Assets/Portal/Runtime/PlayerCamera.cs rename to Assets/Player/Runtime/PlayerCamera.cs diff --git a/Assets/Portal/Runtime/PlayerCamera.cs.meta b/Assets/Player/Runtime/PlayerCamera.cs.meta similarity index 100% rename from Assets/Portal/Runtime/PlayerCamera.cs.meta rename to Assets/Player/Runtime/PlayerCamera.cs.meta diff --git a/Assets/Player/package.json b/Assets/Player/package.json new file mode 100644 index 0000000..2c6a7de --- /dev/null +++ b/Assets/Player/package.json @@ -0,0 +1,17 @@ +{ + "displayName": "Escape Room Engine Player", + "name": "wtf.milan.escape-room-engine.player", + "version": "0.0.1", + "description": "Escape Room VR Player.", + "unity": "2022.1", + "author": { + "name": "Milan van Zanten", + "email": "milan@milan.wtf", + "url": "https://milan.wtf" + }, + "hideInEditor": false, + "keywords": ["vr", "virtual reality", "modular", "escape room"], + "dependencies": { + "com.dbrizov.naughtyattributes": "2.1.4" + } +} diff --git a/Assets/Player/package.json.meta b/Assets/Player/package.json.meta new file mode 100644 index 0000000..e129192 --- /dev/null +++ b/Assets/Player/package.json.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4206c5a74d3783c4b8f8f953d7d6795e +timeCreated: 1668943725 \ No newline at end of file diff --git a/Assets/Portal/README.md b/Assets/Portal/README.md index 29ffbcc..0c590cd 100644 --- a/Assets/Portal/README.md +++ b/Assets/Portal/README.md @@ -1,3 +1,3 @@ -# Escape Room Engine Portals +# Escape Room Engine Player -An implementation of portals for the VR escape room engine. \ No newline at end of file +Escape Room VR Player. \ No newline at end of file diff --git a/Assets/Portal/Runtime/Portal.asmdef b/Assets/Portal/Runtime/Portal.asmdef index c3c9174..c15d484 100644 --- a/Assets/Portal/Runtime/Portal.asmdef +++ b/Assets/Portal/Runtime/Portal.asmdef @@ -4,7 +4,8 @@ "references": [ "GUID:75469ad4d38634e559750d17036d5f7c", "GUID:15fc0a57446b3144c949da3e2b9737a9", - "GUID:fe685ec1767f73d42b749ea8045bfe43" + "GUID:fe685ec1767f73d42b749ea8045bfe43", + "GUID:8804073475ba36c47830e8e19dc699ce" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index bdc435d..77f9544 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -1649,7 +1649,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: loggingEnabled: 1 - typeFilter: 0000000003000000050000000400000001000000 + typeFilter: 000000000400000006000000 --- !u!1 &1718957584 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Escape Room Engine/Test Assets.meta b/Assets/Test Assets.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets.meta rename to Assets/Test Assets.meta diff --git a/Assets/Escape Room Engine/Test Assets/Materials.meta b/Assets/Test Assets/Materials.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials.meta rename to Assets/Test Assets/Materials.meta diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Interactable Metal.mat b/Assets/Test Assets/Materials/Interactable Metal.mat similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/Interactable Metal.mat rename to Assets/Test Assets/Materials/Interactable Metal.mat diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Interactable Metal.mat.meta b/Assets/Test Assets/Materials/Interactable Metal.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/Interactable Metal.mat.meta rename to Assets/Test Assets/Materials/Interactable Metal.mat.meta diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Interactable Plastic.mat b/Assets/Test Assets/Materials/Interactable Plastic.mat similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/Interactable Plastic.mat rename to Assets/Test Assets/Materials/Interactable Plastic.mat diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Interactable Plastic.mat.meta b/Assets/Test Assets/Materials/Interactable Plastic.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/Interactable Plastic.mat.meta rename to Assets/Test Assets/Materials/Interactable Plastic.mat.meta diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Light.mat b/Assets/Test Assets/Materials/Light.mat similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/Light.mat rename to Assets/Test Assets/Materials/Light.mat diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Light.mat.meta b/Assets/Test Assets/Materials/Light.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/Light.mat.meta rename to Assets/Test Assets/Materials/Light.mat.meta diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World A.mat b/Assets/Test Assets/Materials/World A.mat similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/World A.mat rename to Assets/Test Assets/Materials/World A.mat diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World A.mat.meta b/Assets/Test Assets/Materials/World A.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/World A.mat.meta rename to Assets/Test Assets/Materials/World A.mat.meta diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World B.mat b/Assets/Test Assets/Materials/World B.mat similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/World B.mat rename to Assets/Test Assets/Materials/World B.mat diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World B.mat.meta b/Assets/Test Assets/Materials/World B.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/World B.mat.meta rename to Assets/Test Assets/Materials/World B.mat.meta diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World C.mat b/Assets/Test Assets/Materials/World C.mat similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/World C.mat rename to Assets/Test Assets/Materials/World C.mat diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World C.mat.meta b/Assets/Test Assets/Materials/World C.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/World C.mat.meta rename to Assets/Test Assets/Materials/World C.mat.meta diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World D.mat b/Assets/Test Assets/Materials/World D.mat similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/World D.mat rename to Assets/Test Assets/Materials/World D.mat diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World D.mat.meta b/Assets/Test Assets/Materials/World D.mat.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Materials/World D.mat.meta rename to Assets/Test Assets/Materials/World D.mat.meta diff --git a/Assets/Escape Room Engine/Test Assets/Models.meta b/Assets/Test Assets/Models.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Models.meta rename to Assets/Test Assets/Models.meta diff --git a/Assets/Test Assets/Models/Room.blend b/Assets/Test Assets/Models/Room.blend new file mode 100644 index 0000000..37d3a0b --- /dev/null +++ b/Assets/Test Assets/Models/Room.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9337c7c31f2c45fdf72f85b683be0f57c36e78ca540c328879efaec7e6a9a00 +size 809048 diff --git a/Assets/Escape Room Engine/Test Assets/Models/Room.blend.meta b/Assets/Test Assets/Models/Room.blend.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Models/Room.blend.meta rename to Assets/Test Assets/Models/Room.blend.meta diff --git a/Assets/Escape Room Engine/Test Assets/Models/Room.blend1 b/Assets/Test Assets/Models/Room.blend1 similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Models/Room.blend1 rename to Assets/Test Assets/Models/Room.blend1 diff --git a/Assets/Escape Room Engine/Test Assets/Models/Room.blend1.meta b/Assets/Test Assets/Models/Room.blend1.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Models/Room.blend1.meta rename to Assets/Test Assets/Models/Room.blend1.meta diff --git a/Assets/Escape Room Engine/Test Assets/Prefabs.meta b/Assets/Test Assets/Prefabs.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Prefabs.meta rename to Assets/Test Assets/Prefabs.meta diff --git a/Assets/Escape Room Engine/Test Assets/Prefabs/Room.prefab b/Assets/Test Assets/Prefabs/Room.prefab similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Prefabs/Room.prefab rename to Assets/Test Assets/Prefabs/Room.prefab diff --git a/Assets/Escape Room Engine/Test Assets/Prefabs/Room.prefab.meta b/Assets/Test Assets/Prefabs/Room.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Prefabs/Room.prefab.meta rename to Assets/Test Assets/Prefabs/Room.prefab.meta diff --git a/Assets/Escape Room Engine/Test Assets/Prefabs/Test Light.prefab b/Assets/Test Assets/Prefabs/Test Light.prefab similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Prefabs/Test Light.prefab rename to Assets/Test Assets/Prefabs/Test Light.prefab diff --git a/Assets/Escape Room Engine/Test Assets/Prefabs/Test Light.prefab.meta b/Assets/Test Assets/Prefabs/Test Light.prefab.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Prefabs/Test Light.prefab.meta rename to Assets/Test Assets/Prefabs/Test Light.prefab.meta diff --git a/Assets/Escape Room Engine/Test Assets/Test Puzzle 2x2.asset b/Assets/Test Assets/Test Puzzle 2x2.asset similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Test Puzzle 2x2.asset rename to Assets/Test Assets/Test Puzzle 2x2.asset diff --git a/Assets/Escape Room Engine/Test Assets/Test Puzzle 2x2.asset.meta b/Assets/Test Assets/Test Puzzle 2x2.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Test Puzzle 2x2.asset.meta rename to Assets/Test Assets/Test Puzzle 2x2.asset.meta diff --git a/Assets/Escape Room Engine/Test Assets/Test Puzzle.asset b/Assets/Test Assets/Test Puzzle.asset similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Test Puzzle.asset rename to Assets/Test Assets/Test Puzzle.asset diff --git a/Assets/Escape Room Engine/Test Assets/Test Puzzle.asset.meta b/Assets/Test Assets/Test Puzzle.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Test Puzzle.asset.meta rename to Assets/Test Assets/Test Puzzle.asset.meta diff --git a/Assets/Escape Room Engine/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Test Theme.asset rename to Assets/Test Assets/Test Theme.asset diff --git a/Assets/Escape Room Engine/Test Assets/Test Theme.asset.meta b/Assets/Test Assets/Test Theme.asset.meta similarity index 100% rename from Assets/Escape Room Engine/Test Assets/Test Theme.asset.meta rename to Assets/Test Assets/Test Theme.asset.meta