Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
348 changes: 347 additions & 1 deletion Assets/Gothic-Lab/Scenes/Lab.unity

Large diffs are not rendered by default.

2,242 changes: 2,242 additions & 0 deletions Assets/Gothic-VR/Resources/VR/Prefabs/VR - Player XRI.prefab

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 90 additions & 0 deletions Assets/Gothic-VR/Scenes/VR/Player.unity
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ PrefabInstance:
propertyPath: m_Name
value: HVR - Player
objectReference: {fileID: 0}
- target: {fileID: 778145573255517820, guid: c9aaa67c73a5ed34d8a865ecc7613ca2, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1317661251346845374, guid: c9aaa67c73a5ed34d8a865ecc7613ca2, type: 3}
propertyPath: m_AnchoredPosition.x
value: -6.9991455
Expand Down Expand Up @@ -445,6 +449,87 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7d55fa6bfea14d1498e070a53ac806a4, type: 3}
--- !u!1001 &877978168
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 778145573255517820, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_Name
value: VR - Player XRI
objectReference: {fileID: 0}
- target: {fileID: 778145573255517820, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1365252485424465809, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1365252485424465809, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3301783518968500612, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3301783518968500612, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3301783518968500612, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_AnchorMin.y
value: 0.048571706
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3866233120056885002, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9f1083f28417eca49b52039eb29f75eb, type: 3}
--- !u!1001 &1402327359425347789
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -505,6 +590,10 @@ PrefabInstance:
propertyPath: m_Name
value: HVR - XRDeviceSimulator
objectReference: {fileID: 0}
- target: {fileID: 8612154590849758022, guid: 144495bf4b5f5354fb56fc074a0fe5a0, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand All @@ -516,5 +605,6 @@ SceneRoots:
m_Roots:
- {fileID: 138840304}
- {fileID: 441653735}
- {fileID: 877978168}
- {fileID: 1402327359425347789}
- {fileID: 855327201}
3 changes: 2 additions & 1 deletion Assets/Gothic-VR/Scripts/Gothic.VR.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"GUID:e40ba710768534012815d3193fa296cb",
"GUID:5a20be0fd8f247ccb50f69086136ea87",
"GUID:1530a967b84cfb44dbdd5e8a1989764f",
"GUID:fe685ec1767f73d42b749ea8045bfe43"
"GUID:fe685ec1767f73d42b749ea8045bfe43",
"GUID:dc960734dc080426fa6612f1c5fe95f3"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ public void InstallBindings(ContainerBuilder containerBuilder)
containerBuilder.AddSingleton(typeof(HvrUiPointers), typeof(IVrUiPointers));
containerBuilder.AddSingleton(typeof(HvrSfxPlayer), typeof(IVrSfxPlayer));
}

public bool OwnsRig(IVrRig rig)
{
return rig is HvrRig;
}
}
}
#endif
15 changes: 11 additions & 4 deletions Assets/Gothic-VR/Scripts/Interaction/Backends/Xri/XriBackend.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,29 @@ namespace Gothic.VR.Interaction.Backends.Xri
{
/// <summary>
/// XR Interaction Toolkit backend. Always compiled, as XRI is a free package.
/// Implemented: input, haptics, SFX. Missing: the XRI player rig (IVrRig, HVR phase 1b) and the UI laser pointers
/// (IVrUiPointers, HVR phase 1c; registered as a placeholder which only warns).
/// Implemented: input, haptics, SFX and the player rig (XriRig on "VR - Player XRI.prefab", without screen fade).
/// Missing: the UI laser pointers (IVrUiPointers, HVR phase 1c; registered as a placeholder which only warns),
/// ScreenFade/WallFade (1c), the simulator (1d) and grabbing (phase 2).
/// </summary>
public class XriBackend : IVrBackend
{
public string Name => "XR Interaction Toolkit";

public void InstallBindings(ContainerBuilder containerBuilder)
{
Logger.LogWarning("XRI backend is work in progress: input and haptics work. The XRI player rig " +
"(HVR phase 1b) and UI laser pointers (phase 1c) are missing.", LogCat.VR);
Logger.LogWarning("XRI backend is work in progress: rig, locomotion, input and haptics work. " +
"UI laser pointers and screen fades (HVR phase 1c), the simulator (1d) and grabbing " +
"(phase 2) are missing.", LogCat.VR);

containerBuilder.AddSingleton(typeof(XriInput), typeof(IVrInput), typeof(XriInput));
containerBuilder.AddSingleton(typeof(XriHaptics), typeof(IVrHaptics));
containerBuilder.AddSingleton(typeof(XriUiPointers), typeof(IVrUiPointers));
containerBuilder.AddSingleton(typeof(XriSfxPlayer), typeof(IVrSfxPlayer));
}

public bool OwnsRig(IVrRig rig)
{
return rig is XriRig;
}
}
}
Loading