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
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,11 @@ OpenGothic
!.claude/README.md
!.claude/CLAUDE-SETUP.md
!.claude/statuslines/

# Package samples (e.g. XR Interaction Toolkit Starter Assets, XR Interaction Simulator) are re-importable from the
# Package Manager. What we need is copied into Gothic-VR/, so nothing may reference Assets/Samples/.
/[Aa]ssets/[Ss]amples/
/[Aa]ssets/[Ss]amples.meta


ultimatexr-unity/
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
PreselectGameVersion: 1
GameVersion: 0
PreSelectMod: 0
ModIni:
ModPath:
GameControls: 0
VrInteractionBackend: 0
EnableVRDeviceSimulator: 1
ActivateMarvinMode: 1
PreselectMarvinMode: 0
EnableZSpyLogs: 0
AllDebugChannels: 0
ZSpyChannels:
Expand Down Expand Up @@ -51,13 +54,16 @@ MonoBehaviour:
ShowVOBMeshCullingGizmos: 0
ShowCapsuleOverlapGizmos: 0
EnableNpcs: 0
EnableCombatSystem: 0
EnableNpcMeshCulling: 1
NpcCullingDistance: 50
SpawnNpcInstances:
Value:
SpawnMonsterInstances:
Value:
EnableNpcEyeBlinking: 0
EnableNpcLooting: 0
EnableDialogFreeMovement: 1
ShowNpcColliders: 0
ShowFreePoints: 0
ShowWayPoints: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ MonoBehaviour:
ModIni:
ModPath:
GameControls: 0
VrInteractionBackend: 0
EnableVRDeviceSimulator: 0
PreselectMarvinMode: 0
EnableZSpyLogs: 0
Expand Down
4 changes: 4 additions & 0 deletions Assets/Gothic-Core/Scripts/Models/Config/DeveloperConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ public class DebugChannelTypesCollection : CollectionWrapper<DeveloperConfigEnum

public Controls GameControls = Controls.VR;

[ConditionalField(fieldToCheck: nameof(GameControls), compareValues: Controls.VR)]
[Tooltip("VR interaction framework. Hvr falls back to Xri if HVR isn't installed (no GOTHIC_HVR_INSTALLED).")]
public VrInteractionBackend VrInteractionBackend = VrInteractionBackend.Hvr;

[Separator("Debug")]
[ConditionalField(fieldToCheck: nameof(GameControls), compareValues: Controls.VR)]
public bool EnableVRDeviceSimulator;
Expand Down
19 changes: 19 additions & 0 deletions Assets/Gothic-Core/Scripts/Models/Context/VrInteractionBackend.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
namespace Gothic.Core.Models.Context
{
/// <summary>
/// VR interaction framework which provides the VR ports (rig, input, haptics, UI pointers).
/// Stored as int in DeveloperConfig assets. Don't change the values.
/// </summary>
public enum VrInteractionBackend
{
/// <summary>
/// HurricaneVR (commercial). Needs the scripting define GOTHIC_HVR_INSTALLED.
/// </summary>
Hvr = 0,

/// <summary>
/// XR Interaction Toolkit (free, always installed).
/// </summary>
Xri = 1
}
}

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

8 changes: 8 additions & 0 deletions Assets/Gothic-VR/Resources/VR/Input.meta

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

Loading