Skip to content

refactor: VR game code talks to own rig, input, haptics, UI pointer a… #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JaXt0r merged 4 commits into from
Oct 22, 2026
Merged

refactor: VR game code talks to own rig, input, haptics, UI pointer a… #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a57512
refactor: VR game code talks to own rig, input, haptics, UI pointer a…
JaXt0r Oct 22, 2026
b770e1e
refactor: VR grab, hover, socket and door events go through own VrInt…
JaXt0r Oct 22, 2026
c73f08e
Merge branch 'engine/hvr-replacement' into engine/hvr-replacement-0b
JaXt0r Oct 22, 2026
e3e0f02
Merge pull request #417 from Gothic-Unity-Project/engine/hvr-replacem…
JaXt0r Oct 22, 2026
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
2 changes: 1 addition & 1 deletion Assets/Gothic-Core/Scripts/Domain/Vobs/VobInitializerDomain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ private static void SnapDigSpotToLoader(GameObject go)

/// <summary>
/// Child vobs are created inside their parent's GO without a VobLoader of their own. Their adapters
/// (VRVobContainer, VRVobContainerPhysicsChest, door lock picking, VRFocus) call
/// (VRVobContainer, HvrPhysicsChest, door lock picking, VRFocus) call
/// GetComponentInParent&lt;VobLoader&gt;() and got the PARENT's vob (often an unnamed zCVob) -
/// InvalidCastExceptions, "No door or container found for ><", doors/chests that don't work (G2 Xardas' tower).
/// </summary>
Expand Down
816 changes: 207 additions & 609 deletions Assets/Gothic-VR/Resources/VR/Prefabs/HVR - Player.prefab
View file
Open in desktop

Large diffs are not rendered by default.

519 changes: 157 additions & 362 deletions Assets/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack.prefab
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 20 additions & 53 deletions ...ts/Gothic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackInventorySlot.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 4434190707277561806}
- component: {fileID: 7810595717036477131}
- component: {fileID: 8782956222347397959}
- component: {fileID: 1881403388789157283}
m_Layer: 0
m_Name: VRBackpackInventorySlot
m_TagString: Untagged
Expand Down Expand Up @@ -51,63 +52,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory,
Assembly-CSharp
m_MethodName: OnBeforeGrabbed
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
m_MethodName: OnItemPutOutOfBackpack
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
Released:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory,
Assembly-CSharp
m_MethodName: OnReleased
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
m_MethodName: OnItemPutIntoBackpack
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
Expand Down Expand Up @@ -219,6 +170,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
--- !u!114 &1881403388789157283
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5861164055357080340}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1 &7098095399602562181
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -280,6 +243,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -301,7 +266,9 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
70 changes: 16 additions & 54 deletions ...thic-VR/Resources/VR/Prefabs/Player-Elements/BackPack/VRBackpackLargeInventorySlot.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 1109714354293663205}
- component: {fileID: 4434190707277561806}
- component: {fileID: 8782956222347397959}
- component: {fileID: 3068390016136051502}
m_Layer: 0
m_Name: VRBackpackLargeInventorySlot
m_TagString: Untagged
Expand Down Expand Up @@ -51,63 +52,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
BeforeGrabbed:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory,
Assembly-CSharp
m_MethodName: OnBeforeGrabbed
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
m_MethodName: OnItemPutOutOfBackpack
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
Released:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Gothic.HVR.Components.VobContainer.HVRVobContainerSocketInventory,
Assembly-CSharp
m_MethodName: OnReleased
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: Gothic.VR.Adapters.Player.VRBackpack, Gothic.VR
m_MethodName: OnItemPutIntoBackpack
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
BeforeHoverEnter:
m_PersistentCalls:
m_Calls: []
Expand All @@ -119,7 +70,6 @@ MonoBehaviour:
m_Calls: []
_grabBag: {fileID: 0}
GrabBags: []
_allowGrabbing: 0
GrabControl: 0
GrabDetectionType: 1
CheckHandOverlap: 0
Expand Down Expand Up @@ -220,6 +170,18 @@ MonoBehaviour:
Tags: {fileID: 11400000, guid: 836908d62a0d2e8489d7e21e7f774964, type: 2}
_data: 3
Any: 1
--- !u!114 &3068390016136051502
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5861164055357080340}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fce3b6fdf41d541a8cb5f194cfd30a, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrSocketBridge
--- !u!1001 &3062234451954866645
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
88 changes: 33 additions & 55 deletions Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ GameObject:
- component: {fileID: 8543334853728962911}
- component: {fileID: 8461469363836242350}
- component: {fileID: 2018021949967966991}
- component: {fileID: 5746501746354695612}
- component: {fileID: 6145980801324581266}
m_Layer: 6
m_Name: oCItem
m_TagString: GothicVob
Expand Down Expand Up @@ -46,10 +48,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
serializedVersion: 4
serializedVersion: 5
m_Mass: 2.5
m_Drag: 0
m_AngularDrag: 0.05
m_LinearDamping: 0
m_AngularDamping: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
Expand Down Expand Up @@ -166,64 +168,16 @@ MonoBehaviour:
m_Calls: []
Grabbed:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8543334853728962911}
m_TargetAssemblyTypeName: Gothic.HVR.Components.HVROCItem, Assembly-CSharp
m_MethodName: OnGrabbed
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
Released:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8543334853728962911}
m_TargetAssemblyTypeName: Gothic.HVR.Components.HVRoCItem, Assembly-CSharp
m_MethodName: OnReleased
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
HoverEnter:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6759220176799969513}
m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
m_MethodName: OnHoverEnter
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
HoverExit:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6759220176799969513}
m_TargetAssemblyTypeName: GVR.HVR.Components.HVRFocus, Assembly-CSharp
m_MethodName: OnHoverExit
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
Collided:
m_PersistentCalls:
m_Calls: []
Expand Down Expand Up @@ -309,6 +263,30 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_injectionStrategy: 2
--- !u!114 &5746501746354695612
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5165ad186aed3fb408c5d43079b20d34, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Components.VrInteractable
--- !u!114 &6145980801324581266
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 594f5e7857d0629419c1bef807639a86, type: 3}
m_Name:
m_EditorClassIdentifier: Gothic.VR::Gothic.VR.Interaction.Backends.Hvr.HvrInteractableBridge
--- !u!1001 &2283517946604736509
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
3 changes: 1 addition & 2 deletions Assets/Gothic-VR/Resources/VR/Prefabs/Vobs/oCItem/LockPick.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b286a6d3f574029ae48428e93591d28, type: 3}
m_Name:
m_EditorClassIdentifier:
IsSocketed: 0
IsInsideLock: 0
ActiveDoorLock: {fileID: 0}
ActiveContainerDoorPicking: {fileID: 0}
HoldingHand: {fileID: 0}
--- !u!4 &6888142504213485964 stripped
Transform:
Expand Down
Loading