Merge pull request GodotVR#139 from BastiaanOlij/update_upstream_2022…

…0126

Updated godot-cpp to 3.4 59ecf3b and godot-xr-tools d857eb44

.github/workflows/build-on-push.yml

@@ -29,11 +29,19 @@ jobs:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
       with:
-        submodules: 'recursive'    
+        submodules: 'recursive'
 
-    - name: Install scons (Ubuntu)
+    - name: Set up Python (for SCons)
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+      if: matrix.os == 'ubuntu-18.04'
+
+    - name: Install dependencies (Ubuntu)
       run: |
-        sudo apt install scons
+          sudo apt-get update -qq
+          sudo apt-get install -qqq build-essential pkg-config
+          python -m pip install scons
       if: matrix.os == 'ubuntu-18.04'
 
     - name: Install scons (Windows)

demo/Construct.tscn

@@ -15,7 +15,6 @@ void fragment() {
 
 	COLOR = color;
 }"
-custom_defines = ""
 
 [sub_resource type="ShaderMaterial" id=2]
 shader = SubResource( 1 )

demo/addons/godot-openvr/CHANGES.md

@@ -4,6 +4,11 @@ Changes to the Godot OpenVR asset
 Note, version numbers listed here are the version number assigned to the asset. Each time a new version is uploaded to the asset store we will increase the version number.
 More frequent updates may be available on the source repository.
 
+1.2.0 - unreleased
+-------------------
+- Updated godot-cpp to 3.4 59ecf3b9
+- Updated godot-xr-tools to d857eb44
+
 1.1.0 - 9 July 2021
 -------------------
 - Build for Godot 3.3

demo/addons/godot-xr-tools/assets/LeftHand.gd

@@ -0,0 +1,16 @@
+extends Spatial
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	var controller : ARVRController = get_parent()
+	if controller:
+		var grip = controller.get_joystick_axis(JOY_VR_ANALOG_GRIP) * 2.5
+		var trigger = controller.get_joystick_axis(JOY_VR_ANALOG_TRIGGER) * 2.5
+
+		# print("Grip: " + str(grip) + " Trigger: " + str(trigger))
+
+		$AnimationTree.set("parameters/SetGrip/seek_position", grip)
+		$AnimationTree.set("parameters/SetIndex/seek_position", trigger)
+
+		# var grip_state = controller.is_button_pressed(JOY_VR_GRIP)
+		# print("Pressed: " + str(grip_state))