Skip to content

Modularization + HVR introduction #358

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

Jump to bottom
Draft
wants to merge 31 commits into
base: main
Choose a base branch
from
Draft

Modularization + HVR introduction #358

wants to merge 31 commits into from

Conversation

@JaXt0r
Copy link
Contributor

@JaXt0r JaXt0r commented May 18, 2024 •
edited
Loading

To test:

  1. Checkout branch: feature/modularization
  2. See image 1: Install HVR (Assets/HurricaneVR/*) and Activate it via Menu in Unity
  3. See image 2: Skip main menu in feature flags (not working as of now).
  4. What should work with HVR:
    1. Climbing
    2. Chest opening
    3. Door opening

Then the game should load and place you. You can now start testing.

Known issues:

  • The main menu isn't working with HVR so far. I think it's related to the fact, that the HVRPlayer has no menu set up so far
  • When you enter the game, it always spawns you at 0,0,0 (So lean a little forward when hitting "play". Otherwise the character will fall through the ground

Helpful hints:

  • See image 3: You can always check if you're currently using HVR or OXR.
  • When you want to implement main menu etc. Just hit "Deactivate HVR" in the same menu. Then the game boots with OXR logic and you can compare
  • Image 4: The custom HVR adapter logic and OXR adapter logic is now in a separate module

image

image

@JaXt0r JaXt0r changed the title Feature/modularization Modularization + HVR introduction May 18, 2024
JaXt0r and others added 18 commits May 19, 2024 06:51
@JaXt0r
activate(Lab): HVR now works in Lab to walk and run.
35169ab
@piotrb92
HVR Fixes
1dd8f76 
Fixed ladder (adding climbable component to the object with mesh collider, also adding HVR Grabbable and setting grab type to physic poser as we don't have any static grab points)
Fixed UiPointers (added HVRInputModule to player prefab and registered Ui pointers on start using new little script HVR_RegisterUiPointers, also each canvas needs to be added to HVRInputModule UICanvases, so each canvas needs HVR_RegisterUiCanvas script to be added to the input module on start)
Added HVR grabbable to LabVobHandAttachPointsLabHandler so we can grab and play with all spawned objects
all wrapped up in checks if GVR_HVR_INSTALLED

tag and collision matrix changes are HVR defaults
@piotrb92
Update Lab.unity
180ef33
@JaXt0r
change(IInteractionAdapter): Moved certain adapters into one for sake…
a62a7c4 
… of simplicity and updated a few imports.
@JaXt0r
improve(LabItemTool): Removed unneccessary fields and moved OXR/HVR g…
9a08aaf 
…rabbable component attachments to Adapter logic.
@JaXt0r
candy(HVRREgister*): Files renamed.
60eab8d
@JaXt0r
fix(Rain): Added rain to HVRPlayer (and dropped NPE for lookup during…
4f34cc7 
… scene loading.).
@JaXt0r
fix(GeneralSceneLoadedEvent): As the PlayerController is spawned at t…
d48c98d 
…he same time the event is fired, we now provide it as parameter instead using Find(). (find won't work same frame a GO is spawned)
@piotrb92
fixed ladder creation for HVR
36316e7
@Redreaper666
Merge branch 'main' into feature/modularization
8def97b
@Redreaper666
(Fix) Lab Items now spawn with textures
66c15eb
@JaXt0r
doc(Modularization): Added Module documentation for VR controls and h…
c1f6600 
…ow to use them.
@JaXt0r
doc(HVR): Links fixed and pragma explanation enhanced.
bd440b2
@piotrb92
replaced canvas and ui pointers registration scripts by HVR Player ma…
ebb0c84 
…nager that handles all that
@piotrb92
Merge branch 'feature/modularization' of https://github.com/GothicVRP…
482e5a1 
…roject/GothicVR into feature/modularization
@JaXt0r
add(PrefabMerging): GameObjects from Prefabs are now merged with node…
48781d9 
…s from ZenKit. Ensuring Components will stay and can easily be changed inside prefab.
@JaXt0r
add(HVRocMobContainer.prefab): Hard coded prefab lookup for now. Will…
2ac9d5f 
… update it later to proper lookup.
@JaXt0r
fix(HVRPlayerManager): Compile time fix. Surrounded class by #IF HVR …
bd091c5 
…pragma.
@JaXt0r JaXt0r linked an issue May 23, 2024 that may be closed by this pull request
Meshes - Reuse existing component from prefab on Vobs if existing #362
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Meshes - Reuse existing component from prefab on Vobs if existing

4 participants

@JaXt0r @piotrb92 @Redreaper666