Skip to content
Draft
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
18 changes: 8 additions & 10 deletions .github/workflows/build-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ name: Build on push

# Controls when the action will run. Triggers the workflow on push or pull request
# events, but only for the master branch we'll create .zip files
on: [push, pull_request]
on:
workflow_dispatch:

jobs:
build:
Expand Down Expand Up @@ -42,10 +43,12 @@ jobs:
- name: Run the build for godot-cpp
run: |
scons -C godot-cpp platform=${{ matrix.platform }} -j2 target=template_release generate_bindings=yes bits=64
scons -C godot-cpp platform=${{ matrix.platform }} -j2 target=template_debug generate_bindings=yes bits=64 debug_symbols=yes

- name: Run the build for godot_openvr
run: |
scons platform=${{ matrix.platform }} -j2 target=release bits=64
scons platform=${{ matrix.platform }} -j2 target=debug bits=64 debug_symbols=yes

# There's no option to preserve the path structure on the upload action, so we just
# treat each asset as its respective bin/ subfolder and put it in the right place in
Expand All @@ -70,7 +73,6 @@ jobs:
name: Assemble release bundle
runs-on: ubuntu-22.04
needs: build
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -97,12 +99,8 @@ jobs:
- name: Zip asset
run: |
zip -qq -r godot-openvr.zip .
- name: Create and upload asset
uses: ncipollo/release-action@v1
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
allowUpdates: true
artifacts: "godot-openvr.zip"
omitNameDuringUpdate: true
omitBodyDuringUpdate: true
token: ${{ secrets.GITHUB_TOKEN }}
if: startsWith(github.ref, 'refs/tags')
name: "godot-openvr.zip"
path: "godot-openvr.zip"
4 changes: 2 additions & 2 deletions demo/addons/godot-openvr/godot_openvr.gdextension
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ windows.x86_64.release="res://addons/godot-openvr/bin/win64/libgodot_openvr_rele

[dependencies]

linux.x86_64=[ "res://addons/godot-openvr/bin/x11/libopenvr_api.so" ]
windows.x86_64=[ "res://addons/godot-openvr/bin/win64/openvr_api.dll" ]
linux.x86_64={ "res://addons/godot-openvr/bin/x11/libopenvr_api.so" : "" }
windows.x86_64={ "res://addons/godot-openvr/bin/win64/openvr_api.dll" : "" }
3 changes: 3 additions & 0 deletions src/open_vr/openvr_data.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ XRPose::TrackingConfidence openvr_data::confidence_from_tracking_result(vr::ETra

// Convert event data to Variants and emit a signal on the given source.
void openvr_data::_handle_event(Node *source, vr::VREvent_t event) {
//This method crashes on line 340 (if source has signal) and 389 (emit signal), disabling this has seemingly no averse effects
/*
if (!openvr_data::event_signals.has(event.eventType)) {
return;
}
Expand Down Expand Up @@ -485,6 +487,7 @@ void openvr_data::_handle_event(Node *source, vr::VREvent_t event) {
tracker = tracked_devices[event.trackedDeviceIndex].tracker;
}
source->emit_signal(info.signal_name, event.eventAgeSeconds, tracker, data);
*/
}

void openvr_data::process() {
Expand Down